Skip to content

Commit e07e191

Browse files
YunaiVYunaiV
committed
✨ ERP：销售订单的 receiptPrice 调整，为接入财务的收款单做准备
1 parent e951ed1 commit e07e191

File tree

5 files changed

+67
-91
lines changed

5 files changed

+67
-91
lines changed

‎src/views/erp/sale/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="customerId">

‎src/views/erp/sale/out/SaleOutForm.vue

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,11 @@
121121
</el-col>
122122
<el-col :span="8">
123123
<el-form-item label="优惠后金额">
124-
<el-input disabled v-model="formData.totalPrice" :formatter="erpPriceInputFormatter" />
124+
<el-input
125+
disabled
126+
:model-value="formData.totalPrice - formData.otherPrice"
127+
:formatter="erpPriceInputFormatter"
128+
/>
125129
</el-form-item>
126130
</el-col>
127131
<el-col :span="8">
@@ -155,15 +159,8 @@
155159
</el-form-item>
156160
</el-col>
157161
<el-col :span="8">
158-
<el-form-item label="本次收款" prop="payPrice">
159-
<el-input-number
160-
v-model="formData.payPrice"
161-
controls-position="right"
162-
:min="0"
163-
:precision="2"
164-
placeholder="请输入本次收款"
165-
class="!w-1/1"
166-
/>
162+
<el-form-item label="应收金额">
163+
<el-input disabled v-model="formData.totalPrice" :formatter="erpPriceInputFormatter" />
167164
</el-form-item>
168165
</el-col>
169166
</el-row>
@@ -211,15 +208,13 @@ const formData = ref({
211208
discountPrice: 0,
212209
totalPrice: 0,
213210
otherPrice: 0,
214-
payPrice: undefined,
215211
orderNo: undefined,
216212
items: [],
217213
no: undefined // 出库单号，后端返回
218214
})
219215
const formRules = reactive({
220216
customerId: [{ required: true, message: '客户不能为空', trigger: 'blur' }],
221-
outTime: [{ required: true, message: '出库时间不能为空', trigger: 'blur' }],
222-
payPrice: [{ required: true, message: '本次收款不能为空', trigger: 'blur' }]
217+
outTime: [{ required: true, message: '出库时间不能为空', trigger: 'blur' }]
223218
})
224219
const disabled = computed(() => formType.value === 'detail')
225220
const formRef = ref() // 表单 Ref
@@ -242,14 +237,8 @@ watch(
242237
const totalPrice = val.items.reduce((prev, curr) => prev + curr.totalPrice, 0)
243238
const discountPrice =
244239
val.discountPercent != null ? erpPriceMultiply(totalPrice, val.discountPercent / 100.0) : 0
245-
// debugger
246-
// TODO 芋艿：payPrice 自动计算会有问题，界面上看到修改了，传递到后端还是没改过来
247-
// const payPrice = totalPrice - discountPrice + val.otherPrice
248-
// 赋值
249240
formData.value.discountPrice = discountPrice
250-
formData.value.totalPrice = totalPrice - discountPrice
251-
// val.payPrice = payPrice
252-
// formData.value.payPrice = payPrice
241+
formData.value.totalPrice = totalPrice - discountPrice + val.otherPrice
253242
},
254243
{ deep: true }
255244
)
@@ -347,7 +336,6 @@ const resetForm = () => {
347336
discountPrice: 0,
348337
totalPrice: 0,
349338
otherPrice: 0,
350-
payPrice: undefined,
351339
items: []
352340
}
353341
formRef.value?.resetFields()

‎src/views/erp/sale/out/index.vue

