修改数据赋值，统一信用代码验证

pages/user/mycertinfo/orgverify.vue

@@ -36,7 +36,7 @@
     <!-- step 2 -->
     <view class="vfbox" :class=" step===2 ? 'step_show' : 'step_none' ">
       <view class="form-item">
-        <input class="form-item--input" v-model="Organizationcode" maxlength="18" placeholder="统一社会信用代码"/>
+        <input class="form-item--input" v-model="formData.Organizationcode" maxlength="18" placeholder="统一社会信用代码"/>
       </view>
       <view class="vfbtn">
         <button @click="chkinput()">下一步</button>
@@ -136,6 +136,9 @@
         <uni-forms-item class="form-item" label="法人证件号" name="legalsIdnum" required>
           <uni-easyinput type="text" v-model="formData.legalsIdnum" placeholder="请输入法人证件号" />
         </uni-forms-item>
+        <uni-forms-item class="form-item" label="统一社会信用代码" name="Organizationcode" required>
+          <uni-easyinput type="text" v-model="formData.Organizationcode" placeholder="请输入统一社会信用代码" />
+        </uni-forms-item>
         <uni-forms-item class="form-item" label="营业执照有效期" name="licenseDate" required>
           <picker mode="date" :value="formData.licenseDate" :start="startDate" :end="endDate" @change="bindDateChange2">
             <view class="uni-input" >{{formData.licenseDate !== "" ? formData.licenseDate : dateStr}}</view>
