yanghao пре 1 недеља
родитељ
комит
b53fb3d0b9
1 измењених фајлова са 18 додато и 4 уклоњено
  1. 18 4
      src/views/researchProject/list/index.vue

+ 18 - 4
src/views/researchProject/list/index.vue

@@ -108,7 +108,7 @@
           >
 
           <el-button
-            v-if="canEdit(row)"
+            v-if="canDelete(row)"
             link
             type="danger"
             v-hasPermi="['rd:project:delete']"
@@ -571,10 +571,24 @@ const getFormalAuditTagType = (status: number) => {
   return map[status] || 'info'
 }
 
-// 判断按钮显示
-const canEdit = (row: any) => row.preAuditStatus === 0 || row.preAuditStatus === 3
+// ========== 按钮显示逻辑 ==========
+// 能否编辑:草稿 / 预审驳回 / 正式驳回
+const canEdit = (row: any) => {
+  const preEditable = row.preAuditStatus === 0 || row.preAuditStatus === 3
+  const formalEditable =
+    row.preAuditStatus === 2 && (row.formalAuditStatus === 0 || row.formalAuditStatus === 3)
+  return preEditable || formalEditable
+}
+
+// 能否提交预审:草稿 或 预审驳回
 const canSubmitPre = (row: any) => row.preAuditStatus === 0 || row.preAuditStatus === 3
-const canSubmitFormal = (row: any) => row.preAuditStatus === 2 && row.formalAuditStatus === 0
+
+// 能否提交正式立项:预审通过 且(正式未提交 或 正式驳回)
+const canSubmitFormal = (row: any) =>
+  row.preAuditStatus === 2 && (row.formalAuditStatus === 0 || row.formalAuditStatus === 3)
+
+// 能否删除:草稿 或 预审驳回(正式阶段一般不允许删)
+const canDelete = (row: any) => row.preAuditStatus === 0 || row.preAuditStatus === 3
 const canApprove = (row: any) => {
   // 简化处理,实际项目应比对当前审批人是否是自己
   return row.preAuditStatus === 1 || row.formalAuditStatus === 1