Skip to content

Commit 58972e0

Browse files
YunaiVYunaiV
committed
✨ ERP：采购订单的 paymentPrice 调整，为接入财务的付款单做准备
1 parent fcba2b4 commit 58972e0

File tree

5 files changed

+72
-90
lines changed

5 files changed

+72
-90
lines changed

‎src/views/erp/purchase/in/PurchaseInForm.vue

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,11 @@
103103
</el-col>
104104
<el-col :span="8">
105105
<el-form-item label="优惠后金额">
106-
<el-input disabled v-model="formData.totalPrice" :formatter="erpPriceInputFormatter" />
106+
<el-input
107+
disabled
108+
:model-value="formData.totalPrice - formData.otherPrice"
109+
:formatter="erpPriceInputFormatter"
110+
/>
107111
</el-form-item>
108112
</el-col>
109113
<el-col :span="8">
@@ -137,15 +141,8 @@
137141
</el-form-item>
138142
</el-col>
139143
<el-col :span="8">
140-
<el-form-item label="本次付款" prop="refundPrice">
141-
<el-input-number
142-
v-model="formData.refundPrice"
143-
controls-position="right"
144-
:min="0"
145-
:precision="2"
146-
placeholder="请输入本次付款"
147-
class="!w-1/1"
148-
/>
144+
<el-form-item label="应付金额">
145+
<el-input disabled v-model="formData.totalPrice" :formatter="erpPriceInputFormatter" />
149146
</el-form-item>
150147
</el-col>
151148
</el-row>
@@ -195,15 +192,13 @@ const formData = ref({
195192
discountPrice: 0,
196193
totalPrice: 0,
197194
otherPrice: 0,
198-
refundPrice: undefined,
199195
orderNo: undefined,
200196
items: [],
201197
no: undefined // 入库单号，后端返回
202198
})
203199
const formRules = reactive({
204200
supplierId: [{ required: true, message: '供应商不能为空', trigger: 'blur' }],
205-
inTime: [{ required: true, message: '入库时间不能为空', trigger: 'blur' }],
206-
refundPrice: [{ required: true, message: '本次付款不能为空', trigger: 'blur' }]
201+
inTime: [{ required: true, message: '入库时间不能为空', trigger: 'blur' }]
207202
})
208203
const disabled = computed(() => formType.value === 'detail')
209204
const formRef = ref() // 表单 Ref
@@ -226,14 +221,8 @@ watch(
226221
const totalPrice = val.items.reduce((prev, curr) => prev + curr.totalPrice, 0)
227222
const discountPrice =
228223
val.discountPercent != null ? erpPriceMultiply(totalPrice, val.discountPercent / 100.0) : 0
229-
// debugger
230-
// TODO 芋艿：refundPrice 自动计算会有问题，界面上看到修改了，传递到后端还是没改过来
231-
// const refundPrice = totalPrice - discountPrice + val.otherPrice
232-
// 赋值
233224
formData.value.discountPrice = discountPrice
234-
formData.value.totalPrice = totalPrice - discountPrice
235-
// val.refundPrice = refundPrice
236-
// formData.value.refundPrice = refundPrice
225+
formData.value.totalPrice = totalPrice - discountPrice + val.otherPrice
237226
},
238227
{ deep: true }
239228
)
@@ -329,7 +318,6 @@ const resetForm = () => {
329318
discountPrice: 0,
330319
totalPrice: 0,
331320
otherPrice: 0,
332-
refundPrice: undefined,
333321
items: []
334322
}
335323
formRef.value?.resetFields()

‎src/views/erp/purchase/in/index.vue

