From acef4418d8ad0a9f9e802266fb92af33181be715 Mon Sep 17 00:00:00 2001
From: dk <1260500659@qq.com>
Date: Thu, 4 Jun 2026 10:49:34 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=8A=A0=E7=8F=AD=E7=94=B3=E8=AF=B7):=20?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=90=8E=E7=AB=AF=E4=B8=93=E9=97=A8=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E7=8A=B6=E6=80=81=E7=9A=84=E6=8E=A5=E5=8F=A3=EF=BC=8C?=
 =?UTF-8?q?=E4=BB=A3=E6=9B=BF=E4=BD=BF=E7=94=A8=E5=AD=97=E5=85=B8=E3=80=82?=
 =?UTF-8?q?=20fix(status-tag.ts)=EF=BC=9A=E6=8A=8A=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=E9=9C=80=E6=B1=82=E3=80=81=E9=A1=B9=E7=9B=AE=E9=9C=80=E6=B1=82?=
 =?UTF-8?q?=E7=9A=84=E7=8A=B6=E6=80=81=E9=A2=9C=E8=89=B2=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E6=94=B6=E6=95=9B=E5=88=B0=E6=AD=A4=E5=A4=84=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/constants/dict.ts                         |  8 -----
 src/constants/status-tag.ts                   | 34 +++++++++++++++----
 src/service/api/overtime-application.ts       | 13 +++++++
 src/typings/api/overtime-application.d.ts     |  9 +++++
 .../modules/overtime-application-search.vue   | 28 ++++++++++++---
 src/views/product/requirement/index.vue       |  4 +--
 .../shared/requirement-master-data.ts         | 15 --------
 .../project/project/requirement/index.vue     |  4 +--
 .../shared/requirement-master-data.ts         | 18 ----------
 9 files changed, 77 insertions(+), 56 deletions(-)

diff --git a/src/constants/dict.ts b/src/constants/dict.ts
index b240016..5afc803 100644
--- a/src/constants/dict.ts
+++ b/src/constants/dict.ts
@@ -112,14 +112,6 @@ export const RDMS_REQ_CAN_DELETE_STATUS_DICT_CODE = 'rdms_req_can_delete_status'
  */
 export const RDMS_WORKLOG_DIFFICULTY_DICT_CODE = 'rdms_task_item_worklog_difficulty';
 
