注册校验

Signed-off-by: lijunqing <lijunqing@dashoo.cn>

src/dashoo.cn/frontend_web/src/pages/signup.vue

@@ -52,14 +52,16 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="24">
-                  <el-form-item label="上传身份证扫描件" label-width="150px" prop="LegalPersonImg">
+                  <el-form-item label="上传身份证扫描件" label-width="150px" :prop="this.legalHaspic ? '' : 'LegalPersonImg'">
                     <el-upload action="" ref="LegalPersonUpload"
                       list-type="picture-card"
-                      :limit=this.limitNumb
+                      :limit="this.limitNumb"
                       :on-exceed="uploadExceed"
                       :http-request="uploadRequest"
                       :show-file-list="true"
-                      :before-upload="beforeUpload">
+                      :before-upload="beforeUpload"
+                      :on-success="onLegalSuccess"
+                      :on-remove="removeLegalImage">
                       <i class="el-icon-plus"></i>
                       <!-- <el-button size="small" type="primary">上传身份证扫描件<i class="el-icon-upload el-icon--right"></i></el-button> -->
                     </el-upload>
@@ -76,14 +78,16 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="24">
-                  <el-form-item label="上传身份证扫描件" label-width="150px" prop="ContactImg">
+                  <el-form-item label="上传身份证扫描件" label-width="150px" :prop="this.contactHaspic ? '' : 'ContactImg'">
                     <el-upload action="" ref="ContactUpload"
                       list-type="picture-card"
-                      :limit=this.limitNumb
+                      :limit="this.limitNumb"
                       :on-exceed="uploadExceed"
                       :http-request="uploadRequest"
                       :show-file-list="true"
-                      :before-upload="beforeUpload">
+                      :before-upload="beforeUpload"
+                      :on-success="onContactSuccess"
+                      :on-remove="removeContactImage">
                       <i class="el-icon-plus"></i>
                       <!-- <el-button size="small" type="primary">上传身份证扫描件<i class="el-icon-upload el-icon--right"></i></el-button> -->
                     </el-upload>
@@ -193,6 +197,7 @@
                 callback(new Error('该公司已被注册'));
               } 
             }
+            callback();
           }else {
             callback();
           }
@@ -202,9 +207,9 @@
         if (value === '') {
           callback(new Error('请输入统一社会信用代码'));
         } else {
-          let re4 = /^[0-9A-Z]\d{17}$/
+          let re4 = /^[^_IOZSVa-z\W]{2}\d{6}[^_IOZSVa-z\W]{10}$/g
           if (!re4.test(this.formData.CommercialNo)) {
-            callback(new Error('请填写18位统一社会信用代码'));
+            callback(new Error('请填写正确的18位统一社会信用代码'));
           } else {
            if (this.supplierNameList) {            
             for (let i = 0; i < this.supplierNameList.length; i++) {
@@ -212,6 +217,7 @@
                 callback(new Error('该统一社会信用代码与其他公司重复'));
               } 
             }
+            callback();
           }else {
             callback();
            }
@@ -243,29 +249,30 @@
         }
       };
       
