From 9cb49ee7e7a28a80682a5bb251ed900e1e3abda9 Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Sat, 23 Dec 2023 11:13:38 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/aftersales/aftersalesWorkOrderInfo.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/aftersales/aftersalesWorkOrderInfo.vue b/src/views/aftersales/aftersalesWorkOrderInfo.vue index af9d159b..fdb5e31b 100644 --- a/src/views/aftersales/aftersalesWorkOrderInfo.vue +++ b/src/views/aftersales/aftersalesWorkOrderInfo.vue @@ -680,8 +680,8 @@ const ButtonPermissions = computed(() => { return { reply: UserPermissions.value == '仓库客服', //回复按钮 ProcessingResults: UserPermissions.value == '仓库客服', //处理结果按钮 - end: UserPermissions.value == '职能客服', //完结按钮 - repulse: UserPermissions.value == '职能客服', //打回按钮 + end: UserPermissions.value != '仓库客服', //完结按钮 + repulse: UserPermissions.value != '仓库客服', //打回按钮 ArbitrationCompleted: UserPermissions.value == '职能客服', //客服仲裁完结 edit: false, //编辑 }; @@ -696,7 +696,7 @@ const ButtonPermissions = computed(() => { }; case RouteIndexs.value == 5: //仲裁中 return { - reply: false, //回复按钮 + reply: UserPermissions.value == '职能客服', //回复按钮 ProcessingResults: false, //处理结果按钮 end: false, //完结按钮 repulse: false, //打回按钮 From 853792f2e563ab71a20c88889fea56078e054c71 Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Sat, 23 Dec 2023 11:16:23 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=A2=E6=9C=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/aftersales/aftersalesWorkOrderend.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/aftersales/aftersalesWorkOrderend.vue b/src/views/aftersales/aftersalesWorkOrderend.vue index d7085d33..05a0867f 100644 --- a/src/views/aftersales/aftersalesWorkOrderend.vue +++ b/src/views/aftersales/aftersalesWorkOrderend.vue @@ -491,8 +491,9 @@ type="textarea" :autosize="{ minRows: 3, maxRows: 4 }" placeholder="请输入异常问题描述" - :disabled="$route.query.index == '0'" + disabled /> + From cfe6c2bc5b05eab591b347f1b2300e896fe5c10b Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Sat, 23 Dec 2023 14:13:33 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=87=AA=E7=BC=96?= =?UTF-8?q?=E5=8F=B7=E5=8E=BB=E9=87=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aftersales/aftersalesWorkOrderAdd.vue | 2 +- .../aftersales/aftersalesWorkOrderInfo.vue | 16 +++- .../aftersales/aftersalesWorkOrderend.vue | 85 +++---------------- .../turndelivery/deliveryDiscuss.vue | 18 +++- 4 files changed, 44 insertions(+), 77 deletions(-) diff --git a/src/views/aftersales/aftersalesWorkOrderAdd.vue b/src/views/aftersales/aftersalesWorkOrderAdd.vue index d90a714d..2092db7b 100644 --- a/src/views/aftersales/aftersalesWorkOrderAdd.vue +++ b/src/views/aftersales/aftersalesWorkOrderAdd.vue @@ -927,7 +927,7 @@ const ConfirmForm = () => { // waybillNumber: PackageInfo.value.map(item => item.waybillNumber).join(','), //运单号 // orderCode: PackageInfo.value.map(item => item.orderCode).join(','), //订单自编码 // }); - DataSubmit.orderCode = PackageInfo.value.map(item => item.orderCode).join(','); //订单自编码 + DataSubmit.orderCode = [...new Set(PackageInfo.value.map(item => item.orderCode))].join(','); // 总件数 Indexform.value.number = PackageInfo.value.length; console.log(DataSubmit['packageEntityList'], '包件信息'); diff --git a/src/views/aftersales/aftersalesWorkOrderInfo.vue b/src/views/aftersales/aftersalesWorkOrderInfo.vue index fdb5e31b..7ca27647 100644 --- a/src/views/aftersales/aftersalesWorkOrderInfo.vue +++ b/src/views/aftersales/aftersalesWorkOrderInfo.vue @@ -549,11 +549,14 @@ const HistoricalPackageList = ref([]); //历史包件数组 const HistorIndex = ref(0); //历史包件索引 const TotalClaimAmount = ref(0); //总金额 const dialogReturn = ref(false); //打回弹窗 +const ProcessingRecords =ref([]);//处理放记录用于匹配按钮 const repulse = ref(false); //加载效果 const amplifyurl = ref(''); //当前点击的图片 const amplifysrcList = ref([]); //图片循环列表 const RouteIndexs = ref(''); //进入前的页面索引 const UserPermissions = ref('');//当前状态 +const warehouseInfo=ref('');//仓库信息 +const warehouseState=ref(false);//仓库权限 const PackageInfo = ref([ //包件信息 { packageCode: '', orderCode: '', waybillNumber: '', brandName: '' }, @@ -621,7 +624,7 @@ function updateDictionary(targetArray, dictionaryType) { console.log(UserPermissions.value, '当前角色权限'); }); - +warehouseInfo.value = localStorage.getItem('WarehouseName'); // 图片上传必须携带TOKEN @@ -683,7 +686,7 @@ const ButtonPermissions = computed(() => { end: UserPermissions.value != '仓库客服', //完结按钮 repulse: UserPermissions.value != '仓库客服', //打回按钮 ArbitrationCompleted: UserPermissions.value == '职能客服', //客服仲裁完结 - edit: false, //编辑 + edit:UserPermissions.value == '仓库客服', //编辑 }; case RouteIndexs.value == 4: //理赔金额未出 return { @@ -832,6 +835,7 @@ const onLoad = () => { $_getInfo({ id: $route.query.id }).then(res => { console.log(res, '回显返回值参数'); Indexform.value = res.data.data; + Indexform.value['result'] = []; Indexform.value['processor'] = []; //图片处理回显 @@ -869,10 +873,12 @@ const onLoad = () => { res.data.data.processorVOList.forEach(item => { if (item.typesOf == 2) { // 处理方 + ProcessingRecords.value.push(item.businessId) Indexform.value.processor.push(item.businessId); } }); - + // let a=['张三','李四'] + // let b=['张三'] companyProportion.value = 100 - sum; // updateDictionary(columnList[2].checkarr, 'pc_work_order'); //异常类型 @@ -905,6 +911,7 @@ const onLoad = () => { // 处理结果说明回显 Indexform.value.resultDescription = res.data.data.processingResultsVO.resultDescription; }); + }; onLoad(); //初始化程序 // 异常类型事件 @@ -1481,9 +1488,10 @@ const EndJump = () => { } } .foot_btn { +width: 100%; position: fixed; bottom: 0; - left: 42%; + left: 50%; height: 40px; display: flex; align-items: center; diff --git a/src/views/aftersales/aftersalesWorkOrderend.vue b/src/views/aftersales/aftersalesWorkOrderend.vue index 05a0867f..0aa6cbd6 100644 --- a/src/views/aftersales/aftersalesWorkOrderend.vue +++ b/src/views/aftersales/aftersalesWorkOrderend.vue @@ -74,7 +74,7 @@ /> - + --> - + - -
- - -
- + + + + @@ -483,20 +439,6 @@ /> - -
- - - - -
-
图片 @@ -856,6 +798,7 @@ const accountingID = ref(); //财务处理当id前值 const dialogImgList = ref(false); //图片预览弹窗 const amplifyurl = ref(''); //当前点击的图片 const amplifysrcList = ref([]); //图片循环列表 + const PackageInfo = ref([ //包件信息 { packageCode: '', orderCode: '', waybillNumber: '' }, @@ -1637,7 +1580,7 @@ const submit = () => { console.log(info, 'info'); let data = [ { - id:$route.query.id, + id: $route.query.id, completionRecipientEntities: [], //收款方 completionRecordEntities: [], //赔款方 reasonArbitration: endFrom.value.arbitrate, //仲裁原因 @@ -1681,7 +1624,7 @@ const submit = () => { }); // 赔款方 - + console.log(data, '处理好的值'); $_addCompletionEnd(data).then(res => { console.log(res, '完结成功返回值'); diff --git a/src/views/distribution/turndelivery/deliveryDiscuss.vue b/src/views/distribution/turndelivery/deliveryDiscuss.vue index 683840f2..39ed1b27 100644 --- a/src/views/distribution/turndelivery/deliveryDiscuss.vue +++ b/src/views/distribution/turndelivery/deliveryDiscuss.vue @@ -381,9 +381,18 @@ +
+