xiaweibo 1 месяц назад
Родитель
Сommit
ed6405cef6

+ 2 - 0
src/api/production-safety/index.ts

@@ -32,6 +32,7 @@ export interface EmployeeHazardReportDTO {
   createdByName?: string; // 创建人姓名
   createdAt: string; // 创建时间
   updatedAt: string; // 更新时间
+  approvalOrder?: number; // 审核顺序
 }
 
 // 新增员工上报隐患
@@ -82,6 +83,7 @@ export interface ApproveEmployeeHazardReportReq {
   node: number; // 审批节点:1-需求部门,2-安全部门
   approvalStatus: number; // 审批状态:2-通过,3-驳回
   approvalContent?: string; // 审批意见
+  approvalOrder?: number; // 审核顺序
 }
 
 // 兼容旧接口名称(向后兼容)

+ 3 - 1
src/views/production-safety/hiddenTroubleInvestigationAndGovernance/employeeReportHiddenTroubleManagement/components/employeeReportHiddenTroubleManagementDetail.vue

@@ -48,7 +48,7 @@
         <el-form-item label="审批状态:">
           <el-radio-group v-model="approveForm.approvalStatus">
             <el-radio :value="2">通过</el-radio>
-            <el-radio :value="3">回</el-radio>
+            <el-radio :value="3">退回</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="审批意见:">
@@ -194,6 +194,7 @@
     node: 1,
     approvalStatus: 2,
     approvalContent: '',
+    approvalOrder: 0,
   });
 
   const getDetail = async () => {
@@ -216,6 +217,7 @@
         ruleFormData.reportTime = res.reportTime || '';
         // 设置审核表单的隐患ID
         approveForm.value.hazardId = res.id;
+        approveForm.value.approvalOrder = res.approvalOrder ?? 0;
       }
       cloneRuleFormData();
     } catch (e) {

+ 10 - 8
src/views/production-safety/hiddenTroubleInvestigationAndGovernance/employeeReportHiddenTroubleManagement/employeeReportHiddenTroubleManagement.vue

@@ -25,9 +25,9 @@
                 <span>状态:</span>
                 <el-select v-model="tableQuery.queryParam.statusType" placeholder="请选择状态" clearable>
                   <el-option label="全部" :value="0" />
-                  <el-option label="待审核" :value="1" />
-                  <el-option label="审核通过" :value="2" />
-                  <el-option label="审核不通过" :value="3" />
+                  <el-option label="待提交" :value="1" />
+                  <el-option label="待审批" :value="2" />
+                  <el-option label="已完成" :value="3" />
                 </el-select>
               </div>
               <div class="select-box--item">
@@ -70,12 +70,14 @@
                 <!-- 审核通过(需求部门通过或安全部门通过):显示查看和入账 -->
                 <template v-else-if="scope.row.status === 2 || scope.row.status === 4">
                   <ActionButton text="查看" @click="handleView(scope.row.id)" />
-                  <ActionButton text="入账" @click="handleAccount(scope.row.id)" />
                 </template>
                 <!-- 审核不通过(需求部门驳回或安全部门驳回):显示查看 -->
                 <template v-else-if="scope.row.status === 3 || scope.row.status === 5">
                   <ActionButton text="查看" @click="handleView(scope.row.id)" />
                 </template>
+                <template v-else-if="scope.row.status === 3">
+                  <ActionButton text="入账" @click="handleAccount(scope.row.id)" />
+                </template>
                 <!-- 其他状态:显示查看 -->
                 <template v-else>
                   <ActionButton text="查看" @click="handleView(scope.row.id)" />
@@ -150,11 +152,11 @@
     return 0;
   };
 
-  // 根据 statusType 显示文本:1=待审核,2=审核通过,3=审核不通过
+  // 根据 statusType
   const getStatusTypeName = (statusType: number): string => {
-    if (statusType === 1) return '待审核';
-    if (statusType === 2) return '审核通过';
-    if (statusType === 3) return '审核不通过';
+    if (statusType === 1) return '待提交';
+    if (statusType === 2) return '待审批';
+    if (statusType === 3) return '已完成';
     return '-';
   };