pull

src/components/authen/IndividualAuthentication.vue

@@ -3,11 +3,11 @@
     <div class="create-body">
       <div class="title">个人信息认证</div>
       <el-form :model="authentication" :rules="rules" ref="authentication" label-width="12%" class="demo-report">
-        <el-form-item label="姓名" prop="name">
+        <el-form-item label="姓名" prop="realName">
           <el-input v-if="isModifyMode" v-model="authentication.realName"></el-input>
           <span v-if="!isModifyMode">{{authentication.realName}}</span>
         </el-form-item>
-        <el-form-item prop="file" label="手持身份证照片">
+        <el-form-item prop="IDCardPhoto" label="手持身份证照片">
           <el-upload
             v-if="isModifyMode"
             class="avatar-uploader"
@@ -25,7 +25,7 @@
             fit="scale-down"></el-image>
         </span>
         </el-form-item>
-        <el-form-item label="身份证号" prop="name">
+        <el-form-item label="身份证号" prop="IDCard">
           <el-input v-if="isModifyMode" v-model="authentication.IDCard"></el-input>
           <span v-if="!isModifyMode">{{authentication.IDCard}}</span>
         </el-form-item>
@@ -39,11 +39,11 @@
           <el-link v-if="authentication.explain==null || authentication.explain==''" type="danger" disabled>管理员未填写
           </el-link>
         </el-form-item>
-        <el-form-item label="银行卡账户" prop="name">
+        <el-form-item label="银行卡账户" prop="bankAccount">
           <el-input v-if="isModifyMode" v-model="authentication.bankAccount"></el-input>
           <span v-if="!isModifyMode">{{authentication.bankAccount}}</span>
         </el-form-item>
-        <el-form-item label="地址" prop="name">
+        <el-form-item label="地址" prop="address">
           <el-input v-if="isModifyMode" v-model="authentication.address"></el-input>
           <span v-if="!isModifyMode">{{authentication.address}}</span>
         </el-form-item>
@@ -97,23 +97,20 @@ export default {
         explain: ''
       },
       rules: {
-        // name: [
-        //   {required: true, message: '请输入报告名称', trigger: 'blur'}
-        //   // { min: 3, max: 5, message: "长度在 3 到 5 个字符", trigger: "blur" }
-        // ],
-        // abstract: [
-        //   {
-        //     required: true,
-        //     message: '请输入摘要信息',
-        //     trigger: 'change'
-        //   }
-        // ],
-        // type: [
-        //   {required: true, message: '请选择报告类型', trigger: 'change'}
-        // ],
-        // conclusion: [
-        //   {required: true, message: '请输入报告结论', trigger: 'blur'}
-        // ]
+        IDCard: [
+          {required: true, message: '请输入身份证号', trigger: 'blur'},
+          {min: 18, max: 18, message: '身份证号输入有误', trigger: 'blur'}
+        ],
+        realName: [
+          {required: true, message: '请输入身份证上的姓名', trigger: 'blur'},
+        ],
+        bankAccount: [
+          {required: true, message: '请输入银行卡账户', trigger: 'blur'}
+        ],
+        address: [
+          {required: true, message: '请输入地址', trigger: 'blur'}
+        ],
+
       }
     }
   },
