Merge branch 'dev' of licailing/zhirongip into master

src/main/zhi-rong-web/src/components/PersonalInfos.vue

@@ -96,11 +96,15 @@ export default {
                                 const reg = /^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/;
                                 if (!reg.test(value) && value != '') {
                                     callback(new Error('请输入正确的身份证号'));
+                                } else {
+                                    callback();
                                 }
                             } else {
                                 var reg = /^[\u4E00-\u9FA5](字第)([0-9a-zA-Z]{4,8})(号?)$/;
                                 if (reg.test(value) === false) {
                                     callback(new Error('军官证号不合规'));
+                                } else {
+                                    callback();
                                 }
                             }
                         }

src/main/zhi-rong-web/src/components/popup/Message.vue

@@ -98,11 +98,15 @@ export default {
                                 const reg = /^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/;
                                 if (!reg.test(value) && value != '') {
                                     callback(new Error('请输入正确的身份证号'));
+                                } else {
+                                    callback();
                                 }
                             } else {
                                 var reg = /^[\u4E00-\u9FA5](字第)([0-9a-zA-Z]{4,8})(号?)$/;
                                 if (reg.test(value) === false) {
                                     callback(new Error('军官证号不合规'));
+                                } else {
+                                    callback();
                                 }
                             }
                         }
@@ -139,11 +143,9 @@ export default {
         });
     },
     methods: {
-        // change(e) {
-        //     this.formData.documentNumber = '';
-        // },
         onSave() {
             this.$refs.form.validate(valid => {
+                console.log(valid);
                 if (valid) {
                     this.submit();
                 } else {