From e253f248202d16205b0a3674a59da3cb41448881 Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Tue, 2 Jan 2024 15:46:03 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E6=8F=90=E7=AE=A1=E7=90=86=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E8=AE=A2=E5=8D=95=E8=87=AA=E7=BC=96=E5=8F=B7=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aftersales/aftersalesWorkOrderend.vue | 191 +++++++++--------- .../inventory/distrilbutionBillLadingList.vue | 10 + 2 files changed, 103 insertions(+), 98 deletions(-) diff --git a/src/views/aftersales/aftersalesWorkOrderend.vue b/src/views/aftersales/aftersalesWorkOrderend.vue index 27d1d37c..013b581b 100644 --- a/src/views/aftersales/aftersalesWorkOrderend.vue +++ b/src/views/aftersales/aftersalesWorkOrderend.vue @@ -118,16 +118,16 @@ :disabled="$route.query.index == '0'" --> - - - + + + @@ -286,29 +286,31 @@ -
- +
- 处理结果 - - - + + + + + + +
@@ -327,29 +329,24 @@
{{ item.payment ? item.text : '支付方式' }}
- - +
+ +
- 总金额:{{ TotalClaimAmount }} -
- - - 理赔支付时间 - -
- - + 总金额:{{ TotalClaimAmount }}元
+ @@ -435,27 +432,27 @@ - -
- - - + +
+ + + + + + + +
- - - -
-
@@ -541,10 +538,8 @@ -
-
提交
@@ -805,7 +800,7 @@ const msgTop = ref(0); //聊天框吸顶距离 const scrollContainer = ref(null); //客服实例 const KFfeel = ref([]); //附件链接 const MessageResponsibility = ref([]); //消息的处理方选择 -const separateMessageResponsibility=ref([]);//消息的处理方单独选择 +const separateMessageResponsibility = ref([]); //消息的处理方单独选择 const Msgtextarea = ref(''); //回复框消息 const msgState = ref(0); //回复消息状态 const Msgloading = ref(false); //消息回复的加载效果 @@ -853,9 +848,9 @@ const VideoPreviewStatus = ref(false); //视频预览状态 const warehouseData = ref([]); //处理方 const MessageContent = ref([]); const CompensationParty = ref([ - { name: '', state: 0, num: null, reason: '', cld: 1, }, //赔款方 + { name: '', state: 0, num: null, reason: '', cld: 1 }, //赔款方 // explains: '' - { name: '', state: 1, num: null, reason: '', cld: 1, }, //收款方 + { name: '', state: 1, num: null, reason: '', cld: 1 }, //收款方 // explains: '' ]); //收/赔 const ProcessingList = ref([]); //处理结果已经选择的列表 @@ -991,7 +986,6 @@ const onLoad = () => { 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 = []; @@ -1029,8 +1023,8 @@ const onLoad = () => { res.data.data.processorVOList.forEach(item => { if (item.typesOf == 2) { // 处理方 - endFrom.value.processor.push(item.businessId); - MessageResponsibility.value.push(item.businessId) + endFrom.value.processor.push(item.businessId); + MessageResponsibility.value.push(item.businessId); } }); console.log(endFrom.value.processor, ' endFrom.value.processor'); @@ -1041,16 +1035,14 @@ const onLoad = () => { 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, '处理好的发现环节'); }); - // 公司占比回显计算 let sum = 0; FangAddList.value.forEach(item => { @@ -1130,11 +1122,9 @@ const onLoad = () => { details.recorddata = res.data.data.surveyRecordEntities; }); getDictionaryBiz('result_handling').then(res => { - console.log(res, '处理结果'); - ProcessingResults.value = res.data.data; - }); - - + console.log(res, '处理结果'); + ProcessingResults.value = res.data.data; + }); } // 异常类型业务字典 @@ -1240,9 +1230,7 @@ onLoad(); onMounted(() => { msgHight.value = window.innerHeight * 0.76; console.log(msgHight.value, '处理好的页面高度'); - msgTop.value = window.innerHeight * 0.1; - // 滚动到最后 setTimeout(() => { const container = scrollContainer.value; @@ -1254,10 +1242,17 @@ onMounted(() => { const changeProcessingResults = val => { // 首先删除取消的项目 ProcessingList.value = ProcessingList.value.filter(item => val.includes(item.state - 1)); - // 然后添加或保持新的项目 val.forEach(num => { - let newItem = { input: 0, min: 0, max: 9999999999999, state: num + 1, payment: '', text: '' }; + let newItem = { + input: 0, + min: 0, + max: 9999999999999, + state: num + 1, + payment: '', + text: '', + compensationTime: '', + }; // 根据num为newItem的name字段赋值 switch (num) { case '1': @@ -1369,7 +1364,7 @@ const AddCompensation = () => { som++; } }); - CompensationParty.value.push({ name: '', state: 0, num: 0, reason: '', cld: som, }); + CompensationParty.value.push({ name: '', state: 0, num: 0, reason: '', cld: som }); // explains: '' }; // 添加收款方 @@ -1380,7 +1375,7 @@ const AddPayee = () => { som++; } }); - CompensationParty.value.push({ name: '', state: 1, num: 0, reason: '', cld: som, }); + CompensationParty.value.push({ name: '', state: 1, num: 0, reason: '', cld: som }); // explains: '' }; // 理赔总金额计算 @@ -1720,7 +1715,7 @@ const submit = () => { ? paymentMethodMatch.dictValue : '未知支付方式', resultName: item.name, //处理结果名字 - + compensationTime: item.compensationTime, //赔付时间 }; } else { return null; @@ -1728,7 +1723,7 @@ const submit = () => { }) .filter(item => item !== null); data.aftersalesProcessingResultsDTO.processingMoneyEntityList = - data['processingMoneyEntityList']; + data['processingMoneyEntityList']; console.log('走到了这一步'); data.aftersalesProcessingResultsDTO.workOrderId = $route.query.id; //异常工单ID data.aftersalesProcessingResultsDTO['resultType'] = ProcessingList.value @@ -1891,7 +1886,7 @@ const ViewPackageDetails = val => { position: relative; padding: 26px; box-sizing: border-box; - margin-top: 20px; + margin-top: 46px; color: #606266; display: flex; flex-direction: column; @@ -1911,10 +1906,9 @@ const ViewPackageDetails = val => { justify-content: space-between; .name { display: flex; - margin-right: 5%; margin-bottom: 20px; height: 30px; - width: 45%; + width: 46%; span { display: block; width: 30%; @@ -2005,7 +1999,7 @@ const ViewPackageDetails = val => { height: 300px !important; } .Improveinformation { - margin-top: 20px; + margin-top: 32px; width: 100%; :deep(.custom-tabs-label) { display: flex; @@ -2060,7 +2054,8 @@ const ViewPackageDetails = val => { font-size: 14px; padding: 10px; cursor: pointer; - width: 100px; + width: 190px; + margin: 0 4px; } .Paymentname:hover { border: 1px solid #172e60; @@ -2350,7 +2345,7 @@ const ViewPackageDetails = val => { width: 100%; } } -.el-endtabs{ +.el-endtabs { margin-top: 26px; } diff --git a/src/views/distribution/inventory/distrilbutionBillLadingList.vue b/src/views/distribution/inventory/distrilbutionBillLadingList.vue index f9dfe235..a89b7476 100644 --- a/src/views/distribution/inventory/distrilbutionBillLadingList.vue +++ b/src/views/distribution/inventory/distrilbutionBillLadingList.vue @@ -271,6 +271,16 @@ export default { sortable: true, head: false, }, + { + prop: 'orderCode', + label: '订单自编号', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, { prop: 'serviceNumber', label: '服务号',