From 3d60efe1a912d682e6df407d8223fd478c9c1179 Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Mon, 15 Jan 2024 15:17:25 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aftersalesWorkOrderInfoTemp.vue | 21 +++++++++------- .../distributionDeliveryListedt.vue | 24 ++++++++++++++++--- 2 files changed, 33 insertions(+), 12 deletions(-) diff --git a/src/views/aftersales/aftersalesWorkOrderInfoTemp.vue b/src/views/aftersales/aftersalesWorkOrderInfoTemp.vue index b6d3114f..70ee4c22 100644 --- a/src/views/aftersales/aftersalesWorkOrderInfoTemp.vue +++ b/src/views/aftersales/aftersalesWorkOrderInfoTemp.vue @@ -391,6 +391,7 @@ default-first-option :reserve-keyword="false" placeholder="请选择处理结果" + disabled >
{{ item.name }} - +
支付方式 @@ -421,7 +422,7 @@
支付单位
- +
@@ -433,6 +434,7 @@ format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" placeholder="理赔支付时间" + disabled />
@@ -440,7 +442,7 @@
- 总金额:{{ TotalClaimAmount }} + 总金额:{{ TotalClaimAmount }}元
@@ -946,7 +948,7 @@ const onLoad = () => { item => { Indexform.value.result.push(item.resultType); return { - input: item.money, + input: item.money +'元', min: 0, max: 9999999999999999999999999999, state: item.resultType, @@ -1397,13 +1399,14 @@ const isShowFormItem2 = computed(() => { } } span { - display: block; - color: #606266; + color: #000000; font-size: 16px; margin-right: 8px; display: flex; align-items: center; - width: max-content; + justify-content: flex-end; + width: 80px; + margin-left: 10px; } .el_titleName { display: flex; @@ -1475,8 +1478,8 @@ const isShowFormItem2 = computed(() => { font-size: 14px; border: 1px solid #ccc; padding: 4px 20px; - color: #30316e; - font-weight: normal; + color: #000000; + font-weight: 600; } } .el_nint { diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue index a6683fe9..2f2555b6 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue @@ -3621,9 +3621,6 @@ export default { this.SignForPhotos = []; this.signBox = true; this.reservationId = row.id; - - - }, beforeOpen(done, type) { if (['edit', 'view'].includes(type)) { @@ -4089,6 +4086,27 @@ export default { }, // 复核签收确认弹窗 submitForm() { + if(!this.DoorstepPhoto.length){ + ElMessage({ + message: '至少上传一张上门照片', + type: 'warning', + }) + return + } + if(!this.StackingPhoto.length){ + ElMessage({ + message: '至少上传一张对码照片', + type: 'warning', + }) + return + } + if(!this.SignForPhotos.length){ + ElMessage({ + message: '至少上传一张签收照片', + type: 'warning', + }) + return + } console.log(this.reservationId); console.log(this.CheckStore, '要处理的值'); this.checkloading = true; //开启复核签收加载效果 From 020b88b97527b79f1cffa701511fab70b4aace1a Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Mon, 15 Jan 2024 17:20:55 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=A2=E6=9C=8D?= =?UTF-8?q?=E7=BB=8F=E7=90=86=E7=BC=BA=E5=9B=9E=E5=A4=8D=E6=96=B9=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/aftersales/aftersalesWorkOrder.vue | 32 +- .../aftersalesWorkOrderInfoTemp.vue | 187 ++++++++- .../aftersales/aftersalesWorkOrderend.vue | 364 +++++++++--------- .../aftersales/aftersalesWorkOrdermodify.vue | 94 ++--- 4 files changed, 431 insertions(+), 246 deletions(-) diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue index b5265280..d2ed5589 100644 --- a/src/views/aftersales/aftersalesWorkOrder.vue +++ b/src/views/aftersales/aftersalesWorkOrder.vue @@ -232,6 +232,16 @@ @click="Resultediting(slotProps.scope)" >编辑 + + + + 编辑 + + { query: { id: val.row.lawoId, subId: val.row.laprId, - name: val.row.workOrderNumber + '-理赔金额未出编辑', + name: val.row.workOrderNumber + '-处理结果编辑', businessId: val.row.businessId, warehouseId: val.row.warehouseId, workOrderNumber: val.row.workOrderNumber, @@ -1741,7 +1751,25 @@ const Resultediting = val => { }, }); }; - +const ProcessedResultediting=(val)=>{ +console.log(val,'参数'); + // return + $router.push({ + path: '/aftersales/aftersalesWorkOrdermodify', + query: { + id: val.row.id, + subId: val.row.id, + name: val.row.workOrderNumber + '-处理结果编辑', + businessId: val.row.businessId, + warehouseId: val.row.warehouseId, + workOrderNumber: val.row.workOrderNumber, + RouterState: 'Kfend', + Processingresults: true, //处理结果编辑 + Processed:'true', + index: '1', + }, + }); +} // 工单申诉确认按钮 const Appealbutton = state => { if (UserPermissions.value == '仓库客服') { diff --git a/src/views/aftersales/aftersalesWorkOrderInfoTemp.vue b/src/views/aftersales/aftersalesWorkOrderInfoTemp.vue index 70ee4c22..4ba91ee2 100644 --- a/src/views/aftersales/aftersalesWorkOrderInfoTemp.vue +++ b/src/views/aftersales/aftersalesWorkOrderInfoTemp.vue @@ -50,6 +50,12 @@ +
@@ -280,7 +286,13 @@ - + +
@@ -382,7 +394,13 @@ - + +
处理结果-理赔金额
-
-
- {{ item.name }} - -
+
+ {{ item.name }} + +
支付方式
@@ -448,6 +465,85 @@ + + + + + +
+
+ {{ item.state == 0 ? '赔款方' : '受款方' }}{{ item.cld }} +
+ +
+
+ +
+
+ +
+
+ +
+ +
+ + + +
+ +
+ +
+ +
+ +
+
+
+
+ + 赔款金额总和:{{ TotalamountCompensation }} + + 受款金额总和:{{ TotalamountReceived }} +
+ + +
{{ SelectType == 1 ? '运损照片' : SelectType == 3 ? '窜货照片' : '照片' @@ -668,6 +764,31 @@ const msgHight = ref(100); //聊天框消息高度 const msgTop = ref(0); //调查记录距离页面吸顶记录 const msgState = ref(0); const Msgloading = ref(false); +const TotalamountCompensation = ref(0); //赔款总金额 +const TotalamountReceived = ref(0); //受款总金额 +const CompensationParty = ref([ + { + name: '', + state: 0, + num: null, + reason: '', + cld: 1, + warehouseId: null, + compensationPersonnel: '', + }, //赔款方 + // explains: '' + { + name: '', + state: 1, + num: null, + reason: '', + cld: 1, + warehouseId: null, + compensationPersonnel: '', + }, //受款方 + // explains: '' +]); //收/赔 + // ======= const PackageInfo = ref([ @@ -948,7 +1069,7 @@ const onLoad = () => { item => { Indexform.value.result.push(item.resultType); return { - input: item.money +'元', + input: item.money + '元', min: 0, max: 9999999999999999999999999999, state: item.resultType, @@ -996,6 +1117,8 @@ const onLoad = () => { cld: index + 1, id: item.id, accounting: item.accounting ? item.accounting : '', + warehouseId: item.warehouseId, //仓库 + compensationPersonnel: item.compensationPersonnel, //责任人 }); }); } @@ -1394,7 +1517,7 @@ const isShowFormItem2 = computed(() => { :deep(.el-input) { height: 100% !important; } - :deep(.money){ + :deep(.money) { width: 100px; } } @@ -1676,4 +1799,50 @@ const isShowFormItem2 = computed(() => { border-bottom: 1px solid #d5d5d563 !important; border-right: 1px solid #d5d5d563 !important; } +.el-endtabs { + margin-top: 10px; +} +:deep(.custom-tabs-label) { + font-weight: bold; + display: flex; + align-items: center; + .el-icon{ + margin-right: 4px; + } +} +.payanindemnity { + display: flex; + align-items: center; + margin-top: 20px; + justify-content: space-between; + .title { + width: max-content; + height: 100%; + display: flex; + display: block; + align-items: center; + } + .sk_input { + margin: 0 5px; + margin-left: 20px; + width: 20%; + } + .el-button { + border: none; + } + .el_pkLi { + display: flex; + width: 100%; + } +} +.paySum { + margin-top: 36px; + font-size: 14px; + display: flex; + span { + margin-right: 30px; + display: flex; + align-items: center; + } +} diff --git a/src/views/aftersales/aftersalesWorkOrderend.vue b/src/views/aftersales/aftersalesWorkOrderend.vue index 6da9ba1a..98d8034b 100644 --- a/src/views/aftersales/aftersalesWorkOrderend.vue +++ b/src/views/aftersales/aftersalesWorkOrderend.vue @@ -1,13 +1,13 @@ -->
@@ -587,7 +587,7 @@ >客服仲裁完结 { } console.log(UserPermissions.value, '当前角色权限'); Chathistory(); //聊天的历史记录 - }); - // 获取页面参数 - if ($route.query.id) { - console.log($route.query); - routerState.value = $route.query.RouterState; //当前是新增记录 - console.log(routerState.value, '当前状态'); - $_getInfo({ id: $route.query.id }).then(res => { - console.log(res, '回显返回值参数'); - endFrom.value = res.data.data; - endFrom.value.result = []; - endFrom.value.processor = []; - endFrom.value.packageImage = []; - //图片处理回显 - if(res.data.data.discoveryNode=='1'){ - groundlineType.value = '1' - }else{ - groundlineType.value = 'null' - } - res.data.data.decreaseImageVOList.forEach(res => { - amplifysrcList.value.push(res.imagePath); - endFrom.value['packageImage'].push({ - name: res.imageName, - url: res.imagePath, + // 获取页面参数 + if ($route.query.id) { + console.log($route.query); + routerState.value = $route.query.RouterState; //当前是新增记录 + console.log(routerState.value, '当前状态'); + $_getInfo({ id: $route.query.id }).then(res => { + console.log(res, '回显返回值参数'); + endFrom.value = res.data.data; + endFrom.value.result = []; + endFrom.value.processor = []; + endFrom.value.packageImage = []; + //图片处理回显 + if (res.data.data.discoveryNode == '1') { + groundlineType.value = '1'; + } else { + groundlineType.value = 'null'; + } + res.data.data.decreaseImageVOList.forEach(res => { + amplifysrcList.value.push(res.imagePath); + endFrom.value['packageImage'].push({ + name: res.imageName, + url: res.imagePath, + }); }); - }); - // 包件回显 - PackageInfo.value = res.data.data.abnormalPackageVOList; - // 要修改 - // 责任方回显 - FangAddList.value = res.data.data.processorVOList - .filter(item => item && item.typesOf && item.typesOf === '1') - .map(item => { - return { businessName: item.businessId }; + // 包件回显 + PackageInfo.value = res.data.data.abnormalPackageVOList; + // 要修改 + // 责任方回显 + FangAddList.value = res.data.data.processorVOList + .filter(item => item && item.typesOf && item.typesOf === '1') + .map(item => { + return { businessName: item.businessId }; + }); + let factorydata = res.data.data.personResponsibleVOS.find(item => item.typesOf); + if (factorydata.typesOf) { + groundlineType.value = true; //切换处理方模式 + } + FangAddList.value = res.data.data.personResponsibleVOS.map(res => { + console.log(groundlineType.value, '当前责任方状态'); + return { + businessName: res.businessName, //责任方ID + personResponsibleName: res.personResponsibleName, //责任人名称 + responsibilityRatio: res.responsibilityRatio, //占比 + description: res.description, //说明 + }; }); - let factorydata = res.data.data.personResponsibleVOS.find(item => item.typesOf); - if (factorydata.typesOf) { - groundlineType.value = true; //切换处理方模式 - } - FangAddList.value = res.data.data.personResponsibleVOS.map(res => { - console.log(groundlineType.value, '当前责任方状态'); - return { - businessName: res.businessName, //责任方ID - personResponsibleName: res.personResponsibleName, //责任人名称 - responsibilityRatio: res.responsibilityRatio, //占比 - description: res.description, //说明 - }; - }); - // 要修改 - res.data.data.processorVOList.forEach(item => { - if (item) { - if (item.typesOf == 2) { - // 处理方 - endFrom.value.processor.push(item.businessId); - MessageResponsibility.value.push(item.businessId); - Replycopy.value.push(item.businessId); //拷贝一份要回复的 + // 要修改 + res.data.data.processorVOList.forEach(item => { + if (item) { + if (item.typesOf == 2) { + // 处理方 + endFrom.value.processor.push(item.businessId); + MessageResponsibility.value.push(item.businessId); + Replycopy.value.push(item.businessId); //拷贝一份要回复的 + } } + }); + console.log(JSON.parse(localStorage.getItem('my_data')).id); + if (UserPermissions.value == '仓库客服') { + MessageResponsibility.value.push(JSON.parse(localStorage.getItem('my_data')).id); + MessageResponsibility.value = [...new Set(MessageResponsibility.value)]; //对回复方去重 + MessageResponsibility.value = MessageResponsibility.value.filter( + item => item !== JSON.parse(localStorage.getItem('my_data')).id + ); //过滤掉当前登录人的仓库 } - }); - console.log(JSON.parse(localStorage.getItem('my_data')).id); - MessageResponsibility.value.push(JSON.parse(localStorage.getItem('my_data')).id); - MessageResponsibility.value = [...new Set(MessageResponsibility.value)]; //对回复方去重 - MessageResponsibility.value = MessageResponsibility.value.filter( - item => item !== JSON.parse(localStorage.getItem('my_data')).id - ); //过滤掉当前登录人的仓库 - console.log(endFrom.value.processor, ' endFrom.value.processor'); - getDictionaryBiz('pc_work_order').then(res => { - //处理结果字典 - console.log(res, '环节字典'); - endFrom.value.workOrderType = res.data.data.find( - res => res.dictKey == endFrom.value.workOrderType - ).dictValue; //异常类型回显 - }); - //发现环节回显 - getDictionaryBiz('pc_discovery_node').then(res => { - console.log(res, '发现环节'); - TransportlossList.value = res.data.data; - console.log(TransportlossList.value, '处理好的发现环节'); - }); + console.log(endFrom.value.processor, ' endFrom.value.processor'); + getDictionaryBiz('pc_work_order').then(res => { + //处理结果字典 + console.log(res, '环节字典'); + endFrom.value.workOrderType = res.data.data.find( + res => res.dictKey == endFrom.value.workOrderType + ).dictValue; //异常类型回显 + }); - // 公司占比回显计算 - let sum = 0; - FangAddList.value.forEach(item => { - if (item.responsibilityRatio) { - item.responsibilityRatio = item.responsibilityRatio.replace(/%/g, ''); - sum = Number(item.responsibilityRatio) + sum; - } - }); - FangAddList.value.forEach(item => { - item.responsibilityRatio = item.responsibilityRatio + '%'; - }); - companyProportion.value = 100 - sum; - if (res.data.data.processingResultsVO.processingMoneyEntityList) { - ProcessingList.value = res.data.data.processingResultsVO.processingMoneyEntityList.map( - item => { - endFrom.value.result.push(item.resultType); - return { - input: item.money, - min: 0, - max: 9999999999999999999999999999, - state: item.resultType, - payment: item.compensationMethod, - name: item.resultTypeName, - text: item.compensationMethodName, - compensationTime: item.compensationTime, - paymentUnit: item.paymentUnit, - }; + //发现环节回显 + getDictionaryBiz('pc_discovery_node').then(res => { + console.log(res, '发现环节'); + TransportlossList.value = res.data.data; + console.log(TransportlossList.value, '处理好的发现环节'); + }); + + // 公司占比回显计算 + let sum = 0; + FangAddList.value.forEach(item => { + if (item.responsibilityRatio) { + item.responsibilityRatio = item.responsibilityRatio.replace(/%/g, ''); + sum = Number(item.responsibilityRatio) + sum; } - ); - } + }); + FangAddList.value.forEach(item => { + item.responsibilityRatio = item.responsibilityRatio + '%'; + }); + companyProportion.value = 100 - sum; + if (res.data.data.processingResultsVO.processingMoneyEntityList) { + ProcessingList.value = res.data.data.processingResultsVO.processingMoneyEntityList.map( + item => { + endFrom.value.result.push(item.resultType); + return { + input: item.money, + min: 0, + max: 9999999999999999999999999999, + state: item.resultType, + payment: item.compensationMethod, + name: item.resultTypeName, + text: item.compensationMethodName, + compensationTime: item.compensationTime, + paymentUnit: item.paymentUnit, + }; + } + ); + } + + // 总金额回显 + TotalClaimAmount.value = res.data.data.processingResultsVO.money; + // 理赔支付时间 + // endFrom.value.compensationTime = res.data.data.processingResultsVO.compensationTime; + // 处理结果说明回显 + endFrom.value.resultDescription = res.data.data.processingResultsVO.resultDescription; + + // 完结信息回显 + // 受款方 - // 总金额回显 - TotalClaimAmount.value = res.data.data.processingResultsVO.money; - // 理赔支付时间 - // endFrom.value.compensationTime = res.data.data.processingResultsVO.compensationTime; - // 处理结果说明回显 - endFrom.value.resultDescription = res.data.data.processingResultsVO.resultDescription; - - // 完结信息回显 - // 受款方 - - if (res.data.data.completionRecipientEntityList.length > 0) { - CompensationParty.value = []; - res.data.data.completionRecipientEntityList.forEach((item, index) => { - TotalamountReceived.value += Number(item.money); - CompensationParty.value.push({ - state: 1, //状态 - num: item.money, //金额 - name: item.recipient, //受款方名字 - reason: item.reasonReceivingPayment, //受款方原因 - // explains: item.explains, //受款方说明 - cld: index + 1, - id: item.id, + if (res.data.data.completionRecipientEntityList.length > 0) { + CompensationParty.value = []; + res.data.data.completionRecipientEntityList.forEach((item, index) => { + TotalamountReceived.value += Number(item.money); + CompensationParty.value.push({ + state: 1, //状态 + num: item.money, //金额 + name: item.recipient, //受款方名字 + reason: item.reasonReceivingPayment, //受款方原因 + // explains: item.explains, //受款方说明 + cld: index + 1, + id: item.id, + }); }); - }); - } - // 赔款方 - if (res.data.data.completionRecordEntities.length) { - res.data.data.completionRecordEntities.forEach((item, index) => { - TotalamountCompensation.value += Number(item.money); - CompensationParty.value.push({ - state: 0, //状态 - num: item.money, //金额 - name: item.indemnitor, //受款方名字 - reason: item.reason, //受款方原因 - // explains: item.explains, //受款方说明 - cld: index + 1, - id: item.id, - accounting: item.accounting ? item.accounting : '', - warehouseId:item.warehouseId,//仓库 - compensationPersonnel:item.compensationPersonnel,//赔款人员 + } + // 赔款方 + if (res.data.data.completionRecordEntities.length) { + res.data.data.completionRecordEntities.forEach((item, index) => { + TotalamountCompensation.value += Number(item.money); + CompensationParty.value.push({ + state: 0, //状态 + num: item.money, //金额 + name: item.indemnitor, //受款方名字 + reason: item.reason, //受款方原因 + // explains: item.explains, //受款方说明 + cld: index + 1, + id: item.id, + accounting: item.accounting ? item.accounting : '', + warehouseId: item.warehouseId, //仓库 + compensationPersonnel: item.compensationPersonnel, //赔款人员 + }); }); - }); - } - endFrom.value.arbitrate = res.data.data.reasonArbitration; //仲裁原因 - }); + } + endFrom.value.arbitrate = res.data.data.reasonArbitration; //仲裁原因 + }); - getDictionaryBiz('result_handling').then(res => { - console.log(res, '处理结果'); - ProcessingResults.value = res.data.data; - }); - } + getDictionaryBiz('result_handling').then(res => { + console.log(res, '处理结果'); + ProcessingResults.value = res.data.data; + }); + } - // 异常类型业务字典 - getDictionaryBiz('work_order_status').then(res => { - //处理结果字典 - endFrom.value.workOrderStatus = res.data.data.filter( - obj => obj.dictKey == endFrom.value.workOrderStatus - ).dictValue; //异常类型处理 - }); + // 异常类型业务字典 + getDictionaryBiz('work_order_status').then(res => { + //处理结果字典 + endFrom.value.workOrderStatus = res.data.data.filter( + obj => obj.dictKey == endFrom.value.workOrderStatus + ).dictValue; //异常类型处理 + }); - // 支付方式字典 - getDictionaryBiz('payment_method').then(res => { - //处理结果字典 - console.log(res); - Paymentmethod.value = res.data.data; - }); + // 支付方式字典 + getDictionaryBiz('payment_method').then(res => { + //处理结果字典 + console.log(res); + Paymentmethod.value = res.data.data; + }); - getDeptWarehouse({}).then(res => { - // 验证本地仓库用于回复选择，自己不能选择自己仓库 - console.log(res, '处理方'); - localStorage.getItem('WarehouseName'); - console.log(localStorage.getItem('WarehouseName'), '当前本地仓库'); - res.data.data.forEach(item => { - warehouseData.value.push({ - value: item.id, - label: item.name, - disabled: item.name == localStorage.getItem('WarehouseName'), + getDeptWarehouse({}).then(res => { + // 验证本地仓库用于回复选择，自己不能选择自己仓库 + console.log(res, '处理方'); + localStorage.getItem('WarehouseName'); + console.log(localStorage.getItem('WarehouseName'), '当前本地仓库'); + res.data.data.forEach(item => { + warehouseData.value.push({ + value: item.id, + label: item.name, + disabled: item.name == localStorage.getItem('WarehouseName'), + }); }); }); }); @@ -1895,7 +1898,6 @@ const submit = () => { let data = { aftersalesProcessingResultsDTO: { // ...info, - }, // processingMoneyEntityList: [], //赔付方式 }; @@ -1908,7 +1910,7 @@ const submit = () => { } data.aftersalesProcessingResultsDTO.money = sum; //金额汇总 // data.resultDescription=endFrom.value.resultDescription;//处理结果说明 - data.aftersalesProcessingResultsDTO.resultDescription=endFrom.value.resultDescription;//处理结果说明 + data.aftersalesProcessingResultsDTO.resultDescription = endFrom.value.resultDescription; //处理结果说明 // data['compensationMethod'] = Paymentmethod.value.filter( // item => item.dictKey == endFrom.value.compensationMethod // )[0].dictValue; //目前是单选 @@ -1919,7 +1921,7 @@ const submit = () => { data.aftersalesProcessingResultsDTO['compensationMethod'] = ProcessingList.value .map(item => item.text) .join(','); - data.aftersalesProcessingResultsDTO.processingMoneyEntityList = ProcessingList.value + data.aftersalesProcessingResultsDTO.processingMoneyEntityList = ProcessingList.value .map(item => { console.log(item); let match = ProcessingResults.value.find(element => element.dictValue == item.name); diff --git a/src/views/aftersales/aftersalesWorkOrdermodify.vue b/src/views/aftersales/aftersalesWorkOrdermodify.vue index b9b330de..135b887a 100644 --- a/src/views/aftersales/aftersalesWorkOrdermodify.vue +++ b/src/views/aftersales/aftersalesWorkOrdermodify.vue @@ -793,6 +793,7 @@ const dialogImgList = ref(false); //图片预览弹窗 const amplifyurl = ref(''); //当前点击的图片 const amplifysrcList = ref([]); //图片循环列表 const Processingresults = ref(false); //理赔是否可以编辑 +const ProcessedId=ref(null);//处理完毕里面编辑的iD // ref 用于跟踪哪些字段被修改过 // 当字段改变时标记它为已修改 @@ -1100,7 +1101,10 @@ const onLoad = () => { } ); } - + // 保存处理完毕的编辑ID + if(res.data.data.processingResultsVO.id){ + ProcessedId.value = res.data.data.processingResultsVO.id; + } // 总金额回显 TotalClaimAmount.value = res.data.data.processingResultsVO.money; // 理赔支付时间 @@ -1342,58 +1346,37 @@ const TopChange = val => { }; const changeProcessingResults = val => { - console.log(val,'当前点击的参数'); - console.log(ProcessingList.value,'当前的列表'); - // 首先删除取消的项目 - console.log(val[val.length-1]); - ProcessingList.value = ProcessingList.value.filter(item => val.includes(item.state - 1)); - // 然后添加或保持新的项目 -console.log(val,'当前状态'); - console.log(num,'当前参数'); - newItem = { - input: 0, - min: 0, - max: 9999999999999, - state: num, - payment: '', - text: '', - compensationTime: '', - paymentUnit: '', - }; - // 根据num为newItem的name字段赋值 - switch (num) { - case '1': - newItem.name = '下补单'; - break; - case '2': - newItem.name = '维修/补漆'; - break; - case '3': - newItem.name = '客户未要求理赔'; - break; - case '4': - newItem.name = '用库存'; - break; - case '5': - newItem.name = '赔商家'; - break; - case '6': - newItem.name = '赔付运费'; - break; - case '7': - newItem.name = '工厂考核'; - break; - default: - return; - } - - // 如果列表中不存在则加入新项目 - if (!ProcessingList.value.some(item => item.state === newItem.state)) { - ProcessingList.value.push(newItem); - console.log(`添加：${newItem.name}`); - } - +ProcessingList.value = ProcessingList.value.filter(item => val.includes(item.state)); + const nameMapping = { + '1': '下补单', + '2': '维修/补漆', + '3': '客户未要求理赔', + '4': '用库存', + '5': '赔商家', + '6': '赔付运费', + '7': '工厂考核' +}; + +val.forEach(value => { + let existingItem = ProcessingList.value.find(item => item.state === value); + // 如果s中不存在state为当前值的对象，则创建一个空对象并添加到s中 + if (!existingItem) { + ProcessingList.value.push({ + "input": 0, + "min": 0, + "state": value, + "payment": "", + "name": nameMapping[value] || "", + "text": "", + "compensationTime": "", + "paymentUnit": "", + "id": "" + }); + } else { + existingItem.name = nameMapping[value] || ""; + } +}); }; // 支付方式选择 @@ -1875,12 +1858,15 @@ const Arbitrationcompleted = () => { // 理赔金额未出编辑 // 处理结果编辑 let data = { - id: $route.query.id, + id:$route.query.id, // workOrderId: $route.query.id, //异常工单ID resultDescription:Indexform.value.resultDescription,//处理结果说明 aftersalesProcessingResultsDTO: { + assignList:[1746708149765681154,],//删除的处理结果ID resultDescription:Indexform.value.resultDescription,//处理结果说明 - id:$route.query.subId, + id:$route.query.Processed?ProcessedId.value:$route.query.subId, + // $route.query.Processed? + // ProcessedId.value }, }; data.aftersalesProcessingResultsDTO['processingMoneyEntityList'] = ProcessingList.value From e292ab098744939d2ed4f83abad8668ad1571521 Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Mon, 15 Jan 2024 17:23:07 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/aftersales/aftersalesWorkOrdermodify.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/aftersales/aftersalesWorkOrdermodify.vue b/src/views/aftersales/aftersalesWorkOrdermodify.vue index 135b887a..f27b0d0b 100644 --- a/src/views/aftersales/aftersalesWorkOrdermodify.vue +++ b/src/views/aftersales/aftersalesWorkOrdermodify.vue @@ -418,7 +418,7 @@
- 总金额:{{ TotalClaimAmount }} + 总金额:{{ TotalClaimAmount }}元
@@ -1862,7 +1862,7 @@ const Arbitrationcompleted = () => { // workOrderId: $route.query.id, //异常工单ID resultDescription:Indexform.value.resultDescription,//处理结果说明 aftersalesProcessingResultsDTO: { - assignList:[1746708149765681154,],//删除的处理结果ID + assignList:[],//删除的处理结果ID resultDescription:Indexform.value.resultDescription,//处理结果说明 id:$route.query.Processed?ProcessedId.value:$route.query.subId, // $route.query.Processed? From 7a3aff6a6c23f78e7faa4cd3e7175f342120c0af Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Mon, 15 Jan 2024 17:24:07 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=85=8D=E9=80=81=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E8=AF=A6=E6=83=85ID=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/deliverylist/distributionDeliveryListedt.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue index 2f2555b6..908ada46 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue @@ -3796,7 +3796,7 @@ export default { handlePrint(row) { console.log('this.deliverydata.type :>> ', this.deliverydata.type); const submitData = { - ids: row.id, + ids: row.deliveryId, type: this.deliverydata.type, }; printBatch(submitData); @@ -4106,7 +4106,7 @@ export default { type: 'warning', }) return - } + } console.log(this.reservationId); console.log(this.CheckStore, '要处理的值'); this.checkloading = true; //开启复核签收加载效果