From c63a5f87a4e16df535b6acfa943276f39669909d Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 14 Apr 2026 13:53:42 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20refactor(mes):=20?=
 =?UTF-8?q?=E9=87=8D=E6=9E=84=20approveFeedback=20=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=EF=BC=8C=E7=A7=BB=E9=99=A4=E7=94=A8=E6=88=B7=20ID=20=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

简化 approveFeedback 方法，移除不必要的用户 ID 参数，改为使用表单保存的报工人和时间。此变更提高了代码的可读性和维护性，同时确保审批状态更新逻辑的清晰性。
---
 src/views/mes/pro/feedback/FeedbackForm.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/mes/pro/feedback/FeedbackForm.vue b/src/views/mes/pro/feedback/FeedbackForm.vue
index d56cdd8ed..427893cce 100644
--- a/src/views/mes/pro/feedback/FeedbackForm.vue
+++ b/src/views/mes/pro/feedback/FeedbackForm.vue
@@ -485,8 +485,9 @@ const open = async (type: string, id?: number) => {
       formLoading.value = false
     }
   } else {
-    // 创建模式：默认报工人为当前用户
+    // 创建模式：默认报工人为当前用户，报工时间为当前时间
     formData.value.feedbackUserId = useUserStore().getUser.id
+    formData.value.feedbackTime = new Date()
     // 自动生成报工单号
     await generateCode()
   }

From 05f43f91ab04c11bd24755e560a83d263e3a9651 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Wed, 15 Apr 2026 14:29:24 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E2=9C=A8=20feat(mes):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=AE=A1=E9=87=8F=E5=8D=95=E4=BD=8D=E5=90=8D=E7=A7=B0=E5=88=B0?=
 =?UTF-8?q?=E7=94=9F=E4=BA=A7=E4=BB=BB=E5=8A=A1=E5=93=8D=E5=BA=94=E5=AF=B9?=
 =?UTF-8?q?=E8=B1=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/pro/feedback/FeedbackForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/mes/pro/feedback/FeedbackForm.vue b/src/views/mes/pro/feedback/FeedbackForm.vue
index 427893cce..0a8485f6d 100644
--- a/src/views/mes/pro/feedback/FeedbackForm.vue
+++ b/src/views/mes/pro/feedback/FeedbackForm.vue
@@ -424,7 +424,7 @@ const handleTaskChange = async (task: any) => {
   productInfo.value = {
     itemCode: task.itemCode || '',
     itemName: task.itemName || '',
-    unitMeasureName: '',
+    unitMeasureName: task.unitMeasureName || '',
     itemSpecification: task.itemSpecification || ''
   }
   await loadCheckFlag(task.routeId, task.processId)

From 378965d82f82ead9f0ab19710c744aa5cc7ff513 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Wed, 15 Apr 2026 19:22:14 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=F0=9F=8E=A8=20style(mes):=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E6=A8=A1=E6=9D=BF=E6=A0=BC=E5=BC=8F=E5=92=8C=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E6=8E=92=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/wm/barcode/config/index.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/views/mes/wm/barcode/config/index.vue b/src/views/mes/wm/barcode/config/index.vue
index 7a28a3146..52744e025 100644
--- a/src/views/mes/wm/barcode/config/index.vue
+++ b/src/views/mes/wm/barcode/config/index.vue
@@ -1,5 +1,8 @@
 <template>
-  <doc-alert title="【仓库】仓库与库区库位、条码赋码、SN码" url="https://doc.iocoder.cn/mes/wm/warehouse-setup/" />
+  <doc-alert
+    title="【仓库】仓库与库区库位、条码赋码、SN码"
+    url="https://doc.iocoder.cn/mes/wm/warehouse-setup/"
+  />
 
   <ContentWrap>
     <!-- 搜索工作栏 -->
@@ -57,8 +60,7 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <el-table v-loading="loading" :data="list">
-      :show-overflow-tooltip="true"
+    <el-table v-loading="loading" :data="list" :show-overflow-tooltip="true">
       <el-table-column label="编号" align="center" key="id" prop="id" width="100" />
       <el-table-column label="条码格式" align="center" key="format" prop="format" width="100">
         <template #default="scope">

From 0a96738cfbc240a8ecb8929ee32dcca804e22d90 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Thu, 16 Apr 2026 19:27:01 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E2=9C=A8=20feat(mes):=20=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=20MES=20=E7=8A=B6=E6=80=81=E5=B8=B8=E9=87=8F=E5=92=8C=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E6=9E=9A=E4=B8=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

将 MES 设备维护记录状态枚举中的状态值更新为常量引用，增强代码可读性和一致性。同时，新增 MES 单据状态常量，简化状态管理。
---
 src/views/mes/pro/feedback/FeedbackForm.vue   |  4 +--
 .../mes/pro/task/components/ProTaskSelect.vue |  2 +-
 src/views/mes/qc/ipqc/IpqcForm.vue            |  4 +--
 src/views/mes/utils/constants.ts              | 32 +++++++++----------
 4 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/src/views/mes/pro/feedback/FeedbackForm.vue b/src/views/mes/pro/feedback/FeedbackForm.vue
index 0a8485f6d..33273dc35 100644
--- a/src/views/mes/pro/feedback/FeedbackForm.vue
+++ b/src/views/mes/pro/feedback/FeedbackForm.vue
@@ -62,9 +62,7 @@
               :workOrderId="formData.workOrderId"
               :workstationId="formData.workstationId"
               :statuses="[
-                MesProTaskStatusEnum.NORMAL,
-                MesProTaskStatusEnum.START,
-                MesProTaskStatusEnum.PAUSE
+                MesProTaskStatusEnum.PREPARE
               ]"
               :disabled="isHeaderReadonly || !formData.workOrderId"
               placeholder="请选择任务"