-      var checkUploadLegal = (rule, value, callback) => {
-      if(this.$refs.LegalPersonUpload.uploadFiles.length > 0){
-           if (!this.checkSuccess(this.$refs.LegalPersonUpload.uploadFiles)) {
-              callback(new Error('上传照片失败，请重新上传法定代表人身份证照片'));
-            }else { 
-              callback();
-            }
-        }else{
-              callback(new Error('请上传法定代表人身份证照片'));
-        }
-      };
-
-      var checkUploadContact = (rule, value, callback) => {
-        if(this.$refs.ContactUpload.uploadFiles.length > 0){
-           if (!this.checkSuccess(this.$refs.ContactUpload.uploadFiles)) {
-              callback(new Error('上传照片失败，请重新上传联系人身份证照片'));
-            }else { 
-              callback();
-            }
-        }else{
-              callback(new Error('请上传联系人身份证照片'));
-        }
-      };
+      // var checkUploadLegal = (rule, value, callback) => {
+      // if(this.$refs.LegalPersonUpload.uploadFiles.length > 0){
+      //     if (this.checkSuccess(this.$refs.LegalPersonUpload.uploadFiles)) {
+      //       console.log("jinlaile")
+      //       callback();
+      //     }else { 
+      //       callback(new Error('上传照片失败，请重新上传法定代表人身份证照片'));
+      //     }
+      //   }else{
+      //         callback(new Error('请上传法定代表人身份证照片'));
+      //   }
+      // };
+
+      // var checkUploadContact = (rule, value, callback) => {
+      //   if(this.$refs.ContactUpload.uploadFiles.length > 0){
+      //      if (this.checkSuccess(this.$refs.ContactUpload.uploadFiles)) {
+      //         callback();
+      //       }else { 
+      //         callback(new Error('上传照片失败，请重新上传联系人身份证照片'));
+      //       }
+      //   }else{
+      //         callback(new Error('请上传联系人身份证照片'));
+      //   }
+      // };
       var userNameIsExist =  (rule, value, callback) => {
         if (value === '') {
           callback(new Error('请输入登录用户名'));
@@ -326,7 +333,10 @@
         limitNumb: 2, //文件上传限制数
         chooseAuditorVisible: false,
         userIsExist: false, //默认新用户不存在
-
+        legalHaspic: false,
+        contactHaspic: false,
+        legalImages: [],
+        contactImages: [],
         formData: {
           Id: '', //int
           UserId: '', //int
@@ -393,59 +403,60 @@
           SupplierName: [
             { required: true,
               validator: checkSupplierName,
-              trigger: 'blur'
+              trigger: 'change'
             }
           ],
           EMail: [{
             required: true,
             validator: checkemail,
-            trigger: 'blur'
+            trigger: 'change'
           }],
           CommercialNo: [
-            { required: true, validator: checkCommercialNo, trigger: 'blur' }
+            { required: true, validator: checkCommercialNo, trigger: 'change' }
           ],
           LegalPerson: [
-            { required: true, message: '请输入法定代表人姓名', trigger: 'blur' }
+            { required: true, message: '请输入法定代表人姓名', trigger: 'change' }
           ],
           LegalPersonId: [
-            { required: true, validator: checkLegalPersonId, trigger: 'blur' }
-          ],
-          LegalPersonImg: [
-            { required: true,
-              validator: checkUploadLegal,
-              trigger: 'change'
-            }
+            { required: true, validator: checkLegalPersonId, trigger: 'change' }
           ],
+        
           ContactName: [
-            { required: true, message: '请输入联系人姓名', trigger: 'blur' }
+            { required: true, message: '请输入联系人姓名', trigger: 'change' }
           ],
           ContactId: [
-            { required: true, validator: checkContactId, trigger: 'blur' }
+            { required: true, validator: checkContactId, trigger: 'change' }
+          ],
+          LegalPersonImg: [
+            { required:!this.legalHaspic,
+              message: '请上传法定代表人身份证照片',
+              trigger: 'change'
+            }
           ],
           ContactImg: [
-            { required: true,
-              validator: checkUploadContact,
-              trigger: 'blur'
+            { required:!this.ContactImg,
+              message: '请上传联系人身份证照片',
+              trigger: 'change'
             }
           ],
           UserName: [
             { required: true,
               validator: userNameIsExist,
-              trigger: 'blur'
+              trigger: 'change'
             }
           ],
          
           UserTelephone: [
-            { required: true, validator: checkUserTelephone, trigger: 'blur' }
+            { required: true, validator: checkUserTelephone, trigger: 'change' }
           ],
           UserPass: [
-            { required: true, validator: checkUserPass, trigger: 'blur' }
+            { required: true, validator: checkUserPass, trigger: 'change' }
           ],
           UserPass2: [
-            { required: true, validator: checkUserPass2, trigger: 'blur' }
+            { required: true, validator: checkUserPass2, trigger: 'change' }
           ],
           CheckUserName: [
-            { required: true, message: '请选择审核人', trigger: 'blur' }
+            { required: true, message: '请选择审核人', trigger: 'change' }
           ],
         }
       }
@@ -459,6 +470,48 @@
       ChooseAuditor
     },
     methods: {
+      //上传成功后删除校验
+      onLegalSuccess(response, file, fileList){
+        this.legalImages["file"] = fileList;
+        this.legalHaspic = true;
+        // 如果上传了就不显示提示
+        if (typeof this.legalImages.file != "undefined") {
+          if (this.legalImages.file.length > 0) {
+             this.$refs['RegisterFormData'].clearValidate("LegalPersonImg");
+          }
+        }
+      },
+      removeLegalImage(file, fileList){
+      if (typeof this.legalImages.file != "undefined") {
+        if (this.legalImages.file.length > 0) {
+          this.$refs['RegisterFormData'].clearValidate("LegalPersonImg");
+        } else {
+          this.legalHaspic = false;
+          this.$refs['RegisterFormData'].validateField("LegalPersonImg");
+         }
+       }
+      },
+     //上传成功后删除校验
+      onContactSuccess(response, file, fileList){
+        this.contactImages["file"] = fileList;
+        this.contactHaspic = true;
+        // 如果上传了就不显示提示
+        if (typeof this.contactImages.file != "undefined") {
+          if (this.contactImages.file.length > 0) {
+             this.$refs['RegisterFormData'].clearValidate("ContactImg");
+          }
+        }
+      },
+      removeContactImage(file, fileList){
+      if (typeof this.contactImages.file != "undefined") {
+        if (this.contactImages.file.length > 0) {
+          this.$refs['RegisterFormData'].clearValidate("ContactImg");
+        } else {
+          this.contactHaspic = false;
+          this.$refs['RegisterFormData'].validateField("ContactImg");
+         }
+       }
+      },
       //选择审核人
       selectOpera() {
         let _this = this
@@ -508,14 +561,13 @@
                 })
             }
         })
-      },
+    },
 
       //获取已注册的公司
       getSupplierNameList() {
         let _this = this
         _this.$axios.get('/register/getsuppliername', {})
           .then(res => {
-            console.log(res.data.items)
             _this.supplierNameList = res.data.items
           })
           .catch(err => {
@@ -531,7 +583,6 @@
         }
         _this.$axios.get('/register/usernameisexist', {params})
           .then(res => {
-            console.log(res.data.item)
             _this.userIsExist = res.data.item
           })
           .catch(err => {