Browse Source

修复包件判断

pre-production
马远东 1 year ago
parent
commit
4ffffbe232
  1. 22
      src/views/aftersales/aftersalesWorkOrderAdd.vue

22
src/views/aftersales/aftersalesWorkOrderAdd.vue

@ -959,6 +959,7 @@ const AddPackage = () => {
waybillNumber: '', waybillNumber: '',
brandName: '', brandName: '',
state: false, state: false,
mallName:''
}); });
}; };
// //
@ -995,7 +996,7 @@ const ResponsibilityRemoval = val => {
// //
const TopChange = val => { const TopChange = val => {
PackageInfo.value = [ PackageInfo.value = [
{ packageCode: '', orderCode: '', waybillNumber: '', brandName: '', state: false }, { packageCode: '', orderCode: '', waybillNumber: '', brandName: '', state: false,mallName:'' },
]; // ]; //
Indexform.value = {}; // Indexform.value = {}; //
@ -1159,6 +1160,7 @@ const ConfirmForm = () => {
waybillNumber: item.waybillNumber ? item.waybillNumber : null, // waybillNumber: item.waybillNumber ? item.waybillNumber : null, //
orderCode: item.orderCode ? item.orderCode : null, // orderCode: item.orderCode ? item.orderCode : null, //
brandName: item.brandName ? item.brandName : null, // brandName: item.brandName ? item.brandName : null, //
}); });
}); });
DataSubmit.packageCode = [...new Set(PackageInfo.value.map(item => item.packageCode))].join(','); // DataSubmit.packageCode = [...new Set(PackageInfo.value.map(item => item.packageCode))].join(','); //
@ -1470,9 +1472,9 @@ const ChangePackageInfo = (val, index) => {
if (identifying.value == '2') { if (identifying.value == '2') {
Statistics(); // Statistics(); //
return; return;
} }else{
Statistics(); //
if (NumberPackages.value > 1) { if(!NumberPackages.value){
if (!val) { if (!val) {
PackageInfo.value[index].orderCode = ''; // PackageInfo.value[index].orderCode = ''; //
PackageInfo.value[index].waybillNumber = ''; // PackageInfo.value[index].waybillNumber = ''; //
@ -1482,12 +1484,12 @@ const ChangePackageInfo = (val, index) => {
Indexform.value.secondary = ''; // Indexform.value.secondary = ''; //
Indexform.value.waybillMall = ''; // Indexform.value.waybillMall = ''; //
Indexform.value.typeServiceName = ''; // Indexform.value.typeServiceName = ''; //
return; return;
// //
} }
} }
if(!val){ if(!val){
return return
} }
@ -1504,7 +1506,7 @@ const ChangePackageInfo = (val, index) => {
console.log(PackageInfo.value ,'PackageInfo.value'); console.log(PackageInfo.value ,'PackageInfo.value');
const packageData = res.data.data[0]; const packageData = res.data.data[0];
if (NumberPackages.value > 1) { if (NumberPackages.value > 1) {
let mallName = PackageInfo.value.find(item => item.mallName); let mallName = PackageInfo.value.find(item => item.mallName).mallName;
console.log(mallName,'筛选出来的值'); console.log(mallName,'筛选出来的值');
if (mallName != packageData.mallName) { if (mallName != packageData.mallName) {
ElMessageBox.confirm('请选择运单商场一致的包条码!', 'Warning', { ElMessageBox.confirm('请选择运单商场一致的包条码!', 'Warning', {
@ -1523,12 +1525,15 @@ const ChangePackageInfo = (val, index) => {
return; return;
} }
} }
console.log('跑到这里来了');
// //
console.log(packageData, '获取的第一个参数'); console.log(packageData, '获取的第一个参数');
PackageInfo.value[index].orderCode = packageData.orderCode; // PackageInfo.value[index].orderCode = packageData.orderCode; //
PackageInfo.value[index].waybillNumber = packageData.waybillNumber; // PackageInfo.value[index].waybillNumber = packageData.waybillNumber; //
PackageInfo.value[index].orderId = packageData.orderId; // PackageInfo.value[index].orderId = packageData.orderId; //
PackageInfo.value[index].brandName = packageData.brandName; // PackageInfo.value[index].brandName = packageData.brandName; //
PackageInfo.value[index].mallName = packageData.mallName; //
PackageInfo.value[index].state = false; // PackageInfo.value[index].state = false; //
const results = res.data.data.filter(item => { const results = res.data.data.filter(item => {
@ -1557,6 +1562,11 @@ const ChangePackageInfo = (val, index) => {
console.log(PackageInfo.value, '处理好的参数'); console.log(PackageInfo.value, '处理好的参数');
}); });
}
}; };
// //

Loading…
Cancel
Save