Merge branch 'dev' of http://112.124.100.131/GFRS/ebiz-h5 into dev

src/assets/js/utils/data-dictionary.js

@@ -1179,7 +1179,7 @@ export default {
     { id: 'EAM', text: '资深部经理' },
     { id: 'AD', text: '营业总监' }
   ],
-  relationType: [{ id: '0', text: '父母' }, { id: '1', text: '配偶' }, { id: '2', text: '子女' }],
+  relationType: [{ id: '0', text: '配偶' }, { id: '1', text: '子女' }, { id: '2', text: '父母' }],
   guarantRelationType: [{ id: '0', text: '亲属' }, { id: '1', text: '朋友' }, { id: '2', text: '同事' }, { id: '3', text: '其他' }],
   classification: [{ id: '0', text: '司内' }, { id: '1', text: '司外' }],
   //入司国籍/地区

src/views/ebiz/agentEenter/AgentEenterBasicImage.vue

@@ -190,7 +190,7 @@ export default {
               }
               switch (item.subBusinessType) {
                 case '3': // 申请人
-                  this.fileListBank01 = [{ url: config.imgDomain + `/returnImageStream?a=b.jpg&imgPath=${item.rgssUrl}` }]
+                  this.fileListBank01 = [{ url: config.imgDomain + `/returnImageStream?a=b.jpg&imgPath=${item.rgssUrl}` },{ url: config.imgDomain + `/returnImageStream?a=b.jpg&imgPath=${item.rgssUrl}` }]
                   break
                 case '4': //  担保人
                   this.fileListBank06 = [{ url: config.imgDomain + `/returnImageStream?a=b.jpg&imgPath=${item.rgssUrl}` }]
@@ -289,6 +289,7 @@ export default {
 
           let obj = {
             imageInfoType: imageInfoType,
+            subBusinessType:subBusinessType,
             fileName: that.imgName,
             rgssUrl: encodeURI(res.path).replace(/\+/g, '%2B')
           }

src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue

@@ -405,6 +405,8 @@ export default {
             this.userInfo.age = idToData(this.userInfo.idNo).age
             this.userInfo.sex = idToData(this.userInfo.idNo).sex
           }
+          this.userInfo.bankName='工商银行'
+          this.userInfo.nationality='CHN'
         }
       })
     },

src/views/ebiz/agentEenter/AgentEenterBasicSuccess.vue

