From 88bf94a81836edf969e98767568c8e0be69de974 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Fri, 18 Jun 2021 23:13:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=95=86=E5=93=81=E6=9D=A1?=
 =?UTF-8?q?=E7=A0=81=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/jshERP-web/src/views/material/modules/MaterialModal.vue b/jshERP-web/src/views/material/modules/MaterialModal.vue
index e4fadff1..0bca8d47 100644
--- a/jshERP-web/src/views/material/modules/MaterialModal.vue
+++ b/jshERP-web/src/views/material/modules/MaterialModal.vue
@@ -189,7 +189,9 @@
           columns: [
             {
               title: '条码', key: 'barCode', width: '30%', type: FormTypes.input, defaultValue: '', placeholder: '请输入${title}',
-              validateRules: [{ required: true, message: '${title}不能为空' }]
+              validateRules: [{ required: true, message: '${title}不能为空' },
+                { pattern: /^[1-9]\d*$/, message: '请输入零以上的正整数' },
+                { pattern: /^\d{4,13}$/, message: '4到13位数字' }]
             },
             {
               title: '单位', key: 'commodityUnit', width: '12%', type: FormTypes.input, defaultValue: '', placeholder: '请输入${title}',
diff --git a/jshERP-web/src/views/system/modules/SystemConfigModal.vue b/jshERP-web/src/views/system/modules/SystemConfigModal.vue
index ca6ac79b..19d9a0f9 100644
--- a/jshERP-web/src/views/system/modules/SystemConfigModal.vue
+++ b/jshERP-web/src/views/system/modules/SystemConfigModal.vue
@@ -36,15 +36,15 @@
         </a-form-item>
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="仓库权限">
           <a-switch checked-children="启用" un-checked-children="关闭" v-model="depotFlagSwitch" @change="onDepotChange"></a-switch>
-          （如果启用则需要到用户列表配置）
+          （如果启用则需要到<b>用户管理</b>进行<b>分配仓库</b>）
         </a-form-item>
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="客户权限">
           <a-switch checked-children="启用" un-checked-children="关闭" v-model="customerFlagSwitch" @change="onCustomerChange"></a-switch>
-          （如果启用则需要到用户列表配置）
+          （如果启用则需要到<b>用户管理</b>进行<b>分配客户</b>）
         </a-form-item>
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="负库存">
           <a-switch checked-children="启用" un-checked-children="关闭" v-model="minusStockFlagSwitch" @change="onMinusStockChange"></a-switch>
-          （如果启用则支持负库存，批次商品除外）
+          （如果启用则单据支持负库存，批次商品除外）
         </a-form-item>
       </a-form>
     </a-spin>