diff --git a/src/axios.js b/src/axios.js index 701cf312..0241db19 100644 --- a/src/axios.js +++ b/src/axios.js @@ -139,7 +139,7 @@ axios.interceptors.response.use( // 如果状态码为401，则表示用户未认证，需跳转到登录页 if (status === 401 && !isAlertShowing) { isAlertShowing = true; // 设置为 true 表示弹窗正在显示 - ElMessageBox.alert('长时间未操作,登录已过期，请重新登录', '提示', { + ElMessageBox.alert('长时间未操作,登录已过期，或账号已在别处登录，请重新登录', '提示', { confirmButtonText: '确定', showClose: false, // 不显示关闭按钮 closeOnPressEscape: false, // 禁止通过 ESC 键关闭 diff --git a/src/option/aftersales/vueTvemp.js b/src/option/aftersales/vueTvemp.js index 9d64789b..27bacff2 100644 --- a/src/option/aftersales/vueTvemp.js +++ b/src/option/aftersales/vueTvemp.js @@ -19,7 +19,7 @@ export const columnList = [ label: '异常类型', type: 3, values: '', - width: '100', + width: '110', checkarr: [], fixed: false, sortable: true, @@ -30,7 +30,7 @@ export const columnList = [ label: '发现节点', type: 3, values: '', - width: '100', + width: '110', checkarr: [], fixed: false, sortable: true, @@ -479,7 +479,7 @@ export const Claimsfield = [ label: '商场名称', type: 2, values: '', - width: '100', + width: '110', checkarr: [], fixed: false, sortable: true, @@ -512,7 +512,7 @@ export const Claimsfield = [ label: '异常类型名称', type: 3, values: '', - width: '120', + width: '130', checkarr: [], fixed: false, sortable: true, @@ -534,7 +534,7 @@ export const Claimsfield = [ label: '处理结果名称', type: 3, values: '', - width: '120', + width: '130', checkarr: [], fixed: false, sortable: true, @@ -578,7 +578,7 @@ export const Claimsfield = [ label: '处理结果说明', type: 2, values: '', - width: '120', + width: '130', checkarr: [], fixed: false, sortable: true, @@ -589,7 +589,7 @@ export const Claimsfield = [ label: '车辆路线', type: 2, values: '', - width: '100', + width: '110', checkarr: [], fixed: false, sortable: true, @@ -611,7 +611,7 @@ export const Claimsfield = [ label: '判责原因', type: 2, values: '', - width: '100', + width: '110', checkarr: [], fixed: false, sortable: true, diff --git a/src/views/aftersales/aftersalesWorkOrderInfo.vue b/src/views/aftersales/aftersalesWorkOrderInfo.vue index d96a2ed8..a6cbdb57 100644 --- a/src/views/aftersales/aftersalesWorkOrderInfo.vue +++ b/src/views/aftersales/aftersalesWorkOrderInfo.vue @@ -1118,12 +1118,12 @@ const Completionpermissions = computed(() => { } } }); -const onLoad = () => { +const onLoad = async () => { pageState.value = true; //开启页面加载 if (localStorage.getItem('my_data')) { - Mydata.value = JSON.parse(localStorage.getItem('my_data')); //获取本地仓库信息 + Mydata.value = await JSON.parse(localStorage.getItem('my_data')); //获取本地仓库信息 } - getDictionaryBiz('after_sales_visits').then(res => { + getDictionaryBiz('after_sales_visits').then(async res => { const matchingItem = res.data.data.find( item => item.dictValue == JSON.parse(localStorage.getItem('TWMS-userInfo')).content.role_name ); @@ -1133,12 +1133,12 @@ const onLoad = () => { UserPermissions.value = '仓库客服'; } console.log(UserPermissions.value, '当前角色权限'); - Chathistory(); //聊天的历史记录 + await Chathistory(); //聊天的历史记录 routerState.value = $route.query.routerState; - updateDictionary(IndexException.value, 'pc_work_order'); //异常类型 - updateDictionary(DiscoveringNodes.value, 'pc_discovery_node'); //发现环节 - handle(); //处理方和责任方信息 - + await updateDictionary(IndexException.value, 'pc_work_order'); //异常类型 + await updateDictionary(DiscoveringNodes.value, 'pc_discovery_node'); //发现环节 + await handle(); //处理方和责任方信息 + $_getInfo({ id: $route.query.id }).then(res => { pageState.value = false; //关闭页面加载 if ($route.query.Routstate) { diff --git a/src/views/aftersales/aftersalesWorkOrderend.vue b/src/views/aftersales/aftersalesWorkOrderend.vue index 3bd09256..b213a7c3 100644 --- a/src/views/aftersales/aftersalesWorkOrderend.vue +++ b/src/views/aftersales/aftersalesWorkOrderend.vue @@ -336,7 +336,7 @@ :reserve-keyword="false" placeholder="请选择处理结果" @change="changeProcessingResults" - :disabled="!PermissionButton.Submission_results" + :disabled="!PermissionButton.Processing_result_disabled" > @@ -371,7 +371,7 @@ v-model="item.paymentUnit" placeholder="请输入支付单位" clearable - :disabled="!PermissionButton.Submission_results" + :disabled="!PermissionButton.Processing_result_disabled" /> @@ -382,7 +382,7 @@ value-format="YYYY-MM-DD HH:mm:ss" placeholder="理赔支付时间" size="default" - :disabled="!PermissionButton.Submission_results" + :disabled="!PermissionButton.Processing_result_disabled" /> @@ -391,7 +391,7 @@ placeholder="请选择支付方式" style="width: 100%" clearable - :disabled="!PermissionButton.Submission_results" + :disabled="!PermissionButton.Processing_result_disabled" > @@ -1149,6 +1149,14 @@ const Arbitrationcompleted = () => { } } }; +// 处理结果是否可以填写 + +const Processingresultdisabled = () => { + if (['10', '20', '90'].includes($route.query.workOrderStatus)) { + return true; + } +}; + // 权限按钮 const PermissionButton = computed(() => ({ Completed_submission: Completedsubmission(), //处理结果 @@ -1156,6 +1164,7 @@ const PermissionButton = computed(() => ({ Save_results: Saveresults(), //处理结果保存 Arbitration_completed: Arbitrationcompleted(), //客服仲裁完结 Processing_result_modification: Processingresultmodification(), //处理结果编辑提交 + Processing_result_disabled: Processingresultdisabled(), //处理结果是否可以填写 })); // 页面初始化数据 @@ -1887,8 +1896,8 @@ const submitresults = async value => { // 传递要刷新的菜单 $useStore.commit('EDIT_REFRESHITEM', { title: 'aftersalesWorkOrder', status: true }); //要刷新的页面 $useStore.commit('Customer_Menu', Number($route.query.RouteIndexs)); //要刷新的菜单 - $router.push('/aftersales/aftersalesWorkOrder'); AddressClosed('/aftersales/aftersalesWorkOrderend'); //删除当前页面 + $router.push('/aftersales/aftersalesWorkOrder'); } }) .catch(error => { diff --git a/src/views/distribution/reservation/reservation.vue b/src/views/distribution/reservation/reservation.vue index 205673e7..14674ec8 100644 --- a/src/views/distribution/reservation/reservation.vue +++ b/src/views/distribution/reservation/reservation.vue @@ -41,17 +41,17 @@
- 添加预约 批量确认 - 导出
@@ -84,6 +84,7 @@ link icon="el-icon-view" @click="viewReservation(slotProps.scope)" + v-if="permissionList.reservation_view" >查看 编辑 取消预约 确认预约 @@ -134,28 +137,29 @@
- 添加预约 - 批量转备货 - 批量转配送 - 批量打印 + 批量转备货 + 批量转配送 + 批量打印 导出 加入挑单夹 查看 编辑 取消预约 确认预约 + 打印 @@ -266,7 +275,7 @@ :columnList="columnList" v-model="columnList" > - + @@ -905,6 +914,26 @@ export default { }); return ids.join(','); }, + permissionList() { + console.log(this.permission,'permission'); + + return { + reservation_add: this.validData(this.permission.reservation_add, false),//添加预约 + reservation_export: this.validData(this.permission.reservation_export, false),//导出 + reservation_enter_batch: this.validData(this.permission.reservation_enter_batch, false),//批量确认 + reservation_Stock_batch: this.validData(this.permission.reservation_Stock_batch, false),//批量转备货 + reservation_delivery_batch: this.validData(this.permission.reservation_delivery_batch, false),//批量转配送 + reservation_print_batch: this.validData(this.permission.reservation_print_batch, false),//批量打印 + reservation_cancel: this.validData(this.permission.reservation_cancel, false),//取消预约 + reservation_update: this.validData(this.permission.reservation_update, false),//编辑 + reservation_view: this.validData(this.permission.reservation_view, false),//查看 + reservation_print: this.validData(this.permission.reservation_print, false),//打印 + reservation_jionPickerclip: this.validData(this.permission.reservation_jionPickerclip, false),//加入挑单夹 + Confirm_appointment: this.validData(this.permission.Confirm_appointment, false),//确认预约 + remove_pickerclip: this.validData(this.permission.remove_pickerclip, false),//移除调单夹 + + }; + }, }, methods: { /** diff --git a/src/views/distribution/turndelivery/deliveryMarket.vue b/src/views/distribution/turndelivery/deliveryMarket.vue index 849c237c..ca055b43 100644 --- a/src/views/distribution/turndelivery/deliveryMarket.vue +++ b/src/views/distribution/turndelivery/deliveryMarket.vue @@ -1899,6 +1899,7 @@ export default { background-color: #ffffff; // border-bottom: 1px solid rgb(228, 228, 228); padding-left: 10px; + justify-content: flex-start; > .buts { padding: 10px 20px;