Procházet zdrojové kódy

fix: 修改参数信息

xiaweibo před 2 měsíci
rodič
revize
897e760a33

+ 7 - 6
src/views/production-safety/risk-identification-and-control/work-injury-apply-manage/list.vue

@@ -31,7 +31,7 @@
               <div class="select-box--item">
                 <span>状态:</span>
                 <el-select
-                  v-model="tableQuery.queryParam.workStatus"
+                  v-model="tableQuery.queryParam.status"
                   placeholder="请选择状态"
                   clearable
                 >
@@ -92,7 +92,7 @@
                 <!-- 申请加盖公章及材料申请 -->
                 <template v-else-if="scope.row.workStatus === 2 || scope.row.workStatus === '2'">
                   <ActionButton text="查看" @click="handleView(scope.row.id)" />
-                  <!-- <ActionButton text="确认" @click="confirmDialog = true;confirmId = scope.row.id;" /> -->
+                  <ActionButton text="确认" @click="confirmDialog = true;confirmId = scope.row.id;" />
                 </template>
                 <!-- 审核不通过:编辑、删除、查看 -->
                 <template v-else-if="scope.row.workStatus === 3 || scope.row.workStatus === '3'">
@@ -213,7 +213,7 @@
     pageSize: pagination.pageSize,
     queryParam: {
       queryKey: '', // 名称
-      workStatus: '', // 状态,默认启用
+      status: '', // 状态,默认启用
       ids: [], // 选择数据的ID
       deptCode: '', // 所属部门ID
     },
@@ -253,7 +253,7 @@
           approvalOrder: item.approvalOrder, // 审批订单
           templateId: item.templateId, // 模板ID
           injuryCategoryCode: item.injuryCategoryCode, // 工伤类别编码
-          rejectReason: item.workDescription, // 拒绝原因
+          rejectReason: item.rejectReason, // 拒绝原因
         }));
         pagination.total = res.totalRow;
       }
@@ -274,8 +274,9 @@
 
   const handleReset = () => {
     tableQuery.queryParam.queryKey = '';
-    tableQuery.queryParam.workStatus = ''; // 重置为默认启用状态
+    tableQuery.queryParam.status = ''; // 重置为默认启用状态
     tableQuery.queryParam.ids = [];
+    tableQuery.queryParam.deptCode = ''; // 重置为默认启用状态
     handleSearch();
   };
 
@@ -327,7 +328,7 @@
       name: 'workInjuryApplyManageItem',
       query: {
         id,
-        rejectReason:row.workDescription ?? '',
+        rejectReason:row.rejectReason ?? '',
         approvalTemplateId:row.templateId ?? '',
         approvalOrder:row.approvalOrder ?? '',
         approvalStatus:row.workStatus ?? '',

+ 7 - 6
src/views/production-safety/risk-identification-and-control/work-injury-apply-manage/listAdmin.vue

@@ -28,10 +28,10 @@
                   class="act-search-input"
                 />
               </div>
-              <div class="select-box--item">
+              <!-- <div class="select-box--item">
                 <span>状态:</span>
                 <el-select
-                  v-model="tableQuery.queryParam.approvalStatus"
+                  v-model="tableQuery.queryParam.status"
                   placeholder="请选择状态"
                   clearable
                 >
@@ -40,7 +40,7 @@
                   <el-option label="审核不通过" :value="3" />
                   <el-option label="已完成" :value="4" />
                 </el-select>
-              </div>
+              </div> -->
               <div class="select-box--item">
                 <span>所属部门:</span>
                  <el-cascader
@@ -92,7 +92,7 @@
                 <!-- 申请加盖公章及材料申请 -->
                 <template v-else-if="scope.row.approvalStatus === 2 || scope.row.approvalStatus === '2'">
                   <ActionButton text="查看" @click="handleView(scope.row.id)" />
-                  <ActionButton text="确认" @click="confirmDialog = true;confirmId = scope.row.id;" />
+                  <!-- <ActionButton text="确认" @click="confirmDialog = true;confirmId = scope.row.id;" /> -->
                 </template>
                 <!-- 审核不通过:编辑、删除、查看 -->
                 <template v-else-if="scope.row.approvalStatus === 3 || scope.row.approvalStatus === '3'">
@@ -214,7 +214,7 @@
     pageSize: pagination.pageSize,
     queryParam: {
       queryKey: '', // 物品名称
-      approvalStatus: '', // 状态,默认启用
+      status: '', // 状态,默认启用
       ids: [], // 选择数据的ID
       deptCode: '', // 所属部门ID
     },
@@ -275,8 +275,9 @@
 
   const handleReset = () => {
     tableQuery.queryParam.queryKey = '';
-    tableQuery.queryParam.approvalStatus = ''; // 重置为默认启用状态
+    tableQuery.queryParam.status = ''; // 重置为默认启用状态
     tableQuery.queryParam.ids = [];
+    tableQuery.queryParam.deptCode = ''; // 重置为默认启用状态
     handleSearch();
   };