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/, ''),