From 978a67d9f14b099612d836f103d6e959c4ab44d3 Mon Sep 17 00:00:00 2001
From: "maxw@mesnac.com" <maxw0809##>
Date: Mon, 24 Feb 2025 16:23:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=82=A8=E9=85=8D=E7=BD=AE=EF=BC=8C?=
 =?UTF-8?q?=E4=BB=93=E5=BA=93=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/baseWarehouse/index.vue | 6 +++---
 src/views/wms/configuration/index.vue | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/wms/baseWarehouse/index.vue b/src/views/wms/baseWarehouse/index.vue
index ade31eb..96e95d5 100644
--- a/src/views/wms/baseWarehouse/index.vue
+++ b/src/views/wms/baseWarehouse/index.vue
@@ -251,9 +251,9 @@ const data = reactive<PageData<BaseWarehouseForm, BaseWarehouseQuery>>({
     warehouseLocation: [
       { required: true, message: "仓库位置不能为空", trigger: "blur" }
     ],
-    workshopId: [
-      { required: true, message: "关联车间不能为空", trigger: "change" }
-    ],
+    // workshopId: [
+    //   { required: true, message: "关联车间不能为空", trigger: "change" }
+    // ],
     warehouseType: [
       { required: true, message: "仓库类型不能为空", trigger: "change" }
     ],
diff --git a/src/views/wms/configuration/index.vue b/src/views/wms/configuration/index.vue
index 760d571..6f1e719 100644
--- a/src/views/wms/configuration/index.vue
+++ b/src/views/wms/configuration/index.vue
@@ -137,7 +137,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="审批代码" prop="approveRoleCode">
+        <el-form-item label="审批代码" prop="approveRoleCode" v-if="form.approveType==2">
           <el-input v-model="form.approveRoleCode" placeholder="请输入审批代码" />
         </el-form-item>
         <el-form-item label="审批人" prop="auditBy" v-if="form.approveType==0">