diff --git a/src/option/aftersales/vueTvemp.js b/src/option/aftersales/vueTvemp.js index 5777d94f..7b67802d 100644 --- a/src/option/aftersales/vueTvemp.js +++ b/src/option/aftersales/vueTvemp.js @@ -263,8 +263,8 @@ export const columnList = [ head: false, }, { - prop: 'problemDescription', - label: '异常问题描述', + prop: 'investigationProcess', + label: '调查经过', type: 1, values: '', width: '150', diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue index f9365b33..4fcb3800 100644 --- a/src/views/aftersales/aftersalesWorkOrder.vue +++ b/src/views/aftersales/aftersalesWorkOrder.vue @@ -4221,12 +4221,14 @@ 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) @@ -4240,7 +4242,13 @@ const exportReport = () => { .padStart(2, '0')}`; console.log(res, '导出'); downloadXls(res.data, `导出工单数据${formattedDate}.xlsx`); - }); + }).catch((e)=>{ + console.log(e,'error'); + + }).finally(()=>{ + pageLoad.value=false + }) + ; }) .catch(() => {}); }; diff --git a/src/views/financialsector/Financialse/FinancialTrunkLine.vue b/src/views/financialsector/Financialse/FinancialTrunkLine.vue index 0b682353..6f879868 100644 --- a/src/views/financialsector/Financialse/FinancialTrunkLine.vue +++ b/src/views/financialsector/Financialse/FinancialTrunkLine.vue @@ -49,7 +49,11 @@ prop="trunklineIsByCategory" :rules="[{ required: true, message: '请选择是否区分品类', trigger: ['blur', 'change'] }]" > - + { console.log('value :>> ', value); + // 遍历 dataTa 数组 + details.form.billTemplateDetail.forEach(item => { + // 检查 item.code 是否不在 data 数组中 + if (!value.includes(item.code)) { + // 不在则将 categories 重置为空数组 + item.categories = [ + { + reduce: false, + plus: true, + goodsName: '', + goodsId: '', + goods: '', + goodsArr: [], + loading: false, + }, + ]; + } + }); let activeItem: any = {}; for (let i = 0; i < details.lowestType.length; i++) { @@ -387,7 +409,7 @@ const handleChangePrcieMethod = value => { activeItem = item; break; } - + console.log(details.form.billTemplateDetail, 'details.form.billTemplateDetail'); if (!activeItem.MappingOrNot) return; if (!details.form.trunklinePricingType.includes(activeItem.mapValue)) details.form.trunklineMinCostType = '0'; @@ -590,7 +612,22 @@ const handleReduce = (value: any, index: number) => { if (index === 0) return; value.categories.splice(index, 1); }; - +// 是否区分品类重置 +const trunklineIsByCategorychange = () => { + details.form.billTemplateDetail.forEach(item => { + item.categories = [ + { + reduce: false, + plus: true, + goodsName: '', + goodsId: '', + goods: '', + goodsArr: [], + loading: false, + }, + ]; + }); +}; /** 货物变化时 */ const handleChangeCategory = item => { if (!item.goods) {