From 11b0b290eb00c2584c0282872e47307ea4b14e51 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 20 Feb 2026 15:25:37 +0800
Subject: [PATCH] =?UTF-8?q?feat(mes):=20=E6=96=B0=E5=A2=9E=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=92=8C=E7=82=B9=E6=A3=80=E4=BF=9D=E5=85=BB=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E7=B2=BE=E7=AE=80=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=8F=8A=E6=89=B9=E6=AC=A1=E5=8F=B7=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/dv/machinery/index.ts             |  5 +++++
 src/api/mes/dv/subject/index.ts               |  5 +++++
 src/api/mes/pro/workorder/index.ts            |  2 ++
 src/views/mes/pro/workorder/WorkorderForm.vue | 11 +++++++++++
 src/views/mes/pro/workorder/index.vue         | 12 ++++++++++++
 src/views/mes/utils/constants.ts              |  6 ++++++
 6 files changed, 41 insertions(+)

diff --git a/src/api/mes/dv/machinery/index.ts b/src/api/mes/dv/machinery/index.ts
index 7a22bb997..8ba539d3f 100644
--- a/src/api/mes/dv/machinery/index.ts
+++ b/src/api/mes/dv/machinery/index.ts
@@ -44,6 +44,11 @@ export const DvMachineryApi = {
     return await request.delete({ url: `/mes/dv/machinery/delete?id=` + id })
   },
 
+  // 获得设备精简列表（下拉选项用）
+  getSimpleList: async () => {
+    return await request.get({ url: `/mes/dv/machinery/simple-list` })
+  },
+
   // 导出设备台账 Excel
   exportMachinery: async (params: any) => {
     return await request.download({ url: `/mes/dv/machinery/export-excel`, params })
diff --git a/src/api/mes/dv/subject/index.ts b/src/api/mes/dv/subject/index.ts
index a6cce69f0..7bf4e1095 100644
--- a/src/api/mes/dv/subject/index.ts
+++ b/src/api/mes/dv/subject/index.ts
@@ -39,6 +39,11 @@ export const DvSubjectApi = {
     return await request.delete({ url: `/mes/dv/subject/delete?id=` + id })
   },
 
+  // 获得点检保养项目精简列表（下拉选项用）
+  getSimpleList: async () => {
+    return await request.get({ url: `/mes/dv/subject/simple-list` })
+  },
+
   // 导出点检保养项目 Excel
   exportSubject: async (params: any) => {
     return await request.download({ url: `/mes/dv/subject/export-excel`, params })
diff --git a/src/api/mes/pro/workorder/index.ts b/src/api/mes/pro/workorder/index.ts
index 258e2611d..402c3d0a5 100644
--- a/src/api/mes/pro/workorder/index.ts
+++ b/src/api/mes/pro/workorder/index.ts
@@ -23,6 +23,8 @@ export interface ProWorkOrderVO {
   clientName: string // 客户名称
   vendorId: number // 供应商编号
   vendorName: string // 供应商名称
+  vendorCode: string // 供应商编码
+  batchCode: string // 批次号
   requestDate: Date // 需求日期
   parentId: number // 父工单编号
   parentCode: string // 父工单编码
diff --git a/src/views/mes/pro/workorder/WorkorderForm.vue b/src/views/mes/pro/workorder/WorkorderForm.vue
index de72828c8..241d68247 100644
--- a/src/views/mes/pro/workorder/WorkorderForm.vue
+++ b/src/views/mes/pro/workorder/WorkorderForm.vue
@@ -110,6 +110,15 @@
             <MdVendorSelect v-model="formData.vendorId" :disabled="isDetail" />
           </el-form-item>
         </el-col>
+        <el-col :span="8">
+          <el-form-item label="批次号" prop="batchCode">
+            <el-input
+              v-model="formData.batchCode"
+              placeholder="请输入批次号"
+              :disabled="isDetail"
+            />
+          </el-form-item>
+        </el-col>
         <el-col :span="8">
           <el-form-item label="需求日期" prop="requestDate">
             <el-date-picker
@@ -198,6 +207,7 @@ const formData = ref({
   quantity: undefined,
   clientId: undefined,
   vendorId: undefined,
+  batchCode: undefined,
   requestDate: undefined,
   status: undefined,
   remark: undefined
@@ -336,6 +346,7 @@ const resetForm = () => {
     quantity: undefined,
     clientId: undefined,
     vendorId: undefined,
+    batchCode: undefined,
     requestDate: undefined,
     status: undefined,
     remark: undefined
diff --git a/src/views/mes/pro/workorder/index.vue b/src/views/mes/pro/workorder/index.vue
index 3df656021..039c703a4 100644
--- a/src/views/mes/pro/workorder/index.vue
+++ b/src/views/mes/pro/workorder/index.vue
@@ -63,6 +63,15 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="批次号" prop="batchCode">
+        <el-input
+          v-model="queryParams.batchCode"
+          placeholder="请输入批次号"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
       <el-form-item label="工单状态" prop="status">
         <el-select
           v-model="queryParams.status"
@@ -148,6 +157,8 @@
       <el-table-column label="已生产数量" align="center" prop="quantityProduced" width="100" />
       <el-table-column label="客户编码" align="center" prop="clientCode" width="120" />
       <el-table-column label="客户名称" align="center" prop="clientName" width="120" />
+      <el-table-column label="供应商编码" align="center" prop="vendorCode" width="120" />
+      <el-table-column label="批次号" align="center" prop="batchCode" width="120" />
       <el-table-column
         label="需求日期"
         align="center"
@@ -282,6 +293,7 @@ const queryParams = reactive({
   clientId: undefined,
   type: undefined,
   orderSourceType: undefined,
+  batchCode: undefined,
   status: undefined,
   requestDate: undefined
 })
diff --git a/src/views/mes/utils/constants.ts b/src/views/mes/utils/constants.ts
index e20bb94fe..43c537aec 100644
--- a/src/views/mes/utils/constants.ts
+++ b/src/views/mes/utils/constants.ts
@@ -88,6 +88,12 @@ export const MesProTaskStatusEnum = {
   CANCELED: 4 // 已取消
 }
 
+/** MES 点检保养方案状态枚举 */
+export const MesDvCheckPlanStatusEnum = {
+  PREPARE: 0, // 草稿
+  ENABLED: 1 // 已启用
+}
+
 /** 获取物料/产品标识的标签 */
 export const getItemOrProductLabel = (value: string): string => {
   for (const item of Object.values(MesItemOrProductEnum)) {