From ad7b2fe105cdb79f30ed34613d44f5e9c20718ff Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Mon, 18 Dec 2023 10:14:50 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=85=8D=E9=80=81=E9=80=82=E9=85=8D?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=9B=9E=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/views/index.js | 24 +++---- .../aftersales/aftersalesWorkOrdermodify.vue | 70 ++++++++++++++++++- .../distributionDeliveryListmar.vue | 7 ++ vite.config.js | 6 +- 4 files changed, 90 insertions(+), 17 deletions(-) diff --git a/src/router/views/index.js b/src/router/views/index.js index 84c17f65..8d69b1d1 100644 --- a/src/router/views/index.js +++ b/src/router/views/index.js @@ -1193,18 +1193,18 @@ export default [ ], }, - // { - // path: '/aftersales/VueTemp', - // component: Layout, - // redirect: '/aftersales/VueTemp', - // children: [ - // { - // path: '/aftersales/VueTemp', - // name: '工单', - // component: () => import('@/views/aftersales/aftersalesWorkOrder.vue'), - // }, - // ], - // }, + { + path: '/aftersales/aftersalesWorkOrder', + component: Layout, + redirect: '/aftersales/aftersalesWorkOrder', + children: [ + { + path: '/aftersales/aftersalesWorkOrder', + name: '工单', + component: () => import('@/views/aftersales/aftersalesWorkOrder.vue'), + }, + ], + }, { path: '/aftersales/aftersalesWorkOrderAdd', component: Layout, diff --git a/src/views/aftersales/aftersalesWorkOrdermodify.vue b/src/views/aftersales/aftersalesWorkOrdermodify.vue index 94f7f32d..3079ada1 100644 --- a/src/views/aftersales/aftersalesWorkOrdermodify.vue +++ b/src/views/aftersales/aftersalesWorkOrdermodify.vue @@ -635,6 +635,7 @@ const deletePackageInfo = ref([]); //被删除的包间信息 const unDecreaseImageEntityList = ref([]); //移除的货损图片 const NewImageAddress = ref([]); //旧的片地址 const InitialresponsibleParty = ref(); //初始的责任方 +const ProcessingParty =ref();//拷贝一份处理方 const CompensationParty = ref([ { name: '', state: 0, num: null, reason: '', cld: 1, explains: '' }, //赔款方 { name: '', state: 1, num: null, reason: '', cld: 1, explains: '' }, //收款方 @@ -817,6 +818,7 @@ const onLoad = () => { Indexform.value.processor.push(item.businessId); } }); + ProcessingParty.value = JSON.parse(JSON.stringify(Indexform.value.processor))//拷贝一份处理方 console.log(Indexform.value.processor, ' Indexform.value.processor'); getDictionaryBiz('pc_work_order').then(res => { //处理结果字典 @@ -1156,8 +1158,8 @@ const ConfirmForm = () => { completionRecordEntities: [], //异常工单完结赔款方 aftersalesProcessingResultsDTO: {}, //处理结果 - personResponsibleDTO: [], //添加预计责任人 - unPersonResponsibleDTO: [], //取消预计责任人 + personResponsibleDTO: [], //添加预计责任人(完成) + unPersonResponsibleDTO: [], //取消预计责任人（完成） surveyRecordDTO: {}, //调查经过 }; @@ -1252,6 +1254,70 @@ if(unProcessorEntityList.value.length){ } + +// 新增的责任方和处理方 +DataSubmit['processorEntityList'].push({ + businessName:'',//名称 + businessId:'',//ID + workOrderId:$route.query.id,//异常工单ID + conditions:2,//状态 1正常 2新增 3取消 + typesOf:2,// 类型 1 责任方 2 处理方 + processingStatus:'',//处理状态 类型 1 待处理 2 已处理 + warehouseId:$route.query.warehouseId,//仓库ID + assignTime:'',//指派时间 +}) +// 取消的责任方和处理方 +DataSubmit['unProcessorEntityList'].push({ + businessName:'',//名称 + businessId:'',//ID + workOrderId:$route.query.id,//异常工单ID + conditions:2,//状态 1正常 2新增 3取消 + typesOf:2,// 类型 1 责任方 2 处理方 + processingStatus:'',//处理状态 类型 1 待处理 2 已处理 + warehouseId:$route.query.warehouseId,//仓库ID + assignTime:'',//指派时间 +}) + + + + + + +// 新增的责任方和处理方 + Indexform.value.processor.forEach(item=>{ + msgData['processorEntityList'].push({ + businessName: warehouseData.value.find(obj => obj.value == item).label, //名称 + businessId: warehouseData.value.find(obj => obj.value == item).value, //ID + workOrderId: $route.query.id, //异常工单ID + conditions:2,//状态 1正常 2新增 3取消 + typesOf: 2, //1 责任方 2 处理方 + warehouseId: $route.query.warehouseId, //仓库ID + processingStatus:'',//处理状态 类型 1 待处理 2 已处理 + assignTime:'',//指派时间 + }); + }) + +// 取消的责任方和处理方 +Indexform.value.processor.forEach(item=>{ + msgData['unProcessorEntityList'].push({ + businessName: warehouseData.value.find(obj => obj.value == item).label, //名称 + businessId: warehouseData.value.find(obj => obj.value == item).value, //ID + workOrderId: $route.query.id, //异常工单ID + conditions:3,//状态 1正常 2新增 3取消 + typesOf: 2, //1 责任方 2 处理方 + warehouseId: $route.query.warehouseId, //仓库ID + processingStatus:'',//处理状态 类型 1 待处理 2 已处理 + assignTime:'',//指派时间 + }); + }) + + + + + + + + //移除的货损图片 console.log(DataSubmit, '处理好的数据'); // $_modifyData(DataSubmit).then(res => { diff --git a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue index 5af87830..f72f7882 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue @@ -124,6 +124,13 @@ 地 图 + + + 编 辑 + + diff --git a/vite.config.js b/vite.config.js index 5f58ef50..0d63bc25 100644 --- a/vite.config.js +++ b/vite.config.js @@ -23,15 +23,15 @@ export default ({ mode, command }) => { // 新zyc // target: 'http://192.168.6.116:8777', // target: 'http://192.168.6.122:8777', - // target: 'http://192.168.10.25:13000', + target: 'http://192.168.10.25:13000', // target: 'http://192.168.10.25:2888', - // target: 'http://192.168.6.122:8777', + // target: 'http://192.168.6.122:8777', // target: 'http://192.168.6.116:8777', // tjj // sst // target: 'http://192.168.10.94:8888', // target: 'http://192.168.10.29:13000', - target: 'http://h5uapi.huitongys.com', + // target: 'http://h5uapi.huitongys.com', // target: 'http://test.api.huitongys.com', changeOrigin: true, rewrite: path => path.replace(/^\/api/, ''), From 76272ba3095eaa85ae3acb2ceb320ee11ba4508e Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Mon, 18 Dec 2023 11:10:52 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=B8=82=E9=85=8D=E9=85=8D=E9=80=81?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A2=84=E7=BA=A6=E5=8D=95=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../turndelivery/deliveryMarket.vue | 303 +++++++++++++++++- 1 file changed, 300 insertions(+), 3 deletions(-) diff --git a/src/views/distribution/turndelivery/deliveryMarket.vue b/src/views/distribution/turndelivery/deliveryMarket.vue index da4b4217..78e2285e 100644 --- a/src/views/distribution/turndelivery/deliveryMarket.vue +++ b/src/views/distribution/turndelivery/deliveryMarket.vue @@ -256,6 +256,7 @@

