Procházet zdrojové kódy

fix: 申诉受理入口以异议审批通过为前提,申诉类型补充「其他」

lucw před 1 týdnem
rodič
revize
0feff04617
2 změnil soubory, kde provedl 19 přidání a 17 odebrání
  1. 18 16
      src/api/salary/payslipAction.js
  2. 1 1
      src/views/salary/appeal/index.vue

+ 18 - 16
src/api/salary/payslipAction.js

@@ -78,7 +78,8 @@ export const APPEAL_TYPE_OPTIONS = [
   { value: 'AMOUNT', label: '金额差异' },
   { value: 'ATTENDANCE', label: '考勤相关' },
   { value: 'TAX', label: '个税相关' },
-  { value: 'SOCIAL', label: '社保公积金' }
+  { value: 'SOCIAL', label: '社保公积金' },
+  { value: 'OTHER', label: '其他' }
 ];
 
 const APPEAL_TYPE_LABELS = APPEAL_TYPE_OPTIONS.reduce(
@@ -169,15 +170,16 @@ export function normalizeAppealApprovalStatus(raw = {}) {
 
 /**
  * 是否可受理:契约原文「**仅 PROCESSING 可处理**,重复请求会被状态校验拒绝,不会重复创建更正事实」。
- * 因此只有「处理中」的行才展示受理入口,终态一律不展示(后端同时兜底)。
+ * 异议审批流上线后,受理以「异议审批通过(approvalStatus = APPROVED)」为前提,
+ * 因此必须 PROCESSING 且审批已通过才展示受理入口(后端同时兜底,未通过会直接拒绝)。
  *
- * ★ 异议审批流上线后,「受理」在业务上应当以「审批通过」为前提;
- *   但后端申诉单状态机尚未加入审批结果校验,前端此时若强制拦截,
- *   在流程定义未部署的环境会直接把现有受理入口锁死。
- *   因此这里仍按 PROCESSING 放行,审批进度用独立列提示,等后端补校验后再收紧。
+ * @param {string} rawStatus 申诉单处理状态
+ * @param {string} [rawApprovalStatus] 异议审批状态(缺省视为未发起)
  */
-export function isAppealHandleable(rawStatus) {
-  return String(rawStatus || '').trim().toUpperCase() === 'PROCESSING';
+export function isAppealHandleable(rawStatus, rawApprovalStatus) {
+  const status = String(rawStatus || '').trim().toUpperCase();
+  if (status !== 'PROCESSING') return false;
+  return normalizeAppealApprovalStatus({ approvalStatus: rawApprovalStatus }) === 'APPROVED';
 }
 
 /** 申诉处理动作 */
@@ -191,6 +193,7 @@ export const APPEAL_HANDLE_ACTION_OPTIONS = [
 function adaptAppeal(raw = {}) {
   const status = String(raw.status || '').toUpperCase();
   const type = String(raw.appealType || '').toUpperCase();
+  const approvalStatus = normalizeAppealApprovalStatus(raw);
   return {
     ...raw,
     id: raw.id,
@@ -207,26 +210,25 @@ function adaptAppeal(raw = {}) {
     status,
     statusLabel: appealStatusLabel(status),
     statusTagType: appealStatusTagType(status),
-    handleable: isAppealHandleable(status),
+    handleable: isAppealHandleable(status, approvalStatus),
     correctionId: raw.correctionId,
     handleResult: raw.handleResult || '',
     handleTime: raw.handleTime || '',
     /* ★ 异议审批:后端补字段即生效,缺失时按「未提交审批」降级展示 */
     processInstanceId: raw.processInstanceId || raw.approvalInstanceId || '',
-    approvalStatus: normalizeAppealApprovalStatus(raw),
+    approvalStatus,
     approvalStatusLabel:
-      APPEAL_APPROVAL_STATUS_LABELS[normalizeAppealApprovalStatus(raw)] ||
-      normalizeAppealApprovalStatus(raw),
+      APPEAL_APPROVAL_STATUS_LABELS[approvalStatus] || approvalStatus,
     approvalStatusTagType:
       (
         APPEAL_APPROVAL_STATUS_OPTIONS.find(
-          (opt) => opt.value === normalizeAppealApprovalStatus(raw)
+          (opt) => opt.value === approvalStatus
         ) || {}
       ).tagType || 'info',
-    /* 可发起/重新发起审批:只有处理中的申诉才允许;审批中与已通过都不再重复发起 */
+    /* 可发起/重新发起审批:仅处理中的申诉且审批未通过(未发起或已驳回)时允许 */
     canStartApproval:
-      isAppealHandleable(status) &&
-      ['NOT_STARTED', 'REJECTED'].includes(normalizeAppealApprovalStatus(raw))
+      status === 'PROCESSING' &&
+      ['NOT_STARTED', 'REJECTED'].includes(approvalStatus)
   };
 }
 

+ 1 - 1
src/views/salary/appeal/index.vue

@@ -295,7 +295,7 @@
         if (row.handleable !== undefined && row.handleable !== null) {
           return row.handleable === true;
         }
-        return isAppealHandleable(row.status);
+        return isAppealHandleable(row.status, row.approvalStatus);
       },
       /**
        * ★ 2026-10-09:申诉列表改用后端分页接口