@@ -161,17 +158,26 @@ export default {
     //提交认证信息
     updateAuthInfo () {
       //this.isModifyMode = false
-      this.showLoading()
-      const newAuthentication = {
-        userId: this.user.userVO.id,
-        realName: this.authentication.realName,
-        bankAccount: this.authentication.bankAccount,
-        address: this.authentication.address,
-        IDCardPhoto: this.authentication.IDCardPhoto,
-        IDCard: this.authentication.IDCard,
-      }
-      //console.log(newAuthentication)
-      updateIndividualAuthInfo(this.user.userVO.id, newAuthentication, this.updateAuthInfoSuccess, this.updateAuthInfoFail)
+
+      this.$refs['authentication'].validate(valid => {
+        if (valid) {
+          this.showLoading()
+          const newAuthentication = {
+            userId: this.user.userVO.id,
+            realName: this.authentication.realName,
+            bankAccount: this.authentication.bankAccount,
+            address: this.authentication.address,
+            IDCardPhoto: this.authentication.IDCardPhoto,
+            IDCard: this.authentication.IDCard,
+          }
+          //console.log(newAuthentication)
+          updateIndividualAuthInfo(this.user.userVO.id, newAuthentication, this.updateAuthInfoSuccess, this.updateAuthInfoFail)
+        } else {
+          notify('error', '表单填写错误!')
+          return false
+        }
+      })
+
     },
     updateAuthInfoSuccess (res) {
       this.hideLoading()
@@ -201,6 +207,7 @@ export default {
     },
     //取消修改表单，表单进入不可编辑状态，不再使用
     cancelModify () {
+      this.getAuthInfo()
       this.isModifyMode = false
     },
     //上传文件时移除文件的响应函数

src/components/authen/IndividualAuthenticationCreate.vue

@@ -23,16 +23,16 @@
           <!--{{authentication.photo}}</a>-->
           <!--</div>-->
         </el-form-item>
-        <el-form-item label="身份证号" prop="name">
+        <el-form-item label="身份证号" prop="IDCard">
           <el-input size="small" v-if="isModifyMode" v-model="authentication.IDCard"></el-input>
           <!--<span v-if="!isModifyMode">{{authentication.name}}</span>-->
         </el-form-item>
 
-        <el-form-item label="银行卡账户" prop="name">
+        <el-form-item label="银行卡账户" prop="bankAccount">
           <el-input size="small" v-if="isModifyMode" v-model="authentication.bankAccount"></el-input>
           <!--<span v-if="!isModifyMode">{{authentication.bankAccount}}</span>-->
         </el-form-item>
-        <el-form-item label="地址" prop="name">
+        <el-form-item label="地址" prop="address">
           <el-input size="small" v-if="isModifyMode" v-model="authentication.address"></el-input>
           <!--<span v-if="!isModifyMode">{{authentication.address}}</span>-->
         </el-form-item>
@@ -82,23 +82,20 @@ export default {
         address: '',
       },
       rules: {
-        // name: [
-        //   {required: true, message: '请输入报告名称', trigger: 'blur'}
-        //   // { min: 3, max: 5, message: "长度在 3 到 5 个字符", trigger: "blur" }
-        // ],
-        // abstract: [
-        //   {
-        //     required: true,
-        //     message: '请输入摘要信息',
-        //     trigger: 'change'
-        //   }
-        // ],
-        // type: [
-        //   {required: true, message: '请选择报告类型', trigger: 'change'}
-        // ],
-        // conclusion: [
-        //   {required: true, message: '请输入报告结论', trigger: 'blur'}
-        // ]
+        IDCard: [
+          {required: true, message: '请输入身份证号', trigger: 'blur'},
+          {min: 18, max: 18, message: '身份证号输入有误', trigger: 'blur'}
+        ],
+        realName: [
+          {required: true, message: '请输入身份证上的姓名', trigger: 'blur'},
+        ],
+        bankAccount: [
+          {required: true, message: '请输入银行卡账户', trigger: 'blur'}
+        ],
+        address: [
+          {required: true, message: '请输入地址', trigger: 'blur'}
+        ],
+
       }
     }
   },
@@ -122,16 +119,24 @@ export default {
     //提交认证信息
     submitInfo () {
       //this.isModifyMode = false
-      this.showLoading()
-      const newAuthentication = {
-        userId: this.user.userVO.id,
-        realName: this.authentication.realName,
-        IDCard: this.authentication.IDCard,
-        IDCardPhoto: this.authentication.IDCardPhoto,
-        bankAccount: this.authentication.bankAccount,
-        address: this.authentication.address
-      }
-      uploadIndividualAuthenticationInfo(this.user.userVO.id, newAuthentication, this.submitInfoSuccess, this.submitInfoFail)
+      this.$refs['authentication'].validate(valid => {
+        if (valid) {
+          this.showLoading()
+          const newAuthentication = {
+            userId: this.user.userVO.id,
+            realName: this.authentication.realName,
+            IDCard: this.authentication.IDCard,
+            IDCardPhoto: this.authentication.IDCardPhoto,
+            bankAccount: this.authentication.bankAccount,
+            address: this.authentication.address
+          }
+          uploadIndividualAuthenticationInfo(this.user.userVO.id, newAuthentication, this.submitInfoSuccess, this.submitInfoFail)
+
+        } else {
+          notify('error', '表单填写错误!')
+          return false
+        }
+      })
     },
     submitInfoSuccess (res) {
       console.log(res)