From b049f1055781b322a48e4d195df6c2908854b36f Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Thu, 10 Oct 2024 00:22:00 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E7=99=BB=E5=BD=95=E5=92=8C=E6=B3=A8?=
 =?UTF-8?q?=E5=86=8C=E5=A2=9E=E5=8A=A0=E9=AA=8C=E8=AF=81=E7=A0=81=E7=9A=84?=
 =?UTF-8?q?=E5=BF=85=E5=A1=AB=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/views/user/Login.vue    |  5 +++--
 jshERP-web/src/views/user/Register.vue | 15 ++++++++++-----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/jshERP-web/src/views/user/Login.vue b/jshERP-web/src/views/user/Login.vue
index 65fd8487..678d0f5d 100644
--- a/jshERP-web/src/views/user/Login.vue
+++ b/jshERP-web/src/views/user/Login.vue
@@ -27,7 +27,7 @@
         <a-col :span="14">
           <a-form-item>
             <a-input
-              v-decorator="['inputCode']"
+              v-decorator="['inputCode',{initialValue:'', rules: validatorRules.inputCode.rules}]"
               size="large"
               type="text"
               default-value=""
@@ -111,7 +111,8 @@
         },
         validatorRules:{
           loginName:{rules: [{ required: true, message: '请输入用户名!'},{validator: this.handleLoginName}]},
-          password:{rules: [{ required: true, message: '请输入密码!',validator: 'click'}]}
+          password:{rules: [{ required: true, message: '请输入密码!',validator: 'click'}]},
+          inputCode:{rules: [{ required: true, message: '请输入验证码!',validator: 'click'}]}
         },
         verifiedCode:"",
         inputCodeContent:"", //20200510 cfm: 为方便测试，不输入验证码可 ""-->"xxxx"
diff --git a/jshERP-web/src/views/user/Register.vue b/jshERP-web/src/views/user/Register.vue
index d4528bf3..9840b051 100644
--- a/jshERP-web/src/views/user/Register.vue
+++ b/jshERP-web/src/views/user/Register.vue
@@ -35,8 +35,9 @@
 
       <a-row :gutter="0">
         <a-col :span="14">
-          <a-form-item fieldDecoratorId="inputCode">
-            <!--20200510 cfm: 为方便测试，不输入验证码可： default-value="xxxx"-->
+          <a-form-item
+            fieldDecoratorId="inputCode"
+            :fieldDecoratorOptions="{rules: [{ required: true, message: '验证码不能为空'}, { validator: this.handleInputCode}], validateTrigger: ['change', 'blur'], validateFirst: true}">
             <a-input
               size="large"
               type="text"
@@ -190,7 +191,7 @@
           if (level === 0) {
             this.state.percent = 10
           }
-          callback(new Error('密码强度不够'))
+          callback(new Error('强度不够!'))
         }
       },
 
@@ -198,10 +199,10 @@
         let password = this.form.getFieldValue('password')
         //console.log('value', value)
         if (value === undefined) {
-          callback(new Error('请输入密码'))
+          callback(new Error('请输入密码!'))
         }
         if (value && password && value.trim() !== password.trim()) {
-          callback(new Error('两次密码不一致'))
+          callback(new Error('两次密码不一致!'))
         }
         callback()
       },
@@ -214,6 +215,10 @@
         this.state.passwordLevelChecked = false
       },
 
+      handleInputCode(rule, value, callback) {
+        callback()
+      },
+
       handleSubmit() {
         let that = this
         that.registerBtn = true;