@@ -279,13 +282,13 @@ export default {
     return {
       step: 1, // 步骤
       vfindex: 0, // 机构行业
-      Organizationcode: "", // 统一社会信用代码
       sfval: 10, // 选择身份
       jfr_entfile:[], // 经办人授权委托书
       jfr_idafile:[], // 经办人身份证（正）
       jfr_idbfile:[], // 经办人身份证（反）
       // 提交数据表单
       formData: {
+        Organizationcode: "", // 统一社会信用代码
         managerName: '', // 经办人姓名
         managerIdnum: '', // 经办人身份证号
         jfr_entfile: '', // 经办人授权委托书url
@@ -403,6 +406,14 @@ export default {
             errorMessage: '法人证件号不能为空'
           }]
         },
+        Organizationcode: {
+          rules: [
+            {
+              required: true,
+              errorMessage: '统一社会信用代码不能为空'
+            }
+          ]
+        },
         licenseDate: {
           rules: [{
             required: true,
@@ -563,6 +574,7 @@ export default {
     this.getIndustList()
     this.getCertiauditList()
     this.getSelectCertificationFee()
+    this.listLibrary()
   },
   computed: {
     startDate() {
@@ -631,6 +643,45 @@ export default {
     }
   },
   methods: {
+    // 获取初始认证过数据
+    listLibrary() {
+      const app = this
+      let accountId = returnAccountId()
+      return new Promise((resolve, reject) => {
+        VerifyApi.listLibrary(accountId)
+            .then(result => {
+              if (result.resultCode === "00000000") {
+                app.step = 3 // 存在历史数据直接跳过前两个步骤
+                let resData = result.data
+                if (resData.identity != '法人') {
+                  app.formData.managerName = resData.managername
+                  app.formData.managerIdnum = resData.manageridnum
+                }
+                app.formData.Organizationcode = resData.uscc
+                app.formData.name = resData.name
+                app.formData.regionStr = resData.regioncity + ' ' + resData.regiondistrict + ' ' + resData.regionprovince
+                app.formData.address = resData.address
+                app.formData.establishDate = resData.establishdate
+                app.formData.desc = resData.desc
+                app.formData.legalsName = resData.legalsname
+                app.formData.legalsType = resData.legalstype
+                app.formData.legalsIdnum = resData.legalsidnum
+                app.formData.licenseDate = resData.licensedate
+                app.formData.legalsCellPhone = resData.legalscellphone
+                app.formData.publicAccount = resData.publicaccount
+                app.formData.bankAccountName = resData.bankaccountname
+                app.formData.bankCardType = resData.bankcardtype
+                app.formData.bankName = resData.bankname
+                app.formData.bankType = resData.banktype
+                app.formData.certIdnum = resData.certidnum
+                app.formData.bankCellPhone = resData.bankcellphone
+                app.formData.industryType = resData.industrytype
+              }
+              resolve()
+            })
+            .catch(reject)
+      })
+    },
     // 身份选择
     vfselitem(item){
       this.vfindex = item
@@ -641,7 +692,7 @@ export default {
     },
     //检验统一社会信用代码
     chkinput(){
-      let Code = this.Organizationcode
+      let Code = this.formData.Organizationcode
       if(Code === ""){
         this.$toast("统一社会信用代码不能为空")
         return false
@@ -679,6 +730,7 @@ export default {
           this.step = 3
         }
       }
+      return true
     },
     // 身份选择
     selsf(val){
@@ -717,6 +769,11 @@ export default {
         VerifyApi.getIndustry()
             .then(result => {
               app.industryList = result.data
+              app.industryList.forEach(function (e,i) {
+                if (app.formData.industryType != '' && e.industryId == app.formData.industryType) {
+                  app.idIndex = i
+                }
+              })
               resolve()
             })
             .catch(reject)
@@ -967,6 +1024,11 @@ export default {
           agreementIds: "4,5,6",
           userId: accountId
         }
+        // 再次验证统一信用代码
+        let valiRes = app.chkinput()
+        if (!valiRes) {
+          return false
+        }
 
         // 注册地址
         let regionStr = app.formData.regionStr
@@ -1022,7 +1084,7 @@ export default {
           legalsname: app.formData.legalsName, //法人姓名
           legalstype: app.formData.legalsType, //法人证件类型
           legalsidnum: app.formData.legalsIdnum, //法人身份证号
-          uscc: app.Organizationcode, //统一社会信用代码
+          uscc: app.formData.Organizationcode, //统一社会信用代码
           licensedate: app.formData.licenseDate, //营业执照有效期
           legalscellphone: app.formData.legalsCellPhone, //法人手机号
           publicaccount: app.formData.publicAccount, //银行账号

pages/user/mycertinfo/personverify.vue

@@ -301,6 +301,7 @@
       // 页面初始化
       this.getCertiauditList()
       this.getSelectCertificationFee()
+      this.listLibrary()
     },
     created() {
       // 省市区选择
@@ -356,7 +357,30 @@
         // this.formData.bankStr = '请选择开户所在地省/市/区';
       }
     },
-		methods: {
+		methods: {// 获取初始认证过数据
+      listLibrary() {
+        const app = this
+        let accountId = returnAccountId()
+        return new Promise((resolve, reject) => {
+          VerifyApi.listLibrary(accountId)
+              .then(result => {
+                if (result.resultCode === "00000000") {
+                  let resData = result.data
+                  app.formData.pernalName = resData.name
+                  app.formData.pernalCard = resData.uscc
+                  app.formData.domicileStr = resData.regioncity + ' ' + resData.regiondistrict + ' ' + resData.regionprovince
+                  app.formData.pernalAddress = resData.address
+                  app.formData.pernalPhone = resData.contactscellphone
+                  app.formData.pernalEmial = resData.contactsemail
+                  app.formData.pernalBank = resData.publicaccount
+                  app.formData.pernalOpenBank = resData.bankname
+                  app.formData.peralBankPhone = resData.bankcellphone
+                }
+                resolve()
+              })
+              .catch(reject)
+        })
+      },
       // 切换城市户籍
       pickerChange(e) {
         this.domicileIndex = e.detail.value;
@@ -603,6 +627,7 @@
           let peopledata = {
             name: app.formData.pernalName, // 姓名
             uscc: app.formData.pernalCard, // 身份证号
+            avatar: '', // 头像
             regionprovince: domicileArr[0], // 户籍所在地-省
             regioncity: domicileArr[1], // 户籍所在地-市
             regiondistrict: domicileArr[2], // 户籍所在地-区