|
|
@@ -323,7 +323,7 @@
|
|
|
data() {
|
|
|
let formDef = {
|
|
|
id: '',
|
|
|
- payAmount: '',
|
|
|
+ payAmount: 0,
|
|
|
returnFiles: [],
|
|
|
repliedFiles: [],
|
|
|
remark: '',
|
|
|
@@ -680,7 +680,7 @@
|
|
|
},
|
|
|
onchangeLink() {
|
|
|
// this.getSendSaleOrderDetail(this.form.sendId);
|
|
|
- this.form.type=''
|
|
|
+ this.form.type = '';
|
|
|
this.handleSetReturnSourceType();
|
|
|
},
|
|
|
async contactDetail(id) {
|
|
|
@@ -701,8 +701,7 @@
|
|
|
entrustedCode: '',
|
|
|
entrustedId: '',
|
|
|
entrustedReceiveId: '',
|
|
|
- entrustedReceiveCode: '',
|
|
|
-
|
|
|
+ entrustedReceiveCode: ''
|
|
|
});
|
|
|
this.$nextTick(() => {
|
|
|
this.$refs.inventoryTableref &&
|
|
|
@@ -1008,7 +1007,7 @@
|
|
|
];
|
|
|
if (
|
|
|
!['40', '50'].includes(this.form.type) ||
|
|
|
- this.returnSourceType != 1
|
|
|
+ this.form.returnSourceType != 1
|
|
|
) {
|
|
|
proAll.push(
|
|
|
new Promise((resolve, reject) => {
|
|
|
@@ -1039,10 +1038,11 @@
|
|
|
(this.$refs.inventoryTableref1 &&
|
|
|
this.$refs.inventoryTableref1.getTableValue()) ||
|
|
|
[];
|
|
|
+
|
|
|
if (
|
|
|
data.productList.length === 0 &&
|
|
|
(!['40', '50'].includes(this.form.type) ||
|
|
|
- this.returnSourceType != 1)
|
|
|
+ this.form.returnSourceType != 1)
|
|
|
) {
|
|
|
return this.$message.error('至少选择一个退货产品');
|
|
|
}
|
|
|
@@ -1052,10 +1052,9 @@
|
|
|
let commitData = Object.assign({}, this.form, {
|
|
|
totalAmount: this.totalAmount,
|
|
|
productList: data.productList,
|
|
|
+ payAmount:this.totalAmount,
|
|
|
redressProductList
|
|
|
});
|
|
|
- commitData.payAmount = data.payAmount;
|
|
|
- commitData.totalAmount = this.totalAmount;
|
|
|
// return;
|
|
|
if (this.isUpdate) {
|
|
|
UpdateReturnInformation(commitData)
|
