Merge branch 'dev' into pre-production

src/utils/print.js

@@ -25,8 +25,8 @@ const handleDeliveryPrint = (LODOP, templateData) => {
   // LODOP.SET_PRINT_STYLE('FontColor', '#000000');
   // // 设置打印整宽且不变形
   LODOP.SET_PRINT_MODE('PRINT_PAGE_PERCENT', '100%');
-  // LODOP.SET_PRINT_PAGESIZE(1, 2160, 1396.5, '');
+  LODOP.SET_PRINT_PAGESIZE(1, 2160, 1396.5, '');
-  LODOP.SET_PRINT_PAGESIZE(1, 240 + 'mm', 139.7 + 'mm', '');
+  // LODOP.SET_PRINT_PAGESIZE(1, 240 + 'mm', 139.7 + 'mm', '');
   // // 设置打印后自动关闭
   LODOP.SET_PRINT_MODE('AUTO_CLOSE_PREWINDOW', 1);
 

src/views/aftersales/aftersalesWorkOrderAdd.vue

@@ -354,12 +354,13 @@
               </el-form-item>
 
               <!-- 初始必填 -->
-              <div class="el_Basic">
+
               <el-form-item
                 label="处理方"
                 prop="basis.processor"
                 class="el_Processing"
                 v-if="displaySettings.processor"
+                style="width: 34.3%"
               >
                 <el-select
                   v-model="form.basis.processor"
@@ -382,7 +383,7 @@
               <el-form-item
                 label="调查经过"
                 prop="basis.investigationProcess"
-                  class="el_Investigation"
+                class="el_Investigation_process"
                 clearable
                 v-if="displaySettings.investigationProcess"
               >
@@ -390,12 +391,11 @@
                   v-model="form.basis.investigationProcess"
                   placeholder="请输调查经过"
                   type="textarea"
-                    :autosize="{ minRows: 1, maxRows: 10 }"
+                  :autosize="{ minRows: 2, maxRows: 10 }"
                   clearable
                 />
               </el-form-item>
             </div>
-            </div>
           </el-tab-pane>
         </el-tabs>
         <!-- 内部责任划分  -->
@@ -1574,15 +1574,12 @@ const onSubmit = () => {
               ).label; //责任方
               data.businessId = item.businessId; //责任方id
             } else {
-    
-              
               data.personResponsibleId = Responsibleperson ? Responsibleperson.id : null; //责任人id
               data.personResponsibleName = Responsibleperson
                 ? Responsibleperson.name
                 : item.personResponsibleId; //责任人名称
-              data.businessName = item.Responsibleoptions.find(
+              data.businessName =
-                res => res.value == item.businessId
+                item.Responsibleoptions.find(res => res.value == item.businessId)?.label || ''; //责任方
-              )?.label || ''; //责任方
               data.businessId = item.businessId; //责任方id
             }
             // 如果是自定义责任人就删除ID
@@ -1631,9 +1628,8 @@ const onSubmit = () => {
               );
             }
             submitData.aftersalesProcessingResultsDTO['processingMoneyEntityList'].push({
-              compensationMethodName: item.Paymentmethod.find(
+              compensationMethodName:
-                res => res.value == item.compensationMethod
+                item.Paymentmethod.find(res => res.value == item.compensationMethod)?.label || '', //支付方式名称
-              )?.label ||'', //支付方式名称
               compensationMethod: item.compensationMethod, //支付方式value
               compensationTime: item.compensationTime, //支付时间
               money: item.money, //支付金额
@@ -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%;
+}
 </style>

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, //当前单子状态

src/views/aftersales/aftersalesWorkOrderTemp.vue

@@ -37,7 +37,13 @@
         <div class="avue-crud__header">
           <!-- 头部左侧按钮模块 -->
           <div class="avue-crud__left">
-            <el-button type="primary" icon="Edit" v-if="ButtonPermissions.add">创建工单</el-button>
+            <el-button
+              type="primary"
+              icon="Edit"
+              v-if="ButtonPermissions.add"
+              @click="CreateworkOrder"
+              >创建工单</el-button
+            >
             <el-button type="primary" icon="Download" v-if="ButtonPermissions.export_Report"
               >Excel导出</el-button
             >
@@ -114,7 +120,7 @@
         >
           <template #default="slotProps">
             <template v-if="slotProps.scope.column.label === '异常工单号'">
-              <el-text class="el_textBtn" @click="InformationViewing(slotProps.scope)">
+              <el-text class="el_textBtn" @click="ViewDetailsRow(slotProps.scope.row)">
                 {{
                   slotProps.scope.column.label === '异常工单号'
                     ? slotProps.scope.row.workOrderNumber
@@ -124,7 +130,7 @@
             </template>
 
             <template v-if="slotProps.scope.column.label === '操作'">
-              <el-text>查看</el-text>
+              <el-text @click="ViewDetails(slotProps.scope.row)">查看</el-text>
             </template>
           </template>
         </tablecmt>
@@ -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);
+  let _Obj = MatchCurrentMenu(); //匹配出当前菜单
-  onLoad();
+  _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(); //获取角色信息
+    await Promise.all([
-    PublicDataRequest(TabPermissions.value); //获取页面数据
+      Dictionaryrequest(), // 初始化字典
+      Roleverification(), // 获取角色信息
+      SelectionInitialization(), // 下拉框初始化赋值
+    ]);
+
+    // 获取页面数据
+    PublicDataRequest(TabPermissions.value);
   } catch (error) {
     console.log(error);
-  }
+  } finally {
-
     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, '当前行数据');
+ * @description 创建工单
-  const workOrderInfoPath = '/aftersales/aftersalesWorkOrderInfo';
+ */
+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,
+    id: row.id, //异常工单ID
-    name: `${val.row.workOrderNumber}-信息查看`,
+    name: `${row.workOrderNumber}-详情信息`,
-    warehouseId: val.row.warehouseId,
+    workOrderNumber: row.workOrderNumber, //异常工单号
-    workOrderNumber: val.row.workOrderNumber,
+    RouteIndexs: TabPermissions.value, //当前菜单编号
-    businessId: val.row.businessId,
+    workOrderStatus: row.workOrderStatus, //工单状态
-    RouteIndexs: TabPermissions.value,
+  };
-    workOrderStatus: val.row.workOrderStatus,
+  $router.push({ path: workOrderInfoPath, query: { ...queryParams } });
+};
+// 全部异常工单号点击查看
+const ViewDetailsRow = row => {
+  console.log(row, '异常工单号点击查看详情当前行数据');
+  switch (TabPermissions.value) {
+    case 0:
+      ViewDetails0(row);
+      break;
+    case 1:
+      break;
+  }
 };
-  $router.push({ path: workOrderInfoPath, query: { ...queryParams, id: val.row.id } });
+
+/**
+ *  @description: 查看按钮
+ *  @param {Object} row 当前行数据
+ *  @return {void} 无返回值
+ */
+const ViewDetails = row => {
+  console.log(row, '点击查看详情当前行数据');
+  switch (TabPermissions.value) {
+    case 0:
+      ViewDetails0(row); //全部
+      break;
+    case 1:
+      break;
+  }
 };
 </script>