Lines changed: 24 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
start-placeholder="开始日期"
4242
end-placeholder="结束日期"
4343
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
44-
class="!w-240px"
44+
class="!w-220px"
4545
/>
4646
</el-form-item>
4747
<el-form-item label="供应商" prop="supplierId">
@@ -117,19 +117,25 @@
117117
/>
118118
</el-select>
119119
</el-form-item>
120-
<el-form-item label="有无欠款" prop="debtStatus">
120+
<el-form-item label="付款状态" prop="paymentStatus">
121121
<el-select
122-
v-model="queryParams.debtStatus"
123-
placeholder="请选择有无欠款"
122+
v-model="queryParams.paymentStatus"
123+
placeholder="请选择有款状态"
124124
clearable
125125
class="!w-240px"
126126
>
127-
<el-option label="有欠款" value="true" />
128-
<el-option label="无欠款" value="false" />
127+
<el-option label="未付款" value="0" />
128+
<el-option label="部分付款" value="1" />
129+
<el-option label="全部付款" value="2" />
129130
</el-select>
130131
</el-form-item>
131-
<el-form-item label="状态" prop="status">
132-
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable class="!w-240px">
132+
<el-form-item label="审核状态" prop="status">
133+
<el-select
134+
v-model="queryParams.status"
135+
placeholder="请选择审核状态"
136+
clearable
137+
class="!w-240px"
138+
>
133139
<el-option
134140
v-for="dict in getIntDictOptions(DICT_TYPE.ERP_AUDIT_STATUS)"
135141
:key="dict.value"
@@ -208,35 +214,26 @@
208214
:formatter="erpCountTableColumnFormatter"
209215
/>
210216
<el-table-column
211-
label="金额合计"
212-
align="center"
213-
prop="totalProductPrice"
214-
:formatter="erpPriceTableColumnFormatter"
215-
/>
216-
<el-table-column
217-
label="含税金额"
217+
label="应付金额"
218218
align="center"
219219
prop="totalPrice"
220220
:formatter="erpPriceTableColumnFormatter"
221221
/>
222-
<el-table-column label="待收金额" align="center">
223-
<template #default="scope">
224-
{{ erpPriceInputFormatter(scope.row.refundPrice + scope.row.debtPrice) }}
225-
</template>
226-
</el-table-column>
227222
<el-table-column
228-
label="本次付款"
223+
label="已付金额"
229224
align="center"
230-
prop="refundPrice"
225+
prop="paymentPrice"
231226
:formatter="erpPriceTableColumnFormatter"
232227
/>
233-
<el-table-column label="本次欠款" align="center" prop="debtPrice">
228+
<el-table-column label="未付金额" align="center">
234229
<template #default="scope">
235-
<span v-if="scope.row.debtPrice === 0">0</span>
236-
<el-tag type="danger" v-else>{{ erpPriceInputFormatter(scope.row.debtPrice) }}</el-tag>
230+
<span v-if="scope.row.paymentPrice === scope.row.totalPrice">0</span>
231+
<el-tag type="danger" v-else>
232+
{{ erpPriceInputFormatter(scope.row.totalPrice - scope.row.paymentPrice) }}
233+
</el-tag>
237234
</template>
238235
</el-table-column>
239-
<el-table-column label="状态" align="center" fixed="right" width="90" prop="status">
236+
<el-table-column label="审核状态" align="center" fixed="right" width="90" prop="status">
240237
<template #default="scope">
241238
<dict-tag :type="DICT_TYPE.ERP_AUDIT_STATUS" :value="scope.row.status" />
242239
</template>
@@ -337,7 +334,7 @@ const queryParams = reactive({
337334
warehouseId: undefined,
338335
inTime: [],
339336
orderNo: undefined,
340-
debtStatus: undefined,
337+
paymentStatus: undefined,
341338
accountId: undefined,
342339
status: undefined,
343340
remark: undefined,

‎src/views/erp/purchase/order/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
start-placeholder="开始日期"
4242
end-placeholder="结束日期"
4343
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
44-
class="!w-240px"
44+
class="!w-220px"
4545
/>
4646
</el-form-item>
4747
<el-form-item label="供应商" prop="supplierId">

‎src/views/erp/purchase/return/PurchaseReturnForm.vue

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,11 @@
107107
</el-col>
108108
<el-col :span="8">
109109
<el-form-item label="优惠后金额">
110-
<el-input disabled v-model="formData.totalPrice" :formatter="erpPriceInputFormatter" />
110+
<el-input
111+
disabled
112+
:model-value="formData.totalPrice - formData.otherPrice"
113+
:formatter="erpPriceInputFormatter"
114+
/>
111115
</el-form-item>
112116
</el-col>
113117
<el-col :span="8">
@@ -141,15 +145,8 @@
141145
</el-form-item>
142146
</el-col>
143147
<el-col :span="8">
144-
<el-form-item label="本次退款" prop="refundPrice">
145-
<el-input-number
146-
v-model="formData.refundPrice"
147-
controls-position="right"
148-
:min="0"
149-
:precision="2"
150-
placeholder="请输入本次退款"
151-
class="!w-1/1"
152-
/>
148+
<el-form-item label="应退金额" prop="totalPrice">
149+
<el-input disabled v-model="formData.totalPrice" :formatter="erpPriceInputFormatter" />
153150
</el-form-item>
154151
</el-col>
155152
</el-row>
@@ -199,15 +196,13 @@ const formData = ref({
199196
discountPrice: 0,
200197
totalPrice: 0,
201198
otherPrice: 0,
202-
refundPrice: undefined,
203199
orderNo: undefined,
204200
items: [],
205201
no: undefined // 退货单号，后端返回
206202
})
207203
const formRules = reactive({
208204
supplierId: [{ required: true, message: '供应商不能为空', trigger: 'blur' }],
209-
returnTime: [{ required: true, message: '退货时间不能为空', trigger: 'blur' }],
210-
refundPrice: [{ required: true, message: '本次退款不能为空', trigger: 'blur' }]
205+
returnTime: [{ required: true, message: '退货时间不能为空', trigger: 'blur' }]
211206
})
212207
const disabled = computed(() => formType.value === 'detail')
213208
const formRef = ref() // 表单 Ref
@@ -230,14 +225,8 @@ watch(
230225
const totalPrice = val.items.reduce((prev, curr) => prev + curr.totalPrice, 0)
231226
const discountPrice =
232227
val.discountPercent != null ? erpPriceMultiply(totalPrice, val.discountPercent / 100.0) : 0
233-
// debugger
234-
// TODO 芋艿：refundPrice 自动计算会有问题，界面上看到修改了，传递到后端还是没改过来
235-
// const refundPrice = totalPrice - discountPrice + val.otherPrice
236-
// 赋值
237228
formData.value.discountPrice = discountPrice
238-
formData.value.totalPrice = totalPrice - discountPrice
239-
// val.refundPrice = refundPrice
240-
// formData.value.refundPrice = refundPrice
229+
formData.value.totalPrice = totalPrice - discountPrice + val.otherPrice
241230
},
242231
{ deep: true }
243232
)
@@ -332,7 +321,6 @@ const resetForm = () => {
332321
discountPrice: 0,
333322
totalPrice: 0,
334323
otherPrice: 0,
335-
refundPrice: undefined,
336324
items: []
337325
}
338326
formRef.value?.resetFields()

‎src/views/erp/purchase/return/index.vue

Lines changed: 29 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
start-placeholder="开始日期"
4242
end-placeholder="结束日期"
4343
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
44-
class="!w-240px"
44+
class="!w-220px"
4545
/>
4646
</el-form-item>
4747
<el-form-item label="供应商" prop="supplierId">
@@ -117,8 +117,25 @@
117117
/>
118118
</el-select>
119119
</el-form-item>
120-
<el-form-item label="状态" prop="status">
121-
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable class="!w-240px">
120+
<el-form-item label="退款状态" prop="refundStatus">
121+
<el-select
122+
v-model="queryParams.refundStatus"
123+
placeholder="请选择退款状态"
124+
clearable
125+
class="!w-240px"
126+
>
127+
<el-option label="未退款" value="0" />
128+
<el-option label="部分退款" value="1" />
129+
<el-option label="全部退款" value="2" />
130+
</el-select>
131+
</el-form-item>
132+
<el-form-item label="审核状态" prop="status">
133+
<el-select
134+
v-model="queryParams.status"
135+
placeholder="请选择审核状态"
136+
clearable
137+
class="!w-240px"
138+
>
122139
<el-option
123140
v-for="dict in getIntDictOptions(DICT_TYPE.ERP_AUDIT_STATUS)"
124141
:key="dict.value"
@@ -197,35 +214,26 @@
197214
:formatter="erpCountTableColumnFormatter"
198215
/>
199216
<el-table-column
200-
label="金额合计"
201-
align="center"
202-
prop="totalProductPrice"
203-
:formatter="erpPriceTableColumnFormatter"
204-
/>
205-
<el-table-column
206-
label="含税金额"
217+
label="应退金额"
207218
align="center"
208219
prop="totalPrice"
209220
:formatter="erpPriceTableColumnFormatter"
210221
/>
211-
<el-table-column label="待收金额" align="center">
212-
<template #default="scope">
213-
{{ erpPriceInputFormatter(scope.row.refundPrice + scope.row.debtPrice) }}
214-
</template>
215-
</el-table-column>
216222
<el-table-column
217-
label="本次收款"
223+
label="已退金额"
218224
align="center"
219225
prop="refundPrice"
220226
:formatter="erpPriceTableColumnFormatter"
221227
/>
222-
<el-table-column label="本次欠款" align="center" prop="debtPrice">
228+
<el-table-column label="未退金额" align="center">
223229
<template #default="scope">
224-
<span v-if="scope.row.debtPrice === 0">0</span>
225-
<el-tag type="danger" v-else>{{ erpPriceInputFormatter(scope.row.debtPrice) }}</el-tag>
230+
<span v-if="scope.row.refundPrice === scope.row.totalPrice">0</span>
231+
<el-tag type="danger" v-else>
232+
{{ erpPriceInputFormatter(scope.row.totalPrice - scope.row.refundPrice) }}
233+
</el-tag>
226234
</template>
227235
</el-table-column>
228-
<el-table-column label="状态" align="center" fixed="right" width="90" prop="status">
236+
<el-table-column label="审核状态" align="center" fixed="right" width="90" prop="status">
229237
<template #default="scope">
230238
<dict-tag :type="DICT_TYPE.ERP_AUDIT_STATUS" :value="scope.row.status" />
231239
</template>
@@ -328,6 +336,7 @@ const queryParams = reactive({
328336
orderNo: undefined,
329337
accountId: undefined,
330338
status: undefined,
339+
refundStatus: undefined,
331340
remark: undefined,
332341
creator: undefined
333342
})

0 commit comments

Comments
 (0)