From 3d0c7a22195cbf27e6eeef29f96f5f704b1927b5 Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Tue, 9 Jan 2024 21:44:00 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=AE=A2=E6=9C=8D=E7=94=B3=E8=AF=89?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/aftersales/aftersalesWorkOrder.js | 18 ++ src/views/aftersales/aftersalesWorkOrder.vue | 163 +++++++++++++------ 2 files changed, 131 insertions(+), 50 deletions(-) diff --git a/src/api/aftersales/aftersalesWorkOrder.js b/src/api/aftersales/aftersalesWorkOrder.js index d03b0a44..d27480c2 100644 --- a/src/api/aftersales/aftersalesWorkOrder.js +++ b/src/api/aftersales/aftersalesWorkOrder.js @@ -398,4 +398,22 @@ export const $_AppealDetails = (params) => { method: 'get', params }) +} + +// 取消申诉 +export const $_Cancelappeal = (data) => { + return request({ + url: '/api/logpm-aftersales/aftersalesAppeal/update', + method: 'post', + data + }) +} + +// 删除申诉 +export const $_getDetails = (params) => { + return request({ + url: '/api/logpm-aftersales/aftersalesAppeal/detail', + method: 'get', + params + }) } \ No newline at end of file diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue index 38c41849..50aeb901 100644 --- a/src/views/aftersales/aftersalesWorkOrder.vue +++ b/src/views/aftersales/aftersalesWorkOrder.vue @@ -122,7 +122,7 @@ - 申诉 @@ -139,8 +139,8 @@ - - + + @@ -189,12 +189,13 @@ >申诉 - 编辑 取消申诉 @@ -442,7 +443,7 @@ - +
{ const AppealAttachmentImgSuccess = val => { console.log(val, '申诉图片上传成功'); }; + +// 取消申诉 +const CancelappealFn = val => { + let data = { + id: val.row.id, //取消申诉ID + typesOf: '3', //申诉状态 + workOrderId:val.row.workOrderId,//异常工单ID + }; + + $_Cancelappeal(data).then(res => { + console.log(res, '取消申诉返回值'); + if (res.data.code == 200) { + appealFn(details.query); + ElMessage({ + message: '取消申诉成功', + type: 'success', + }); + } + }); +}; + // 工单申诉按钮 const appeal = (val, state) => { + AppealAttachment.value=[];//清空图片 + Appealselection.value='';//清空责任人 + Reasonforappeal.value='',//清空申诉内容 console.log(state); console.log(val.row, '申诉当前点击的按钮'); if (state == 'edit') { // 当前是编辑申诉 - + details.selectionList.push(val.row); AppealeditorState.value = true; //开启申诉编辑状态 - if(val.row) { - selectList.value.push(val.row) + if (val.row) { + selectList.value.push(val.row); } - let data={ - id:val.row.id, - } - $_AppealDetails(data).then(res=>{ - console.log(res,'申诉编辑回显'); - Reasonforappeal.value = res.data.data.reason;//申诉原因 - setTimeout(()=>{ - console.log(res.data.data.peopleEntityList.map(item=>item.actualPersonId)); - console.log(warehouseData.value,'仓库数据'); - // Appealselection.value= - dialogappeal.value = true; //展开申诉编辑 - },0) - - }) + let data = { + id: val.row.id, + }; + $_AppealDetails(data).then(res => { + console.log(res, '申诉编辑回显'); + Reasonforappeal.value = res.data.data.reason; //申诉原因 + setTimeout(() => { + console.log(res.data.data.peopleEntityList.map(item => item.actualPersonId)); + console.log(warehouseData.value, '仓库数据'); + if(res.data.data.peopleEntityList){ + Appealselection.value= res.data.data.peopleEntityList.map(item => item.actualPersonId) + } + if(res.data.data.imagePath){ + AppealAttachment.value.push({ + url:res.data.data.imagePath, + }) + } + dialogappeal.value = true; //展开申诉编辑 + }, 0); + }); return; } if (!state) { // 单条申诉 AppealeditorState.value = false; //开启申诉编辑状态 - if(val.row){ + if (val.row) { details.selectionList.push(val.row); } - dialogappeal.value = true; //展开申诉弹窗 } else { // 批量申诉 @@ -1532,59 +1563,82 @@ const Appealbutton = state => { peopleEntityList: [], //参数一 imagePath: '', //申诉图片附件 }; - data.workOrderId = details.selectionList[0].id; + if(AppealeditorState.value){ + data.workOrderId = details.selectionList[0].workOrderId; + }else{ + data.workOrderId = details.selectionList[0].id; + } data.reason = Reasonforappeal.value; data.appealPeopleName = warehouseData.value .filter(item => Appealselection.value.includes(item.value)) .map(item => item.label) .join(','); //实际责任人名称 //如果为编辑状态追加ID字段 - console.log(AppealeditorState.value,'申诉状态'); + console.log(AppealeditorState.value, '申诉状态'); if (AppealeditorState.value) { data.id = details.selectionList[0].id; } - console.log(details.selectionList,'准备处理的数据'); - details.selectionList.forEach(item => { - console.log(item, '已经选择的列表'); + console.log(details.selectionList, '准备处理的数据'); + //处理数据 + Appealselection.value.forEach(item => { + console.log(item,'循环的值'); data['peopleEntityList'].push({ - workOrderId: item.id, //异常工单ID - warehouseId: item.warehouseId == '/' ? '' : item.warehouseId, + workOrderId: details.selectionList[0].id, //异常工单ID reason: Reasonforappeal.value, //申诉理由 claimant: userInfo.value.content.user_name, //申诉人 - actualPersonId: warehouseData.value - .filter(item => Appealselection.value.includes(item.value)) - .map(item => item.value) - .join(','), //实际责任人ID - actualPersonName: warehouseData.value - .filter(item => Appealselection.value.includes(item.value)) - .map(item => item.label) - .join(','), //实际责任人名称 + actualPersonId: warehouseData.value.find(res => res.value == item).value, //实际责任人ID + actualPersonName: warehouseData.value.find(res=> res.value == item).label, //实际责任人名称 }); }); if (AppealAttachment.value.length) { - data.imagePath = AppealAttachment.value[0].response.data.link; //申诉图片 + console.log(AppealAttachment.value,'图片'); + if(AppealAttachment.value[0].response){ + data.imagePath = AppealAttachment.value[0].response.data.link; //申诉图片 + }else{ + data.imagePath = AppealAttachment.value[0].url; //申诉图片 + } } - console.log(data, '处理好的值'); + $_appealSubmit(data).then(res => { + if (res.data.code == 200) { + ElMessage({ + message: res.data.msg, + type: 'success', + }); + } + }).finally(res=>{ dialogappeal.value = false; //关闭申诉弹窗 loadingappeal.value = false; //关闭加载效果 - console.log(res, '申诉成功返回值'); + console.log(res, '功返回值'); ProcessingPartyState.value = false; //关闭处理方 - data.workOrderStatus = 30; - details.query.workOrderStatus = 30; ArbitrationStatus.value = false; //不可以申请仲裁 - tabValue.value = 2; AppealeditorState.value = false; //关闭编辑状态 appealData.value = {}; //清空当前行申诉数据 + if(AppealStatusT.value){ + Tableheaderswitching(AppealList); //切换表头 + AppealList.forEach(item => { + //清空搜索记录 + item.values = ''; + }); + appealFn(); // 获取申诉列表 + }else{ + + data.workOrderStatus = 30; + details.query.workOrderStatus = 30; + tabValue.value = 2; empty(); //清空搜索数据 IndexTable({ workOrderStatus: 30 }); - if (res.data.code == 200) { - ElMessage({ + } + + + + + + ElMessage({ message: res.data.msg, type: 'success', }); - } }); }; @@ -1903,6 +1957,7 @@ const settlementclaim = val => { }; // 获取申诉列表 const appealFn = val => { + details.loadingObj.list = true; //开启动画加载 AppealStatus.value = true; //开启申诉列表状态 TimeoutStatus.value = false; //关闭 超时状态 @@ -1932,6 +1987,7 @@ const appealFn = val => { // 申诉列表 const AppealTab = val => { + if (val == 0) { AppealStatusT.value = false; //申诉列表关闭 Tableheaderswitching(columnList); //切换表头 @@ -1945,8 +2001,11 @@ const AppealTab = val => { }; IndexTable(data); } else { + AppealStatusT.value = true; //申诉列表开启 console.log(val, '切换申诉列表'); + data.workOrderStatus = ''; + console.log( data.workOrderStatus,'当前搜索状态'); Tableheaderswitching(AppealList); //切换表头 AppealList.forEach(item => { //清空搜索记录 @@ -1954,6 +2013,10 @@ const AppealTab = val => { }); appealFn(); // 获取申诉列表 } + + AppealAttachment.value=[];//清空图片 + Appealselection.value='';//清空责任人 + Reasonforappeal.value='';//清空申诉内容 }; // 超时金额修改 const BtnModifyAmount = val => { From ec08867cec8c8dd8e07cc206cd36d39b808188c3 Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Tue, 9 Jan 2024 21:50:50 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=B3=E8=AF=89?= =?UTF-8?q?=E4=B9=8B=E5=90=8E=E8=8E=B7=E5=8F=96=E5=80=BC=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/aftersales/aftersalesWorkOrder.vue | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue index 50aeb901..f22c12ff 100644 --- a/src/views/aftersales/aftersalesWorkOrder.vue +++ b/src/views/aftersales/aftersalesWorkOrder.vue @@ -1547,7 +1547,8 @@ const appeal = (val, state) => { }; // 工单申诉确认按钮 const Appealbutton = state => { - if (AppealAttachment.value.length > 1) { + if(UserPermissions.value =='仓库客服'){ + if (AppealAttachment.value.length > 1) { ElMessage({ message: '只能上传一张图片', type: 'warning', @@ -1623,23 +1624,18 @@ const Appealbutton = state => { }); appealFn(); // 获取申诉列表 }else{ - - data.workOrderStatus = 30; - details.query.workOrderStatus = 30; - tabValue.value = 2; + data.workOrderStatus = 80; + details.query.workOrderStatus = 80; + tabValue.value = 6; empty(); //清空搜索数据 - IndexTable({ workOrderStatus: 30 }); + IndexTable({ workOrderStatus: 80 }); } - - - - - ElMessage({ message: res.data.msg, type: 'success', }); }); + } }; // 异常类型事件 From d4aa85765f66231fdb96a319124dd51724969ddf Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Tue, 9 Jan 2024 21:58:13 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BE=85=E5=A4=84?= =?UTF-8?q?=E7=90=86=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/aftersales/aftersalesWorkOrder.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue index f22c12ff..5cb120bb 100644 --- a/src/views/aftersales/aftersalesWorkOrder.vue +++ b/src/views/aftersales/aftersalesWorkOrder.vue @@ -2091,7 +2091,7 @@ const tabChenge = val => { details.query.workOrderStatus = 40; Tableheaderswitching(columnList); empty(); - ProcessingPartyFun(data); + IndexTable(data); } ProcessingPartyState.value = false; //关闭处理方 ArbitrationStatus.value = true; //可以申请仲裁 From 353fd4b068fc2189cfdc571ed5d4fc60c91282d0 Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Tue, 9 Jan 2024 22:31:48 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=B3=E8=AF=89?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/aftersales/aftersalesWorkOrder.vue | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue index 5cb120bb..72b7edc7 100644 --- a/src/views/aftersales/aftersalesWorkOrder.vue +++ b/src/views/aftersales/aftersalesWorkOrder.vue @@ -172,10 +172,17 @@
查看 + + 查看 + 申诉 - 编辑 取消申诉 - + + From ac74f0ba4d5d742c7ef331ad159b4ec1557b078e Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Tue, 9 Jan 2024 22:46:57 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=AB=98=E5=BA=A6?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/aftersales/aftersalesWorkOrder.vue | 13 +++++-------- vite.config.js | 4 ++-- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue index 72b7edc7..56967272 100644 --- a/src/views/aftersales/aftersalesWorkOrder.vue +++ b/src/views/aftersales/aftersalesWorkOrder.vue @@ -172,17 +172,11 @@
查看 - - 查看 - { width: 100%; } } +:deep(#bodys){ + height: auto !important; +} diff --git a/vite.config.js b/vite.config.js index 0b9195b5..7ff39569 100644 --- a/vite.config.js +++ b/vite.config.js @@ -14,7 +14,7 @@ export default ({ mode, command }) => { '/api': { // target: 'http://192.168.10.126:8889', // hy - target: 'http://192.168.10.48:13000', + // target: 'http://192.168.10.48:13000', // lmy // target: 'http://192.168.10.123:8889', // target: 'http://192.168.10.101:8888', @@ -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 5e8f4fc3302519aa373fecb75fffa22e76d1a416 Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Tue, 9 Jan 2024 22:47:33 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E9=AB=98=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/aftersales/aftersalesWorkOrder.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue index 56967272..8e2fe33a 100644 --- a/src/views/aftersales/aftersalesWorkOrder.vue +++ b/src/views/aftersales/aftersalesWorkOrder.vue @@ -3288,6 +3288,6 @@ const CompletedSubmission = () => { } } :deep(#bodys){ - height: auto !important; + height: auto !important; }