-/**
- * 加班申请状态字典编码
- *
- * 对应业务字段：加班申请中的 statusCode
- * 来源口径：`overtime-application-design.md` 明确状态字典为 rdms_overtime_application_status
- */
-export const RDMS_OVERTIME_APPLICATION_STATUS_DICT_CODE = 'rdms_overtime_application_status';
-
 /**
  * 加班时长快捷选项字典编码
  *
diff --git a/src/constants/status-tag.ts b/src/constants/status-tag.ts
index 0e7dc10..730aa92 100644
--- a/src/constants/status-tag.ts
+++ b/src/constants/status-tag.ts
@@ -14,7 +14,8 @@ export type StatusDomain =
   | 'taskAssigneeMember'
   | 'project'
   | 'product'
-  | 'requirement'
+  | 'productRequirement'
+  | 'projectRequirement'
   | 'workOrder'
   | 'personalItem'
   | 'overtimeApplication';
@@ -52,8 +53,31 @@ const statusTagTypeRegistry: Record<StatusDomain, Record<string, StatusTagType>>
   project: {},
   // 产品（待补全）
   product: {},
-  // 需求（待补全）
-  requirement: {},
+  // 产品需求
+  productRequirement: {
+    pending_claim: 'info',
+    pending_review: 'info',
+    pending_dispatch: 'primary',
+    reviewed: 'success',
+    review_rejected: 'danger',
+    implementing: 'primary',
+    accepted: 'success',
+    closed: 'danger',
+    rejected: 'danger',
+    cancelled: 'danger'
+  },
+  // 项目需求
+  projectRequirement: {
+    pending_claim: 'info',
+    pending_review: 'info',
+    reviewed: 'success',
+    review_rejected: 'danger',
+    implementing: 'primary',
+    accepted: 'success',
+    closed: 'danger',
+    rejected: 'danger',
+    cancelled: 'danger'
+  },
   // 工单（待补全）
   workOrder: {},
   // 个人事项
@@ -83,7 +107,3 @@ export function getStatusTagType(domain: StatusDomain, statusCode: string | null
 export function getPersonalItemStatusTagType(statusCode: string | null | undefined) {
   return getStatusTagType('personalItem', statusCode);
 }
-
-export function getOvertimeApplicationStatusTagType(statusCode: string | null | undefined) {
-  return getStatusTagType('overtimeApplication', statusCode);
-}
diff --git a/src/service/api/overtime-application.ts b/src/service/api/overtime-application.ts
index 14120bf..53e27df 100644
--- a/src/service/api/overtime-application.ts
+++ b/src/service/api/overtime-application.ts
@@ -269,6 +269,19 @@ export async function fetchGetOvertimeApplicationStatusLogs(id: string) {
   );
 }
 
+export async function fetchGetOvertimeApplicationStatusDict() {
+  const result = await request<Api.OvertimeApplication.OvertimeApplicationStatusDict[]>({
+    ...safeJsonRequestConfig,
+    url: `${OVERTIME_APPLICATION_PREFIX}/status/dict`,
+    method: 'get'
+  });
+
+  return mapServiceResult(
+    result as ServiceRequestResult<Api.OvertimeApplication.OvertimeApplicationStatusDict[]>,
+    data => data
+  );
+}
+
 export function fetchExportOvertimeApplications(params: Api.OvertimeApplication.OvertimeApplicationSearchParams = {}) {
   const query = createPageQuery(params);
 
diff --git a/src/typings/api/overtime-application.d.ts b/src/typings/api/overtime-application.d.ts
index 24b7a8f..3ea00f5 100644
--- a/src/typings/api/overtime-application.d.ts
+++ b/src/typings/api/overtime-application.d.ts
@@ -74,5 +74,14 @@ declare namespace Api {
       remark?: string | null;
       createTime: string;
     }
+
+    interface OvertimeApplicationStatusDict {
+      statusCode: string;
+      statusName: string;
+      sort: number;
+      initialFlag: boolean;
+      terminalFlag: boolean;
+      allowEdit: boolean;
+    }
   }
 }
diff --git a/src/views/personal-center/overtime-application/modules/overtime-application-search.vue b/src/views/personal-center/overtime-application/modules/overtime-application-search.vue
index ec70728..4afadbf 100644
--- a/src/views/personal-center/overtime-application/modules/overtime-application-search.vue
+++ b/src/views/personal-center/overtime-application/modules/overtime-application-search.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
-import { computed, reactive, watch } from 'vue';
-import { RDMS_OVERTIME_APPLICATION_STATUS_DICT_CODE } from '@/constants/dict';
+import { computed, onMounted, reactive, ref, watch } from 'vue';
+import { fetchGetOvertimeApplicationStatusDict } from '@/service/api';
 import TableSearchFields, { type SearchField } from '@/components/custom/table-search-fields.vue';
 
 defineOptions({ name: 'OvertimeApplicationSearch' });
@@ -21,6 +21,8 @@ const searchModel = reactive<Record<string, any>>({
   approverName: ''
 });
 
+const statusOptions = ref<Array<{ label: string; value: string }>>([]);
+
 let syncingFromSource = false;
 
 watch(
@@ -53,6 +55,24 @@ watch(
   { flush: 'sync' }
 );
 
+async function loadStatusOptions() {
+  const { error, data } = await fetchGetOvertimeApplicationStatusDict();
+
+  if (error || !data) {
+    statusOptions.value = [];
+    return;
+  }
+
+  statusOptions.value = data.map(item => ({
+    label: item.statusName,
+    value: item.statusCode
+  }));
+}
+
+onMounted(async () => {
+  await loadStatusOptions();
+});
+
 const fields = computed<SearchField[]>(() => [
   {
     key: 'applicantName',
@@ -69,8 +89,8 @@ const fields = computed<SearchField[]>(() => [
   {
     key: 'statusCode',
     label: '状态',
-    type: 'dict',
-    dictCode: RDMS_OVERTIME_APPLICATION_STATUS_DICT_CODE,
+    type: 'select',
+    options: statusOptions.value,
     placeholder: '请选择状态'
   },
   {
diff --git a/src/views/product/requirement/index.vue b/src/views/product/requirement/index.vue
index a98e73e..051fd45 100644
--- a/src/views/product/requirement/index.vue
+++ b/src/views/product/requirement/index.vue
@@ -10,6 +10,7 @@ import {
   RDMS_REQ_PRIORITY_DICT_CODE,
   RDMS_REQ_SOURCE_TYPE_DICT_CODE
 } from '@/constants/dict';
+import { getStatusTagType } from '@/constants/status-tag';
 import {
   fetchChangeRequirementStatus,
   fetchDeleteRequirement,
@@ -31,7 +32,6 @@ import {
   ACTION_TYPE_MAP,
   type RequirementStatusActionCode,
   getRequirementActionDisplayName,
-  getRequirementStatusTagType,
   isRequirementActionNeedProject,
   isRequirementActionNeedReviewChoice,
   isRequirementActionTerminal
@@ -375,7 +375,7 @@ const columns = computed(() => [
     width: 100,
     align: 'center',
     formatter: (row: Api.Product.Requirement) => (
-      <ElTag type={getRequirementStatusTagType(row.statusCode)}>{getStatusLabel(row.statusCode)}</ElTag>
+      <ElTag type={getStatusTagType('productRequirement', row.statusCode)}>{getStatusLabel(row.statusCode)}</ElTag>
     )
   },
   {
diff --git a/src/views/product/requirement/shared/requirement-master-data.ts b/src/views/product/requirement/shared/requirement-master-data.ts
index 40a7e7c..c553944 100644
--- a/src/views/product/requirement/shared/requirement-master-data.ts
+++ b/src/views/product/requirement/shared/requirement-master-data.ts
@@ -90,22 +90,7 @@ export const ACTION_TYPE_MAP: Record<string, 'primary' | 'success' | 'danger'> =
   close: 'danger',
   delete: 'danger'
 };
-export function getRequirementStatusTagType(status: Api.Product.RequirementStatusCode): UI.ThemeColor {
-  const statusTagTypeMap: Record<Api.Product.RequirementStatusCode, UI.ThemeColor> = {
-    pending_claim: 'info',
-    pending_review: 'info',
-    pending_dispatch: 'primary',
-    reviewed: 'success',
-    review_rejected: 'danger',
-    implementing: 'primary',
-    accepted: 'success',
-    closed: 'danger',
-    rejected: 'danger',
-    cancelled: 'danger'
-  };
 
-  return statusTagTypeMap[status];
-}
 export function isRequirementActionTerminal(actionCode: RequirementStatusActionCode) {
   const terminalActions: RequirementStatusActionCode[] = ['reject', 'cancel', 'close'];
   return terminalActions.includes(actionCode);
diff --git a/src/views/project/project/requirement/index.vue b/src/views/project/project/requirement/index.vue
index 78b5e8a..151ea5b 100644
--- a/src/views/project/project/requirement/index.vue
+++ b/src/views/project/project/requirement/index.vue
@@ -9,6 +9,7 @@ import {
   RDMS_REQ_PRIORITY_DICT_CODE,
   RDMS_REQ_SOURCE_TYPE_DICT_CODE
 } from '@/constants/dict';
+import { getStatusTagType } from '@/constants/status-tag';
 import {
   fetchChangeProjectRequirementStatus,
   fetchDeleteProjectRequirement,
@@ -28,7 +29,6 @@ import {
   getProjectRequirementActionButtonType,
   getProjectRequirementActionDisplayName,
   getProjectRequirementActionIcon,
-  getProjectRequirementStatusTagType,
   isProjectRequirementActionTerminal
 } from './shared/requirement-master-data';
 import RequirementActionDialog from './modules/requirement-action-dialog.vue';
@@ -377,7 +377,7 @@ const columns = computed(() => [
     width: 110,
     align: 'center',
     formatter: (row: Api.Project.ProjectRequirement) => (
-      <ElTag type={getProjectRequirementStatusTagType(row.statusCode)}>{getStatusLabel(row.statusCode)}</ElTag>
+      <ElTag type={getStatusTagType('projectRequirement', row.statusCode)}>{getStatusLabel(row.statusCode)}</ElTag>
     )
   },
   {
diff --git a/src/views/project/project/requirement/shared/requirement-master-data.ts b/src/views/project/project/requirement/shared/requirement-master-data.ts
index 6fec2c5..428e9de 100644
--- a/src/views/project/project/requirement/shared/requirement-master-data.ts
+++ b/src/views/project/project/requirement/shared/requirement-master-data.ts
@@ -77,24 +77,6 @@ function resolveActionKeyword(actionCode: string) {
   return Object.keys(ACTION_ICON_MAP).find(keyword => actionCode.includes(keyword));
 }
 
-/**
- * 获取项目需求状态的标签颜色
- */
-export function getProjectRequirementStatusTagType(status: Api.Project.ProjectRequirementStatusCode): UI.ThemeColor {
-  const statusTagTypeMap: Record<Api.Project.ProjectRequirementStatusCode, UI.ThemeColor> = {
-    pending_claim: 'info',
-    pending_review: 'info',
-    reviewed: 'success',
-    review_rejected: 'danger',
-    implementing: 'primary',
-    accepted: 'success',
-    closed: 'danger',
-    rejected: 'danger',
-    cancelled: 'danger'
-  };
-
-  return statusTagTypeMap[status];
-}
 /**
  * 判断动作是否为终态动作
  *