diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue index 15808050..6bc88dc8 100644 --- a/src/views/aftersales/aftersalesWorkOrder.vue +++ b/src/views/aftersales/aftersalesWorkOrder.vue @@ -97,7 +97,7 @@ - 申请仲裁 + 客服介入 钉钉号填写 diff --git a/src/views/aftersales/aftersalesWorkOrderAdd.vue b/src/views/aftersales/aftersalesWorkOrderAdd.vue index 6d7b198c..7d0685b6 100644 --- a/src/views/aftersales/aftersalesWorkOrderAdd.vue +++ b/src/views/aftersales/aftersalesWorkOrderAdd.vue @@ -277,6 +277,13 @@ + + + + + + + @@ -495,7 +502,6 @@
总金额:{{ TotalClaimAmount }}
- @@ -694,7 +700,7 @@ const ProcessingList = ref([]); //处理结果已经选择的列表 const Paymentmethod = ref([]); //支付方式 const PackageInfo = ref([ //包件信息 - { packageCode: '', orderCode: '', waybillNumber: '', brandName: '' }, + { packageCode: '', orderCode: '', waybillNumber: '', brandName: '', state: false }, ]); // 责任方列表 const FangAddList = ref([ @@ -978,7 +984,13 @@ const handlePictureCardPreview = uploadFile => { // 添加包件 const AddPackage = () => { - PackageInfo.value.push({ packageCode: '', orderCode: '', waybillNumber: '', brandName: '' }); + PackageInfo.value.push({ + packageCode: '', + orderCode: '', + waybillNumber: '', + brandName: '', + state: false, + }); }; // 包件移除 const PackagRemoval = val => { @@ -1228,28 +1240,28 @@ const ConfirmForm = () => { } DataSubmit.aftersalesProcessingResultsDTO.money = sum; //金额汇总 DataSubmit.aftersalesProcessingResultsDTO.processingMoneyEntityList = ProcessingList.value - .map(item => { - let match = ProcessingResults.value.find(element => element.dictValue == item.name); - if (match) { - let paymentMethodMatch = Paymentmethod.value.find( - paymentMethod => paymentMethod.dictKey == item.payment - ); - return { - resultType: match.dictKey, //赔方式的key - money: item.input, //金额 - typesOf: 1, //固定参数 - compensationMethod: paymentMethodMatch ? paymentMethodMatch.dictKey : '未知支付方式', - compensationMethodName: paymentMethodMatch - ? paymentMethodMatch.dictValue - : '未知支付方式', - resultName: item.name, //处理结果名字 - compensationTime:item.compensationTime,//支付时间 - }; - } else { - return null; - } - }) - .filter(item => item !== null); + .map(item => { + let match = ProcessingResults.value.find(element => element.dictValue == item.name); + if (match) { + let paymentMethodMatch = Paymentmethod.value.find( + paymentMethod => paymentMethod.dictKey == item.payment + ); + return { + resultType: match.dictKey, //赔方式的key + money: item.input, //金额 + typesOf: 1, //固定参数 + compensationMethod: paymentMethodMatch ? paymentMethodMatch.dictKey : '未知支付方式', + compensationMethodName: paymentMethodMatch + ? paymentMethodMatch.dictValue + : '未知支付方式', + resultName: item.name, //处理结果名字 + compensationTime: item.compensationTime, //支付时间 + }; + } else { + return null; + } + }) + .filter(item => item !== null); } delete DataSubmit.duty, //移除多余字段 @@ -1403,16 +1415,21 @@ const ChangePackageInfo = (val, index) => { console.log(packageData, '处理的包件参数'); console.log(Indexform.value.firsts, '一级品'); console.log(Indexform.value.second, '二 级品'); - res.data.data.find(item => { - if (item.workOrderId && item.workOrderNumber) { - HistoricalPackageList.value = res.data.data; - PackageInfo.value[index].state = true; //状态 - } + const results = res.data.data.filter(item => { + return item.workOrderId && item.workOrderNumber; }); - + console.log(results, '筛选后的结果'); + if (results.length > 0) { + HistoricalPackageList.value = results; + PackageInfo.value[index].state = true; //状态 + }else{ + PackageInfo.value[index].state = false; //状态 + } + // 确保在没有满足条件的元素时,不执行 HistoricalPackageList 和 PackageInfo 的赋值操作 Indexform.value.first = packageData.firsts; //一级品 Indexform.value.secondary = packageData.second; //二级品 Indexform.value.waybillMall = packageData.mallName; //客户名称(运单商场) + Indexform.value.typeServiceName = packageData.typeServiceName; //合作模式 } // packageCode; //包件码 // //订单自编码 @@ -1822,7 +1839,7 @@ const ViewPackageDetails = val => { .Paymentname:hover { border: 1px solid #172e60; } -.el_Processingresults{ +.el_Processingresults { margin-top: 12px; }