From fcc3f96a76d35abc14210cfcaaf4d218fd194ad3 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 14 八月 2025 20:47:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/base/FactoryManager.vue |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/views/base/FactoryManager.vue b/src/views/base/FactoryManager.vue
index 61c782a..1ed3c6c 100644
--- a/src/views/base/FactoryManager.vue
+++ b/src/views/base/FactoryManager.vue
@@ -86,7 +86,7 @@
                 </a-tree-select>
               </a-form-model-item>
               <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="鎺掑簭">
-                <a-input-number v-model="model.sorter"/>
+                <a-input-number v-model="model.sorter" style="width:100%"/>
               </a-form-model-item>
               <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="澶囨敞">
                 <a-textarea placeholder="璇疯緭鍏ュ娉�" v-model="model.remark"/>
@@ -166,7 +166,9 @@
           edges: []
         },
         validatorRules: {
-          factoryName: [{ required: true, message: '璇疯緭鍏ヤ骇绾�/杞﹂棿鍚嶇О!' }]
+          factoryCode:[{ required: true, message: '璇疯緭鍏ュ伐鍘�/杞﹂棿/浜х嚎缂栧彿!' }],
+          factoryName:[{ required: true, message: '璇疯緭鍏ュ伐鍘�/杞﹂棿/浜х嚎鍚嶇О!' }],
+          productionType:[{ required: false, message: '璇烽�夋嫨浜х嚎绫诲瀷!' }],
         },
         url: {
           delete: '/base/factory/delete',
@@ -348,6 +350,7 @@
         this.setValuesToForm(record)
         if(record.factoryCategory == '3'){
           this.$refs.userFactory.show(record.id)
+          this.validatorRules.productionType[0].required = true
         }else{
           this.$refs.userFactory.factoryId = ''
         }

--
Gitblit v1.9.3