|
@@ -441,7 +441,7 @@
|
|
|
this.oldProductList = JSON.parse(JSON.stringify(productList));
|
|
this.oldProductList = JSON.parse(JSON.stringify(productList));
|
|
|
if (eom_saleOrder_addInvoice?.value == 1) {
|
|
if (eom_saleOrder_addInvoice?.value == 1) {
|
|
|
this.$refs.inventoryTableref &&
|
|
this.$refs.inventoryTableref &&
|
|
|
- this.$refs.inventoryTableref.putTableValue(productList);
|
|
|
|
|
|
|
+ this.$refs.inventoryTableref.putTableValue(productList,true);
|
|
|
} else {
|
|
} else {
|
|
|
this.$refs.inventoryTableref &&
|
|
this.$refs.inventoryTableref &&
|
|
|
this.$refs.inventoryTableref.$refs.productListRef.open(
|
|
this.$refs.inventoryTableref.$refs.productListRef.open(
|
|
@@ -519,7 +519,7 @@
|
|
|
data.carNo = data.carNo ? data.carNo.split(',') : [];
|
|
data.carNo = data.carNo ? data.carNo.split(',') : [];
|
|
|
this.form = data;
|
|
this.form = data;
|
|
|
this.$refs.inventoryTableref &&
|
|
this.$refs.inventoryTableref &&
|
|
|
- this.$refs.inventoryTableref.putTableValue(data.productList);
|
|
|
|
|
|
|
+ this.$refs.inventoryTableref.putTableValue(data.productList,true);
|
|
|
this.$refs.stowageTableRef &&
|
|
this.$refs.stowageTableRef &&
|
|
|
this.$refs.stowageTableRef.putTableValue(data.carList);
|
|
this.$refs.stowageTableRef.putTableValue(data.carList);
|
|
|
this.$refs.taskInfoTableRef &&
|
|
this.$refs.taskInfoTableRef &&
|
|
@@ -543,6 +543,7 @@
|
|
|
linkName: '',
|
|
linkName: '',
|
|
|
linkPhone: '',
|
|
linkPhone: '',
|
|
|
orderNo: '',
|
|
orderNo: '',
|
|
|
|
|
+ productList:[],
|
|
|
orderId: '',
|
|
orderId: '',
|
|
|
contactId: '',
|
|
contactId: '',
|
|
|
contactName: '',
|
|
contactName: '',
|
|
@@ -552,7 +553,7 @@
|
|
|
pricingWay: ''
|
|
pricingWay: ''
|
|
|
});
|
|
});
|
|
|
this.$refs.inventoryTableref &&
|
|
this.$refs.inventoryTableref &&
|
|
|
- this.$refs.inventoryTableref.putTableValue([]);
|
|
|
|
|
|
|
+ this.$refs.inventoryTableref.putTableValue([],true);
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
this.searchParams = {
|
|
this.searchParams = {
|
|
@@ -575,17 +576,17 @@
|
|
|
linkPhone,
|
|
linkPhone,
|
|
|
orderId,
|
|
orderId,
|
|
|
orderNo,
|
|
orderNo,
|
|
|
- productList,
|
|
|
|
|
|
|
+ // productList,
|
|
|
contactId,
|
|
contactId,
|
|
|
contactName,
|
|
contactName,
|
|
|
pricingWay = data?.saleOrder?.pricingWay
|
|
pricingWay = data?.saleOrder?.pricingWay
|
|
|
} = data;
|
|
} = data;
|
|
|
- if (productList && productList.length > 0) {
|
|
|
|
|
- productList.forEach((v) => {
|
|
|
|
|
- v.orderTotalCount = v.orderTotalCount || v.totalCount;
|
|
|
|
|
- v.extField = {};
|
|
|
|
|
- });
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ // if (productList && productList.length > 0) {
|
|
|
|
|
+ // productList.forEach((v) => {
|
|
|
|
|
+ // v.orderTotalCount = v.orderTotalCount || v.totalCount;
|
|
|
|
|
+ // v.extField = {};
|
|
|
|
|
+ // });
|
|
|
|
|
+ // }
|
|
|
this.form = Object.assign({}, this.form, {
|
|
this.form = Object.assign({}, this.form, {
|
|
|
contactId,
|
|
contactId,
|
|
|
contactName,
|
|
contactName,
|
|
@@ -593,18 +594,19 @@
|
|
|
linkPhone,
|
|
linkPhone,
|
|
|
orderNo,
|
|
orderNo,
|
|
|
orderIds: orderId,
|
|
orderIds: orderId,
|
|
|
- productList,
|
|
|
|
|
|
|
+ // productList,
|
|
|
carNo: carNo ? carNo.split(',') : [],
|
|
carNo: carNo ? carNo.split(',') : [],
|
|
|
pricingWay,
|
|
pricingWay,
|
|
|
entrustedCode: code,
|
|
entrustedCode: code,
|
|
|
entrustedId: id
|
|
entrustedId: id
|
|
|
});
|
|
});
|
|
|
- productList.forEach((item, index) => {
|
|
|
|
|
- item.id = '';
|
|
|
|
|
- item['tempId'] = index;
|
|
|
|
|
- });
|
|
|
|
|
- this.$refs.inventoryTableref &&
|
|
|
|
|
- this.$refs.inventoryTableref.putTableValue(productList, code);
|
|
|
|
|
|
|
+ this.getSaleOrderDetails([orderId]);
|
|
|
|
|
+ // productList.forEach((item, index) => {
|
|
|
|
|
+ // item.id = '';
|
|
|
|
|
+ // item['tempId'] = index;
|
|
|
|
|
+ // });
|
|
|
|
|
+ // this.$refs.inventoryTableref &&
|
|
|
|
|
+ // this.$refs.inventoryTableref.putTableValue(productList, code);
|
|
|
});
|
|
});
|
|
|
},
|
|
},
|
|
|
//替代料
|
|
//替代料
|