xiaweibo 2 месяцев назад
Родитель
Сommit
847344dadf

+ 1 - 0
src/api/production-safety/business-registration-application.ts

@@ -21,6 +21,7 @@ export interface InventoryItem {
   injuryCategoryCode: string; // 工伤类别编码
   rejectReason: string; // 拒绝原因
   workDescription: string; // 工作描述
+  approvalStatus: number; // 审批状态
 }
 
 /**

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

@@ -31,7 +31,7 @@
               <div class="select-box--item">
                 <span>状态:</span>
                 <el-select
-                  v-model="tableQuery.queryParam.workStatus"
+                  v-model="tableQuery.queryParam.approvalStatus"
                   placeholder="请选择状态"
                   clearable
                 >
@@ -73,7 +73,7 @@
           >
             <template #status="scope">
               <span>
-                {{ scope.row.workStatus === 1 ? '待审核' : scope.row.workStatus === 2 ? '申请加盖公章及材料申请' : scope.row.workStatus === 3 ? '审核不通过' : scope.row.workStatus === 4 ? '已完成' : '-' }}
+                {{ scope.row.approvalStatus === 1 ? '待审核' : scope.row.approvalStatus === 2 ? '申请加盖公章及材料申请' : scope.row.approvalStatus === 3 ? '审核不通过' : scope.row.approvalStatus === 4 ? '已完成' : '-' }}
               </span>
             </template>
             <template #injuryCategoryCode="scope">
@@ -85,17 +85,17 @@
               <div class="action-container--div" style="justify-content: left">
                 
                 <!-- 待审核:查看、审核 -->
-                <template v-if="scope.row.workStatus === 1 || scope.row.workStatus === '1'">
+                <template v-if="scope.row.approvalStatus === 1 || scope.row.approvalStatus === '1'">
                   <ActionButton text="查看" @click="handleView(scope.row.id)" />
                   <ActionButton text="审核" @click="handleAudit(scope.row.id,scope.row)" />
                 </template>
                 <!-- 申请加盖公章及材料申请 -->
-                <template v-else-if="scope.row.workStatus === 2 || scope.row.workStatus === '2'">
+                <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;" />
                 </template>
                 <!-- 审核不通过:编辑、删除、查看 -->
-                <template v-else-if="scope.row.workStatus === 3 || scope.row.workStatus === '3'">
+                <template v-else-if="scope.row.approvalStatus === 3 || scope.row.approvalStatus === '3'">
                   <!-- <ActionButton text="编辑" @click="handleEdit(scope.row.id,scope.row)" />
                   <ActionButton
                     text="删除"
@@ -105,7 +105,7 @@
                   <ActionButton text="查看" @click="handleView(scope.row.id!)" />
                 </template>
                 <!-- 已完成:查看 -->
-                <template v-else-if="scope.row.workStatus === 4 || scope.row.workStatus === '4'">
+                <template v-else-if="scope.row.approvalStatus === 4 || scope.row.approvalStatus === '4'">
                   <ActionButton text="查看" @click="handleView(scope.row.id!)" />
                 </template>
               </div>
@@ -214,7 +214,7 @@
     pageSize: pagination.pageSize,
     queryParam: {
       queryKey: '', // 物品名称
-      workStatus: '', // 状态,默认启用
+      approvalStatus: '', // 状态,默认启用
       ids: [], // 选择数据的ID
       deptCode: '', // 所属部门ID
     },
@@ -249,7 +249,7 @@
           injuryTime: item.injuryTime, // 受伤时间
           injuryCategoryName: item.injuryCategoryName, // 工伤类别
           remark: item.remark, // 备注
-          workStatus: item.workStatus, // 状态
+          approvalStatus: item.approvalStatus, // 状态
           approvalTemplateId: item.approvalTemplateId, // 审批模板ID
           approvalOrder: item.approvalOrder, // 审批订单
           templateId: item.templateId, // 模板ID
@@ -275,7 +275,7 @@
 
   const handleReset = () => {
     tableQuery.queryParam.queryKey = '';
-    tableQuery.queryParam.workStatus = ''; // 重置为默认启用状态
+    tableQuery.queryParam.approvalStatus = ''; // 重置为默认启用状态
     tableQuery.queryParam.ids = [];
     handleSearch();
   };
@@ -331,7 +331,7 @@
         rejectReason:row.rejectReason ?? '',
         approvalTemplateId:row.templateId ?? '',
         approvalOrder:row.approvalOrder ?? '',
-        approvalStatus:row.workStatus ?? '',
+        approvalStatus:row.approvalStatus ?? '',
         injuryCategoryCode:row.injuryCategoryCode ?? '',
         operate: 'inventory-edit',
       },