Browse Source

修复已知bug

dev-xx
马远东 5 months ago
parent
commit
5bfc9ffa20
  1. 61
      src/views/aftersales/aftersalesWorkOrder.vue
  2. 4
      src/views/aftersales/aftersalesWorkOrderInfo.vue

61
src/views/aftersales/aftersalesWorkOrder.vue

@ -889,6 +889,7 @@
>
<el-form-item :label="AssignmentType == '1' ? '仓库选择' : '商场选择'">
<el-select
style="width: 240px"
v-if="AssignmentType == '1'"
v-model="BatchFrom.AssignWarehouse"
filterable
@ -907,6 +908,7 @@
</el-select>
<el-select
style="width: 240px"
v-else
v-model="BatchFrom.AssignWarehouse"
filterable
@ -932,6 +934,8 @@
default-first-option
:reserve-keyword="false"
placeholder="请选择客服"
collapse-tags
:max-collapse-tags="2"
>
<el-option
v-for="item in AssignCustomerservice"
@ -1741,7 +1745,7 @@ const Statusprocessing = val => {
} 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;
}

4
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;
}
}

Loading…
Cancel
Save