预约列表

+ 新 增
+ + + + + + + + +
+
勾选数量: {{ selectionList.length }}
+ + + +
+ + + + 取 消 + 确 定 + + + + + + ",'执行预约新增'); + //开启弹窗 + this.reservationDialogVisible = true; + console.log("aaaaa-------->",'aaa'); + //查询可进行预约的预约单 + let excludeId=[]; + if (this.reservationData.length>0){ + //列表存在的预约单进行过滤 + excludeId = this.reservationData.map(item=> item.id).join(",") + } + this.getAddReservationList(this.page,excludeId); + + + + }, + saveAddReservation(){ + if (this.selectionList.length === 0 ){ + this.$message.warning("请选择需要增加的预约单"); + } + + + this.reservationData.push(...this.selectionList); + + console.log('aaa->>>>>>',this.selectionList); + console.log('this.reservationData->>>>>>',this.reservationData); + this.reservationDialogVisible = false; + + + + }, + //查询可用预约单 + getAddReservationList(page,excludeId,params={}){ + this.reservationQuery.reservationStatus = '20'; + this.reservationQuery.excludeId = excludeId; + getList(page.currentPage,page.pageSize , Object.assign(params, this.reservationQuery)).then(res=>{ + console.log('res=========>',res); + const data = res.data.data; + this.reservationListData = data.records; + this.page.total = data.total; + }) + + }, //查询叉车人员 async getFork() { let ides = ''; @@ -957,7 +1254,7 @@ type: 'warning', }) return - } + } } console.log(">>>>>>>>>>>> 配送类型:",this.aaa +" "+ this.bbb) @@ -1343,7 +1640,7 @@ this.query = {}; }, - + onLoad(page, params = {}) { From e528c664f82f1b8bc95f9642cfbbe58811c88bc4 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Mon, 18 Dec 2023 11:45:20 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=B8=82=E9=85=8D=E9=85=8D=E9=80=81?= =?UTF-8?q?=E9=A2=84=E7=BA=A6=E5=AD=97=E6=AE=B5=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../turndelivery/deliveryMarket.vue | 276 ++++++++++++------ 1 file changed, 180 insertions(+), 96 deletions(-) diff --git a/src/views/distribution/turndelivery/deliveryMarket.vue b/src/views/distribution/turndelivery/deliveryMarket.vue index 78e2285e..f1859b80 100644 --- a/src/views/distribution/turndelivery/deliveryMarket.vue +++ b/src/views/distribution/turndelivery/deliveryMarket.vue @@ -483,6 +483,16 @@ fixed: true, }, { + prop: 'reservationCode', + label: '预约单号', + type: 2, + values: '', + width: '200', + checkarr: [], + fixed: false, + sortable: true, + }, + { prop: 'stockArticleId', label: '订单自编号', type: 2, @@ -492,6 +502,26 @@ fixed: false, sortable: true, }, + { + prop: 'warehouseName', + label: '仓库', + type: 2, + values: '', + width: '200', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'mallName', + label: '商场名称', + type: 2, + values: '', + width: '200', + checkarr: [], + fixed: false, + sortable: true, + }, { prop: 'consignee', label: '收货人', @@ -542,7 +572,7 @@ fixed: false, sortable: true, }, - { + { prop: 'deliveryWayName', label: '配送方式', type: 2, @@ -552,7 +582,37 @@ fixed: false, sortable: true, }, - { + { + prop: 'deliveryTypeName', + label: '配送类型', + type: 2, + values: '', + width: '200', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'reservationStatusName', + label: '预约单状态', + type: 2, + values: '', + width: '200', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'stockupStatusName', + label: '备货状态', + type: 2, + values: '', + width: '200', + checkarr: [], + fixed: false, + sortable: true, + }, + { prop: 'loadingStatusName', label: '装车状态', type: 2, @@ -562,7 +622,7 @@ fixed: false, sortable: true, }, - { + { prop: 'signingStatusName', label: '签收状态', type: 2, @@ -572,16 +632,26 @@ fixed: false, sortable: true, }, - { - prop: 'deliveryTypeName', - label: '配送类型', - type: 2, - values: '', - width: '200', - checkarr: [], - fixed: false, - sortable: true, - }, + { + prop: 'reservationNum', + label: '包件数量', + type: 2, + values: '', + width: '200', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'reservationStockListNum', + label: '库存品数量', + type: 2, + values: '', + width: '200', + checkarr: [], + fixed: false, + sortable: true, + }, { prop: 'collectFee', label: '到付运费', @@ -622,36 +692,8 @@ fixed: false, sortable: true, }, - { - prop: 'reservationStatusName', - label: '预约信息状态', - type: 2, - values: '', - width: '200', - checkarr: [], - fixed: false, - sortable: true, - }, - { - prop: 'stockupStatusName', - label: '备货状态', - type: 2, - values: '', - width: '200', - checkarr: [], - fixed: false, - sortable: true, - }, - { - prop: 'reservationNum', - label: '包件数量', - type: 2, - values: '', - width: '200', - checkarr: [], - fixed: false, - sortable: true, - }, + + { prop: '', label: '操作', @@ -674,6 +716,16 @@ fixed: true, }, { + prop: 'reservationCode', + label: '预约单号', + type: 2, + values: '', + width: '200', + checkarr: [], + fixed: false, + sortable: true, + }, + { prop: 'stockArticleId', label: '订单自编号', type: 2, @@ -683,6 +735,26 @@ fixed: false, sortable: true, }, + { + prop: 'warehouseName', + label: '仓库', + type: 2, + values: '', + width: '200', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'mallName', + label: '商场名称', + type: 2, + values: '', + width: '200', + checkarr: [], + fixed: false, + sortable: true, + }, { prop: 'consignee', label: '收货人', @@ -733,7 +805,7 @@ fixed: false, sortable: true, }, - { + { prop: 'deliveryWayName', label: '配送方式', type: 2, @@ -743,7 +815,37 @@ fixed: false, sortable: true, }, - { + { + prop: 'deliveryTypeName', + label: '配送类型', + type: 2, + values: '', + width: '200', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'reservationStatusName', + label: '预约单状态', + type: 2, + values: '', + width: '200', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'stockupStatusName', + label: '备货状态', + type: 2, + values: '', + width: '200', + checkarr: [], + fixed: false, + sortable: true, + }, + { prop: 'loadingStatusName', label: '装车状态', type: 2, @@ -753,7 +855,7 @@ fixed: false, sortable: true, }, - { + { prop: 'signingStatusName', label: '签收状态', type: 2, @@ -763,16 +865,26 @@ fixed: false, sortable: true, }, - { - prop: 'deliveryTypeName', - label: '配送类型', - type: 2, - values: '', - width: '200', - checkarr: [], - fixed: false, - sortable: true, - }, + { + prop: 'reservationNum', + label: '包件数量', + type: 2, + values: '', + width: '200', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'reservationStockListNum', + label: '库存品数量', + type: 2, + values: '', + width: '200', + checkarr: [], + fixed: false, + sortable: true, + }, { prop: 'collectFee', label: '到付运费', @@ -813,46 +925,18 @@ fixed: false, sortable: true, }, - { - prop: 'reservationStatusName', - label: '预约信息状态', - type: 2, - values: '', - width: '200', - checkarr: [], - fixed: false, - sortable: true, - }, - { - prop: 'stockupStatusName', - label: '备货状态', - type: 2, - values: '', - width: '200', - checkarr: [], - fixed: false, - sortable: true, - }, - { - prop: 'reservationNum', - label: '包件数量', - type: 2, - values: '', - width: '200', - checkarr: [], - fixed: false, - sortable: true, - }, - // { - // prop: '', - // label: '操作', - // type: 6, - // values: '', - // width: '150', - // checkarr: [], - // fixed: 'right', - // hide: true, - // }, + + + { + prop: '', + label: '操作', + type: 6, + values: '', + width: '150', + checkarr: [], + fixed: 'right', + hide: true, + }, ], height: 0, loading: false,