diff --git a/src/api/aftersales/aftersalesWorkOrder.js b/src/api/aftersales/aftersalesWorkOrder.js index 5eb05bfd..b0dd300b 100644 --- a/src/api/aftersales/aftersalesWorkOrder.js +++ b/src/api/aftersales/aftersalesWorkOrder.js @@ -155,7 +155,6 @@ export const $_addSubmit = (data) => { data }) } - // 批量打回 export const $_batchReturn = (data) => { return request({ @@ -164,6 +163,14 @@ export const $_batchReturn = (data) => { data }) } +// 经理批量打回 +export const $_batchRepulseCompleted = (data) => { + return request({ + url: '/api/logpm-aftersales/aftersalesReturnRecord/batchRepulseCompleted', + method: 'post', + data + }) +} // 工单指派接口 export const $_assignCustomerService = (data) => { diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue index a06b2b5c..f5f4ea45 100644 --- a/src/views/aftersales/aftersalesWorkOrder.vue +++ b/src/views/aftersales/aftersalesWorkOrder.vue @@ -662,27 +662,27 @@ + v-model="Reasonforappeal" + :rows="4" + type="textarea" + placeholder="请输入申诉原因" + /> - - + v-model:file-list="AppealAttachment" + list-type="picture-card" + :on-preview="AppealAttachmentpictureList" + :on-remove="AppealAttachmentImgListRemove" + :action="doubledCount" + :on-success="AppealAttachmentImgSuccess" + :before-upload="beforeAvatarUpload" + :headers="headers" + multiple + drag + > + + @@ -1085,7 +1085,7 @@ import { MallassignmentColumnList, customerserviceColumnList, } from '@/option/aftersales/vueTvemp.js'; -import { processRowProperty, isNumber, computeNumber,setNodeHeight } from '@/utils/util'; +import { processRowProperty, isNumber, computeNumber, setNodeHeight } from '@/utils/util'; import { useRouter } from 'vue-router'; import { downloadXls, deepClone } from '@/utils/util'; import dayjs from 'dayjs'; @@ -1094,8 +1094,8 @@ const $useStore = useStore(); const $route = useRoute(); /** vuex */ const customerData = ref([]); //查询已绑定的客服 -const pageLoad=ref(false) -console.log($useStore,'$useStore'); +const pageLoad = ref(false); +console.log($useStore, '$useStore'); const accessControl = $useStore.getters.permission; console.log(accessControl, '权限按钮'); const loadingFinancial = ref(false); @@ -1259,12 +1259,11 @@ const TabList = ref([ { name: 4, label: '理赔金额未出', state: true, request: true, DataList: [], total: '' }, { name: 2, label: '处理完毕', state: true, request: true, DataList: [], total: '' }, { name: 5, label: '客服介入', state: true, request: true, DataList: [], total: '' }, - { name: 6, label: '完结', state: true, request: true, DataList: [], total: '' }, { name: 9, label: '待审核', state: true, request: true, DataList: [], total: '' }, + { name: 6, label: '完结', state: true, request: true, DataList: [], total: '' }, { name: 7, label: '超时未处理', state: true, request: true, DataList: [], total: '' }, ]); //标签栏 - const DeliveryDriver = ref([]); const CompensationParty = ref([ { name: '', state: 0, num: null, reason: '', cld: 1, warehouseId: '', personResponsibleName: '' }, //赔款方 @@ -1468,7 +1467,7 @@ const ButtonPermissions = computed(() => { // batchFinish:true, //批量完结 // appeal: true, //申诉 add: true, //新增按钮 - batchReject: UserPermissions.value != '仓库客服', //批量打回 + batchReject:false, //批量打回 assignment: false, //工单指派 applyArbitration: false, //客服介入 DingTalkNumber: false, //钉钉号填写 @@ -1484,7 +1483,7 @@ const ButtonPermissions = computed(() => { case 1: //处理中 return { add: false, //新增按钮 - batchReject: UserPermissions.value == '职能客服' || UserPermissions.value == '客服经理', //批量打回 + batchReject:false, //批量打回 assignment: false, //工单指派 applyArbitration: UserPermissions.value == '仓库客服', //客服介入 DingTalkNumber: false, //钉钉号填写 @@ -1501,7 +1500,7 @@ const ButtonPermissions = computed(() => { case 2: //处理完毕 return { add: false, //新增按钮 - batchReject: false, //批量打回 + batchReject: UserPermissions.value =='总部客服', //批量打回 assignment: false, //工单指派 applyArbitration: false, //客服介入 DingTalkNumber: false, //钉钉号填 @@ -1518,7 +1517,7 @@ const ButtonPermissions = computed(() => { case 3: //待处理 return { add: false, //新增按钮 - batchReject: UserPermissions.value == '总部客服', //批量打回 + batchReject: false, //批量打回 assignment: false, //工单指派 applyArbitration: false, //客服介入 batchFinish: false, //批量完结 @@ -1618,7 +1617,7 @@ const ButtonPermissions = computed(() => { case 9: //待审核 return { add: false, //新增按钮 - batchReject: false, //批量打回 + batchReject:false, //批量打回 assignment: UserPermissions.value == '总部客服经理', //工单指派 applyArbitration: false, //客服介入 batchFinish: UserPermissions.value != '仓库客服', //批量完结 @@ -1751,9 +1750,9 @@ const Statusprocessing = val => { item.workOrderStatusNameS = columnList[10].checkarr[8].label; //理赔金未出 } else if (item.workOrderStatus == 21) { item.workOrderStatusNameS = columnList[10].checkarr[9].label; //处理结果已提交 - }else if(item.workOrderStatus == 100){ + } else if (item.workOrderStatus == 100) { item.workOrderStatusNameS = columnList[10].checkarr[10].label; //处理结果已提交 - }else if(item.workOrderStatus == 110){ + } else if (item.workOrderStatus == 110) { item.workOrderStatusNameS = columnList[10].checkarr[11].label; //处理结果已提交 } // } else if (item.workOrderStatus == 100) { @@ -1782,7 +1781,7 @@ const IndexTable = (val, Refresh) => { TimeoutStatus.value = false; //关闭超时 // ProcessingPartyState.value = false; //关闭处理方 details.loadingObj.list = true; //开启动画加载 - pageLoad.value=true + pageLoad.value = true; columnList[2].checkarr = []; //重置下拉搜索框 columnList[3].checkarr = []; columnList[10].checkarr = []; @@ -1829,7 +1828,7 @@ const IndexTable = (val, Refresh) => { Tableheaderswitching(columnList); console.log(res, '初始化返回值'); details.loadingObj.list = false; //关闭动画加载 - pageLoad.value=false + pageLoad.value = false; if (res.data.data) { console.log(res.data.data, '初始化返回值===>'); // page.value.total = res.data.data.total; //总页数 @@ -1905,23 +1904,26 @@ const OnLoad = () => { }; OnLoad(); -// 监听路由地址变化 -watch(() => $route.path, (newPath, oldPath) => { - if ($useStore.state.isRefresh.refreshObj.aftersalesWorkOrder) { - TabPermissions.value = $useStore.state.Customer.Customerobj - console.log(TabPermissions.value,'当前TabPermissions.value'); - console.log( tabValue.value,'当前 tabValue.value'); - tabValue.value=$useStore.state.Customer.Customerobj;//菜单编号 - if([0,2,3,4,6].includes(TabPermissions.value)){ +// 页面筛选监听路由地址变化 +watch( + () => $route.path, + (newPath, oldPath) => { + if ($useStore.state.isRefresh.refreshObj.aftersalesWorkOrder) { + TabPermissions.value = $useStore.state.Customer.Customerobj; + console.log(TabPermissions.value, '当前TabPermissions.value'); + console.log(tabValue.value, '当前 tabValue.value'); + tabValue.value = $useStore.state.Customer.Customerobj; //菜单编号 + if ([0,1,2,3,4,5,6,7,8,9].includes(TabPermissions.value)) { //0.全部菜单 //4. 理赔金未出 - tabChenge(TabPermissions.value,null,true) - $useStore.commit('Customer_Menu',0);//设置回初始值 + tabChenge(TabPermissions.value, null, true); + $useStore.commit('Customer_Menu', 0); //设置回初始值 } - // 重新请求数据 - $useStore.commit('EDIT_REFRESHITEM', { title: 'aftersalesWorkOrder', status: false }); + // 重新请求数据 + $useStore.commit('EDIT_REFRESHITEM', { title: 'aftersalesWorkOrder', status: false }); + } } -}); +); // onActivated(() => { // console.log('进入缓存'); // if ($useStore.state.isRefresh.refreshObj.aftersalesWorkOrder) { @@ -2034,13 +2036,13 @@ const InformationViewing = val => { id: val.row.workOrderId, appealID: val.row.id, //只有申诉才需要的参数 name: val.row.workOrderNumber + '-信息查看', + typesOf: val.row.typesOf, //申诉列表状态0:待处理，1:成立,2:不成立 warehouseId: val.row.warehouseId, workOrderNumber: val.row.workOrderNumber, //添加异常记录包条码 businessId: val.row.businessId, ProcessType: TabPermissions.value == 2 ? '2' : TabPermissions.value == 3 ? '1' : '', //类型 1 待处理 2 已处理 RouteIndexs: TabPermissions.value, //当前记录参数 Routstate: 'appeal', //申诉列表 - AppealReview: val.row.typesOf == '0' ? 'true' : 'false', //当前只能查看申诉详情信息 workOrderStatus: val.row.workOrderStatus, //工单状态 }, }); @@ -2092,7 +2094,6 @@ const InformationViewing = val => { warehouseId: val.row.warehouseId, workOrderNumber: val.row.workOrderNumber, //添加异常记录包条码 businessId: val.row.businessId, - ProcessType: TabPermissions.value == 2 ? '2' : TabPermissions.value == 3 ? '1' : '', //类型 1 待处理 2 已处理 RouteIndexs: TabPermissions.value, //当前记录参数 workOrderStatus: val.row.workOrderStatus, //工单状态 }, @@ -2100,27 +2101,27 @@ const InformationViewing = val => { }; // 首页查看详情按钮 const view = val => { - console.log(val.row); + console.log(val.row, '申诉查看'); if (AppealStatusT.value) { + console.log('当前是申诉'); // 表示当前在申诉列表 $router.push({ // AppealStatusT为真表示是申诉列表 path: '/aftersales/aftersalesWorkOrderInfo', query: { id: val.row.workOrderId, + typesOf: val.row.typesOf, //申诉列表状态0:待处理，1:成立,2:不成立 appealID: val.row.id, //只有申诉才需要的参数 name: val.row.workOrderNumber + '-信息查看', warehouseId: val.row.warehouseId, workOrderNumber: val.row.workOrderNumber, //添加异常记录包条码 businessId: val.row.businessId, - ProcessType: TabPermissions.value == 2 ? '2' : TabPermissions.value == 3 ? '1' : '', //类型 1 待处理 2 已处理 RouteIndexs: TabPermissions.value, //当前菜单 Routstate: 'appeal', //申诉列表 - AppealReview: val.row.typesOf == '0' ? 'true' : 'false', //当前只能查看申诉详情信息 workOrderStatus: val.row.workOrderStatus, //当前工单状态 }, }); - return; + return } // 理赔查看 @@ -2162,6 +2163,7 @@ const view = val => { return; } + console.log(AppealStatusT.value,'AppealStatusT.value'); $router.push({ // AppealStatusT为真表示是申诉列表 path: '/aftersales/aftersalesWorkOrderInfo', @@ -2290,22 +2292,30 @@ const AppealAttachmentImgSuccess = val => { // 取消申诉 const CancelappealFn = val => { - let data = { - id: val.row.id, //取消申诉ID - typesOf: '3', //申诉状态 - workOrderId: val.row.workOrderId, //异常工单ID - }; + ElMessageBox.confirm('是否取消申诉?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning', + }) + .then(() => { + 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', + $_Cancelappeal(data).then(res => { + console.log(res, '取消申诉返回值'); + if (res.data.code == 200) { + appealFn(details.query); + ElMessage({ + message: '取消申诉成功', + type: 'success', + }); + } }); - } - }); + }) + .catch(() => {}); }; // 工单申诉按钮 @@ -2323,7 +2333,6 @@ const appeal = (val, state) => { if (val.row) { selectList.value.push(val.row); } - let data = { id: val.row.id, }; @@ -2381,37 +2390,33 @@ const appealAll = () => { }; // 确定理赔金额 const DetermineClaims = val => { - ElMessageBox.confirm( - '是否确认理赔金额?', - '提示', - { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning', - } - ) + ElMessageBox.confirm('是否确认理赔金额?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning', + }) .then(() => { - console.log(val.row); - let data = { - id: val.row.lawoId, - workOrderStatus: 30, - }; - details.loadingObj.list = true; //开启动画加载 - pageLoad.value=true - console.log(data, '处理好的值'); - $_settlementUpdate(data) - .then(res => { - console.log(res); - if (res.data.code == 200) { - tabChenge(TabPermissions.value, {}, true); - } - }) - .catch(res => { - details.loadingObj.list = false; //关闭动画加载 - pageLoad.value=false - }); + console.log(val.row); + let data = { + id: val.row.lawoId, + workOrderStatus: 30, + }; + details.loadingObj.list = true; //开启动画加载 + pageLoad.value = true; + console.log(data, '处理好的值'); + $_settlementUpdate(data) + .then(res => { + console.log(res); + if (res.data.code == 200) { + tabChenge(TabPermissions.value, {}, true); + } + }) + .catch(res => { + details.loadingObj.list = false; //关闭动画加载 + pageLoad.value = false; + }); }) - .catch(() => {}) + .catch(() => {}); }; // 理赔金额未出编辑操作 const Resultediting = val => { @@ -2419,7 +2424,7 @@ const Resultediting = val => { // return console.log(val.row, '理赔金额未出'); $router.push({ - path: '/aftersales/aftersalesWorkOrdermodify', + path: '/aftersales/aftersalesWorkOrderend', query: { id: val.row.lawoId, subId: val.row.laprId, @@ -2427,10 +2432,8 @@ const Resultediting = val => { businessId: val.row.businessId, warehouseId: val.row.warehouseId, workOrderNumber: val.row.workOrderNumber, - RouterState: 'Kfend', - Processingresults: true, //理赔编辑 - Resultediting: true, //编辑理赔金额 - index: '1', + workOrderStatus: val.row.workOrderStatus, //订单状态 + RouteIndexs: TabPermissions.value, //当前记录参数 }, }); }; @@ -2449,8 +2452,22 @@ const ProcessedResultediting = val => { RouterState: 'Kfend', Processingresults: true, //处理结果编辑 Resultediting: true, //编辑理赔金额 - Processed: 'true', - index: '1', + workOrderStatus: val.row.workOrderStatus, //订单状态 + RouteIndexs: TabPermissions.value, //当前记录参数 + }, + }); +}; +// 回复按钮 +const MessageReply = val => { + $router.push({ + path: '/aftersales/aftersalesWorkOrderend', + query: { + id: val.row.id, + name: val.row.workOrderNumber + '-消息回复', + businessId: val.row.businessId, + RouterState: 'determine', + workOrderStatus: val.row.workOrderStatus, //订单状态 + RouteIndexs: TabPermissions.value, //当前记录参数 }, }); }; @@ -2476,109 +2493,102 @@ const CompletedEditing = val => { }; // 工单申诉确认按钮 const Appealbutton = state => { - ElMessageBox.confirm( - '是否确认发起工单申诉?', - '提示', - { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning', - } - ) + ElMessageBox.confirm('是否确认发起工单申诉?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning', + }) .then(() => { if (UserPermissions.value == '仓库客服') { - if (AppealAttachment.value.length > 1) { - ElMessage({ - message: '只能上传一张图片', - type: 'warning', - }); - return; - } - // appealData.value单条申诉点击变量暂未启用 - console.log(details.selectionList, '当前申诉的东西'); - loadingappeal.value = true; //开启加载效果 - console.log(Appealselection.value, '当前选择的责任人'); - console.log(warehouseData.value, '要循环处理的参数'); - let data = { - peopleEntityList: [], //参数一 - imagePath: '', //申诉图片附件 - workOrderId: selectList.value[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, '申诉状态'); - if (AppealeditorState.value) { - data.id = details.selectionList[0].id; - } - console.log(details.selectionList, '准备处理的数据'); - //处理数据 - Appealselection.value.forEach(item => { - console.log(item, '循环的值'); - data['peopleEntityList'].push({ - workOrderId: details.selectionList[0].id, //异常工单ID - reason: Reasonforappeal.value, //申诉理由 - claimant: userInfo.value.content.user_name, //申诉人 - actualPersonId: warehouseData.value.find(res => res.value == item).value, //实际责任人ID - actualPersonName: warehouseData.value.find(res => res.value == item).label, //实际责任人名称 - }); - }); - if (AppealAttachment.value.length) { - 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) { + if (AppealAttachment.value.length > 1) { ElMessage({ - message: res.data.msg, - type: 'success', + message: '只能上传一张图片', + type: 'warning', }); - DataRendering(TabPermissions.value, details.query, true); + return; } - }) - .finally(res => { - dialogappeal.value = false; //关闭申诉弹窗 - loadingappeal.value = false; //关闭加载效果 - console.log(res, '功返回值'); - ProcessingPartyState.value = false; //关闭处理方 - ArbitrationStatus.value = false; //不可以申请完结 - AppealeditorState.value = false; //关闭编辑状态 - appealData.value = {}; //清空当前行申诉数据 - if (AppealStatusT.value) { - Tableheaderswitching(AppealList); //切换表头 - appealFn(); // 获取申诉列表 + // appealData.value单条申诉点击变量暂未启用 + console.log(details.selectionList, '当前申诉的东西'); + loadingappeal.value = true; //开启加载效果 + console.log(Appealselection.value, '当前选择的责任人'); + console.log(warehouseData.value, '要循环处理的参数'); + let data = { + peopleEntityList: [], //参数一 + imagePath: '', //申诉图片附件 + workOrderId: selectList.value[0], //工单ID + }; + if (AppealeditorState.value) { + data.workOrderId = details.selectionList[0].workOrderId; } else { - data.workOrderStatus = 80; - details.query.workOrderStatus = 80; - tabValue.value = 6; - IndexTable({ workOrderStatus: 80 }); + data.workOrderId = details.selectionList[0].id; } - ElMessage({ - message: res.data.msg, - type: 'success', + 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, '申诉状态'); + if (AppealeditorState.value) { + data.id = details.selectionList[0].id; + } + console.log(details.selectionList, '准备处理的数据'); + //处理数据 + Appealselection.value.forEach(item => { + console.log(item, '循环的值'); + data['peopleEntityList'].push({ + workOrderId: details.selectionList[0].id, //异常工单ID + reason: Reasonforappeal.value, //申诉理由 + claimant: userInfo.value.content.user_name, //申诉人 + actualPersonId: warehouseData.value.find(res => res.value == item).value, //实际责任人ID + actualPersonName: warehouseData.value.find(res => res.value == item).label, //实际责任人名称 + }); }); - }); - } - }) - .catch(() => {}) - - + if (AppealAttachment.value.length) { + 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', + }); + DataRendering(TabPermissions.value, details.query, true); + } + }) + .finally(res => { + dialogappeal.value = false; //关闭申诉弹窗 + loadingappeal.value = false; //关闭加载效果 + console.log(res, '功返回值'); + ProcessingPartyState.value = false; //关闭处理方 + ArbitrationStatus.value = false; //不可以申请完结 + AppealeditorState.value = false; //关闭编辑状态 + appealData.value = {}; //清空当前行申诉数据 + if (AppealStatusT.value) { + Tableheaderswitching(AppealList); //切换表头 + appealFn(); // 获取申诉列表 + } else { + data.workOrderStatus = 80; + details.query.workOrderStatus = 80; + tabValue.value = 6; + IndexTable({ workOrderStatus: 80 }); + } + ElMessage({ + message: res.data.msg, + type: 'success', + }); + }); + } + }) + .catch(() => {}); }; /** 表格表头输入框搜索 */ @@ -2781,7 +2791,7 @@ const settlementclaim = (val, Refresh) => { return; } details.loadingObj.list = true; //开启动画加载 - pageLoad.value=true + pageLoad.value = true; console.log(Claimsfield, '理赔数据'); ClaimStatus.value = true; //开启理赔查询状态 AppealStatus.value = false; //关闭申诉状态 @@ -2828,7 +2838,7 @@ const settlementclaim = (val, Refresh) => { $_listSettlement(data) .then(res => { details.loadingObj.list = false; //关闭动画加载 - pageLoad.value=false + pageLoad.value = false; console.log(res, '查询理赔数据'); if (res.data.data) { if (res.data.data.records.length) { @@ -2849,13 +2859,13 @@ const settlementclaim = (val, Refresh) => { }) .catch(res => { details.loadingObj.list = false; //关闭动画加载 - pageLoad.value=false + pageLoad.value = false; }); }; // 获取申诉列表 const appealFn = val => { details.loadingObj.list = true; //开启动画加载 - pageLoad.value=true + pageLoad.value = true; AppealStatus.value = true; //开启申诉列表状态 TimeoutStatus.value = false; //关闭 超时状态 ClaimStatus.value = false; //关闭理赔查询状态 @@ -2876,7 +2886,7 @@ const appealFn = val => { $_listAppeal(data) .then(res => { details.loadingObj.list = false; //开启动画加载 - pageLoad.value=false + pageLoad.value = false; console.log(res, '申诉列表返回值'); if (res.data.data.records.length) { // details.data = res.data.data.records; @@ -2895,7 +2905,7 @@ const appealFn = val => { }) .catch(res => { details.loadingObj.list = false; //关闭动画加载 - pageLoad.value=false + pageLoad.value = false; }); }; @@ -3009,7 +3019,7 @@ const TimeoutHandling = (val, Refresh) => { AppealStatus.value = false; //关闭申诉状态 TimeoutStatus.value = true; //开启超时记录查询 details.loadingObj.list = true; //开启动画加载 - pageLoad.value=true + pageLoad.value = true; updateDictionary(timeoutList[3].checkarr, 'pc_work_order'); //异常类型 updateDictionary(timeoutList[4].checkarr, 'pc_discovery_node'); //发现环节 let data = { @@ -3020,7 +3030,7 @@ const TimeoutHandling = (val, Refresh) => { $_listOwn(data) .then(res => { details.loadingObj.list = false; //关闭动画加载 - pageLoad.value=false + pageLoad.value = false; console.log(res, '超时记录'); if (res.data.data.records.length) { @@ -3041,7 +3051,7 @@ const TimeoutHandling = (val, Refresh) => { }) .catch(res => { details.loadingObj.list = false; //关闭动画加载 - pageLoad.value=false + pageLoad.value = false; }); }; @@ -3237,7 +3247,7 @@ const ProcessingPartyFun = (val, Refresh) => { AppealStatus.value = false; //关闭申诉状态 // details.query.workOrderStatus = null; details.loadingObj.list = true; //开启动画加载 - pageLoad.value=true + pageLoad.value = true; let data = { ...val, }; @@ -3251,7 +3261,7 @@ const ProcessingPartyFun = (val, Refresh) => { $_getProcessor(data) .then(res => { details.loadingObj.list = false; //关闭动画加载 - pageLoad.value=false + pageLoad.value = false; // page.value.total = res.data.data.total; //总页数 if (res.data.data.records.length) { Statusprocessing(res.data.data.records); @@ -3397,44 +3407,40 @@ const DetermineStorage = val => { }); return; } - ElMessageBox.confirm( - '是否确定确定批量审核?', - '提示', - { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning', - } - ) + ElMessageBox.confirm('是否确定确定批量审核?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning', + }) .then(() => { let data = { - assignList: [], - }; - data['assignList'] = details.selectionList.map(item => item.id); - details.loadingObj.list = true; //开启加载效果 - pageLoad.value=true - // 完结结果确定 - console.log(data, '处理好的值'); - $_updateManagerConfirmed(data) - .then(res => { - if (res.data.code == 200) { - ElMessage({ - message: res.data.msg, - type: 'success', + assignList: [], + }; + data['assignList'] = details.selectionList.map(item => item.id); + details.loadingObj.list = true; //开启加载效果 + pageLoad.value = true; + // 完结结果确定 + console.log(data, '处理好的值'); + $_updateManagerConfirmed(data) + .then(res => { + if (res.data.code == 200) { + ElMessage({ + message: res.data.msg, + type: 'success', + }); + } + console.log(res, '处理完毕确定'); + tabChenge(TabPermissions.value, {}, true); + }) + .catch(res => { + console.log(res, '错误信息'); + }) + .finally(res => { + details.loadingObj.list = false; //关闭加载效果 + pageLoad.value = false; }); - } - console.log(res, '处理完毕确定'); - tabChenge(TabPermissions.value, {}, true); - }) - .catch(res => { - console.log(res, '错误信息'); - }) - .finally(res => { - details.loadingObj.list = false; //关闭加载效果 - pageLoad.value=false - }); }) - .catch(() => { }) + .catch(() => {}); }; // 完结里面确定按钮 @@ -3444,7 +3450,7 @@ const EndArbitration = val => { assignList: [val.row.id], }; details.loadingObj.list = true; //开启加载效果 - pageLoad.value=true + pageLoad.value = true; $_updateArbitrateStatu(data) .then(res => { console.log(res, '处理成功'); @@ -3461,7 +3467,7 @@ const EndArbitration = val => { }) .finally(() => { details.loadingObj.list = false; //开启加载效果 - pageLoad.value=false + pageLoad.value = false; }); }; // 批量完结确定 @@ -3496,7 +3502,7 @@ const AllEndArbitration = () => { .finally(() => { details.selectionList = []; //清空勾选数据 details.loadingObj.list = false; //开启加载效果 - pageLoad.value=false + pageLoad.value = false; }); }; // 处理完毕里面确定（仓库客服用的） @@ -3533,7 +3539,7 @@ const ResultConfirmation = val => { if (ConfirmStatus) { // 走的批量确认 let state = details.selectionList.every(item => item.workOrderStatus == '21'); - console.log(state,'state'); + console.log(state, 'state'); if (!state) { ElMessage({ message: '勾选单子中有已经确认的请取消勾选!', @@ -3557,7 +3563,7 @@ const ResultConfirmation = val => { }) .then(() => { details.loadingObj.list = true; //开启加载效果 - pageLoad.value=true + pageLoad.value = true; console.log(data, '处理好的数据'); $_updateWorkOrderStatus(data) .then(res => { @@ -3575,7 +3581,7 @@ const ResultConfirmation = val => { }) .finally(() => { details.loadingObj.list = false; //关闭加载效果 - pageLoad.value=false + pageLoad.value = false; }); }) .catch(() => { @@ -3635,7 +3641,7 @@ const ResultConfirmation = val => { }) .then(() => { details.loadingObj.list = true; //开启加载效果 - pageLoad.value=true + pageLoad.value = true; // 完结结果确定 $_updateManagerConfirmed(data) .then(res => { @@ -3653,7 +3659,7 @@ const ResultConfirmation = val => { }) .finally(res => { details.loadingObj.list = false; //关闭加载效果 - pageLoad.value=false + pageLoad.value = false; }); // 赔款方 console.log(data, '处理好的值'); @@ -3670,8 +3676,8 @@ const ResultConfirmation = val => { // 审核确定 const findingAudit = () => {}; // 批量打回 -const BatchReturn = () => { - BatchFrom.value.businessDepartment = []; +const BatchReturn = () => { + BatchFrom.value.businessDepartment =[]; BatchFrom.value.txt = null; if (!details.selectionList.length) { ElMessage({ @@ -3690,7 +3696,8 @@ const ConfirmReturn = () => { processorList: [], }; // 过滤满足条件的对象 - let foundObjs = warehouseData.value.filter(obj => + if(BatchFrom.value.businessDepartment.length){ + let foundObjs = warehouseData.value.filter(obj => BatchFrom.value.businessDepartment.includes(obj.value) ); data['businessId'] = foundObjs.map(item => item.value).join(','); @@ -3699,10 +3706,13 @@ const ConfirmReturn = () => { foundObjs.forEach(item => { data['processorList'].push({ id: item.value, name: item.label }); }); + } + data.reasonReturn = BatchFrom.value.txt; //打回原因 // data.warehouseId = details.selectionList.map(item=>item.warehouseId); //仓库ID data.workOrderIds = details.selectionList.map(item => item.id); //异常工单ID console.log(data, '处理好的值'); + data.typesOf='1';//普通打回 $_batchReturn(data) .then(res => { repulse.value = false; //关闭加载并关闭按钮 @@ -3714,6 +3724,7 @@ const ConfirmReturn = () => { message: res.data.msg, type: 'success', }); + DataRendering(TabPermissions.value, details.query, true); } }) .catch(error => { @@ -3973,7 +3984,7 @@ const Financialfilling = () => { dialogFinancialaccounting.value = false; //关闭财务入账弹窗 DataRendering(TabPermissions.value, details.query, true); } - AppealListFn(); + // AppealListFn(); }) .catch(res => { console.log(res, '财务入账成功返回值'); @@ -4125,19 +4136,6 @@ const Deleteappeal = val => { }); }; -// 回复按钮 -const MessageReply = val => { - $router.push({ - path: '/aftersales/aftersalesWorkOrderend', - query: { - id: val.row.id, - name: val.row.workOrderNumber + '-消息回复', - businessId: val.row.businessId, - RouterState: 'determine', - index: '0', - }, - }); -}; // 导出报表 const exportReport = () => { @@ -4269,13 +4267,6 @@ const setAsdefault = val => { // 指派新增 const CreateAdditions = () => { - // Malldropdown.value - let a = [ - { a: 1, disabled: false }, - { a: 2, disabled: false }, - { a: 3, disabled: false }, - ]; - let tab = [{}]; if (AssignmentType.value == '2') { $_basicdataTripartiteMall({}).then(res => { console.log(res, '商场指派列表'); @@ -4885,10 +4876,10 @@ const AssignSubmission = () => { width: 100% !important; margin-bottom: 10px; } - :deep(.el-form-item){ + :deep(.el-form-item) { flex-direction: column; align-items: flex-start; - .el-form-item__content{ + .el-form-item__content { width: 100% !important; } } diff --git a/src/views/aftersales/aftersalesWorkOrderAdd.vue b/src/views/aftersales/aftersalesWorkOrderAdd.vue index 1f738d58..93d60207 100644 --- a/src/views/aftersales/aftersalesWorkOrderAdd.vue +++ b/src/views/aftersales/aftersalesWorkOrderAdd.vue @@ -1138,6 +1138,7 @@ const Totalamount = () => { }; const Claimssettlement = value => { + form.value.Claimamount = []; if (value.length) { let data = []; value.forEach(item => { @@ -1146,7 +1147,6 @@ const Claimssettlement = value => { data.push(_data); } }); - form.value.Claimamount = []; if (data && data.length) { data.forEach(item => { form.value.Claimamount.push({ @@ -1508,10 +1508,9 @@ const onSubmit = () => { // 运单号 submitData.waybillNumber = form.value.PackageList[0].waybillNumber; } - + submitData.processorEntityList = []; // 处理方处理 if (form.value.basis.processor.length) { - submitData.processorEntityList = []; form.value.basis.processor.forEach(item => { submitData['processorEntityList'].push({ businessName: Processingoptions.value.find(res => res.value == item).label, //仓库名称 @@ -1525,8 +1524,9 @@ const onSubmit = () => { // 责任方处理 if (form.value.groundlineType == '1') { form.value.responsibilitiesList.forEach(item => { + let businesTemp = item.Responsibleoptions.find(res => res.value == item.businessId); //仓库名称 submitData['processorEntityList'].push({ - businessName: item.Responsibleoptions.find(res => res.value == item.businessId).label, //仓库名称 + businessName:businesTemp?businesTemp.label:item.businessId, //仓库名称 businessId: item.businessId, //仓库ID conditions: 1, //固定参数 typesOf: 1, //1责任方 ，2处理方 @@ -1602,7 +1602,7 @@ const onSubmit = () => { submitData['decreaseImageEntityList'].push({ imageName: item.response.data.originalName, //图片名称 imagePath: item.response.data.link, //图片地址 - imageType: form.value.groundlineType == 1 ? 10 : 20, //图片类型 + imageType: form.value.basis.workOrderType == 1 ? 10 : 20, //图片类型 }); } }); @@ -1657,7 +1657,7 @@ const onSubmit = () => { } form.value.Pageloading = true; //关闭页面加载 - //是否直接提交到处理结果 + //是否直接提交到处理结果(处理完毕) if (form.value.Processed) { submitData.workOrderStatus = 30; } diff --git a/src/views/aftersales/aftersalesWorkOrderInfo.vue b/src/views/aftersales/aftersalesWorkOrderInfo.vue index d59eabe7..01f4868b 100644 --- a/src/views/aftersales/aftersalesWorkOrderInfo.vue +++ b/src/views/aftersales/aftersalesWorkOrderInfo.vue @@ -329,6 +329,7 @@ + 确定审核 --> + 结果打回 + 完结工单 + > 打回 @@ -607,7 +612,7 @@ type="primary" v-if="PermissionButton.Result_determination" @click="ResultDetermination" - >确定处理结果确定 @@ -734,6 +739,49 @@ + + + + + + + + + + + + + + + + + + diff --git a/src/views/basicdata/brand/basicClient.vue b/src/views/basicdata/brand/basicClient.vue index 9d368a6d..ce6fbe2a 100644 --- a/src/views/basicdata/brand/basicClient.vue +++ b/src/views/basicdata/brand/basicClient.vue @@ -584,7 +584,7 @@ export default { { prop: 'linkman', label: '联系人', - type: 1, + type: 2, values: '', width: '130', checkarr: [], @@ -595,7 +595,7 @@ export default { { prop: 'phone', label: '联系电话', - type: 1, + type: 2, values: '', width: '130', checkarr: [], @@ -606,10 +606,27 @@ export default { { prop: 'typeServiceName', label: '配送类型', - type: 1, + type: 3, values: '', width: '130', - checkarr: [], + checkarr: [{ + value: '1', + label: '商配', + }, + { + value: '2', + label: '市配', + }, + { + value: '3', + label: '自提', + }, + { + value: '4', + label: '三方中转', + }, + + ], fixed: false, sortable: true, head: false, @@ -1298,6 +1315,7 @@ export default { this.title = '新增'; this.form = {}; this.fileList = []; + this.viewEntd = true; this.box = true; this.distriType = false; this.viewClientEntd = false; diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue index 5927f82b..3be41404 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue @@ -520,8 +520,9 @@ >