Merge branch 'feature/GFRS-1198【待确定】自助入司改造（涉及销管）' into dev

# Conflicts:
#	src/assets/js/utils/request.js

src/api/ebiz/agentEenter/agentEenter.js

@@ -85,3 +85,11 @@ export function agentAddApproval(data) {
     data
   })
 }
+//入司增员审批
+export function revoke(data) {
+  return request({
+    url: getUrl('/agent/enter/revoke', 1),
+    method: 'post',
+    data
+  })
+}

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

@@ -1464,8 +1464,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: '父母' }, { id: '3', text: '无' }],
+  relationType: [{ id: '0', text: '配偶' }, { id: '1', text: '子女' }, { id: '2', text: '父母' }, { id: '3', text: '无' }],
   guarantRelationType: [{ id: '0', text: '亲属' }, { id: '1', text: '朋友' }, { id: '2', text: '同事' }, { id: '3', text: '其他' }],
   classification: [{ id: '0', text: '司内' }, { id: '1', text: '司外' }],
   //入司国籍/地区

src/assets/js/utils/request.js

@@ -11,17 +11,6 @@ let proposal = [
   '/proposal/proposal/deleteProposal'
 ] //建议书
 
-//入司
-let agentEnter = [
-  '/agent/enter/share',
-  '/agent/enter/query',
-  '/agent/enter/saveOrUpdateInfo',
-  '/agent/enter/queryAll',
-  '/agent/enter/getImpart',
-  '/agent/agreement/query',
-  '/agent/agreement/signAgreement',
-  '/agent/enter/query'
-]
 //理赔
 let claims = [
   `/claim/claimApply/progress`,
@@ -58,6 +47,18 @@ let sale = [
   '/sale/insure/selfToHuman',
   '/sale/insure/orderPayStatusQuery'
 ]
+//入司
+let agentEnter = [
+  '/agent/enter/share',
+  '/agent/enter/query',
+  '/agent/enter/saveOrUpdateInfo',
+  '/agent/enter/queryAll',
+  '/agent/enter/getImpart',
+  '/agent/agreement/query',
+  '/agent/agreement/signAgreement',
+  '/agent/enter/query',
+  '/agent/examineApprove/dispose' //入司增员审批
+]
 
 let survey = [
   //'/customer/question/getQuestionnaire', // 代理人下问卷查询 --ok

src/router/ebiz/agentEenter.js

@@ -24,6 +24,8 @@ const ApproveList = () => import('@/views/ebiz/agentEenter/approve/ApproveList')
 const BasicInfo = () => import('@/views/ebiz/agentEenter/approve/BasicInfo')
 const ApproveInfo = () => import('@/views/ebiz/agentEenter/approve/ApproveInfo')
 const SubmitSuccess = () => import('@/views/ebiz/agentEenter/approve/SubmitSuccess')
+const recordList = () => import('@/views/ebiz/agentEenter/approve/RecordList')
+const recordDetail = () => import('@/views/ebiz/agentEenter/approve/RecordDetail')
 
 export default [
   {
@@ -250,5 +252,23 @@ export default [
       title: '提交成功',
       index: 1
     }
+  },
+  {
+    path: '/agentEenter/approve/recordList',
+    name: 'recordList',
+    component: recordList,
+    meta: {
+      title: '审批记录',
+      index: 1
+    }
+  },
+  {
+    path: '/agentEenter/approve/recordDetail/:baseId',
+    name: 'recordDetail',
+    component: recordDetail,
+    meta: {
+      title: '审批详细信息',
+      index: 1
+    }
   }
 ]

src/views/ebiz/agentEenter/AgentEenterBasicImage.vue

@@ -395,6 +395,14 @@ export default {
     },
     // 下一步
     nextStep() {
+      if (this.fileListBank01.length < 2) {
+        this.$toast('您需要同时上传本人身份证正面及反面图像，请上传')
+        return
+      }
+      if (this.fileListBank06.length < 2) {
+        this.$toast('您需要同时上传担保人身份证正面及反面图像，请上传')
+        return
+      }
       let that = this
       this.$toast.loading({
         duration: 0, // 持续展示 toast

src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue

@@ -117,7 +117,7 @@
       </van-field>
       <van-field v-model="userInfo.address" label="联系地址" name="联系地址" placeholder="请输入" v-validate="'required'" required clearable />
       <!-- <van-field v-model="userInfo.zip" label="邮政编码" name="邮政编码" placeholder="请输入" v-validate="'required|zipCode'" required clearable /> -->
-      <van-field v-model="userInfo.zip" label="邮政编码" name="邮政编码" placeholder="请输入" clearable />
+      <van-field v-model="userInfo.zip" label="邮政编码" name="邮政编码" placeholder="请输入" v-validate="'zipCode'" clearable />
       <van-field :value="userInfo.bankName" label="开户银行" name="开户银行" v-validate="'required'" required readonly />
       <!-- @click="focus"
         right-icon="arrow"
@@ -141,6 +141,15 @@
         <van-button slot="button" size="small" type="danger" round @click="cardScanning('0')">银行卡扫描</van-button>
       </van-field>
       <van-field
+        v-model="userInfo.perationPeriod"
+        type="digit"
+        label="从业年限"
+        name="从业年限"
+        placeholder="请输入整数"
+        v-validate="'onlyInteger'"
+        clearable
+      />
+      <!-- <van-field
         v-model="userInfo.perationPeriod"
         type="digit"
         label="从业年限"
@@ -149,7 +158,7 @@
         v-validate="'required|onlyInteger'"
         required
         clearable
-      />
+      /> -->
       <van-field v-model="userInfo.oldCompany" label="原工作单位" name="原工作单位" placeholder="请输入" required v-validate="'required'" clearable />
       <van-field
         :value="userInfo.oldOccupation | idToText('oldOccupation')"

src/views/ebiz/agentEenter/AgentEnterGuarantor.vue

@@ -16,7 +16,7 @@
         @click="toSelect('1')"
         required
       />
-      <van-field
+      <!-- <van-field
         :value="userInfo.type | idToText('classification')"
         v-validate="'required'"
         readonly
@@ -26,7 +26,8 @@
         placeholder="请选择"
         @click="toSelect('2')"
         required
-      />
+      /> -->
+      <van-field :value="userInfo.type | idToText('classification')" v-validate="'required'" readonly label="类别" name="类别" disabled />
       <van-field label="姓名" type="text" name="姓名" placeholder="请输入" v-validate="'required|name'" clearable v-model="userInfo.name" required />
       <select-radio :radios="sexRadio" label="性别" name="性别" v-validate="'required'" required :value.sync="userInfo.sex"></select-radio>
       <van-field
@@ -40,8 +41,10 @@
         required
         maxlength="18"
       />
-      <van-field label="单位" type="text" name="单位" placeholder="请输入" v-validate="'required'" clearable v-model="userInfo.company" required />
-      <van-field label="家庭地址" type="text" name="家庭地址" placeholder="请输入" v-validate="'required'" clearable v-model="userInfo.homeAdress" required />
+      <van-field label="单位" type="text" name="单位" placeholder="请输入" clearable v-model="userInfo.company" />
+      <van-field label="家庭地址" type="text" name="家庭地址" placeholder="请输入" clearable v-model="userInfo.homeAdress" />
+      <!-- <van-field label="单位" type="text" name="单位" placeholder="请输入" v-validate="'required'" clearable v-model="userInfo.company" required /> -->
+      <!-- <van-field label="家庭地址" type="text" name="家庭地址" placeholder="请输入" v-validate="'required'" clearable v-model="userInfo.homeAdress" required /> -->
       <van-field
         v-model="userInfo.mobile"
         label="手机号码"
@@ -65,7 +68,7 @@
   </div>
 </template>
 <script>
-import { Field, CellGroup, Button, col, popup, picker, Dialog } from 'vant'
+import { Field, CellGroup, Button, col, popup, picker, Dialog, Cell } from 'vant'
 import FieldDatePicter from '@/components/ebiz/FieldDatePicter'
 import SelectRadio from '@/components/ebiz/SelectRadio'
 import DataDictionary from '@/assets/js/utils/data-dictionary'
@@ -79,6 +82,7 @@ export default {
     [FieldDatePicter.name]: FieldDatePicter,
     [Field.name]: Field,
     [CellGroup.name]: CellGroup,
+    [Cell.name]: Cell,
     [Button.name]: Button,
     [col.name]: col,
     [popup.name]: popup,
@@ -93,7 +97,7 @@ export default {
       columns: [],
       userInfo: {
         relation: '',
-        type: '',
+        type: '0',
         name: '',
         sex: '0',
         idNo: '',
@@ -162,6 +166,12 @@ export default {
           } else {
             this.userInfo.sex = String(res.content.ebizGuarantorDto.sex) //性别
           }
+          //担保人类别
+          if (res.content.ebizGuarantorDto.type == null) {
+            this.userInfo.type = '1'
+          } else {
+            this.userInfo.type = String(res.content.ebizGuarantorDto.type) //性别
+          }
         }
       })
     },
@@ -246,10 +256,11 @@ export default {
 </script>
 <style lang="scss" scoped>
 .guarant-info-container {
-  .referrerW {
-    /deep/.van-cell__title {
-      width: 110px;
-    }
+  /deep/ .van-cell__value {
+    text-align: left;
+  }
+  /deep/ .van-cell__title {
+    width: 20%;
   }
   .add-btn {
     width: 80%;

src/views/ebiz/agentEenter/EntryProcess.vue

@@ -246,10 +246,10 @@ export default {
       this.$jump({
         flag: 'h5',
         extra: {
-          url: location.origin + `/#/agentEenter/seeCause`
+          url: location.origin + `/#/agentEenter/seeCause?basicId=${this.ebizExamineApproveDtoList[0].baseId}`
         },
         routerInfo: {
-          path: `/agentEenter/seeCause`
+          path: `/agentEenter/seeCause?basicId=${this.ebizExamineApproveDtoList[0].baseId}`
         }
       })
     },

src/views/ebiz/agentEenter/SeeCause.vue

@@ -16,14 +16,16 @@
           <span>{{ refusalCause }}</span>
         </div>
       </div>
-      <van-button @click="goBaseInfo" plain type="danger" class="w200 mt50" round>去修改</van-button>
+      <van-button @click="goBaseInfo" plain type="danger" class="w150 mt50 mr20" round>去修改</van-button>
+      <van-button @click="revoke()" plain type="danger" class="w150 mt50" round>撤销申请</van-button>
     </div>
   </div>
 </template>
 
 <script>
 import { Field, Icon, Button, Checkbox, CheckboxGroup } from 'vant'
-import { processCheck } from '@/api/ebiz/agentEenter/agentEenter'
+import { processCheck, revoke } from '@/api/ebiz/agentEenter/agentEenter'
+
 export default {
   data() {
     return {
@@ -59,6 +61,24 @@ export default {
         }
       })
     },
+    //撤销申请
+    revoke() {
+      //调后端撤销申请接口
+      let data = {
+        ebizEnterCustomerDto: {
+          id: this.$route.query.basicId
+        }
+      }
+      revoke(data).then(res => {
+        if (res.result == 0) {
+          this.$toast('撤销成功')
+          // eslint-disable-next-line no-undef
+          EWebBridge.webCallAppInJs('login')
+        } else {
+          this.$toast(res.resultMessage)
+        }
+      })
+    },
     processCheck() {
       let that = this
       that.$toast.loading({

src/views/ebiz/agentEenter/approve/ApproveList.vue

@@ -1,47 +1,48 @@
 <template>
   <div class="sale-list-container pb50">
-    <div v-if="isSuccess">
-      <div v-if="approveList.length > 0">
-        <div v-for="(item, index) in approveList" :key="index">
-          <div class="bg-white pv15 pr15 pl10 m15">
-            <div class="flex justify-content-s align-items-c">
+    <van-list v-model="loading" :immediate-check="false" :finished="finished" :finished-text="finishedText" @load="loadMore">
+      <div v-if="isSuccess">
+        <div v-if="approveList.length > 0">
+          <div v-for="(item, index) in approveList" :key="index">
+            <div class="bg-white pv15 pr15 pl10 m15">
+              <div class="flex justify-content-s align-items-c">
+                <div class="mb10">
+                  <div class="inline-b" style="margin-right:13px">
+                    <van-tag plain color="#5CA7DE">申请人</van-tag>
+                  </div>
+                  <span class="fs14 c-gray-dark ml20">{{ item.name }}</span>
+                </div>
+              </div>
               <div class="mb10">
                 <div class="inline-b" style="margin-right:13px">
-                  <van-tag plain color="#5CA7DE">申请人</van-tag>
+                  <van-tag plain color="#5CA7DE">推荐人</van-tag>
                 </div>
-                <span class="fs14 c-gray-dark ml20">{{ item.name }}</span>
+                <span class="fs14 c-gray-dark ml20">{{ item.referName }}</span>
               </div>
-            </div>
-            <div class="mb10">
-              <div class="inline-b" style="margin-right:13px">
-                <van-tag plain color="#5CA7DE">推荐人</van-tag>
+              <div class="mb10">
+                <div class="inline-b">
+                  <van-tag plain color="#5CA7DE">所属团队</van-tag>
+                </div>
+                <span class="fs14 c-gray-dark ml20">{{ item.team }}</span>
               </div>
-              <span class="fs14 c-gray-dark ml20">{{ item.referName }}</span>
-            </div>
-            <div class="mb10">
-              <div class="inline-b">
-                <van-tag plain color="#5CA7DE">所属团队</van-tag>
+              <div class="mb10">
+                <div class="inline-b">
+                  <van-tag plain color="#5CA7DE">申请时间</van-tag>
+                </div>
+                <span class="fs14 c-gray-dark ml20">{{ item.createdDate }}</span>
               </div>
-              <span class="fs14 c-gray-dark ml20">{{ item.team }}</span>
-            </div>
-            <div class="mb10">
-              <div class="inline-b">
-                <van-tag plain color="#5CA7DE">申请时间</van-tag>
+              <div class="mt10 flex justify-content-fe">
+                <van-button round size="small" class="mr5" type="danger" @click="goApprove(item.baseId)">审批</van-button>
               </div>
-              <span class="fs14 c-gray-dark ml20">{{ item.createdDate }}</span>
-            </div>
-            <div class="mt10 flex justify-content-fe">
-              <van-button round size="small" class="mr5" type="danger" @click="goApprove(item.baseId)">审批</van-button>
             </div>
           </div>
         </div>
       </div>
-    </div>
-
-    <div v-else class="text-center">
-      <img class="mt40" src="@/assets/images/pic_page-non.png" />
-      <div class="fs17 mt40">暂无审批信息！</div>
-    </div>
+      <div v-else class="text-center">
+        <img class="mt40" src="@/assets/images/pic_page-non.png" />
+        <div class="fs17 mt40">暂无审批信息！</div>
+      </div>
+    </van-list>
   </div>
 </template>
 
@@ -60,41 +61,50 @@ export default {
   data() {
     return {
       approveList: [], //审批列表信息
+      loading: false,
+      finished: false,
+      currentPage: 1, //当前页数
+      finishedText: '',
       isSuccess: false
     }
   },
   mounted() {
-    this.getOrderList()
+    this.loadMore()
   },
   methods: {
+    loadMore() {
+      let pageInfo = {
+        pageNum: this.currentPage
+        // pageSize: this.pageSize
+      }
+      console.log('pageInfo==', pageInfo)
+      this.getOrderList(pageInfo)
+    },
     //初始化审批列表
-    getOrderList() {
-      this.$toast.loading({
-        duration: 0, // 持续展示 toast
-        forbidClick: true, // 禁用背景点击
-        loadingType: 'spinner',
-        message: '加载中……'
-      })
+    getOrderList(pageInfo) {
       let data = {
+        ...pageInfo,
         types: ['01']
       }
       agentAddApproval(data).then(res => {
         this.$toast.clear()
         if (res.result == '0') {
-          let resData = res.content.ebizExamineApproveDtoList
-          let obj = {}
-          if (resData.length > 0) {
+          let resData = res.content.approveWaitPageInfo
+          if (resData.list.length > 0) {
             this.isSuccess = true
-            resData.forEach(ele => {
-              obj = {}
-              obj.name = ele.name //申请人姓名
-              obj.referName = ele.referName //推荐人姓名
-              obj.team = ele.team //所属团队
-              obj.createdDate = ele.createdDate //申请时间
-              obj.baseId = ele.baseId //代理人id
-              this.approveList.push(obj)
+            resData.list.map(ele => {
+              this.approveList.push(ele)
             })
+            if (resData.pageNum == resData.pages) {
+              this.finished = true
+              this.finishedText = '没有更多了'
+            }
+            this.loading = false
           }
+        } else {
+          this.finished = true
+          this.loading = false
+          this.finishedText = res.resultMessage
         }
       })
     },

src/views/ebiz/agentEenter/approve/RecordDetail.vue

@@ -0,0 +1,135 @@
+<template>
+  <div class="record-detail-container">
+    <p style="border-bottom: 1px solid #ebedf0" class="fs15 fwb pl10 pv12">基本信息</p>
+    <div class="pb80">
+      <van-cell-group>
+        <van-cell title="姓名" :value="basicInfoDTO.name" />
+        <van-cell title="性别" :value="basicInfoDTO.sex == 0 ? '男' : '女'" />
+        <van-cell title="出生日期" :value="basicInfoDTO.birthday" />
+        <van-cell title="籍贯" :value="basicInfoDTO.nativePlace | idToText('rsnativePlace')" />
+        <van-cell title="民族" :value="basicInfoDTO.ethnic | idToText('nationType')" />
+        <van-cell title="户口所在地" :value="basicInfoDTO.rgtAddress | idToText('rsnativePlace')" />
+        <van-cell title="职称" :value="basicInfoDTO.title" />
+        <van-cell title="婚姻状况" :value="basicInfoDTO.marriage | idToText('rsmarriage')" />
+        <van-cell title="政治面貌" :value="basicInfoDTO.political | idToText('rspoliticsStatus')" />
+        <van-cell title="学历" :value="basicInfoDTO.degree | idToText('rsdegree')" />
+        <van-cell title="毕业院校" :value="basicInfoDTO.school" />
+        <van-cell title="所学专业" :value="basicInfoDTO.discipline" />
+        <van-cell title="手机" :value="basicInfoDTO.mobile" />
+        <van-cell title="证件类型" :value="basicInfoDTO.idType | idToText('idType')" />
+        <van-cell title="证件号码" :value="basicInfoDTO.idNo" />
+        <van-cell title="联系地址" :value="basicInfoDTO.address" />
+        <van-cell title="邮政编码" :value="basicInfoDTO.zip" />
+        <van-cell title="开户银行" :value="basicInfoDTO.bankName" />
+        <van-cell title="开户地" :value="basicInfoDTO.bankAddress" />
+        <van-cell title="开户姓名" :value="basicInfoDTO.accountName" />
+        <van-cell title="银行卡号" :value="basicInfoDTO.bankCode" />
+        <van-cell title="从业年限" :value="basicInfoDTO.perationPeriod" />
+        <van-cell title="原工作单位" :value="basicInfoDTO.oldCompany" />
+        <van-cell title="原职业" :value="basicInfoDTO.oldOccupation | idToText('oldOccupation')" />
+        <van-cell title="是否同业" :value="basicInfoDTO.sameTrade | idToText('rshealthCondition')" />
+        <van-cell title="国籍/地区" :value="basicInfoDTO.nationality | idToText('rsnativeplace')" />
+        <van-cell title="是否境外人员" :value="basicInfoDTO.foreigners | idToText('rshealthCondition')" />
+        <van-cell title="职级" :value="basicInfoDTO.applGrade" />
+      </van-cell-group>
+      <p style="border-bottom: 1px solid #ebedf0" class="fs15 fwb pl10 pv12">推荐人信息</p>
+      <van-cell-group>
+        <van-cell title=" 推荐人代码" :value="referrerInfoDTO.referCode" />
+        <van-cell title="推荐人姓名" :value="referrerInfoDTO.referName" />
+        <van-cell title="营业组主管代码" :value="referrerInfoDTO.teamManger" />
+        <van-cell title="营业组主管姓名" :value="referrerInfoDTO.teamMangerName" />
+        <van-cell title="营业部经理代码" :value="referrerInfoDTO.officeManger" />
+        <van-cell title="营业部经理姓名" :value="referrerInfoDTO.officeMangerName" />
+        <van-cell title="业务总监经理代码" :value="referrerInfoDTO.areaManger" />
+        <van-cell title="业务总监经理姓名" :value="referrerInfoDTO.areaMangerName" />
+      </van-cell-group>
+      <p style="border-bottom: 1px solid #ebedf0" class="fs15 fwb pl10 pv12">审批信息</p>
+      <van-cell-group v-for="item in approvalInfo" :key="item.examineApproveName" class="fs15">
+        <van-cell title="审批时间" :value="item.modifiedDate" />
+        <van-cell title="审批结论" :value="item.examineApproveResult == '0' ? '拒绝审批' : '审批通过'" />
+        <van-cell v-if="item.examineApproveResult == '0'" title="退回原因" :value="item.examineApproveMsg" />
+      </van-cell-group>
+    </div>
+  </div>
+</template>
+<script>
+import { agentAddApproval } from '@/api/ebiz/agentEenter/agentEenter.js'
+import { Cell, CellGroup, Button } from 'vant'
+// import DataDictionary from '@/assets/js/utils/data-dictionary'
+
+export default {
+  name: 'recordDetail',
+  components: {
+    [Cell.name]: Cell,
+    [CellGroup.name]: CellGroup,
+    [Button.name]: Button
+  },
+  data() {
+    return {
+      basicInfoDTO: {}, //基本信息
+      referrerInfoDTO: {}, //推荐人信息
+      approvalInfo: [] //审批信息
+    }
+  },
+  async mounted() {
+    let basicParams = {
+      types: ['02', '03'],
+      ebizEnterCustomerDto: {
+        id: this.$route.params.baseId
+      }
+    }
+    //获取列表信息
+    await this.getOrderList(basicParams, '1')
+    let { idNo, idType, name } = this.basicInfoDTO
+    let param = {
+      types: ['04'],
+      ebizEnterCustomerDto: {
+        id: this.$route.params.baseId,
+        idNo,
+        idType,
+        name
+      }
+    }
+    await this.getOrderList(param, '2')
+  },
+  methods: {
+    //获取列表信息
+    getOrderList(params, code) {
+      return new Promise((resolve, reject) => {
+        //获取代理人信息、推荐人信息
+        agentAddApproval(params).then(res => {
+          if (res.result == '0') {
+            if (res.content) {
+              if (code == '1') {
+                this.basicInfoDTO = res.content.ebizEnterCustomerDto
+                this.referrerInfoDTO = res.content.ebizReferrerDto
+              }
+              // 需要新的接口文档
+              if (code == '2') {
+                this.approvalInfo = res.content.ebizHisExamineApproveDtoList
+              }
+            }
+            resolve()
+          } else {
+            this.$toast.resultMessage
+          }
+        })
+      })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.detail-container {
+  .van-hairline--top-bottom::after {
+    border: none;
+  }
+  /deep/ .van-cell__title {
+    min-width: 40%;
+  }
+  /deep/ .van-cell__value {
+    text-align: left !important;
+    min-width: 60%;
+  }
+}
+</style>

src/views/ebiz/agentEenter/approve/RecordList.vue

@@ -0,0 +1,139 @@
+<template>
+  <div class="record-list-container pb50">
+    <van-list v-model="loading" :immediate-check="false" :finished="finished" :finished-text="finishedText" @load="loadMore">
+      <div v-if="isSuccess">
+        <div v-if="approveList.length > 0">
+          <div v-for="(item, index) in approveList" :key="index">
+            <div class="bg-white pv15 pr15 pl10 record-list">
+              <div class="flex justify-content-s align-items-c">
+                <div class="mb10">
+                  <div class="inline-b" style="margin-right:13px">
+                    <van-tag plain color="#5CA7DE">申请人</van-tag>
+                  </div>
+                  <span class="fs14 c-gray-dark ml20">{{ item.name }}</span>
+                </div>
+              </div>
+              <div class="mb10">
+                <div class="inline-b" style="margin-right:13px">
+                  <van-tag plain color="#5CA7DE">推荐人</van-tag>
+                </div>
+                <span class="fs14 c-gray-dark ml20">{{ item.referName }}</span>
+              </div>
+              <div class="mb10">
+                <div class="inline-b">
+                  <van-tag plain color="#5CA7DE">所属团队</van-tag>
+                </div>
+                <span class="fs14 c-gray-dark ml20">{{ item.team }}</span>
+              </div>
+              <div class="mb10">
+                <div class="inline-b">
+                  <van-tag plain color="#5CA7DE">审批时间</van-tag>
+                </div>
+                <span class="fs14 c-gray-dark ml20">{{ item.createdDate }}</span>
+              </div>
+              <div class="mt10 pt10 flex justify-content-fe">
+                <van-button round size="small" class="mr10" type="danger" @click="goDetail(item.baseId)">查看</van-button>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div v-else class="text-center">
+        <img class="mt40" src="@/assets/images/pic_page-non.png" />
+        <div class="fs17 mt40">暂无审批记录！</div>
+      </div>
+    </van-list>
+  </div>
+</template>
+
+<script>
+import { List, Tag, Sticky, Toast, Dialog } from 'vant'
+import { agentAddApproval } from '@/api/ebiz/agentEenter/agentEenter.js'
+
+export default {
+  name: 'approveList',
+  components: {
+    [List.name]: List,
+    [Tag.name]: Tag,
+    [Sticky.name]: Sticky,
+    [Dialog.name]: Dialog
+  },
+  data() {
+    return {
+      approveList: [], //审批列表信息
+      loading: false,
+      finished: false,
+      currentPage: 1, //当前页数
+      finishedText: '',
+      // pageSize: 15, //每页数据条数
+      isSuccess: false
+    }
+  },
+  mounted() {
+    document.getElementsByTagName('body')[0].classList.add('bg-white')
+    // this.getOrderList()
+    this.loadMore()
+  },
+  destroyed() {
+    document.getElementsByTagName('body')[0].classList.remove('bg-white')
+  },
+  methods: {
+    loadMore() {
+      let pageInfo = {
+        pageNum: this.currentPage
+        // pageSize: this.pageSize
+      }
+      this.getOrderList(pageInfo)
+    },
+    //初始化审批记录列表
+    getOrderList(pageInfo) {
+      let data = {
+        ...pageInfo,
+        types: ['05']
+      }
+      agentAddApproval(data).then(res => {
+        this.$toast.clear()
+        if (res.result == '0') {
+          let resData = res.content.approveDonePageInfo
+          if (resData.list.length > 0) {
+            this.isSuccess = true
+            resData.list.map(ele => {
+              this.approveList.push(ele)
+            })
+            if (resData.pageNum == resData.pages) {
+              this.finished = true
+              this.finishedText = '没有更多了'
+            }
+            this.loading = false
+          }
+        } else {
+          this.finished = true
+          this.loading = false
+          this.finishedText = res.resultMessage
+        }
+      })
+    },
+
+    //查看详情
+    goDetail(baseId) {
+      this.$jump({
+        flag: 'h5',
+        extra: {
+          url: location.origin + `/#/agentEenter/approve/recordDetail/${baseId}`
+        },
+        routerInfo: { path: `/agentEenter/approve/recordDetail/${baseId}` }
+      })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.record-list {
+  border-bottom: 1px solid #ebedf0;
+  border-top: 1px solid #ebedf0;
+  margin: 15px 0;
+  .justify-content-fe {
+    border-top: 1px solid #ebedf0;
+  }
+}
+</style>

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

@@ -144,17 +144,6 @@ export default {
     this.getData()
   },
   methods: {
-    // yuansheng() {
-    //   EWebBridge.webCallAppInJs('bridge', {
-    //       flag: 'share',
-    //       extra: {
-    //         title: '鼎诚人寿欢迎你！',
-    //         content: '正在招聘代理人，工作地点北京市朝阳区，有意向请戳我…',
-    //         url: location.origin + '/#/agentEenter/ShareInfo?token=' + this.token,
-    //         img: this.$assetsUrl + 'images/logo.png'
-    //       }
-    //     })
-    // },
     getData: function() {
       let self = this
       self.$toast.loading({

src/views/ebiz/manpower/Training.vue

@@ -10,7 +10,7 @@
 <script>
 import UserInfoHeader from '@/components/ebiz/manpower/UserInfoHeader'
 import NavItem from '@/components/ebiz/manpower/NavItem'
-
+import record from '@/assets/images/u73803.png'
 import { CellGroup } from 'vant'
 
 import { getTokenForUserModel } from '@/api/ebiz/manpower/manpower'
@@ -37,6 +37,11 @@ export default {
           title: '增员审批',
           icon: 'comment-o',
           path: '/agentEenter/approve/ApproveList'
+        },
+        {
+          title: '审批记录',
+          src: record,
+          path: '/agentEenter/approve/recordList'
         }
       ]
     }