diff --git a/src/option/aftersales/vueTvemp.js b/src/option/aftersales/vueTvemp.js index 02835ad8..04161914 100644 --- a/src/option/aftersales/vueTvemp.js +++ b/src/option/aftersales/vueTvemp.js @@ -740,7 +740,7 @@ export const AppealList = [ { prop: 'workOrderTypeName', label: '异常类型', - type: 3, + type: 1, values: '', width: '130', checkarr: [], @@ -751,7 +751,7 @@ export const AppealList = [ { prop: 'discoveryNodeName', label: '发现节点', - type: 3, + type: 1, values: '', width: '130', checkarr: [], @@ -761,8 +761,8 @@ export const AppealList = [ }, { prop: 'typesOfName', - label: '状态名称', - type: 2, + label: '工单状态', + type: 1, values: '', width: '130', checkarr: [], diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue index d589e7ec..a06b2b5c 100644 --- a/src/views/aftersales/aftersalesWorkOrder.vue +++ b/src/views/aftersales/aftersalesWorkOrder.vue @@ -641,7 +641,7 @@
@@ -660,13 +660,16 @@ /> - + - + + + + 取消 确定 @@ -1746,6 +1751,10 @@ 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){ + item.workOrderStatusNameS = columnList[10].checkarr[10].label; //处理结果已提交 + }else if(item.workOrderStatus == 110){ + item.workOrderStatusNameS = columnList[10].checkarr[11].label; //处理结果已提交 } // } else if (item.workOrderStatus == 100) { // item.workOrderStatusNameS = columnList[10].checkarr[10].label; //申诉中 @@ -1903,7 +1912,7 @@ watch(() => $route.path, (newPath, oldPath) => { console.log(TabPermissions.value,'当前TabPermissions.value'); console.log( tabValue.value,'当前 tabValue.value'); tabValue.value=$useStore.state.Customer.Customerobj;//菜单编号 - if([0,2,3,4].includes(TabPermissions.value)){ + if([0,2,3,4,6].includes(TabPermissions.value)){ //0.全部菜单 //4. 理赔金未出 tabChenge(TabPermissions.value,null,true) @@ -2467,7 +2476,17 @@ const CompletedEditing = val => { }; // 工单申诉确认按钮 const Appealbutton = state => { - if (UserPermissions.value == '仓库客服') { + ElMessageBox.confirm( + '是否确认发起工单申诉?', + '提示', + { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning', + } + ) + .then(() => { + if (UserPermissions.value == '仓库客服') { if (AppealAttachment.value.length > 1) { ElMessage({ message: '只能上传一张图片', @@ -2555,6 +2574,11 @@ const Appealbutton = state => { }); }); } + }) + .catch(() => {}) + + + }; /** 表格表头输入框搜索 */ @@ -2837,8 +2861,11 @@ const appealFn = val => { ClaimStatus.value = false; //关闭理赔查询状态 AppealList[5].checkarr = []; //异常类型名称 AppealList[6].checkarr = []; //发现环节 + AppealList[7].checkarr = []; //发现环节 updateDictionary(AppealList[5].checkarr, 'pc_work_order'); //异常类型 updateDictionary(AppealList[6].checkarr, 'pc_discovery_node'); //发现环节 + updateDictionary(AppealList[7].checkarr, 'work_order_status'); //发现环节 + console.log('当前是申诉列表'); let data = { current: details.page.currentPage, @@ -2851,7 +2878,6 @@ const appealFn = val => { details.loadingObj.list = false; //开启动画加载 pageLoad.value=false console.log(res, '申诉列表返回值'); - if (res.data.data.records.length) { // details.data = res.data.data.records; TabList.value.find(res => res.name == TabPermissions.value).DataList = @@ -2907,10 +2933,10 @@ function AppealListFn(val) { data.workOrderStatus = ''; console.log(data.workOrderStatus, '当前搜索状态'); Tableheaderswitching(AppealList); //切换表头 - AppealList.forEach(item => { - //清空搜索记录 - item.values = ''; - }); + // AppealList.forEach(item => { + // //清空搜索记录 + // item.values = ''; + // }); appealFn(val); // 获取申诉列表 } @@ -4859,6 +4885,13 @@ const AssignSubmission = () => { width: 100% !important; margin-bottom: 10px; } + :deep(.el-form-item){ + flex-direction: column; + align-items: flex-start; + .el-form-item__content{ + width: 100% !important; + } + } } .el_sdialog-footer { display: flex; diff --git a/src/views/aftersales/aftersalesWorkOrderInfo.vue b/src/views/aftersales/aftersalesWorkOrderInfo.vue index d440d999..285eb30e 100644 --- a/src/views/aftersales/aftersalesWorkOrderInfo.vue +++ b/src/views/aftersales/aftersalesWorkOrderInfo.vue @@ -502,13 +502,13 @@
- +
@@ -903,7 +903,10 @@ const PermissionButton = computed(() => { $route.query.workOrderStatus != '80' && $route.query.workOrderStatus != '30' && $route.query.workOrderStatus != '20' && - $route.query.workOrderStatus != '40', //回复 + $route.query.workOrderStatus != '40' && + $route.query.workOrderStatus != '100' && + $route.query.workOrderStatus != '110' + , //回复 Processing_results: !appeal.value && (($route.query.RouteIndexs == '0' && $route.query.workOrderStatus == '10') || @@ -933,8 +936,8 @@ const PermissionButton = computed(() => { (($route.query.RouteIndexs == '0' && $route.query.workOrderStatus == '10') || ($route.query.RouteIndexs == '3' && $route.query.workOrderStatus == '10')) && warehouseIdState.value, //信息编辑 只能待处理和当前仓库人 - Appeal_established: appeal.value && AppealReview.value, //申诉成立 - Appeal_rejection: appeal.value && AppealReview.value, //申诉驳回 + Appeal_established: appeal.value && AppealReview.value && UserPermissions.value=='总部客服经理', //申诉成立 + Appeal_rejection: appeal.value && AppealReview.value && UserPermissions.value=='总部客服经理', //申诉驳回 Processing_confirmation: (UserPermissions.value != '仓库客服' && $route.query.RouteIndexs == '0' && @@ -1381,7 +1384,17 @@ const AppealEstablished = () => { // 申诉驳回 const AppealRejection = () => { - let data = { + ElMessageBox.confirm( + '是否确认申诉驳回?', + '提示', + { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning', + } + ) + .then(() => { + let data = { id: $route.query.appealID, //取消申诉ID typesOf: '2', //申诉状态 workOrderId: $route.query.id, //异常工单ID @@ -1395,6 +1408,11 @@ const AppealRejection = () => { message: '申诉驳回成功', type: 'success', }); + $useStore.commit('EDIT_REFRESHITEM', { + title: 'aftersalesWorkOrder', + status: true, + }); + $useStore.commit('Customer_Menu',6);//要刷新的菜单 $useStore.commit('DEL_TAG_CURRENT'); //关闭当前页面 $router.push({ path: '/aftersales/aftersalesWorkOrder', @@ -1407,6 +1425,8 @@ const AppealRejection = () => { .finally(() => { Pageloading.value = false; //关闭加载效果 }); + }) + .catch(() => {}) }; // 待审核确定 diff --git a/src/views/aftersales/aftersalesWorkOrderend.vue b/src/views/aftersales/aftersalesWorkOrderend.vue index 629b918b..84cfc566 100644 --- a/src/views/aftersales/aftersalesWorkOrderend.vue +++ b/src/views/aftersales/aftersalesWorkOrderend.vue @@ -511,14 +511,14 @@ - +
@@ -526,7 +526,7 @@ v-model="endFrom.arbitrate" type="textarea" :autosize="{ minRows: 5, maxRows: 4 }" - placeholder="请输入完结说明" + placeholder="请输入仲裁原因" /> diff --git a/src/views/aftersales/aftersalesWorkOrdermodify.vue b/src/views/aftersales/aftersalesWorkOrdermodify.vue index e386774a..d67abeb6 100644 --- a/src/views/aftersales/aftersalesWorkOrdermodify.vue +++ b/src/views/aftersales/aftersalesWorkOrdermodify.vue @@ -622,7 +622,7 @@ @@ -630,7 +630,7 @@ v-model="Indexform.arbitrate" type="textarea" :autosize="{ minRows: 5, maxRows: 4 }" - placeholder="请输入完结原因" + placeholder="请输入仲裁原因" :disabled="ProcessingresultsState" /> @@ -821,7 +821,7 @@ import { computeNumber, isNumber } from '@/utils/util'; import { useStore } from 'vuex'; import error from '@/error'; const $router = useRouter(); -const $store = useStore(); +const $useStore = useStore(); const $route = useRoute(); const TotalamountCompensation = ref(0); //赔款金额合计 const TotalamountReceived = ref(0); //收款金额合计 @@ -1067,6 +1067,7 @@ const ResponsiblePartychange = (val, index) => { }; const onLoad = () => { + editloading.value=true;//开启页面加载 RouterState.value = $route.query.RouterState; console.log($route.query.Appealeditor, '申诉==='); if ($route.query.Appealeditor) { @@ -1082,10 +1083,14 @@ const onLoad = () => { } // 判断是否为理赔金未出编辑 if ($route.query.ProcessingresultsState && UserPermissions.value != '仓库客服') { + if($route.query.AppealEstablished==true){ + ProcessingresultsState.value = true; + }else{ + ProcessingresultsState.value = false; + } console.log($route.query.Processingresults, '理赔金未出编辑'); - ProcessingresultsState.value = false; } else { - ProcessingresultsState.value = true; + ProcessingresultsState.value = false; } // 客服完结完结提交(完结信息) if ($route.query.CustomerServiceCompleted && UserPermissions.value != '仓库客服') { @@ -1138,7 +1143,6 @@ const onLoad = () => { console.log(res); Paymentmethod.value = res.data.data; }); - console.log($route.query.id, '页面初始化'); routerState.value = $route.query.routerState; updateDictionary(IndexException.value, 'pc_work_order'); //异常类型 @@ -1362,6 +1366,7 @@ const onLoad = () => { ).value; console.log(SelectType.value, '异常类型'); Statistics(); + editloading.value=false;//关闭页面加载 }); }; onLoad(); //初始化程序 @@ -2011,6 +2016,17 @@ const ConfirmForm = () => { // 申诉成立编辑 const AppealEditor = () => { + + ElMessageBox.confirm( + '是否确认申诉成立编辑提交?', + '提示', + { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning', + } + ) + .then(() => { // 申诉下面的编辑完结信息 if ($route.query.AppealEstablished) { editloading.value = true; //开启加载效果 @@ -2079,7 +2095,12 @@ const AppealEditor = () => { message: res.data.msg, type: 'success', }); - $store.commit('DEL_TAG_CURRENT'); //关闭当前页面 + $useStore.commit('EDIT_REFRESHITEM', { + title: 'aftersalesWorkOrder', + status: true, + }); + $useStore.commit('Customer_Menu',6);//要刷新的菜单 + $useStore.commit('DEL_TAG_CURRENT'); //关闭当前页面 $router.push({ //跳转到首页 path: '/aftersales/aftersalesWorkOrder', @@ -2090,8 +2111,9 @@ const AppealEditor = () => { editloading.value = false; //关闭加载效果 }); console.log('申诉下面编辑完结信息'); - return; } + }) + .catch(() => {}) }; // 理赔金未出编辑 @@ -2387,7 +2409,7 @@ const Arbitrationcompleted = () => { // message: res.data.msg, // type: 'success', // }); -// $store.commit('DEL_TAG_CURRENT'); //关闭当前页面 +// $useStore.commit('DEL_TAG_CURRENT'); //关闭当前页面 // $router.push({ // //跳转到首页 // path: '/aftersales/aftersalesWorkOrder', @@ -2563,7 +2585,7 @@ const Arbitrationcompleted = () => { // // message: res.data.msg, // // type: 'success', // // }); -// // $store.commit('DEL_TAG_CURRENT'); //关闭当前页面 +// // $useStore.commit('DEL_TAG_CURRENT'); //关闭当前页面 // // $router.push({ // // //跳转到首页 // // path: '/aftersales/aftersalesWorkOrder', @@ -3286,4 +3308,9 @@ const isShowFormItem2 = computed(() => { } } } +:deep(.el-loading-mask) { + position: fixed; + left: 12%; + top: 10%; +}