@@ -28,7 +28,7 @@ export default {
   methods: {
     goBack() {
       this.$jump({
-        flag: 'goBack',
+        flag: 'h5',
         extra: {
           refresh: '1',
           index: '-1'

src/views/ebiz/agentEenter/EntryProcess.vue

@@ -1,7 +1,7 @@
 <template>
-  <div class="entry-container pt60 bg-white">
+  <div class="entry-container pt60 bg-white" v-if="proces">
     <div class="ml80 w200 text-center">
-      入司申请<br /><span class="grey">{{ result.applyDate }}</span>
+      入司申请<br /><span class="grey">{{ proces.applyDate }}</span>
     </div>
     <div class="ml80 w100 flex path relative" style="flex-wrap: wrap">
       <div class="left-path flex" style="flex-direction: column">
@@ -14,17 +14,17 @@
           <div class="flex align-items-c text-center">
             <div>
               <div>自助入司资料上传</div>
-              <span v-if="result.approvalStatus == '03'" class="grey">{{ result.approvalDate }}{{ result.approvalTime }}</span>
+              <span v-if="proces.approvalStatus == '03'" class="grey">{{ proces.approvalDate }}{{ proces.approvalTime }}</span>
             </div>
-            <van-button v-if="result.approvalStatus == '01'" @click="goBaseInfo" class="ml15 ph10" plain type="primary"
+            <van-button v-if="proces.approvalStatus == '01'" @click="goBaseInfo" class="ml15 ph10" plain type="primary"
               >立即上传</van-button
             >
           </div>
         </div>
-         <!-- <div v-if="result.approvalStatus == '02'" class="h50 flex relative border-right">
+         <!-- <div v-if="proces.approvalStatus == '02'" class="h50 flex relative border-right">
           <i class="w10 h10 radius50 right-cir absolute bottom0"></i>
         </div>
-        <div v-if="result.approvalStatus == '02'" class="relative nowrap grey pv5">
+        <div v-if="proces.approvalStatus == '02'" class="relative nowrap grey pv5">
           <div class="flex align-items-c text-center">
             <div>
               <div>人员管理岗审批</div>
@@ -32,7 +32,7 @@
             </div>
           </div>
         </div> -->
-        <div v-for="(item, index) in result.trajectoryList" :key="index">
+        <div v-for="(item, index) in proces.trajectoryList" :key="index">
           <div class="h60 flex relative border-right active">
             <i class="w10 h10 radius50 right-circle absolute  bottom0"></i>
           </div>
@@ -55,19 +55,19 @@
             </div>
           </div>
         </div>
-        <div :class="['h60', 'flex', 'relative', 'border-right', result.approvalStatus == '06' || result.approvalStatus == '07' ? 'active' : '']"></div>
+        <div :class="['h60', 'flex', 'relative', 'border-right', proces.approvalStatus == '06' || proces.approvalStatus == '07' ? 'active' : '']"></div>
       </div>
       <div>
-        <!-- <div :class="['h50','w100', 'border-right', result.approvalStatus == '06'|| result.approvalStatus == '07' ? 'active' : '']"></div> -->
+        <!-- <div :class="['h50','w100', 'border-right', proces.approvalStatus == '06'|| proces.approvalStatus == '07' ? 'active' : '']"></div> -->
         <div class="text-center" style="width:400%;font-size:0">
-          <i :class="['w10', 'h10', 'relative', 'right1', 'radius50 ', 'inline-b', 'middle-circle', result.approvalStatus == '06'|| result.approvalStatus == '07' ? 'active' : '']"></i>
+          <i :class="['w10', 'h10', 'relative', 'right1', 'radius50 ', 'inline-b', 'middle-circle', proces.approvalStatus == '06'|| proces.approvalStatus == '07' ? 'active' : '']"></i>
         </div>
         <div class="nowrap text-center relative mt5" style="width:400%">
           <span>签署协议</span>
-          <div v-if="result.approvalStatus == '07'">{{ result.signDate }}</div>
-          <van-button v-if="result.approvalStatus == '06'" plain type="primary" @click="goSign" class="absolute left120 ph15">去签署</van-button>
-          <van-button v-if="result.approvalStatus == '05'" plain class="absolute left120 ph15">协议正在生成</van-button>
-          <van-button v-if="result.approvalStatus == '07'" plain type="primary" class="absolute left120 ph15" @click="seeShowPDF">查看协议</van-button>
+          <div v-if="proces.approvalStatus == '07'">{{ proces.signDate }}</div>
+          <van-button v-if="proces.approvalStatus == '06'" plain type="primary" @click="goSign" class="absolute left120 ph15">去签署</van-button>
+          <van-button v-if="proces.approvalStatus == '05'" plain class="absolute left120 ph15">协议正在生成</van-button>
+          <van-button v-if="proces.approvalStatus == '07'" plain type="primary" class="absolute left120 ph15" @click="seeShowPDF">查看协议</van-button>
         </div>
       </div>
     </div>
@@ -81,16 +81,7 @@ import { processCheck } from '@/api/ebiz/agentEenter/agentEenter'
 export default {
   data() {
     return {
-      result: {
-        approvalStatus: '07',
-        approvalDate: '2019/06/20 18:25',
-        trajectoryList: [
-          {
-            approvalStatus: '03', //0 审批中
-            approvalDate: '2019/06/20 18:25'
-          }
-        ]
-      }
+      proces: null
     }
   },
   components: {
@@ -98,7 +89,7 @@ export default {
     [Dialog.name]: Dialog
   },
   created() {
-    // this.processCheck()
+    this.processCheck()
   },
   methods: {
     processCheck() {
@@ -118,7 +109,8 @@ export default {
       processCheck(data).then(res => {
         that.$toast.clear()
         if (res.result == '0') {
-          that.result = res.content
+          that.proces = res.content
+          console.log(' that.proces', that.proces)
         } else {
           this.$toast(res.resultMessage)
         }
@@ -157,7 +149,7 @@ export default {
         }
       })
     },
-    seeShowPDF(){
+    seeShowPDF() {
       this.$jump({
         flag: 'h5',
         extra: {

src/views/ebiz/agentEenter/share/ShareInfo.vue

@@ -103,9 +103,9 @@ export default {
       valueKey: 'text',
       census: '', //户籍
       recommender: {
-        name: '推荐人姓名',
-        agentGrade: '推荐人职级',
-        unitName: '所属团队'
+        name: '--',
+        agentGrade: '--',
+        unitName: '--'
       },
       agentGrade: '',
       userInfo: {
@@ -171,7 +171,10 @@ export default {
         })
         .then(function(response) {
           self.$toast.clear()
-          if (response.data.code == 0) {
+          console.log('response', response)
+          if (response.data.code == '0') {
+            console.log('response.data.content', response.data.content)
+            if (response.data.content.result == '0') {
               self.recommender = response.data.content
               DataDictionary.agentGrade.map((item, index) => {
                 for (var key in item) {
@@ -181,6 +184,9 @@ export default {
                 }
               })
             }else{
+              this.$toast.fail(response.data.content.resultMessage)
+            }
+          } else {
             this.$toast.fail(response.data.message)
           }
         })
@@ -297,7 +303,7 @@ export default {
                 flag: 'h5',
                 extra: {
                   url: location.origin + `/#/agentEenter/ShareInfoSuccess`,
-                  forbidSwipeBack:'1'
+                  forbidSwipeBack: '1'
                 },
                 routerInfo: {
                   path: `/agentEenter/ShareInfoSuccess`