From 1e5f56b54b1ff29b9e912aec721ec59362e0d6fa Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 15 Mar 2026 09:22:05 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(mes):=20=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?=E5=8D=95=E4=BD=8D=E7=BC=96=E5=8F=B7=E5=AD=97=E6=AE=B5=EF=BC=8C?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B7=A5=E5=8D=95=E8=AF=B7=E6=B1=82=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/pro/workorder/index.ts            |  1 -
 .../mes/pro/workorder/WorkOrderBomList.vue    |  5 ++---
 src/views/mes/pro/workorder/WorkorderForm.vue | 18 +++++-------------
 src/views/mes/pro/workorder/index.vue         | 19 ++++++++-----------
 4 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/src/api/mes/pro/workorder/index.ts b/src/api/mes/pro/workorder/index.ts
index 18999082e..7039aeb38 100644
--- a/src/api/mes/pro/workorder/index.ts
+++ b/src/api/mes/pro/workorder/index.ts
@@ -12,7 +12,6 @@ export interface ProWorkOrderVO {
   productName: string // 产品名称
   productCode: string // 产品编码
   productSpec: string // 规格型号
-  unitMeasureId: number // 单位编号
   unitMeasureName: string // 单位名称
   quantity: number // 生产数量
   quantityProduced: number // 已生产数量
diff --git a/src/views/mes/pro/workorder/WorkOrderBomList.vue b/src/views/mes/pro/workorder/WorkOrderBomList.vue
index e8477c8ad..4fc059fe7 100644
--- a/src/views/mes/pro/workorder/WorkOrderBomList.vue
+++ b/src/views/mes/pro/workorder/WorkOrderBomList.vue
@@ -87,8 +87,7 @@ const props = defineProps<{
   disabled?: boolean
 }>()
 
-// generate-work-order：通知 WorkOrderForm 用 BOM 行的物料作为产品，新建子工单
-const emit = defineEmits(['generate-work-order'])
+const emit = defineEmits(['generate-work-order']) // generate-work-order：通知 WorkOrderForm 用 BOM 行的物料作为产品，新建子工单
 
 const message = useMessage()
 const { t } = useI18n()
@@ -179,7 +178,7 @@ const submitForm = async () => {
   }
 }
 
-// ==================== 初始化 ====================
+/** 初始化 **/
 onMounted(async () => {
   await getBomList()
 })
diff --git a/src/views/mes/pro/workorder/WorkorderForm.vue b/src/views/mes/pro/workorder/WorkorderForm.vue
index 241d68247..d509e45cb 100644
--- a/src/views/mes/pro/workorder/WorkorderForm.vue
+++ b/src/views/mes/pro/workorder/WorkorderForm.vue
@@ -77,7 +77,6 @@
             <MdItemSelect
               v-model="formData.productId"
               :disabled="isDetail"
-              @change="handleProductChange"
             />
           </el-form-item>
         </el-col>
@@ -175,7 +174,6 @@
 <script setup lang="ts">
 import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
 import { ProWorkOrderApi, ProWorkOrderVO } from '@/api/mes/pro/workorder'
-import { MdItemVO } from '@/api/mes/md/item'
 import { generateRandomStr } from '@/utils'
 import MdItemSelect from '@/views/mes/md/item/components/MdItemSelect.vue'
 import MdClientSelect from '@/views/mes/md/client/components/MdClientSelect.vue'
@@ -203,7 +201,6 @@ const formData = ref({
   orderSourceType: undefined,
   orderSourceCode: undefined,
   productId: undefined,
-  unitMeasureId: undefined,
   quantity: undefined,
   clientId: undefined,
   vendorId: undefined,
@@ -234,7 +231,11 @@ const generateCode = () => {
 /** 打开弹窗 */
 const open = async (type: string, id?: number, parentRow?: any) => {
   dialogVisible.value = true
-  dialogTitle.value = parentRow ? '新增子工单' : type === 'detail' ? '工单详情' : t('action.' + type)
+  dialogTitle.value = parentRow
+    ? '新增子工单'
+    : type === 'detail'
+      ? '工单详情'
+      : t('action.' + type)
   formType.value = type
   activeTab.value = 'bom'
   resetForm()
@@ -277,19 +278,11 @@ const handleGenerateWorkOrder = (bomRow: any) => {
   formData.value.vendorId = currentWorkOrder.vendorId
   formData.value.requestDate = currentWorkOrder.requestDate
   formData.value.productId = bomRow.itemId
-  formData.value.unitMeasureId = bomRow.unitMeasureId
   formData.value.quantity = bomRow.quantity
 }
 
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
-/** 产品变更：自动填充单位 */
-const handleProductChange = (product: MdItemVO) => {
-  if (product?.unitMeasureId) {
-    formData.value.unitMeasureId = product.unitMeasureId
-  }
-}
-
 /** 工单来源变更：非客户订单时清空来源单据编号 */
 watch(
   () => formData.value.orderSourceType,
@@ -342,7 +335,6 @@ const resetForm = () => {
     orderSourceType: undefined,
     orderSourceCode: undefined,
     productId: undefined,
-    unitMeasureId: undefined,
     quantity: undefined,
     clientId: undefined,
     vendorId: undefined,
diff --git a/src/views/mes/pro/workorder/index.vue b/src/views/mes/pro/workorder/index.vue
index 5863ae132..3373c6ab5 100644
--- a/src/views/mes/pro/workorder/index.vue
+++ b/src/views/mes/pro/workorder/index.vue
@@ -95,7 +95,13 @@
       default-expand-all
       :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
     >
-      <el-table-column label="工单编码" align="center" prop="code" width="140" />
+      <el-table-column label="工单编码" prop="code" width="220" fixed="left">
+        <template #default="scope">
+          <el-button link type="primary" @click="openForm('detail', scope.row.id)">
+            {{ scope.row.code }}
+          </el-button>
+        </template>
+      </el-table-column>
       <el-table-column label="工单名称" align="center" prop="name" min-width="150" />
       <el-table-column label="工单类型" align="center" prop="type" width="100">
         <template #default="scope">
@@ -140,7 +146,7 @@
         :formatter="dateFormatter"
         width="180"
       />
-      <el-table-column label="操作" align="center" width="240" fixed="right">
+      <el-table-column label="操作" align="center" width="200" fixed="right">
         <template #default="scope">
           <!-- 草稿状态：编辑、确认、删除 -->
           <template v-if="scope.row.status === MesProWorkOrderStatusEnum.PREPARE">
@@ -201,15 +207,6 @@
               取消
             </el-button>
           </template>
-          <!-- 所有状态：详情 -->
-          <el-button
-            link
-            type="primary"
-            @click="openForm('detail', scope.row.id)"
-            v-hasPermi="['mes:pro-work-order:query']"
-          >
-            详情
-          </el-button>
           <!-- 工单条码 -->
           <!-- TODO @芋艿：这里应该是打印；后面在跟进把； -->
           <el-button