diff --git a/src/views/aftersales/aftersalesWorkOrderAdd.vue b/src/views/aftersales/aftersalesWorkOrderAdd.vue index f5318b8e..09e40f12 100644 --- a/src/views/aftersales/aftersalesWorkOrderAdd.vue +++ b/src/views/aftersales/aftersalesWorkOrderAdd.vue @@ -959,6 +959,7 @@ const AddPackage = () => { waybillNumber: '', brandName: '', state: false, + mallName:'' }); }; // 包件移除 @@ -995,7 +996,7 @@ const ResponsibilityRemoval = val => { // 顶部标签切换 const TopChange = val => { PackageInfo.value = [ - { packageCode: '', orderCode: '', waybillNumber: '', brandName: '', state: false }, + { packageCode: '', orderCode: '', waybillNumber: '', brandName: '', state: false,mallName:'' }, ]; //重置包件信息 Indexform.value = {}; //重置表单 @@ -1159,6 +1160,7 @@ const ConfirmForm = () => { waybillNumber: item.waybillNumber ? item.waybillNumber : null, //运单号 orderCode: item.orderCode ? item.orderCode : null, //订单自编码 brandName: item.brandName ? item.brandName : null, //品牌 + }); }); DataSubmit.packageCode = [...new Set(PackageInfo.value.map(item => item.packageCode))].join(','); //包条码 @@ -1470,9 +1472,9 @@ const ChangePackageInfo = (val, index) => { if (identifying.value == '2') { Statistics(); //调用统计包件信息 return; - } - - if (NumberPackages.value > 1) { + }else{ + Statistics(); //调用统计包件信息 + if(!NumberPackages.value){ if (!val) { PackageInfo.value[index].orderCode = ''; //订单自编码 PackageInfo.value[index].waybillNumber = ''; //运单号 @@ -1482,12 +1484,12 @@ const ChangePackageInfo = (val, index) => { Indexform.value.secondary = ''; //二级品 Indexform.value.waybillMall = ''; //客户名称(运单商场) Indexform.value.typeServiceName = ''; //合作模式 - return; // 如果输入框里面没有值就不请求 } } + if(!val){ return } @@ -1504,7 +1506,7 @@ const ChangePackageInfo = (val, index) => { console.log(PackageInfo.value ,'PackageInfo.value'); const packageData = res.data.data[0]; if (NumberPackages.value > 1) { - let mallName = PackageInfo.value.find(item => item.mallName); + let mallName = PackageInfo.value.find(item => item.mallName).mallName; console.log(mallName,'筛选出来的值'); if (mallName != packageData.mallName) { ElMessageBox.confirm('请选择运单商场一致的包条码!', 'Warning', { @@ -1523,12 +1525,15 @@ const ChangePackageInfo = (val, index) => { return; } } + console.log('跑到这里来了'); // 如果已经有一条数据了,后面运单商场必须和后面的一样 console.log(packageData, '获取的第一个参数'); PackageInfo.value[index].orderCode = packageData.orderCode; //订单自编码 PackageInfo.value[index].waybillNumber = packageData.waybillNumber; //运单号 PackageInfo.value[index].orderId = packageData.orderId; //运单号 PackageInfo.value[index].brandName = packageData.brandName; //品牌 + PackageInfo.value[index].mallName = packageData.mallName; //运单商场 + PackageInfo.value[index].state = false; //状态 const results = res.data.data.filter(item => { @@ -1557,6 +1562,11 @@ const ChangePackageInfo = (val, index) => { console.log(PackageInfo.value, '处理好的参数'); }); + + + } + + }; // 查看历史包件