From 31f60ca04695025363a3c9bdcfed5dd0db97fb90 Mon Sep 17 00:00:00 2001
From: git_rabbit <zhaozhengyi1b@126.com>
Date: Wed, 21 Jan 2026 12:44:56 +0800
Subject: [PATCH] =?UTF-8?q?fix(MmInventory):=20=E8=B0=83=E6=95=B4=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E5=B8=83=E5=B1=80=E5=B9=B6=E6=B7=BB=E5=8A=A0=E5=88=B6?=
 =?UTF-8?q?=E9=80=A0=E5=B7=A5=E5=8D=95=E5=8F=B7=E9=AA=8C=E8=AF=81=E8=A7=84?=
 =?UTF-8?q?=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

调整入库单和出库单对话框的表单标签宽度，从100px改为120px
为制造工单号字段添加条件显示和验证规则，采购入库时不显示且非必填
---
 .../productionMaterial/MmInventory.vue        | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/views/materialManagement/productionMaterial/MmInventory.vue b/src/views/materialManagement/productionMaterial/MmInventory.vue
index a272377..1b0aca2 100644
--- a/src/views/materialManagement/productionMaterial/MmInventory.vue
+++ b/src/views/materialManagement/productionMaterial/MmInventory.vue
@@ -130,7 +130,7 @@
 
         <!-- 入库单dialog -->
         <el-dialog :title="title" :lock-scroll="false" v-model="openStorage">
-            <el-form ref="formRef" :model="form" :rules="rules" label-width="100px">
+            <el-form ref="formRef" :model="form" :rules="rules" label-width="120px">
                 <el-row :gutter="20">
                     <el-col :lg="12">
                         <el-form-item label="物料编码" prop="materialCode">
@@ -216,7 +216,7 @@
                         </el-form-item>
                     </el-col>
 
-                    <el-col :lg="12">
+                    <el-col :lg="12" v-if="form.transactionType !== '采购入库'">
                         <el-form-item label="制造工单号" prop="workorder">
                             <el-input v-model="form.workorder" placeholder="请输入制造工单号" />
                         </el-form-item>
@@ -242,7 +242,7 @@
         </el-dialog>
         <!-- 出库单dialog -->
         <el-dialog :title="title" :lock-scroll="false" v-model="openOutStorage">
-            <el-form ref="formRef" :model="form" :rules="rulesOut" label-width="100px">
+            <el-form ref="formRef" :model="form" :rules="rulesOut" label-width="120px">
                 <el-row :gutter="20">
                     <!-- <el-col :lg="12" v-if="opertype != 1">
                         <el-form-item label="主键ID" prop="id">
@@ -809,7 +809,20 @@ const state = reactive({
         warehouseCode: [{ required: true, message: '仓库编码不能为空', trigger: 'blur' }],
         locationCode: [{ required: true, message: '库位编码不能为空', trigger: 'blur' }],
         // inboundNo: [{ required: true, message: '入库单号不能为空', trigger: 'blur' }],
-        batchNo: [{ required: true, message: '原材料批次号不能为空', trigger: 'blur' }]
+        batchNo: [{ required: true, message: '原材料批次号不能为空', trigger: 'blur' }],
+        workorder: [
+            {
+                validator: (rule, value, callback) => {
+                    // 采购入库不需要制造工单号，其他入库类型需要
+                    if (form.value.transactionType && form.value.transactionType !== '采购入库' && !value) {
+                        callback(new Error('制造工单号不能为空'))
+                    } else {
+                        callback()
+                    }
+                },
+                trigger: 'blur'
+            }
+        ]
     },
     rulesOut: {
         materialCode: [{ required: true, message: '物料编码不能为空', trigger: 'blur' }],