diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue index 4fcb3800..8cfd556a 100644 --- a/src/views/aftersales/aftersalesWorkOrder.vue +++ b/src/views/aftersales/aftersalesWorkOrder.vue @@ -889,6 +889,7 @@ > { } else if (item.workOrderStatus == 60) { item.workOrderStatusNameS = columnList[10].checkarr[3].label; //超时未处理 } else if (item.workOrderStatus == 70) { - item.workOrderStatusNameS = columnList[10].checkarr[6].label; //完结 + item.workOrderStatusNameS = columnList[10].checkarr[6].label; //仲裁中 } else if (item.workOrderStatus == 80) { item.workOrderStatusNameS = columnList[10].checkarr[7].label; //完结 } else if (item.workOrderStatus == 90) { @@ -2047,7 +2051,7 @@ const InformationViewing = val => { }); $router.push({ path: workOrderInfoPath, query: queryParams }); console.log('申诉跳转'); - + return; } @@ -2156,11 +2160,11 @@ const view = val => { if (TabPermissions.value === 4) { console.log('当前菜单4'); - + const claimQueryParams = { ...baseQueryParams, appealID: val.row.id, - id:val.row.lawoId,//理赔金未出需要的ID + id: val.row.lawoId, //理赔金未出需要的ID ProcessType: TabPermissions.value == 2 ? '2' : TabPermissions.value == 3 ? '1' : '', Routstate: '', AppealReview: val.row.typesOf ? (val.row.typesOf === '0' ? 'true' : 'false') : 'true', @@ -2186,7 +2190,7 @@ const view = val => { AppealReview: val.row.typesOf ? (val.row.typesOf === '0' ? 'true' : 'false') : 'true', }; console.log('默认跳转'); - + $router.push({ path: workOrderInfoPath, query: defaultQueryParams }); }; @@ -4221,34 +4225,34 @@ const exportReport = () => { type: 'warning', }) .then(() => { - let dataID = { workOrderStatus: details.query.workOrderStatus, }; if (details.selectionList.length) { dataID.ids = details.selectionList.map(item => item.id).join(','); } - pageLoad.value=true - $_exportAftersalesWorkOrder(dataID).then(res => { - const currentDate = new Date(); - const formattedDate = `${currentDate.getFullYear()}${(currentDate.getMonth() + 1) - .toString() - .padStart(2, '0')}${currentDate.getDate().toString().padStart(2, '0')}${currentDate - .getHours() - .toString() - .padStart(2, '0')}${currentDate.getMinutes().toString().padStart(2, '0')}${currentDate - .getSeconds() - .toString() - .padStart(2, '0')}`; - console.log(res, '导出'); - downloadXls(res.data, `导出工单数据${formattedDate}.xlsx`); - }).catch((e)=>{ - console.log(e,'error'); - - }).finally(()=>{ - pageLoad.value=false - }) - ; + pageLoad.value = true; + $_exportAftersalesWorkOrder(dataID) + .then(res => { + const currentDate = new Date(); + const formattedDate = `${currentDate.getFullYear()}${(currentDate.getMonth() + 1) + .toString() + .padStart(2, '0')}${currentDate.getDate().toString().padStart(2, '0')}${currentDate + .getHours() + .toString() + .padStart(2, '0')}${currentDate.getMinutes().toString().padStart(2, '0')}${currentDate + .getSeconds() + .toString() + .padStart(2, '0')}`; + console.log(res, '导出'); + downloadXls(res.data, `导出工单数据${formattedDate}.xlsx`); + }) + .catch(e => { + console.log(e, 'error'); + }) + .finally(() => { + pageLoad.value = false; + }); }) .catch(() => {}); }; @@ -4406,7 +4410,7 @@ const AssignSubmission = () => { .then(res => { console.log(res, '指派成功'); if (res.data.code == 200) { - ElMessageBox.confirm('提交成功是否关闭?', 'Warning', { + ElMessageBox.confirm('提交成功是否关闭?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning', @@ -5025,6 +5029,7 @@ const AssignSubmission = () => { } } .el_Customer { +width: 440px; #bodys { height: 300px !important; } diff --git a/src/views/aftersales/aftersalesWorkOrderInfo.vue b/src/views/aftersales/aftersalesWorkOrderInfo.vue index f3116a97..2162c95e 100644 --- a/src/views/aftersales/aftersalesWorkOrderInfo.vue +++ b/src/views/aftersales/aftersalesWorkOrderInfo.vue @@ -1316,7 +1316,7 @@ const isHeadquarterCustomerServiceManager = userRole === '总部客服经理'; / const isWarehouseIdState = warehouseIdState.value; // 处理结果权限 const isProcessingResults = () => { - if (workOrderStatus == '10' || workOrderStatus === '20') { + if (workOrderStatus == '10' || workOrderStatus == '20') { return true; } }; @@ -1351,7 +1351,7 @@ const Resultreturned = () => { // 客服仲裁完结权限 const isApplyArbitration = () => { if (UserPermissions.value != '仓库客服') { - if (workOrderStatus === '70') { + if (workOrderStatus == '70') { return true; } }