From 2e00975d53ba92c8a0dd4ebc0a9bdaaa8933fb69 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, 24 Jun 2021 01:07:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=8F=E5=88=97=E5=8F=B7=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/system/modules/SerialNumberBatchModal.vue    | 10 ++++++++--
 .../src/views/system/modules/SerialNumberModal.vue     |  5 ++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/jshERP-web/src/views/system/modules/SerialNumberBatchModal.vue b/jshERP-web/src/views/system/modules/SerialNumberBatchModal.vue
index bd3339eb..d570ce4c 100644
--- a/jshERP-web/src/views/system/modules/SerialNumberBatchModal.vue
+++ b/jshERP-web/src/views/system/modules/SerialNumberBatchModal.vue
@@ -15,10 +15,10 @@
           <a-input placeholder="请输入序列号前缀" v-decorator.trim="[ 'serialNumberPrefix', validatorRules.serialNumberPrefix]" />
         </a-form-item>
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="序列号数量">
-          <a-input placeholder="请输入序列号数量" v-decorator.trim="[ 'batAddTotal' ]" />
+          <a-input placeholder="请输入序列号数量" v-decorator.trim="[ 'batAddTotal', validatorRules.batAddTotal]" />
         </a-form-item>
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="商品条码">
-          <j-select-serial-material v-decorator="[ 'materialCode' ]" :multi="false" @change="onInputChange"/>
+          <j-select-serial-material v-decorator="[ 'materialCode', validatorRules.materialCode]" :multi="false" @change="onInputChange"/>
         </a-form-item>
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="商品名称">
           <a-input v-decorator="[ 'materialName' ]" :readOnly="true"/>
@@ -62,6 +62,12 @@
               { required: true, message: '请输入序列号前缀!' },
               { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' }
             ]
+          },
+          batAddTotal:{
+            rules: [{ required: true, message: '请输入序列号数量!' }]
+          },
+          materialCode:{
+            rules: [{ required: true, message: '请选择商品条码!' }]
           }
         }
       }
diff --git a/jshERP-web/src/views/system/modules/SerialNumberModal.vue b/jshERP-web/src/views/system/modules/SerialNumberModal.vue
index 47c88031..52903d3a 100644
--- a/jshERP-web/src/views/system/modules/SerialNumberModal.vue
+++ b/jshERP-web/src/views/system/modules/SerialNumberModal.vue
@@ -20,7 +20,7 @@
           <a-input placeholder="请输入序列号" v-decorator.trim="[ 'serialNumber', validatorRules.serialNumber]" />
         </a-form-item>
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="商品条码">
-          <j-select-serial-material v-decorator="[ 'materialCode' ]" :multi="false" @change="onInputChange"/>
+          <j-select-serial-material v-decorator="[ 'materialCode', validatorRules.materialCode]" :multi="false" @change="onInputChange"/>
         </a-form-item>
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="商品名称">
           <a-input v-decorator="[ 'materialName' ]" :readOnly="true"/>
@@ -66,6 +66,9 @@
               { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' },
               { validator: this.validateSerialNumberName}
             ]
+          },
+          materialCode:{
+            rules: [{ required: true, message: '请选择商品条码!' }]
           }
         }
       }