Lines changed: 18 additions & 26 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="customerId">
@@ -117,18 +117,19 @@
117117
/>
118118
</el-select>
119119
</el-form-item>
120-
<el-form-item label="有无欠款" prop="debtStatus">
120+
<el-form-item label="收款状态" prop="receiptStatus">
121121
<el-select
122-
v-model="queryParams.debtStatus"
123-
placeholder="请选择有无欠款"
122+
v-model="queryParams.receiptStatus"
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-form-item label="审核状态" prop="status">
132133
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable class="!w-240px">
133134
<el-option
134135
v-for="dict in getIntDictOptions(DICT_TYPE.ERP_AUDIT_STATUS)"
@@ -208,35 +209,26 @@
208209
:formatter="erpCountTableColumnFormatter"
209210
/>
210211
<el-table-column
211-
label="金额合计"
212-
align="center"
213-
prop="totalProductPrice"
214-
:formatter="erpPriceTableColumnFormatter"
215-
/>
216-
<el-table-column
217-
label="含税金额"
212+
label="应收金额"
218213
align="center"
219214
prop="totalPrice"
220215
:formatter="erpPriceTableColumnFormatter"
221216
/>
222-
<el-table-column label="待收金额" align="center">
223-
<template #default="scope">
224-
{{ erpPriceInputFormatter(scope.row.payPrice + scope.row.debtPrice) }}
225-
</template>
226-
</el-table-column>
227217
<el-table-column
228-
label="本次收款"
218+
label="已收金额"
229219
align="center"
230-
prop="payPrice"
220+
prop="receiptPrice"
231221
:formatter="erpPriceTableColumnFormatter"
232222
/>
233-
<el-table-column label="本次欠款" align="center" prop="debtPrice">
223+
<el-table-column label="未收金额" align="center">
234224
<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>
225+
<span v-if="scope.row.receiptPrice === scope.row.totalPrice">0</span>
226+
<el-tag type="danger" v-else>
227+
{{ erpPriceInputFormatter(scope.row.totalPrice - scope.row.receiptPrice) }}
228+
</el-tag>
237229
</template>
238230
</el-table-column>
239-
<el-table-column label="状态" align="center" fixed="right" width="90" prop="status">
231+
<el-table-column label="审核状态" align="center" fixed="right" width="90" prop="status">
240232
<template #default="scope">
241233
<dict-tag :type="DICT_TYPE.ERP_AUDIT_STATUS" :value="scope.row.status" />
242234
</template>
@@ -337,7 +329,7 @@ const queryParams = reactive({
337329
warehouseId: undefined,
338330
outTime: [],
339331
orderNo: undefined,
340-
debtStatus: undefined,
332+
receiptStatus: undefined,
341333
accountId: undefined,
342334
status: undefined,
343335
remark: undefined,

‎src/views/erp/sale/return/SaleReturnForm.vue

Lines changed: 9 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,11 @@
121121
</el-col>
122122
<el-col :span="8">
123123
<el-form-item label="优惠后金额">
124-
<el-input disabled v-model="formData.totalPrice" :formatter="erpPriceInputFormatter" />
124+
<el-input
125+
disabled
126+
:model-value="formData.totalPrice - formData.otherPrice"
127+
:formatter="erpPriceInputFormatter"
128+
/>
125129
</el-form-item>
126130
</el-col>
127131
<el-col :span="8">
@@ -155,15 +159,8 @@
155159
</el-form-item>
156160
</el-col>
157161
<el-col :span="8">
158-
<el-form-item label="本次退款" prop="refundPrice">
159-
<el-input-number
160-
v-model="formData.refundPrice"
161-
controls-position="right"
162-
:min="0"
163-
:precision="2"
164-
placeholder="请输入本次退款"
165-
class="!w-1/1"
166-
/>
162+
<el-form-item label="应退金额" prop="totalPrice">
163+
<el-input disabled v-model="formData.totalPrice" :formatter="erpPriceInputFormatter" />
167164
</el-form-item>
168165
</el-col>
169166
</el-row>
@@ -211,15 +208,13 @@ const formData = ref({
211208
discountPrice: 0,
212209
totalPrice: 0,
213210
otherPrice: 0,
214-
refundPrice: undefined,
215211
orderNo: undefined,
216212
items: [],
217213
no: undefined // 退货单号，后端返回
218214
})
219215
const formRules = reactive({
220216
customerId: [{ required: true, message: '客户不能为空', trigger: 'blur' }],
221-
returnTime: [{ required: true, message: '退货时间不能为空', trigger: 'blur' }],
222-
refundPrice: [{ required: true, message: '本次退款不能为空', trigger: 'blur' }]
217+
returnTime: [{ required: true, message: '退货时间不能为空', trigger: 'blur' }]
223218
})
224219
const disabled = computed(() => formType.value === 'detail')
225220
const formRef = ref() // 表单 Ref
@@ -242,14 +237,7 @@ watch(
242237
const totalPrice = val.items.reduce((prev, curr) => prev + curr.totalPrice, 0)
243238
const discountPrice =
244239
val.discountPercent != null ? erpPriceMultiply(totalPrice, val.discountPercent / 100.0) : 0
245-
// debugger
246-
// TODO 芋艿：refundPrice 自动计算会有问题，界面上看到修改了，传递到后端还是没改过来
247-
// const refundPrice = totalPrice - discountPrice + val.otherPrice
248-
// 赋值
249-
formData.value.discountPrice = discountPrice
250-
formData.value.totalPrice = totalPrice - discountPrice
251-
// val.refundPrice = refundPrice
252-
// formData.value.refundPrice = refundPrice
240+
formData.value.totalPrice = totalPrice - discountPrice + val.otherPrice
253241
},
254242
{ deep: true }
255243
)
@@ -346,7 +334,6 @@ const resetForm = () => {
346334
discountPrice: 0,
347335
totalPrice: 0,
348336
otherPrice: 0,
349-
refundPrice: undefined,
350337
items: []
351338
}
352339
formRef.value?.resetFields()

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

Lines changed: 30 additions & 21 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="customerId">
@@ -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>
@@ -329,7 +337,8 @@ const queryParams = reactive({
329337
accountId: undefined,
330338
status: undefined,
331339
remark: undefined,
332-
creator: undefined
340+
creator: undefined,
341+
refundStatus: undefined
333342
})
334343
const queryFormRef = ref() // 搜索的表单
335344
const exportLoading = ref(false) // 导出的加载中

0 commit comments

Comments
 (0)