Explorar el Código

fix: 移除描述,为确认发放按钮添加新判断

xiaweibo hace 1 mes
padre
commit
6d4ce2647a

+ 1 - 0
src/api/receiptRecord/index.ts

@@ -24,6 +24,7 @@ export interface ReceiptRecordItem {
   templateId?: number; // 审批流程模板ID(可选,后端字段为 templateId)
   approvalOrder?: number; // 审批顺序(管理员审核页使用)
   rejectReson?: string; // 审核不通过原因(后端字段为 rejectReson)
+  conformClaimButton?: number; // 确认发放按钮
 }
 
 /**

+ 2 - 2
src/views/production-safety/safetyAssessment/receiptRecord/components/ReceiptRecordDetail.vue

@@ -70,9 +70,9 @@
     <template #form>
       <div class="form">
         <el-form ref="approvalFormRef" :model="approvalForm">
-          <el-form-item label="审批描述:" label-position="top">
+          <!-- <el-form-item label="审批描述:" label-position="top">
             <el-input v-model="approvalForm.description" placeholder="请输入审批描述" type="textarea" />
-          </el-form-item>
+          </el-form-item> -->
           <div class="form-item">
             <span>审批流程:</span>
             <template v-for="item in approvalNodeList" :key="item.id">

+ 4 - 2
src/views/production-safety/safetyAssessment/receiptRecord/receiptRecord.vue

@@ -81,8 +81,9 @@
                     @confirm="handleDelete(scope.row.id)"
                   />
                   <ActionButton
-                    text="确认领取"
-                    :popconfirm="{ title: '确定要确认领取?' }"
+                    text="确认发放"
+                    v-if="scope.row.conformClaimButton"
+                    :popconfirm="{ title: '确定要发放吗?' }"
                     @confirm="handleConfirm(scope.row.id)"
                   />
                   <ActionButton text="查看" @click="handleView(scope.row.id)" />
@@ -203,6 +204,7 @@
           department: item.deptName, // 部门
           recipient: item.userName, // 领取人
           status: item.status, // 0 待审核 1 审核通过 -1 审核不通过 2 已领取
+          conformClaimButton: item.conformClaimButton, // 确认发放按钮
         }));
         pagination.total = res.totalRow;
       }