From a2b27f3a9f5e8d40bba5e42fa57b56b92e7f9d6f Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Tue, 9 Jan 2024 15:59:43 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=8C=E7=BB=93?= =?UTF-8?q?=EF=BC=8C=E5=A4=84=E7=90=86=E7=BB=93=E6=9E=9C=E7=A1=AE=E5=AE=9A?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/aftersales/aftersalesWorkOrder.vue | 107 +++++++++++------- .../aftersales/aftersalesWorkOrderInfo.vue | 3 +- .../aftersales/aftersalesWorkOrdermodify.vue | 32 ++++-- vite.config.js | 2 +- 4 files changed, 92 insertions(+), 52 deletions(-) diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue index 935b1976..e6257e66 100644 --- a/src/views/aftersales/aftersalesWorkOrder.vue +++ b/src/views/aftersales/aftersalesWorkOrder.vue @@ -324,7 +324,7 @@
添加赔款方 - 添加收款方 + 添加受款方
{{ item.state == 0 ? '赔款方' : '收款方' }}{{ item.cld }}{{ item.state == 0 ? '赔款方' : '受款方' }}{{ item.cld }}
@@ -352,6 +352,35 @@ placeholder="金额" />
+ +
+ + + +
+ +
+ +
+ + +
+ +
+ +
+ +
移除 @@ -541,6 +570,8 @@ import { $_listOwn, $_moneyUpdate, $_updateWorkList, + $_updateManagerConfirmed, + $_updateWorkOrderStatus, } from '@/api/aftersales/aftersalesWorkOrder'; import { getToken } from '@/utils/auth'; import { getDictionaryBiz } from '@/api/system/dict'; //字典 @@ -689,8 +720,8 @@ const TabList = ref([ const DeliveryDriver = ref([]); const CompensationParty = ref([ - { name: '', state: 0, num: null, reason: '', cld: 1 }, //赔款方 - { name: '', state: 1, num: null, reason: '', cld: 1 }, //收款方 + { name: '', state: 0, num: null, reason: '', cld: 1 ,warehouseId:'',personResponsibleName:''}, //赔款方 + { name: '', state: 1, num: null, reason: '', cld: 1 ,warehouseId:'',personResponsibleName:''}, //受款方 ]); //收/赔 const details = reactive({ @@ -1297,31 +1328,29 @@ const view = val => { businessId: val.row.businessId, ProcessType: TabPermissions.value == 2 ? '2' : TabPermissions.value == 3 ? '1' : '', //类型 1 待处理 2 已处理 RouteIndexs: TabPermissions.value, //当前记录参数 + }, }); - return; - console.log(val, '当前行数据'); - FromDisabled.value = true; //禁用输入框 - updateDictionary(IndexException.value, 'pc_work_order'); //异常类型 - updateDictionary(DiscoveringNodes.value, 'pc_discovery_node'); //发现环节 - getDeptWarehouse({}).then(res => { - res.data.data.forEach(item => { - warehouseData.value.push({ - value: item.id, - label: item.name, - }); - }); - }); - $_getDetail({ - id: val.row.id, - }).then(res => { - console.log(res, '查看详情返回值'); - if (res.data.data) { - Indexform.value = res.data.data; - Indexdialog.value = true; //展开弹窗 - } +}; + +// 申诉列表编辑 +const Appealeditor = (val) => { +// 编辑信息 + $router.push({ + path: '/aftersales/aftersalesWorkOrdermodify', + query: { + id: val.row.id, + name: val.row.workOrderNumber + '-申诉编辑', + businessId: $route.query.businessId, + warehouseId: val.row.warehouseId, + workOrderNumber: val.row.workOrderNumber, + RouterState: 'Kfend', + Appealeditor: 'appeal',//申诉编辑 + }, }); }; + + // 首页删除 const ViewDelete = val => { ElMessageBox.confirm(`是否删除该条数据?`) @@ -1492,8 +1521,7 @@ const Appealbutton = () => { }); }; -// 申诉列表编辑 -const Appealeditor = () => {}; + // 异常类型事件 const abnormalChange = val => { @@ -2225,7 +2253,7 @@ const DetermineStorage = val => { let ID = {}; ID = val.row.id; data['assignList'].push(ID); - if (routerState.value == 'end') { + if(TabPermissions.value=='6'){ $_updateManagerConfirmed(data).then(res => { if (res.data.code == 200) { ElMessage({ @@ -2237,7 +2265,8 @@ const DetermineStorage = val => { }); // 赔款方 console.log(data, '处理好的值'); - } else { + } + if(TabPermissions.value=='2'){ console.log(data, '处理好的数据'); $_updateWorkOrderStatus(data).then(res => { console.log(res, '确定提交存储'); @@ -2445,9 +2474,9 @@ 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 ,warehouseId:'',personResponsibleName:''}); }; -// 添加收款方 +// 添加受款方 const AddPayee = () => { let som = 1; CompensationParty.value.forEach(item => { @@ -2494,7 +2523,7 @@ const amountMoney = () => { _num ).result; } - // 统计收款方金额【1】 + // 统计受款方金额【1】 if (item.state == 1) { TotalamountReceived.value = computeNumber(TotalamountReceived.value, '+', _num).result; } @@ -2519,6 +2548,7 @@ const Batchcompletion = () => { // 批量提交 const CompletedSubmission = () => { + PLloading.value = true; //开启处理加载效果 console.log(CompensationParty.value); let pay = CompensationParty.value.find(item => item.cld == 1); @@ -2557,13 +2587,14 @@ const CompletedSubmission = () => { reason: party.reason, money: Number(party.num), reasonArbitration: Reasonarbitration.value, - workOrderId: selection.id, - warehouseId: selection.warehouseId, + // workOrderId: selection.id, + warehouseId: party.warehouseId,//仓库 + personResponsibleName:party.personResponsibleName }; // 将赔款方信息添加到对应的completionRecordEntities数组中 data[index].completionRecordEntities.push(record); } else { - // 收款方信息对象 + // 受款方信息对象 const recipient = { recipient: party.name, reasonReceivingPayment: party.reason, @@ -2573,7 +2604,7 @@ const CompletedSubmission = () => { workOrderId: selection.id, warehouseId: selection.warehouseId, }; - // 将收款方信息添加到对应的completionRecipientEntities数组中 + // 将受款方信息添加到对应的completionRecipientEntities数组中 data[index].completionRecipientEntities.push(recipient); } }); @@ -2800,7 +2831,7 @@ const CompletedSubmission = () => { align-items: center; margin-top: 20px; .title { - width: 76px; + width: 120px; height: 100%; display: flex; display: block; diff --git a/src/views/aftersales/aftersalesWorkOrderInfo.vue b/src/views/aftersales/aftersalesWorkOrderInfo.vue index d83a6a03..e7d453ff 100644 --- a/src/views/aftersales/aftersalesWorkOrderInfo.vue +++ b/src/views/aftersales/aftersalesWorkOrderInfo.vue @@ -960,7 +960,8 @@ const onLoad = () => { payment: item.compensationMethod, name: item.resultTypeName, text: item.compensationMethodName, - compensationTime: item.compensationTime, + compensationTime: item.compensationTime,//支付时间 + paymentUnit: item.paymentUnit, //支付单位 }; } ); diff --git a/src/views/aftersales/aftersalesWorkOrdermodify.vue b/src/views/aftersales/aftersalesWorkOrdermodify.vue index 58322851..2c35f656 100644 --- a/src/views/aftersales/aftersalesWorkOrdermodify.vue +++ b/src/views/aftersales/aftersalesWorkOrdermodify.vue @@ -324,8 +324,8 @@ %
- - + +
@@ -366,6 +366,7 @@ :reserve-keyword="false" placeholder="请选择处理结果" @change="changeProcessingResults" + :disabled="Appealeditor=='appeal' " > + +
+ {{ item.payment ? item.text : '支付方式' }} +
-
+
{{ item.payment ? item.text : '支付方式' }}
+ +
支付单位: - +
取消 - + 提交 - + 提交 @@ -866,6 +875,11 @@ const ResponsiblePartychange = (val, index) => { }; const onLoad = () => { RouterState.value = $route.query.RouterState; + if($route.query.Appealeditor){ + Appealeditor.value = $route.query.Appealeditor;//申诉编辑 + console.log(Appealeditor.value,'申诉编辑状态'); + } + console.log(RouterState.value, '路由状态'); getDictionaryBiz('result_handling').then(res => { console.log(res, '发现环节'); @@ -919,12 +933,6 @@ const onLoad = () => { unPackageInfo.value = JSON.parse(JSON.stringify(PackageInfo.value)); //拷贝一份旧的包件信息 console.log(unPackageInfo.value, '包件信息'); - // 责任方回显 - // FangAddList.value = res.data.data.processorVOList - // .filter(item => item && item.typesOf && item.typesOf == '1') - // .map(item => { - // return { businessName: item.businessId }; - // }); FangAddList.value = res.data.data.personResponsibleVOS.map(res => { ResponsiblepartyData.value.push(res); diff --git a/vite.config.js b/vite.config.js index 2e2d8817..f9da57f9 100644 --- a/vite.config.js +++ b/vite.config.js @@ -25,7 +25,7 @@ export default ({ mode, command }) => { // target: 'http://192.168.6.122:8777', // target: 'http://192.168.10.25:13000', // target: 'http://192.168.10.25:2888', - target: 'http://192.168.6.163:9777',//CYZ + target: 'http://192.168.6.163:9777',//CYZ // target: 'http://192.168.10.57:13000', // target: 'http://192.168.10.200:13000', // target: 'http://192.168.10.29:13000', From 8a88f1b9469393002601ac4a9ff1dc1cfec5195c Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Tue, 9 Jan 2024 16:32:00 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=94=B3=E8=AF=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/aftersales/aftersalesWorkOrder.vue | 42 ++++++++++++++------ 1 file changed, 30 insertions(+), 12 deletions(-) diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue index e6257e66..7fa2b891 100644 --- a/src/views/aftersales/aftersalesWorkOrder.vue +++ b/src/views/aftersales/aftersalesWorkOrder.vue @@ -176,12 +176,26 @@ > 确定 + + 申诉 + + 取消 + + - 编辑 + @@ -954,7 +968,7 @@ const ButtonPermissions = computed(() => { assignment: false, //工单指派 applyArbitration: false, //申请仲裁 batchFinish: false, //批量完结 - appeal: UserPermissions.value == '仓库客服', //申诉 + appeal: false, //申诉 }; case 5: //仲裁中 return { @@ -972,7 +986,7 @@ const ButtonPermissions = computed(() => { assignment: false, //工单指派 applyArbitration: false, //申请仲裁 batchFinish: false, //批量完结 - appeal: false, //申诉 + appeal: true, //申诉 }; case 7: //超时未处理 return { @@ -1498,7 +1512,10 @@ const Appealbutton = () => { .join(','), //实际责任人名称 }); }); - data.imagePath = AppealAttachment.value[0].response.data.link; //申诉图片 + if(AppealAttachment.value.length){ + data.imagePath = AppealAttachment.value[0].response.data.link; //申诉图片 + } + console.log(data, '处理好的值'); $_appealSubmit(data).then(res => { @@ -1855,19 +1872,20 @@ const appealFn = val => { $_listAppeal(data).then(res => { details.loadingObj.list = false; //开启动画加载 console.log(res, '申诉列表返回值'); - if (res.data.data.records.length) { - if (res.data.data.records) { - details.data = res.data.data.records; - } else { - details.data = [{}]; - } - page.value.total = res.data.data.total; + + if(res.data.data.records.length){ + details.data = res.data.data.records; + }else{ + details.data=[{}] } + page.value.total = res.data.data.total; + }); }; // 申诉列表 const AppealTab = val => { + if (val == 0) { AppealStatusT.value = false; //申诉列表关闭 Tableheaderswitching(columnList); //切换表头 From 0908e045d9d015792fc9837bd9cc4511b288b582 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Tue, 9 Jan 2024 17:56:41 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=B8=82=E9=85=8D=E9=85=8D=E9=80=81?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=BA=93=E5=AD=98=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distributionDeliveryListedt.vue | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue index 063d34ef..0c56b48b 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue @@ -2920,6 +2920,17 @@ export default { sortable: true, head: false, }, + { + prop: 'stockPackageCode', + label: '库存品包条码', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, // { // prop: 'serviceNumber', // label: '服务号', @@ -3838,11 +3849,31 @@ export default { }); }, cancelReservationInventoryPackage(row) { + console.log('row', row); console.log('deliveryId', this.deliveryId); console.log('reservationId', this.wid); this.$message.warning('功能维护中...'); return; + console.log('row', row); + console.log('deliveryId', this.deliveryId); + console.log('reservationId', this.wid); + let data = { + deliveryId: this.deliveryId, + reservationId: this.wid, + type: 2, + inventoryPackageIds: row.id, + }; + console.log("data------->",data); + cancelReservationPackage(data).then(res => { + if (res.data.code === 200) { + this.$message.success(res.data.msg); + this.getReservationInventoryPackageListInfo(this.page); + } + }); + + + // let data = { // deliveryId:this.deliveryId, // reservationId:this.wid,