From de7ed4a04c4a64d495e56e1bdd3fdc8065a38925 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, 5 Nov 2021 21:56:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E7=A7=9F=E6=88=B7=E7=9A=84?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81=E9=95=BF=E5=BA=A6=E6=94=B9=E4=B8=BA6?=
 =?UTF-8?q?=E4=BD=8D=EF=BC=8C=E7=BB=99=E8=AE=A2=E5=8D=95=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=8E=BB=E6=8E=89=E4=BB=93=E5=BA=93=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/bill/modules/PurchaseOrderModal.vue      |  8 --------
 jshERP-web/src/views/bill/modules/SaleOrderModal.vue   |  8 --------
 jshERP-web/src/views/user/Register.vue                 | 10 +++++-----
 3 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
index 349f1078..f5fb1f36 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
@@ -61,11 +61,6 @@
           @valueChange="onValueChange"
           @deleted="onDeleted">
           <template #buttonAfter>
-            <a-row :gutter="24" style="float:left;width:140px;">
-              <a-col :md="24" :sm="24">
-                <a-button icon="plus" @click="addDepot">新增仓库</a-button>
-              </a-col>
-            </a-row>
             <a-row :gutter="24" style="float:left;" data-step="3" data-title="扫码录入" data-intro="此功能支持扫码枪扫描商品条码进行录入">
               <a-col v-if="scanStatus" :md="6" :sm="24">
                 <a-button @click="scanEnter">扫码录入</a-button>
@@ -96,13 +91,11 @@
       </a-form>
     </a-spin>
     <vendor-modal ref="vendorModalForm" @ok="vendorModalFormOk"></vendor-modal>
-    <depot-modal ref="depotModalForm" @ok="depotModalFormOk"></depot-modal>
   </j-modal>
 </template>
 <script>
   import pick from 'lodash.pick'
   import VendorModal from '../../system/modules/VendorModal'
-  import DepotModal from '../../system/modules/DepotModal'
   import { FormTypes } from '@/utils/JEditableTableUtil'
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import { BillModalMixin } from '../mixins/BillModalMixin'
@@ -115,7 +108,6 @@
     mixins: [JEditableTableMixin,BillModalMixin],
     components: {
       VendorModal,
-      DepotModal,
       JUpload,
       JDate,
       VNodes: {
diff --git a/jshERP-web/src/views/bill/modules/SaleOrderModal.vue b/jshERP-web/src/views/bill/modules/SaleOrderModal.vue
index 2210955b..32be71e4 100644
--- a/jshERP-web/src/views/bill/modules/SaleOrderModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleOrderModal.vue
@@ -67,11 +67,6 @@
           @valueChange="onValueChange"
           @deleted="onDeleted">
           <template #buttonAfter>
-            <a-row :gutter="24" style="float:left;width:140px;">
-              <a-col :md="24" :sm="24">
-                <a-button icon="plus" @click="addDepot">新增仓库</a-button>
-              </a-col>
-            </a-row>
             <a-row :gutter="24" style="float:left;" data-step="4" data-title="扫码录入" data-intro="此功能支持扫码枪扫描商品条码进行录入">
               <a-col v-if="scanStatus" :md="6" :sm="24">
                 <a-button @click="scanEnter">扫码录入</a-button>
@@ -102,13 +97,11 @@
       </a-form>
     </a-spin>
     <customer-modal ref="customerModalForm" @ok="customerModalFormOk"></customer-modal>
-    <depot-modal ref="depotModalForm" @ok="depotModalFormOk"></depot-modal>
   </j-modal>
 </template>
 <script>
   import pick from 'lodash.pick'
   import CustomerModal from '../../system/modules/CustomerModal'
-  import DepotModal from '../../system/modules/DepotModal'
   import { FormTypes } from '@/utils/JEditableTableUtil'
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import { BillModalMixin } from '../mixins/BillModalMixin'
@@ -122,7 +115,6 @@
     mixins: [JEditableTableMixin, BillModalMixin],
     components: {
       CustomerModal,
-      DepotModal,
       JUpload,
       JDate,
       JSelectMultiple,
diff --git a/jshERP-web/src/views/user/Register.vue b/jshERP-web/src/views/user/Register.vue
index f41f625c..37f6c76e 100644
--- a/jshERP-web/src/views/user/Register.vue
+++ b/jshERP-web/src/views/user/Register.vue
@@ -14,20 +14,20 @@
             <div :class="['user-register', passwordLevelClass]">强度：<span>{{ passwordLevelName }}</span></div>
             <a-progress :percent="state.percent" :showInfo="false" :strokeColor=" passwordLevelColor "/>
             <div style="margin-top: 10px;">
-              <span>请至少输入 8 个字符。请不要使用容易被猜到的密码。</span>
+              <span>请至少输入 6 个字符。请不要使用容易被猜到的密码。</span>
             </div>
           </div>
         </template>
         <a-form-item
           fieldDecoratorId="password"
           :fieldDecoratorOptions="{rules: [{ required: false}, { validator: this.handlePasswordLevel }], validateTrigger: ['change', 'blur'], validateFirst: true}">
-          <a-input size="large" type="password" @click="handlePasswordInputClick" autocomplete="false" placeholder="至少8位密码，区分大小写"></a-input>
+          <a-input size="large" type="password" @click="handlePasswordInputClick" autocomplete="false" placeholder="至少6位密码，区分大小写"></a-input>
         </a-form-item>
       </a-popover>
 
       <a-form-item
         fieldDecoratorId="password2"
-        :fieldDecoratorOptions="{rules: [{ required: true, message: '至少8位密码，区分大小写' }, { validator: this.handlePasswordCheck }], validateTrigger: ['change', 'blur'], validateFirst: true}">
+        :fieldDecoratorOptions="{rules: [{ required: true, message: '至少6位密码，区分大小写' }, { validator: this.handlePasswordCheck }], validateTrigger: ['change', 'blur'], validateFirst: true}">
 
         <a-input size="large" type="password" autocomplete="false" placeholder="确认密码"></a-input>
       </a-form-item>
@@ -163,9 +163,9 @@
       handlePasswordLevel(rule, value, callback) {
 
         let level = 0
-        let reg = /^(?=.*[a-z])(?=.*\d).{8,}$/;
+        let reg = /^(?=.*[a-z])(?=.*\d).{6,}$/;
         if (!reg.test(value)) {
-          callback(new Error('密码由8位数字、小写字母组成!'))
+          callback(new Error('密码由6位数字、小写字母组成!'))
         }
         // 判断这个字符串中有没有数字
         if (/[0-9]/.test(value)) {