diff --git a/src/views/mes/pro/task/components/ProTaskSelect.vue b/src/views/mes/pro/task/components/ProTaskSelect.vue
index 550a6bd08..a0b52f96e 100644
--- a/src/views/mes/pro/task/components/ProTaskSelect.vue
+++ b/src/views/mes/pro/task/components/ProTaskSelect.vue
@@ -69,7 +69,7 @@ const props = withDefaults(
     workOrderId?: number // 可选，打开弹窗时默认按此工单过滤
     workstationId?: number // 可选，打开弹窗时默认按此工位过滤
     statuses?: number[] // 可选，任务状态列表（IN 查询）
-    disabled?: boolean // 是否禁用
+    m?: boolean // 是否禁用
     clearable?: boolean // 是否允许清空
     placeholder?: string // 占位文字
   }>(),
diff --git a/src/views/mes/qc/ipqc/IpqcForm.vue b/src/views/mes/qc/ipqc/IpqcForm.vue
index 921cf9e56..c7e427db4 100644
--- a/src/views/mes/qc/ipqc/IpqcForm.vue
+++ b/src/views/mes/qc/ipqc/IpqcForm.vue
@@ -90,9 +90,7 @@
               :workOrderId="formData.workOrderId"
               :workstationId="formData.workstationId"
               :statuses="[
-                MesProTaskStatusEnum.NORMAL,
-                MesProTaskStatusEnum.START,
-                MesProTaskStatusEnum.PAUSE
+                MesProTaskStatusEnum.PREPARE
               ]"
               placeholder="请选择生产任务"
               class="!w-1/1"
diff --git a/src/views/mes/utils/constants.ts b/src/views/mes/utils/constants.ts
index 30c478eed..7eab07311 100644
--- a/src/views/mes/utils/constants.ts
+++ b/src/views/mes/utils/constants.ts
@@ -1,3 +1,13 @@
+/** MES 单据状态常量 */
+export const MesOrderStatusConstants = {
+  DRAFT: 0,
+  CONFIRMED: 1,
+  APPROVING: 2,
+  APPROVED: 3,
+  FINISHED: 4,
+  CANCELLED: 5
+} as const
+
 /** MES 工具状态枚举 */
 export const MesToolStatusEnum = {
   STORE: 1, // 在库
@@ -89,11 +99,9 @@ export const MesProWorkOrderSourceTypeEnum = {
 
 /** MES 生产任务状态枚举 */
 export const MesProTaskStatusEnum = {
-  NORMAL: 0, // 草稿
-  START: 1, // 进行中
-  PAUSE: 2, // 暂停
-  FINISHED: 3, // 已完成
-  CANCELED: 4 // 已取消
+  PREPARE: MesOrderStatusConstants.DRAFT, // 草稿
+  FINISHED: MesOrderStatusConstants.FINISHED, // 已完成
+  CANCELED: MesOrderStatusConstants.CANCELLED // 已取消
 }
 
 /** MES 点检保养项目类型枚举（对应字典 mes_dv_subject_type） */
@@ -110,8 +118,8 @@ export const MesDvCheckPlanStatusEnum = {
 
 /** MES 设备保养记录状态枚举 */
 export const MesDvMaintenRecordStatusEnum = {
-  PREPARE: 0, // 草稿
-  SUBMITTED: 1 // 已提交
+  PREPARE: MesOrderStatusConstants.DRAFT, // 草稿
+  SUBMITTED: MesOrderStatusConstants.FINISHED // 已提交
 }
 
 /** MES 设备保养明细结果枚举（对应字典 mes_mainten_status） */
@@ -176,16 +184,6 @@ export const MesQcTypeEnum = {
   RQC: 4 // 退货检验
 }
 
-/** MES 单据状态常量 */
-export const MesOrderStatusConstants = {
-  DRAFT: 0,
-  CONFIRMED: 1,
-  APPROVING: 2,
-  APPROVED: 3,
-  FINISHED: 4,
-  CANCELLED: 5
-} as const
-
 /** MES 维修工单状态枚举 */
 export const MesDvRepairStatusEnum = {
   PREPARE: MesOrderStatusConstants.DRAFT, // 草稿

From a839dd6fa5b59260571445b181af37b2d78faa02 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 17 Apr 2026 22:10:14 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E2=9C=A8=20feat(mes):=20=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=20MES=20=E7=8A=B6=E6=80=81=E5=B8=B8=E9=87=8F=E5=92=8C=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E6=9E=9A=E4=B8=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

将 MES 设备维护记录状态枚举中的状态值更新为常量引用，增强代码可读性和一致性。同时，新增 MES 单据状态常量，简化状态管理。
---
 src/views/system/user/components/UserSelectDialogV2.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/system/user/components/UserSelectDialogV2.vue b/src/views/system/user/components/UserSelectDialogV2.vue
index d01617a47..dfc9ec623 100644
--- a/src/views/system/user/components/UserSelectDialogV2.vue
+++ b/src/views/system/user/components/UserSelectDialogV2.vue
@@ -1,8 +1,8 @@
 <!--
   系统用户弹窗选择器（V2，支持单选/多选）
 
-  对齐 MdVendorSelectDialog 架构模式 + KTG userSelect 左侧部门树
-  搜索字段 & 展示字段对齐 KTG userSelect：用户名称、用户昵称、部门、手机号码
+  对齐 MdVendorSelectDialog 架构模式 + userSelect 左侧部门树
+  搜索字段 & 展示字段：用户名称、用户昵称、部门、手机号码
 
   Props:
     multiple — true 多选（checkbox），false 单选（radio）；默认 true