From 3cae9f11a79109726ff590b80ee827aa08ecbbfe Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Wed, 13 Dec 2023 14:37:37 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=B4=A7=E4=BD=8D=E5=8F=AF=E8=A7=86?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/aftersales/aftersalesWorkOrder.js | 9 + src/option/aftersales/vueTvemp.js | 10 + src/router/views/index.js | 15 + src/views/aftersales/aftersalesWorkOrder.vue | 39 +- .../aftersales/aftersalesWorkOrderAdd.vue | 111 +- .../aftersales/aftersalesWorkOrderInfo.vue | 1287 +++++++++++++++++ .../aftersales/aftersalesWorkOrderend.vue | 236 ++- .../goodsShelf/basicdataGoodsShelfView.vue | 13 +- vite.config.js | 5 +- 9 files changed, 1686 insertions(+), 39 deletions(-) create mode 100644 src/views/aftersales/aftersalesWorkOrderInfo.vue diff --git a/src/api/aftersales/aftersalesWorkOrder.js b/src/api/aftersales/aftersalesWorkOrder.js index 389d5083..baed09b7 100644 --- a/src/api/aftersales/aftersalesWorkOrder.js +++ b/src/api/aftersales/aftersalesWorkOrder.js @@ -274,3 +274,12 @@ export const $_getAbnormalPackage = (params) => { params }) } + +//查询申述数据 +export const $_listAppeal = (params) => { + return request({ + url: '/api/logpm-aftersales/aftersalesAppeal/listAppeal', + method: 'get', + params + }) +} diff --git a/src/option/aftersales/vueTvemp.js b/src/option/aftersales/vueTvemp.js index e7749a9a..d36cd424 100644 --- a/src/option/aftersales/vueTvemp.js +++ b/src/option/aftersales/vueTvemp.js @@ -644,5 +644,15 @@ export const Claimsfield = [ sortable: true, head: false, }, + { + prop: 'createUserName', + label: '操作', + type: 6, + values: '', + width: '220', + checkarr: [], + fixed: 'right', + sortable: false, + }, ] diff --git a/src/router/views/index.js b/src/router/views/index.js index 08cd3f34..d35eb521 100644 --- a/src/router/views/index.js +++ b/src/router/views/index.js @@ -1216,6 +1216,21 @@ export default [ }, ], }, + + { + path: '/aftersales/aftersalesWorkOrderInfo', + component: Layout, + redirect: '/aftersales/aftersalesWorkOrderInfo', + children: [ + { + path: '/aftersales/aftersalesWorkOrderInfo', + name: '工单详情查看', + component: () => import('@/views/aftersales/aftersalesWorkOrderInfo.vue'), + }, + ], + }, + + { path: '/aftersales/aftersalesWorkOrderend', component: Layout, diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue index e0478b35..050bda68 100644 --- a/src/views/aftersales/aftersalesWorkOrder.vue +++ b/src/views/aftersales/aftersalesWorkOrder.vue @@ -89,7 +89,7 @@ 工单指派 申请仲裁 批量完结 - 申诉 + 申诉 @@ -126,11 +126,14 @@ @@ -1013,7 +1016,7 @@ import { $_addCompletionEnd, $_appealSubmit, $_listSettlement, - $_getAbnormalPackage, + $_listAppeal, } from '@/api/aftersales/aftersalesWorkOrder'; import { getToken } from '@/utils/auth'; import { getDictionaryBiz } from '@/api/system/dict'; //字典 @@ -1469,11 +1472,10 @@ const searchHide = () => { const view = val => { console.log(val.row.id); $router.push({ - path: '/aftersales/aftersalesWorkOrderAdd', + path: '/aftersales/aftersalesWorkOrderInfo', query: { id: val.row.id, name: val.row.id + '-信息查看', - routerState: 'view', }, }); return; @@ -1586,6 +1588,13 @@ const appeal = val => { }); return; } + if (details.selectionList.length>1) { + ElMessage({ + message: '只能单条申诉', + type: 'warning', + }); + return; + } dialogappeal.value = true; //展开申诉弹窗 }; // 工单申诉确认按钮 @@ -1596,7 +1605,16 @@ const Appealbutton = () => { let data = { peopleEntityList: [], //参数一 }; + 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(','), //实际责任人名称 + details.selectionList.forEach(item => { + console.log(item.id); console.log(item, '已经选择的列表'); data['peopleEntityList'].push({ workOrderId: item.id, //异常工单ID @@ -1608,10 +1626,6 @@ const Appealbutton = () => { .filter(item => Appealselection.value.includes(item.value)) .map(item => item.label) .join(','), //实际责任人名称 - actualPersonId: warehouseData.value - .filter(item => Appealselection.value.includes(item.value)) - .map(item => item.value) - .join(','), //实际责任人ID }); }); console.log(data, '处理好的值'); @@ -1646,6 +1660,11 @@ const AppealTab = val => { IndexTable({ workOrderStatus: 30 }); } else { console.log('当前是申诉列表'); + let data={} + $_listAppeal(data).then(res=>{ + console.log(res,'申诉列表返回值') + + }) } }; @@ -2764,6 +2783,8 @@ const CompletedSubmission = () => { display: flex; align-items: flex-end; margin-bottom: 10px; + position: fixed; + bottom: 0; } .el-times { :deep(.el-input__wrapper) { diff --git a/src/views/aftersales/aftersalesWorkOrderAdd.vue b/src/views/aftersales/aftersalesWorkOrderAdd.vue index ae0326a7..c1356494 100644 --- a/src/views/aftersales/aftersalesWorkOrderAdd.vue +++ b/src/views/aftersales/aftersalesWorkOrderAdd.vue @@ -21,6 +21,7 @@ placeholder="请输入包条码" clearable :rows="2" + @change="ChangePackageInfo(item.packageCode, index)" /> @@ -36,6 +37,9 @@
+ + 查看历史包件 + 移除
@@ -361,6 +365,17 @@ :rows="2" /> + +
+ 说明: + +
+
移除 @@ -454,6 +469,28 @@ + + + + + + + 查看详情 + + + + \ No newline at end of file diff --git a/src/views/aftersales/aftersalesWorkOrderend.vue b/src/views/aftersales/aftersalesWorkOrderend.vue index 6fef7fca..75ad7851 100644 --- a/src/views/aftersales/aftersalesWorkOrderend.vue +++ b/src/views/aftersales/aftersalesWorkOrderend.vue @@ -22,9 +22,32 @@ - + + + + +
+ 运损节点 + + + +
+ + @@ -98,26 +121,7 @@
--> -
-
- 运损节点 - - - -
-
+ + + +
+
添加信息
+
+
+
+ 包条码: + +
+ +
+ 订单自编码: + +
+ +
+ 运单号: + +
+
+ +
+ + 查看历史包件 + + 移除 +
+
+
+ 总件数:{{ endFrom.number }} +
+
+ + +
@@ -614,6 +660,30 @@ + + + + + + + + 查看详情 + + + + @@ -630,6 +700,7 @@ import { $_savaSurveyRecord, $_addProcessingResults, $_getSurveyRecord, + $_getAbnormalPackage, } from '@/api/aftersales/aftersalesWorkOrder'; import { columnList, recordList } from '@/option/aftersales/vueTvemp.js'; import { getToken } from '@/utils/auth'; @@ -656,6 +727,13 @@ const Msgtextarea = ref(''); //回复框消息 const msgState = ref(0); //回复消息状态 const Msgloading = ref(false); //消息回复的加载效果 const companyProportion = ref(0); //公司占比 +const HistoricalPackageList = ref([]); //历史包件数组 +const dialogHistoricalPackage=ref(false);//包件弹窗 +const HistoricalPackageinput=ref('');//历史包件选择 +const PackageInfo = ref([ + //包件信息 + { packageCode: '', orderCode: '', waybillNumber: '' }, +]); // 提货责任方 const responsible = ref([ { @@ -1184,6 +1262,47 @@ const amountMoney = () => { console.log('收款总计金额', TotalamountReceived.value); }; +// 添加包件 +const AddPackage = () => { + PackageInfo.value.push({ packageCode: '', orderCode: '', waybillNumber: '' }); +}; +// 包件移除 +const PackagRemoval = val => { + PackageInfo.value.splice(val, 1); //移除当前点击的按钮 +}; +// 查看历史包件 +const historicalPackages = val => { + dialogHistoricalPackage.value = true; //打开历史包件弹窗 + HistorIndex.value = val; + console.log(val); +}; +// 查询包件信息自动回显 +const ChangePackageInfo = (val, index) => { + let data = { + packageCode: val, + }; + $_getAbnormalPackage(data).then(res => { + console.log(res, '包件信息'); + console.log(res.data.data, '包件信息'); + + const packageData = res.data.data[0]; + PackageInfo.value[index].orderCode = packageData.orderCode; //订单自编码 + PackageInfo.value[index].waybillNumber = packageData.waybillNumber; //运单号 + PackageInfo.value[index].orderId = packageData.orderId; //运单号 + PackageInfo.value[index].state = false; //状态 + + if (res.data.data.length > 1) { + HistoricalPackageList.value = res.data.data; + PackageInfo.value[index].state = true; //状态 + } + // packageCode; //包件码 + // //订单自编码 + // orderCode: orderId; //运单号 + // workOrderId; //工单id + // workOrderNumber; //工单名称 + console.log(PackageInfo.value, '处理好的参数'); + }); +}; // 新视频预览 const AddVideoPreview = val => { VideoPreviewStatus.value = true; //开启视频查看弹窗 @@ -1448,6 +1567,29 @@ const replyMessage = () => { } }); }; + +// 历史包件里面的查看 +const ViewPackageDetails = val => { + if(!val){ + ElMessage({ + message: '请选择要查看的数据', + type: 'warning', + }) + return + } + console.log(val); + let info = HistoricalPackageList.value.find(obj => obj.workOrderId == val); + console.log(info,'筛选的值'); + $router.push({ + path: '/aftersales/aftersalesWorkOrderInfo', + query: { + id: info.workOrderId, + name: info.workOrderId + '-信息查看', + routerState: 'view', + }, + }); + dialogHistoricalPackage.value = false; //打开历史包件弹窗 +}; diff --git a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue index a6c24102..aab34e96 100644 --- a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue +++ b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue @@ -647,11 +647,11 @@ onMounted(() => { initconfig(); initnumber(); }); -async function initnumber() { - let res = await Alloclocationsnub(); - console.log(res.data.data); - details.countnumber = res.data.data; -} +// async function initnumber() { +// let res = await Alloclocationsnub(); +// console.log(res.data.data); +// details.countnumber = res.data.data; +// } // watchEffect(()=>{ // if(details.isshowupt){ // details.inputtxts='' @@ -666,8 +666,10 @@ async function initconfig() { let res = await getstoreCargo(); details.arrlist = res.data.data; console.log(details.arrlist, '仓库列表'); + if (details.arrlist.length > 0) { $_locationsnub({ warehouseId: details.arrlist[0].id }).then(res => { + details.countnumber =res.data.data console.log('初始化仓库参数成功', res); }); } @@ -849,6 +851,7 @@ const checkcso = val => { console.log(details.arrlist[val].id, '选择的ID-====='); console.log(val, '货位接受参数'); $_locationsnub({ warehouseId: details.arrlist[val].id }).then(res => { + details.countnumber =res.data.data console.log('切换请求成功', res); }); if (details.arrlist[details.checkselect]?.warehouseGoodsAreaVOList.length > 0) { diff --git a/vite.config.js b/vite.config.js index eacdd94d..5b916f74 100644 --- a/vite.config.js +++ b/vite.config.js @@ -23,9 +23,10 @@ export default ({ mode, command }) => { // 新zyc // target: 'http://192.168.6.116:8777', - target: 'http://192.168.6.122:8777', + // target: 'http://192.168.6.122:8777', // target: 'http://192.168.6.116:8777', - // tjj + // tjj : + target:'http://192.168.10.25:13000', // sst // target: 'http://192.168.10.94:8888', // target: 'http://192.168.10.29:13000', From fcd2be278ac36125e866f24a0e8a388a075659cb Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Wed, 13 Dec 2023 15:00:56 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=9B=98=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/aftersales/aftersalesWorkOrder.vue | 14 +++++++++--- .../checkInventoryTask/createTask.vue | 22 +++++++++---------- vite.config.js | 6 ++--- 3 files changed, 25 insertions(+), 17 deletions(-) diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue index 050bda68..77e05ba8 100644 --- a/src/views/aftersales/aftersalesWorkOrder.vue +++ b/src/views/aftersales/aftersalesWorkOrder.vue @@ -2,6 +2,7 @@
+
@@ -2783,8 +2784,7 @@ const CompletedSubmission = () => { display: flex; align-items: flex-end; margin-bottom: 10px; - position: fixed; - bottom: 0; + } .el-times { :deep(.el-input__wrapper) { @@ -3022,10 +3022,15 @@ const CompletedSubmission = () => { :deep(.el_tabs) { width: 100%; display: flex; - flex-direction: column; + // flex-direction: column; + flex-wrap: wrap; .el-tabs__content { padding: 0; } + .el-tabs__header{ + height: 37px; + width: 100%; + } } :deep(.avue-crud__pagination) { padding-top: 2px !important; @@ -3050,4 +3055,7 @@ const CompletedSubmission = () => { justify-content: flex-end; margin-top: 10px; } +:deep(.avue-crud__header){ + align-items: center; +} diff --git a/src/views/distribution/checkInventoryTask/createTask.vue b/src/views/distribution/checkInventoryTask/createTask.vue index d291648f..c08ee777 100644 --- a/src/views/distribution/checkInventoryTask/createTask.vue +++ b/src/views/distribution/checkInventoryTask/createTask.vue @@ -2462,17 +2462,17 @@ const InventorySubmit = () => { InventoryPopup.value = false; //关闭创建盘点任务弹窗 loading.value = true; //开启表格加载 console.log(SubData, '处理好的数据'); - // postAddtaskQuest(SubData).then(res => { - // onLoad(); //体积之后初始化页面 - // if ((res.data.code = 200)) { - // ElMessage({ - // message: res.data.msg, - // type: 'success', - // }); - // onLoad(); //体积之后初始化页面 - // } - // console.log(res, '盘点计划提交成功'); - // }); + postAddtaskQuest(SubData).then(res => { + onLoad(); //体积之后初始化页面 + if ((res.data.code = 200)) { + ElMessage({ + message: res.data.msg, + type: 'success', + }); + onLoad(); //体积之后初始化页面 + } + console.log(res, '盘点计划提交成功'); + }); return; } diff --git a/vite.config.js b/vite.config.js index 5b916f74..ae6eea31 100644 --- a/vite.config.js +++ b/vite.config.js @@ -23,10 +23,10 @@ export default ({ mode, command }) => { // 新zyc // target: 'http://192.168.6.116:8777', - // target: 'http://192.168.6.122:8777', + target: 'http://192.168.6.122:8777', // target: 'http://192.168.6.116:8777', - // tjj : - target:'http://192.168.10.25:13000', + // tjj : + // target:'http://192.168.10.25:13000', // sst // target: 'http://192.168.10.94:8888', // target: 'http://192.168.10.29:13000', From 5b965334e9a6fcb1496f09d50d67c98ca16911b8 Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Wed, 13 Dec 2023 15:10:14 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=9B=98=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/distribution/checkInventoryTask/createTask.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/distribution/checkInventoryTask/createTask.vue b/src/views/distribution/checkInventoryTask/createTask.vue index c08ee777..3616e2de 100644 --- a/src/views/distribution/checkInventoryTask/createTask.vue +++ b/src/views/distribution/checkInventoryTask/createTask.vue @@ -2495,10 +2495,10 @@ const InventorySubmit = () => { SubData.startTime = formInventory.value.time[0]; console.log(SubData, '处理好要提交的数据'); InventoryPopup.value = false; //关闭创建盘点任务弹窗 - // postAddtaskQuest(SubData).then(res => { - // console.log(res, '盘点计划提交成功'); - // onLoad(); //体积之后初始化页面 - // }); + postAddtaskQuest(SubData).then(res => { + console.log(res, '盘点计划提交成功'); + onLoad(); //体积之后初始化页面 + }); }; // 顶部废弃按钮 const discard = () => { From 5ed33219d1a5e608dbca37c76dc3aeb909cfcf63 Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Wed, 13 Dec 2023 15:20:22 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BB=93=E5=BA=93=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/page/index/top/index.vue | 2 +- .../distribution/checkInventoryTask/createTask.vue | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/page/index/top/index.vue b/src/page/index/top/index.vue index 3de4b69e..0ee9e0e6 100644 --- a/src/page/index/top/index.vue +++ b/src/page/index/top/index.vue @@ -67,7 +67,7 @@
- + { loading.value = true; //开启表格加载 console.log(SubData, '处理好的数据'); postAddtaskQuest(SubData).then(res => { - onLoad(); //体积之后初始化页面 + if ((res.data.code = 200)) { ElMessage({ message: res.data.msg, @@ -2495,9 +2495,17 @@ const InventorySubmit = () => { SubData.startTime = formInventory.value.time[0]; console.log(SubData, '处理好要提交的数据'); InventoryPopup.value = false; //关闭创建盘点任务弹窗 + loading.value = true; //开启表格加载 postAddtaskQuest(SubData).then(res => { + if ((res.data.code = 200)) { + ElMessage({ + message: res.data.msg, + type: 'success', + }); + onLoad(); //体积之后初始化页面 + } console.log(res, '盘点计划提交成功'); - onLoad(); //体积之后初始化页面 + }); }; // 顶部废弃按钮