From 5c29fc17904f8d6a3839815cd3598812a0791e13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Thu, 21 Apr 2022 23:07:13 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E5=95=86=E5=93=81=E3=80=81=E4=BE=9B?=
 =?UTF-8?q?=E5=BA=94=E5=95=86=E3=80=81=E5=AE=A2=E6=88=B7=E7=AD=89=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E7=9A=84=E5=90=8D=E7=A7=B0=E6=A0=A1=E9=AA=8C=E9=95=BF?=
 =?UTF-8?q?=E5=BA=A6=E8=BF=9B=E8=A1=8C=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/material/modules/MaterialModal.vue       | 10 +++++++---
 jshERP-web/src/views/system/modules/CustomerModal.vue  |  2 +-
 jshERP-web/src/views/system/modules/MemberModal.vue    |  2 +-
 jshERP-web/src/views/system/modules/VendorModal.vue    |  2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/jshERP-web/src/views/material/modules/MaterialModal.vue b/jshERP-web/src/views/material/modules/MaterialModal.vue
index f91a5b3f..39d975a4 100644
--- a/jshERP-web/src/views/material/modules/MaterialModal.vue
+++ b/jshERP-web/src/views/material/modules/MaterialModal.vue
@@ -21,8 +21,8 @@
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
         <a-tabs default-active-key="1">
-          <a-tab-pane key="1" tab="基本信息" forceRender>
-            <a-row class="form-row" :gutter="24" id="materialHeadModal">
+          <a-tab-pane key="1" tab="基本信息" id="materialHeadModal" forceRender>
+            <a-row class="form-row" :gutter="24">
               <a-col :md="6" :sm="24">
                 <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="名称" data-step="1" data-title="名称" data-intro="名称必填，可以重复">
                   <a-input placeholder="请输入名称" v-decorator.trim="[ 'name', validatorRules.name]"/>
@@ -65,6 +65,8 @@
                   </a-row>
                 </a-form-item>
               </a-col>
+            </a-row>
+            <a-row class="form-row" :gutter="24">
               <a-col :md="6" :sm="24">
                 <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="颜色">
                   <a-input placeholder="请输入颜色" v-decorator.trim="[ 'color' ]" />
@@ -90,6 +92,8 @@
                   </a-tree-select>
                 </a-form-item>
               </a-col>
+            </a-row>
+            <a-row class="form-row" :gutter="24">
               <a-col :md="6" :sm="24">
                 <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="序列号" data-step="8" data-title="序列号"
                   data-intro="此处是商品的序列号开关，如果选择了有，则在采购入库单据需要录入该商品的序列号，在销售出库单据需要选择该商品的序列号进行出库">
@@ -396,7 +400,7 @@
           name:{
             rules: [
               { required: true, message: '请输入名称!' },
-              { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' }
+              { min: 2, max: 60, message: '长度在 2 到 60 个字符', trigger: 'blur' }
             ]
           },
           unit:{
diff --git a/jshERP-web/src/views/system/modules/CustomerModal.vue b/jshERP-web/src/views/system/modules/CustomerModal.vue
index 1e5fc184..f9545da5 100644
--- a/jshERP-web/src/views/system/modules/CustomerModal.vue
+++ b/jshERP-web/src/views/system/modules/CustomerModal.vue
@@ -116,7 +116,7 @@
           supplier:{
             rules: [
               { required: true, message: '请输入名称!' },
-              { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' },
+              { min: 2, max: 60, message: '长度在 2 到 60 个字符', trigger: 'blur' },
               { validator: this.validateSupplierName}
             ]
           }
diff --git a/jshERP-web/src/views/system/modules/MemberModal.vue b/jshERP-web/src/views/system/modules/MemberModal.vue
index 2635a771..95315546 100644
--- a/jshERP-web/src/views/system/modules/MemberModal.vue
+++ b/jshERP-web/src/views/system/modules/MemberModal.vue
@@ -76,7 +76,7 @@
           supplier:{
             rules: [
               { required: true, message: '请输入名称!' },
-              { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' },
+              { min: 2, max: 60, message: '长度在 2 到 60 个字符', trigger: 'blur' },
               { validator: this.validateSupplierName}
             ]
           }
diff --git a/jshERP-web/src/views/system/modules/VendorModal.vue b/jshERP-web/src/views/system/modules/VendorModal.vue
index 35ba659a..6b4710f7 100644
--- a/jshERP-web/src/views/system/modules/VendorModal.vue
+++ b/jshERP-web/src/views/system/modules/VendorModal.vue
@@ -116,7 +116,7 @@
           supplier:{
             rules: [
               { required: true, message: '请输入名称!' },
-              { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' },
+              { min: 2, max: 60, message: '长度在 2 到 60 个字符', trigger: 'blur' },
               { validator: this.validateSupplierName}
             ]
           }