From 373599bed9a0d7407002fea242492b020b5fd1ff Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Thu, 31 Oct 2024 17:44:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aftersales/aftersalesWorkOrderAdd.vue | 129 +++++++-------- .../aftersales/aftersalesWorkOrderInfo.vue | 6 +- .../aftersales/aftersalesWorkOrderTemp.vue | 150 ++++++++++++++---- 3 files changed, 178 insertions(+), 107 deletions(-) diff --git a/src/views/aftersales/aftersalesWorkOrderAdd.vue b/src/views/aftersales/aftersalesWorkOrderAdd.vue index 1afbefeb..c3ae148f 100644 --- a/src/views/aftersales/aftersalesWorkOrderAdd.vue +++ b/src/views/aftersales/aftersalesWorkOrderAdd.vue @@ -354,47 +354,47 @@ -
- - - - - - - + - - -
+ + + + + + + @@ -1566,23 +1566,20 @@ const onSubmit = () => { Responsibleperson = item.ResponsibleoNameptions.find( res => res.id == item.personResponsibleId ); - + if (form.value.groundlineType == '1') { data.personResponsibleName = item.personResponsibleId; //责任人名称 data.businessName = item.Processingoptions.find( res => res.value == item.businessId ).label; //责任方 data.businessId = item.businessId; //责任方id - } else { - - + } else { data.personResponsibleId = Responsibleperson ? Responsibleperson.id : null; //责任人id data.personResponsibleName = Responsibleperson ? Responsibleperson.name : item.personResponsibleId; //责任人名称 - data.businessName = item.Responsibleoptions.find( - res => res.value == item.businessId - )?.label || ''; //责任方 + data.businessName = + item.Responsibleoptions.find(res => res.value == item.businessId)?.label || ''; //责任方 data.businessId = item.businessId; //责任方id } // 如果是自定义责任人就删除ID @@ -1610,8 +1607,8 @@ const onSubmit = () => { } }); } - console.log(form.value,'表单内容'); - + console.log(form.value, '表单内容'); + // 处理结果 if (form.value.basis.result?.length) { submitData.aftersalesProcessingResultsDTO = { @@ -1625,22 +1622,21 @@ const onSubmit = () => { let resultTypeValue = Processingresultsoptions.value.find( res => res.label == item.title ).value; - if (item.compensationMethod) { + if (item.compensationMethod) { PlayName.push( item.Paymentmethod.find(res => res.value == item.compensationMethod).label ); } submitData.aftersalesProcessingResultsDTO['processingMoneyEntityList'].push({ - compensationMethodName: item.Paymentmethod.find( - res => res.value == item.compensationMethod - )?.label ||'', //支付方式名称 + compensationMethodName: + item.Paymentmethod.find(res => res.value == item.compensationMethod)?.label || '', //支付方式名称 compensationMethod: item.compensationMethod, //支付方式value compensationTime: item.compensationTime, //支付时间 money: item.money, //支付金额 paymentUnit: item.paymentUnit, //支付单位 resultName: item.title, //处理结果方式 下补单 resultType: resultTypeValue ? resultTypeValue : null, //处理结果方式 value - typesOf: 1, //固定参数 + typesOf: 1, //固定参数 }); }); submitData.aftersalesProcessingResultsDTO.resultType = form.value.Claimamount.map( @@ -1664,11 +1660,11 @@ const onSubmit = () => { //是否直接提交到处理结果(处理完毕) if (form.value.Processed) { submitData.workOrderStatus = 30; - submitData.resultIdentification=1; - }else{ - submitData.resultIdentification=2; + submitData.resultIdentification = 1; + } else { + submitData.resultIdentification = 2; } - + delete submitData.result; //删除处理结果字段 //移除责任方表单(必须) delete submitData.processor; @@ -1730,7 +1726,7 @@ const TabactiveClick = (a, b) => { // border-left: 1px solid #dcdfe6; // border-right: 1px solid #dcdfe6; } - .el-tabs__content{ + .el-tabs__content { display: none; } } @@ -1856,24 +1852,6 @@ const TabactiveClick = (a, b) => { margin-bottom: 0; } } - .el_Basic { - flex: 1; - display: flex; - min-width: 32%; - .el_Processing { - min-width: 50%; - } - :deep(.el_Investigation) { - flex: 1; - } - // :deep(.is-error) { - // .el-input--suffix { - // .el-textarea__inner:focus { - // box-shadow: 0 0 0 1px #ff0000 inset !important; - // } - // } - // } - } } .responsibilities { :deep(.el-upload-dragger) { @@ -2039,4 +2017,7 @@ const TabactiveClick = (a, b) => { top: 10%; background-color: #ffffffc2; } +.el_Investigation_process { + min-width: 100%; +} diff --git a/src/views/aftersales/aftersalesWorkOrderInfo.vue b/src/views/aftersales/aftersalesWorkOrderInfo.vue index 8008e526..597f0f61 100644 --- a/src/views/aftersales/aftersalesWorkOrderInfo.vue +++ b/src/views/aftersales/aftersalesWorkOrderInfo.vue @@ -1697,7 +1697,7 @@ const CustomerServiceCompleted = () => { id: $route.query.id, name: $route.query.workOrderNumber + '-客服仲裁完结', businessId: $route.query.businessId, - warehouseId: $route.query.warehouseId, + // warehouseId: $route.query.warehouseId, workOrderNumber: $route.query.workOrderNumber, RouterState: 'Kfend', workOrderStatus: $route.query.workOrderStatus, //当前单子状态 @@ -1716,7 +1716,7 @@ const EditInformation = () => { id: $route.query.id, name: $route.query.workOrderNumber + '-编辑', businessId: $route.query.businessId, - warehouseId: $route.query.warehouseId, + // warehouseId: $route.query.warehouseId, workOrderNumber: $route.query.workOrderNumber, RouterState: 'Infoedit', workOrderStatus: $route.query.workOrderStatus, //当前单子状态 @@ -1731,7 +1731,7 @@ const AppealEstablished = () => { id: $route.query.id, //这里的id是workOrderId是有申诉列表带入的 name: $route.query.workOrderNumber + '-申诉编辑', businessId: $route.query.businessId, - warehouseId: $route.query.warehouseId, + // warehouseId: $route.query.warehouseId, workOrderNumber: $route.query.workOrderNumber, RouterState: 'Kfend', workOrderStatus: $route.query.workOrderStatus, //当前单子状态 diff --git a/src/views/aftersales/aftersalesWorkOrderTemp.vue b/src/views/aftersales/aftersalesWorkOrderTemp.vue index 354b7301..fe8ef9af 100644 --- a/src/views/aftersales/aftersalesWorkOrderTemp.vue +++ b/src/views/aftersales/aftersalesWorkOrderTemp.vue @@ -37,7 +37,13 @@
- 创建工单 + 创建工单 Excel导出 @@ -91,7 +97,7 @@ - + @@ -114,7 +120,7 @@ > @@ -629,13 +635,15 @@ const timesc = (index, row) => { if (!index) { delete details.query[row.prop]; } - onLoad(); }; /** 表格表头下拉框选择 */ const selectsc = (index, row) => { - processRowPropertyName(index, row, details.query); - onLoad(); + let _Obj = MatchCurrentMenu(); //匹配出当前菜单 + _Obj.request = true; //更新请求状态 + _Obj.query = details.query; + processRowPropertyName(index, row, _Obj.query); + PublicDataRequest(TabPermissions.value); //获取页面数据 }; /** 表格表头复选框选择 */ const selectionChange = list => { @@ -690,6 +698,48 @@ const autoscaling = () => { const _node = document.querySelector('.tableNode'); setNodeHeight(_node, '', true); }; +/** + * 该函数将 columnList - columnList10 等十一个表头对象的 + * checkarr 属性赋值为对应的字典数组 + * @param {Array} columnLists - 一个包含 columnList - columnList10 等十一个对象的数组 + * @param {Object} propToDictionaryMap - 一个对象，键为 columnList 对象的 prop 属性，值为对应的字典数组 + */ +const SelectionInitialization = () => { + const columnLists = [ + columnList, + columnList1, + columnList2, + columnList3, + columnList4, + columnList5, + columnList6, + columnList7, + columnList8, + columnList9, + columnList10, + ]; + + // 定义一个映射对象，用于替代 if-else 判断 + const propToDictionaryMap = { + workOrderTypeNameS: dictionaries.pc_work_order.value, + discoveryNodeNameS: dictionaries.pc_discovery_node.value, + workOrderStatusNameS: dictionaries.work_order_status.value, + }; + + const functionIF = item => { + // 缓存过滤结果 + const filteredData = item.filter(item => item.type === 3); + + filteredData.forEach(item => { + const checkarr = propToDictionaryMap[item.prop]; + if (checkarr) { + item.checkarr = checkarr; + } + }); + }; + + columnLists.forEach(functionIF); +}; /** * 描述: 初始化字典，包含角色信息、异常类型、发现环节、工单状态，。 @@ -747,26 +797,27 @@ const Roleverification = () => { }; onMounted(() => { autoscaling(); -}) -// 页面初始化请求 -const onLoad = () => {}; +}); /** *页面初始化函数，包含字典，等必要请求 */ const PageOnlaod = async () => { PageLoading.value = true; try { - await Dictionaryrequest(); //初始化字典 - await Roleverification(); //获取角色信息 - PublicDataRequest(TabPermissions.value); //获取页面数据 + // 并行执行异步请求 + await Promise.all([ + Dictionaryrequest(), // 初始化字典 + Roleverification(), // 获取角色信息 + SelectionInitialization(), // 下拉框初始化赋值 + ]); + + // 获取页面数据 + PublicDataRequest(TabPermissions.value); } catch (error) { console.log(error); + } finally { + PageLoading.value = false; } - - PageLoading.value = false; - console.log(Useridentity, 'Useridentity'); - console.log('外部执行完毕'); - console.log(dictionaries); }; // 页面初始化 PageOnlaod(); @@ -795,11 +846,13 @@ const PagingDataProcessing = () => { * @return {void} 无返回值 */ const tabChenge = async (value, Reset) => { + PageLoading.value = true; // 开启loading let _Obj = await MatchCurrentMenu(); //匹配出上一个菜单 _Obj.query = await deepClone(details.query); //把上一个菜单的搜索条件缓存起来 TabPermissions.value = value; //记录最新的菜单 PublicDataRequest(value, Reset); //请求数据 }; + const PublicDataRequest = async (value, Reset) => { try { await MenuHeaderProcessing(value); // 处理头部菜单 @@ -807,6 +860,7 @@ const PublicDataRequest = async (value, Reset) => { // 判断是否需要请求数据{_state}返回true表示需要false表示不需要 let _state = PagingDataProcessing(); if (!_state) { + PageLoading.value = false; // 关闭oading return; } PageLoading.value = true; // 开启loading @@ -1095,20 +1149,56 @@ const Publicaccessdata = async Reset => { } }; -// 异常工单号点击查看 -const InformationViewing = val => { - console.log(val, '当前行数据'); - const workOrderInfoPath = '/aftersales/aftersalesWorkOrderInfo'; +/** + * + * @description 创建工单 + */ +const CreateworkOrder = () => { + $router.push('/aftersales/aftersalesWorkOrderAdd'); +}; +/** + * @description: 全部常工单号，跳转到详情信息页面 + * @param {Object} row - 当前行数据 + * @return {void} + */ +const ViewDetails0 = row => { + console.log(row, '当前行数据'); + const workOrderInfoPath = '/aftersales/aftersalesWorkOrderInfo'; //跳转路径 const queryParams = { - id: val.row.workOrderId, - name: `${val.row.workOrderNumber}-信息查看`, - warehouseId: val.row.warehouseId, - workOrderNumber: val.row.workOrderNumber, - businessId: val.row.businessId, - RouteIndexs: TabPermissions.value, - workOrderStatus: val.row.workOrderStatus, + id: row.id, //异常工单ID + name: `${row.workOrderNumber}-详情信息`, + workOrderNumber: row.workOrderNumber, //异常工单号 + RouteIndexs: TabPermissions.value, //当前菜单编号 + workOrderStatus: row.workOrderStatus, //工单状态 }; - $router.push({ path: workOrderInfoPath, query: { ...queryParams, id: val.row.id } }); + $router.push({ path: workOrderInfoPath, query: { ...queryParams } }); +}; +// 全部异常工单号点击查看 +const ViewDetailsRow = row => { + console.log(row, '异常工单号点击查看详情当前行数据'); + switch (TabPermissions.value) { + case 0: + ViewDetails0(row); + break; + case 1: + break; + } +}; + +/** + * @description: 查看按钮 + * @param {Object} row 当前行数据 + * @return {void} 无返回值 + */ +const ViewDetails = row => { + console.log(row, '点击查看详情当前行数据'); + switch (TabPermissions.value) { + case 0: + ViewDetails0(row); //全部 + break; + case 1: + break; + } };