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

2025-12-25 04:52:52 +08:00 · 2020-02-15 20:03:26 +08:00
parent 0da146bcf0 b5bd17160a
commit fa3073fbb8
12 changed files with 650 additions and 53 deletions
--- a/src/api/ebiz/agentEenter/agentEenter.js
+++ b/src/api/ebiz/agentEenter/agentEenter.js
@@ -76,3 +76,12 @@ export function enterQuery(data) {
    data
  })
 }
+
+//入司增员审批
+export function agentAddApproval(data) {
+  return request({
+    url: getUrl('/agent/examineApprove/dispose', 1),
+    method: 'post',
+    data
+  })
+}
--- a/src/router/ebiz/agentEenter.js
+++ b/src/router/ebiz/agentEenter.js
@@ -20,6 +20,11 @@ const agentEenterBasicHealth = () => import('@/views/ebiz/agentEenter/AgentEente
 const agentEenterBasicSuccess = () => import('@/views/ebiz/agentEenter/AgentEenterBasicSuccess')
 const ShareInfo = () => import('@/views/ebiz/agentEenter/share/ShareInfo')
 const ShareInfoSuccess = () => import('@/views/ebiz/agentEenter/share/ShareInfoSuccess')
+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')
+
 export default [
  {
    path: '/agentEenter/entryProcess',
@@ -209,5 +214,41 @@ export default [
      title: '增员申请',
      index: 1
    }
+  },
+  {
+    path: '/agentEenter/approve/ApproveList',
+    name: 'ApproveList',
+    component: ApproveList,
+    meta: {
+      title: '增员审批列表',
+      index: 1
+    }
+  },
+  {
+    path: '/agentEenter/approve/BasicInfo/:baseId',
+    name: 'BasicInfo',
+    component: BasicInfo,
+    meta: {
+      title: '增员审批',
+      index: 1
+    }
+  },
+  {
+    path: '/agentEenter/approve/ApproveInfo/:baseId',
+    name: 'ApproveInfo',
+    component: ApproveInfo,
+    meta: {
+      title: '增员审批',
+      index: 1
+    }
+  },
+  {
+    path: '/agentEenter/approve/SubmitSuccess',
+    name: 'SubmitSuccess',
+    component: SubmitSuccess,
+    meta: {
+      title: '提交成功',
+      index: 1
+    }
  }
 ]
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -10,16 +10,25 @@ export default new Vuex.Store({
    app
  },
  state: {
-    pageFlag: ''
+    pageFlag: '',
+    agentEnterApplyMobil: '', //自助入司-新的被增员人填好的基础信息里的电话号码
+    agentEnterApplyIdNo: '' //自助入司-新的被增员人填好的基础信息里的证件号码
  },
  mutations: {
    updatePageFlag(state, val) {
      state.pageFlag = val
+    },
+    updateAgentEnterApplyMsg(state, mobile, idNo) {
+      state.agentEnterApplyMobil = mobile
+      state.agentEnterApplyIdNo = idNo
    }
  },
  getters: {
    getPageFlag(state) {
      return state.pageFlag
+    },
+    getAgentEnterApplyMsg(state) {
+      return state
    }
  }
 })
--- a/src/views/app/Home.vue
+++ b/src/views/app/Home.vue
@@ -27,6 +27,7 @@
          <li><router-link to="/serve/list">保单列表</router-link></li>
          <li><router-link to="/agentEenter/agentEenterBasicInfor">自助入司</router-link></li>
          <li><router-link to="/nbs/list">nbs列表</router-link></li>
+          <li><router-link to="/agentEenter/approve/ApproveList">入司审批列表</router-link></li>
        </ul>
      </li>
    </ul>
--- a/src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue
+++ b/src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue
@@ -54,7 +54,7 @@
        maxlength="20"
        required
      />
-      <van-field v-model="userInfo.title" label="职称" name="职称" v-validate="'required'" placeholder="请输入" required clearable />
+      <van-field v-model="userInfo.title" label="职称" name="职称" placeholder="请输入" />
      <!-- <van-field
        :value="userInfo.health | idToText('rshealthCondition')"
        label="健康状况"
@@ -98,39 +98,48 @@
        @click="toSelect('6')"
        required
      />
-      <van-field v-model="userInfo.school" maxlength="40" label="毕业院校" name="毕业院校" placeholder="请输入" required v-validate="'required'" clearable />
-      <van-field v-model="userInfo.discipline" maxlength="40" label="所学专业" name="所学专业" placeholder="请输入" required v-validate="'required'" clearable />
-      <!-- <van-field v-model="userInfo.homePhone" label="宅电" name="宅电" placeholder="非必填" maxlength="16" @blur="HomeMobile(userInfo.homePhone)" clearable /> -->
+      <van-field v-model="userInfo.school" label="毕业院校" name="毕业院校" placeholder="请输入" v-validate="'required'" clearable required />
+      <van-field
+        v-model="userInfo.discipline"
+        label="所学专业"
+        name="所学专业"
+        placeholder="请输入"
+        v-validate="Number(userInfo.degree) <= 4 || Number(userInfo.degree) == 10 || Number(userInfo.degree) == 11 ? 'required' : ''"
+        clearable
+      />
      <van-field v-model="userInfo.mobile" label="手机" name="手机" required readonly />
      <van-field :value="userInfo.idType | idToText('idType')" v-validate="'required'" label="证件类型" name="证件类型" required readonly />
      <!-- <van-field v-model="userInfo.idNo" v-validate="'required|idNo'" maxlength="18" label="证件号码" name="证件号码" placeholder="请输入" clearable> -->
      <van-field v-model="userInfo.idNo" label="证件号码" readonly>
        <!-- <van-button v-if="userInfo.idType == 1" slot="button" size="small" type="danger" round @click="selectClick('3')">证件扫描</van-button> -->
      </van-field>
-      <van-field v-model="userInfo.address" label="联系地址" maxlength="80" name="联系地址" placeholder="请输入" v-validate="'required'" required clearable />
-      <van-field v-model="userInfo.zip" label="邮政编码" name="邮政编码" placeholder="请输入" v-validate="'required|zipCode'" required clearable />
-      <van-field
-        :value="userInfo.bankName"
-        label="开户银行"
-        name="开户银行"
-        v-validate="'required'"
-        required
-        readonly />
-        <!-- @click="focus"
+      <van-field v-model="userInfo.address" label="联系地址" name="联系地址" placeholder="请输入" v-validate="'required'" required clearable />
+      <van-field v-model="userInfo.zip" label="邮政编码" name="邮政编码" placeholder="请输入" clearable />
+      <van-field :value="userInfo.bankName" label="开户银行" name="开户银行" v-validate="'required'" required readonly />
+      <!-- @click="focus"
        right-icon="arrow"
        data-vv-name="开户银行" -->
-      
+
      <!-- <van-field v-model="userInfo.bankName" label="开户银行" name="开户银行" placeholder="请输入" v-validate="'required'" /> -->
      <!-- <van-field v-model="bank" label="开户银行" placeholder="请选择" required @click="focus" v-validate="'required'" data-vv-name="开户银行" /> -->
-      
-      <van-field v-model="userInfo.bankAddress" label="开户地" name="开户地" placeholder="请输入" maxlength="100" v-validate="'required'" required clearable />
+
+      <van-field v-model="userInfo.bankAddress" label="开户地" name="开户地" placeholder="请输入" v-validate="'required'" required clearable />
      <van-field v-model="userInfo.accountName" label="开户姓名" name="开户姓名" placeholder="请输入" v-validate="'required'" required clearable />
-      <van-field v-model="userInfo.bankCode" maxlength="19" label="银行卡号" name="银行卡号" placeholder="请输入" required clearable v-validate="'required|bankCard'">
+      <van-field
+        v-model="userInfo.bankCode"
+        maxlength="19"
+        label="银行卡号"
+        name="银行卡号"
+        placeholder="请输入"
+        required
+        clearable
+        v-validate="'required|bankCard'"
+      >
        <van-button slot="button" size="small" type="danger" round @click="cardScanning('0')">银行卡扫描</van-button>
      </van-field>
-       <van-field v-model="userInfo.perationPeriod" label="从业年限" name="从业年限" placeholder="请输入" v-validate="'onlyNumber'" clearable />
+      <van-field v-model="userInfo.perationPeriod" label="从业年限" name="从业年限" placeholder="请输入" v-validate="'required'" clearable />
      <van-field v-model="userInfo.oldCompany" label="原工作单位" name="原工作单位" placeholder="请输入" required v-validate="'required'" clearable />
-       <van-field
+      <van-field
        :value="userInfo.oldOccupation | idToText('oldOccupation')"
        label="原职业"
        name="原职业"
@@ -152,7 +161,7 @@
        placeholder="请选择"
        @click="toSelect('3')"
      />
-        <van-field
+      <van-field
        :value="userInfo.nationality | idToText('rsnativeplace')"
        label="国籍/地区"
        name="国籍/地区"
@@ -163,7 +172,7 @@
        placeholder="请选择"
        @click="toSelect('12')"
      />
-       <van-field
+      <van-field
        :value="userInfo.foreigners | idToText('rshealthCondition')"
        label="是否境外人员"
        name="是否境外人员"
@@ -174,7 +183,15 @@
        placeholder="请选择"
        @click="toSelect('15')"
      />
-       <van-field :value="userInfo.applGrade | idToText('applGrade')" right-icon="arrow" placeholder="请选择" @click="toSelect('13')" label="职级" v-validate="'required'" name="职级"  />
+      <van-field
+        :value="userInfo.applGrade | idToText('applGrade')"
+        right-icon="arrow"
+        placeholder="请选择"
+        @click="toSelect('13')"
+        label="职级"
+        v-validate="'required'"
+        name="职级"
+      />
    </van-cell-group>
    <van-cell-group class="" :border="false">
      <p style=" border-bottom: 1px solid #ebedf0" class="fs15 fwb pl10 mt10 pv12">推荐人信息</p>
@@ -406,8 +423,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'
+          this.userInfo.bankName = '工商银行'
+          this.userInfo.nationality = 'CHN'
        }
      })
    },
@@ -496,6 +513,9 @@ export default {
          if (this.userInfo.bankName == '工商银行') {
            this.userInfo.bankName = '102'
          }
+          if (Number(this.userInfo.degree) >= 5 && Number(this.userInfo.degree) <= 14 && Number(this.userInfo.degree) != 12) {
+            return this.$toast('学历不符合入司条件')
+          }
          console.log('this.userInfo.bankName', this.userInfo.bankName)
          let data = {
            entryType: 'CUSTOMER_BASE',
@@ -620,7 +640,7 @@ export default {
        }
      })
      this.isScan = false
-    },
+    }
    // //验证宅电
    // HomeMobile(value) {
    //   let res = /^((0\d{2,3}-\d{7,8})|(1\d{10}))$/.test(value)
--- a/src/views/ebiz/agentEenter/approve/ApproveInfo.vue
+++ b/src/views/ebiz/agentEenter/approve/ApproveInfo.vue
@@ -0,0 +1,184 @@
+<template>
+  <div class="detail-container">
+    <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.examineApproveName" />
+      <van-cell title="职级" :value="item.examineApproveTitle" />
+      <van-cell title="所属团队" :value="item.examineApproveTeam" />
+      <van-cell title="审批结论" :value="item.examineApproveResult" />
+      <van-cell title="退回原因" :value="item.examineApproveMsg" />
+    </van-cell-group>
+    <van-cell-group class="pt10 fs15">
+      <van-radio-group v-model="approvalResult" v-validate="approvalResult === '' ? 'required' : ''" name="审批结论" class="pl15">
+        <van-row>
+          <van-col span="8">审批结论</van-col>
+          <van-col span="8">
+            <van-radio name="0">退回修改</van-radio>
+          </van-col>
+          <van-col span="8">
+            <van-radio name="1">通过</van-radio>
+          </van-col>
+        </van-row>
+      </van-radio-group>
+      <van-row class="mt10 mr15 mb10">
+        <van-col span="8"></van-col>
+        <van-col span="16">
+          <van-field
+            class="van-hairline--surround"
+            v-model="approvalMsg"
+            rows="4"
+            autosize
+            type="textarea"
+            name="退回修改原因"
+            placeholder="请填写退回修改原因"
+            :required="approvalResult === '0' ? true : false"
+            v-validate="approvalResult === '0' ? 'required' : ''"
+            v-if="approvalResult === '0'"
+          />
+        </van-col>
+      </van-row>
+    </van-cell-group>
+    <div class="flex justify-content-s bottom-btn  bg-white">
+      <van-button class=" bottom0 left0" square plain type="danger" @click="goBack" size="large">上一步</van-button>
+      <van-button class=" bottom0 left0" square type="danger" size="large" @click="nextStep" v-no-more-click="1000">提交</van-button>
+    </div>
+  </div>
+</template>
+<script>
+import { agentAddApproval } from '@/api/ebiz/agentEenter/agentEenter.js'
+import { Cell, CellGroup, Field, Button, RadioGroup, Radio, Col, Row } from 'vant'
+export default {
+  name: 'approveInfo',
+  components: {
+    [Cell.name]: Cell,
+    [CellGroup.name]: CellGroup,
+    [Button.name]: Button,
+    [RadioGroup.name]: RadioGroup,
+    [Radio.name]: Radio,
+    [Col.name]: Col,
+    [Row.name]: Row,
+    [Field.name]: Field
+  },
+  data() {
+    return {
+      // approvalInfo: [], //审批信息
+      approvalInfo: [
+        { examineApproveName: '审批人1', examineApproveTitle: '业务主任1', examineApproveTeam: '团队1234' },
+        { examineApproveName: '审批人2', examineApproveTitle: '业务主任2', examineApproveTeam: '团队1235' }
+      ], //审批信息
+      approvalResult: '', //该审批人填写的审批结果
+      approvalMsg: '' //该审批人填写的退回原因
+    }
+  },
+  mounted() {
+    //获取审批信息
+    this.getOrderList()
+  },
+  methods: {
+    //获取审批信息
+    getOrderList() {
+      let params = {
+        types: ['04'],
+        ebizEnterCustomerDto: {
+          id: this.$route.params.baseId
+        }
+      }
+      //获取代理人信息
+      agentAddApproval(params).then(res => {
+        if (res.result == '0') {
+          if (res.content.length > 0) {
+            this.approvalInfo = res.content.ebizHisExamineApproveDtoList
+          }
+        }
+      })
+    },
+    //上一步
+    goBack() {
+      let baseId = this.$route.params.baseId // 代理人id
+      this.$jump({
+        flag: 'goBack',
+        extra: {
+          refresh: '1',
+          index: '-1',
+          forbidSwipeBack: '1'
+        },
+        routerInfo: {
+          type: 2,
+          index: -1,
+          path: `/agentEenter/approve/BasicInfo/${baseId}`
+        }
+      })
+    },
+    //提交审批结果
+    nextStep() {
+      this.$validator.validate().then(valid => {
+        if (true === valid) {
+          let baseId = this.$route.params.baseId // 代理人id
+          let params = {
+            types: ['00'],
+            ebizEnterCustomerDto: {
+              id: baseId // 代理人id
+            },
+            // userModel: {
+            //   id: 'A864501000001', // 审批人工号
+            //   name: '审批人一号', // 审批人姓名
+            //   agentGrade: 'A201' // 审批人职级
+            // },
+            result: this.approvalResult, //审批结果 0-拒绝审批  1-通过
+            Msg: this.approvalMsg //审批原因
+          }
+          this.$jump({
+            flag: 'h5',
+            extra: {
+              url: location.origin + `/#/agentEenter/approve/SubmitSuccess`,
+              forbidSwipeBack: '1', //1:禁止右滑返回
+              backToFirst: '1' //1:点击左上角，返回到入口第一个webview
+            },
+            routerInfo: { path: `/agentEenter/approve/SubmitSuccess` }
+          })
+          /*
+          agentAddApproval(params).then(res => {
+            console.log('res ==', res)
+            if (res.result == '0') {
+              console.log('审批结果提交===')
+              if (res.content.result == '0') {
+                //跳转页面
+                this.$jump({
+                  flag: 'h5',
+                  extra: {
+                    url: location.origin + `/#/agentEenter/approve/SubmitSuccess`,
+                    forbidSwipeBack: '1', //1:禁止右滑返回
+                    backToFirst: '1' //1:点击左上角，返回到入口第一个webview
+                  },
+                  routerInfo: { path: `/agentEenter/approve/SubmitSuccess` }
+                })
+              }
+            } else {
+              this.$toast(res.resultMessage)
+            }
+          })*/
+        } else {
+          this.$toast(this.$validator.errors.all()[0])
+        }
+      })
+    }
+  }
+}
+</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%;
+  }
+  /deep/ .van-cell-group {
+    margin-bottom: 10px;
+  }
+}
+</style>
--- a/src/views/ebiz/agentEenter/approve/ApproveList.vue
+++ b/src/views/ebiz/agentEenter/approve/ApproveList.vue
@@ -0,0 +1,151 @@
+<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">
+              <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.examineApproveTeam }}</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 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>
+</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: [], //审批列表信息
+      isSuccess: false
+    }
+  },
+  mounted() {
+    this.getOrderList()
+  },
+  methods: {
+    //初始化审批列表
+    getOrderList() {
+      this.$toast.loading({
+        duration: 0, // 持续展示 toast
+        forbidClick: true, // 禁用背景点击
+        loadingType: 'spinner',
+        message: '加载中……'
+      })
+      let data = {
+        types: ['01'],
+        userModel: {
+          //线上去掉
+          id: 'A864501000001' //审批人工号
+        }
+      }
+      let resData = [
+        {
+          ebizEnterCustomerDto: { name: '张三' },
+          ebizReferrerDto: { referName: '推荐人李四' },
+          ebizHisExamineApproveDtoList: { examineApproveTeam: '李四团队' },
+          ebizExamineApproveDtoList: { createdDate: '2020-01-27', baseId: '57' }
+        },
+        {
+          ebizEnterCustomerDto: { name: '张san' },
+          ebizReferrerDto: { referName: '推荐人李si' },
+          ebizHisExamineApproveDtoList: { examineApproveTeam: '李四团队' },
+          ebizExamineApproveDtoList: { createdDate: '2020-02-01', baseId: '57' }
+        }
+      ]
+      let obj = {}
+      if (resData.length > 0) {
+        this.$toast.clear()
+        resData.forEach(ele => {
+          obj = {}
+          obj.name = ele.ebizEnterCustomerDto.name //申请人姓名
+          obj.referName = ele.ebizReferrerDto.referName //推荐人姓名
+          obj.examineApproveTeam = ele.ebizHisExamineApproveDtoList.examineApproveTeam //所属团队
+          obj.createdDate = ele.ebizExamineApproveDtoList.createdDate //申请时间
+          obj.baseId = ele.ebizExamineApproveDtoList.baseId //代理人id
+          this.approveList.push(obj)
+        })
+        this.isSuccess = true
+      }
+      // agentAddApproval(data).then(res => {
+      //   this.$toast.clear()
+      //   if (res.result == '0') {
+      //     let resData = res.content
+      //     let obj = {}
+      //     if (resData.length > 0) {
+      //       this.isSuccess = true
+      //       resData.forEach(ele => {
+      //         obj = {}
+      //         obj.name = ele.ebizEnterCustomerDto.name //申请人姓名
+      //         obj.referName = ele.ebizReferrerDto.referName //推荐人姓名
+      //         obj.examineApproveTeam = ele.ebizHisExamineApproveDtoList.examineApproveTeam //所属团队
+      //         obj.createdDate = ele.ebizExamineApproveDtoList.createdDate //申请时间
+      //         obj.baseId = ele.ebizExamineApproveDtoList.baseId //代理人id
+      //         this.approveList.push(obj)
+      //       })
+      //     }
+      //   }
+      // })
+    },
+
+    //审批
+    goApprove(baseId) {
+      console.log(baseId)
+      this.$jump({
+        flag: 'h5',
+        extra: {
+          url: location.origin + `/#/agentEenter/approve/BasicInfo/${baseId}`,
+          forbidSwipeBack: '1', //1:禁止右滑返回
+          pullRefresh: '1', //1:需要开启下拉刷新
+          backToFirst: '1' //1:点击左上角，返回到入口第一个webview
+        },
+        routerInfo: { path: `/agentEenter/approve/BasicInfo/${baseId}` }
+      })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped></style>
--- a/src/views/ebiz/agentEenter/approve/BasicInfo.vue
+++ b/src/views/ebiz/agentEenter/approve/BasicInfo.vue
@@ -0,0 +1,119 @@
+<template>
+  <div class="detail-container">
+    <p style="border-bottom: 1px solid #ebedf0" class="fs15 fwb pl10 pv12">基本信息</p>
+    <van-cell-group>
+      <van-cell title="姓名" :value="BasicInfoDTO.name" />
+      <van-cell title="性别" :value="BasicInfoDTO.sex" />
+      <van-cell title="出生日期" :value="BasicInfoDTO.birthday" />
+      <van-cell title="籍贯" :value="BasicInfoDTO.nativePlace" />
+      <van-cell title="民族" :value="BasicInfoDTO.ethnic" />
+      <van-cell title="户口所在地" :value="BasicInfoDTO.rgtAddress" />
+      <van-cell title="职称" :value="BasicInfoDTO.title" />
+      <van-cell title="婚姻状况" :value="BasicInfoDTO.marriage" />
+      <van-cell title="政治面貌" :value="BasicInfoDTO.political" />
+      <van-cell title="学历" :value="BasicInfoDTO.degree" />
+      <van-cell title="毕业院校" :value="BasicInfoDTO.school" />
+      <van-cell title="所学专业" :value="BasicInfoDTO.discipline" />
+      <van-cell title="手机" :value="BasicInfoDTO.mobile" />
+      <van-cell title="证件类型" :value="BasicInfoDTO.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" />
+      <van-cell title="是否同业" :value="BasicInfoDTO.sameTrade" />
+      <van-cell title="国籍/地区" :value="BasicInfoDTO.nationality" />
+      <van-cell title="是否境外人员" :value="BasicInfoDTO.foreigners" />
+      <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.teamCode" />
+      <van-cell title="营业组主管姓名" :value="referrerInfoDTO.teamName" />
+      <van-cell title="营业处经理代码" :value="referrerInfoDTO.officeCode" />
+      <van-cell title="营业处经理姓名" :value="referrerInfoDTO.officeName" />
+      <van-cell title="营业区经理代码" :value="referrerInfoDTO.areaCode" />
+      <van-cell title="营业区经理姓名" :value="referrerInfoDTO.areaName" />
+    </van-cell-group>
+    <div class="flex justify-content-s bottom-btn  bg-white">
+      <van-button class=" bottom0 left0" square type="danger" size="large" @click="nextStep" v-no-more-click="1000">下一步</van-button>
+    </div>
+  </div>
+</template>
+<script>
+import { agentAddApproval } from '@/api/ebiz/agentEenter/agentEenter.js'
+import { Cell, CellGroup, Button } from 'vant'
+export default {
+  name: 'approveInfo',
+  components: {
+    [Cell.name]: Cell,
+    [CellGroup.name]: CellGroup,
+    [Button.name]: Button
+  },
+  data() {
+    return {
+      BasicInfoDTO: {}, //基本信息
+      referrerInfoDTO: {} //推荐人信息
+    }
+  },
+  mounted() {
+    //获取列表信息
+    this.getOrderList()
+  },
+  methods: {
+    //获取列表信息
+    getOrderList() {
+      let BasicParams = {
+        types: ['02', '03'],
+        ebizEnterCustomerDto: {
+          id: this.$route.params.baseId
+        }
+      }
+      //获取代理人信息、推荐人信息
+      agentAddApproval(BasicParams).then(res => {
+        if (res.result == '0') {
+          if (res.content.length > 0) {
+            this.BasicInfoDTO = res.content.ebizEnterCustomerDto
+            this.referrerInfoDTO = res.content.ebizReferrerDto
+          }
+        }
+      })
+    },
+    //下一步
+    nextStep() {
+      let baseId = this.$route.params.baseId // 代理人id
+      this.$jump({
+        flag: 'h5',
+        extra: {
+          url: location.origin + `/#/agentEenter/approve/ApproveInfo/${baseId}`,
+          forbidSwipeBack: '1', //1:禁止右滑返回
+          pullRefresh: '1', //1:需要开启下拉刷新
+          backToFirst: '1' //1:点击左上角，返回到入口第一个webview
+        },
+        routerInfo: { path: `/agentEenter/approve/ApproveInfo/${baseId}` }
+      })
+    }
+  }
+}
+</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>
--- a/src/views/ebiz/agentEenter/approve/SubmitSuccess.vue
+++ b/src/views/ebiz/agentEenter/approve/SubmitSuccess.vue
@@ -0,0 +1,52 @@
+<template>
+  <div>
+    <div class="pt80 flex align-items-c flex-direction-colunm">
+      <img src="@/assets/images/u20257.png" class="img" alt />
+      <h2 class="green mt15">提交成功</h2>
+    </div>
+    <div class="bottom-btn bg-white">
+      <van-button type="danger" size="large" @click="back" v-no-more-click="1000">返回</van-button>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {}
+  },
+  mounted() {
+    document.body.style.backgroundColor = '#fff'
+    EWebBridge.webCallAppInJs('webview_left_button', {
+      img: this.$assetsUrl + 'images/del-close@3x.png',
+      intercept: '1' //是否拦截原生返回事件 1是 其他否
+    })
+    window.appCallBack = this.appCallBack
+  },
+  beforeRouteLeave(to, from, next) {
+    document.body.style.backgroundColor = ''
+    next()
+  },
+  methods: {
+    appCallBack(data) {
+      if (data.trigger == 'left_button_click') {
+        this.$jump({
+          flag: 'mine'
+        })
+      }
+    },
+    back() {
+      this.$jump({
+        flag: 'mine'
+      })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.img {
+  width: 50px;
+}
+.green {
+  color: #1abc9c !important;
+}
+</style>
--- a/src/views/ebiz/agentEenter/share/ShareInfo.vue
+++ b/src/views/ebiz/agentEenter/share/ShareInfo.vue
@@ -111,7 +111,7 @@ export default {
      },
      agentGrade: '',
      userInfo: {
-        name: '', //投保人姓名 
+        name: '', //投保人姓名
        sex: '0', //投保人性别
        idType: '1', //证件类型
        idNo: '', //证件号码
@@ -178,7 +178,7 @@ export default {
            console.log('response.data.content', response.data.content)
            if (response.data.content.result == '0') {
              self.recommender = response.data.content
-            }else{
+            } else {
              this.$toast.fail(response.data.content.resultMessage)
            }
          } else {
@@ -293,17 +293,17 @@ export default {
      Dialog.confirm({
        title: '提示',
        message: '是否确认提交？手机号与证件信息会作为您入司的重要信息，一旦提交无法再次修改！'
-      }).then(() => {      
+      }).then(() => {
        let data = {
          // userModel: { //线上去掉
          //   mobile: '18978145583'
          // },
          entryType: 'SHARE_ADD',
-          ebizEnterCustomerDto: this.userInfo,
+          ebizEnterCustomerDto: this.userInfo
          // ebizReferrerDto: this.recommender
        }
        console.log(data)
-         let that = this
+        let that = this
        that.$toast.loading({
          duration: 0, // 持续展示 toast
          forbidClick: true, // 禁用背景点击
@@ -314,6 +314,7 @@ export default {
          .then(res => {
            // console.log(res)
            if (res.result == '0') {
+              this.$store.commit('updateAgentEnterApplyMsg', this.userInfo.mobile, this.userInfo.idNo)
              that.$toast.clear()
              this.$jump({
                flag: 'h5',
--- a/src/views/ebiz/agentEenter/share/ShareInfoSuccess.vue
+++ b/src/views/ebiz/agentEenter/share/ShareInfoSuccess.vue
@@ -3,14 +3,16 @@
    <div class="payResult-header flex justify-content-fs align-items-c p30 box-sizing-bb w100h100r bg-white flex-direction-colunm">
      <img :src="srcSuccess" class="payResult-img mb15  pt30" />
      <h3 class="mb10">填写成功</h3>
-      <p class="pt60">请扫描下方二维码下载【金掌桂】APP，使用您所预留的手机号码进行登录，完成后续自助入司操作。</p>
+      <p class="pt60">
+        请扫描下方二维码下载【金掌桂】APP，使用您所预留的手机号码：{{ agentEnterApplyMobil }}及证件号：{{ agentEnterApplyIdNo }}进行登录，完成后续自助入司操作。
+      </p>

      <div class="flex w315 pt30 justify-content-a">
        <div class="border-text w130 pv10 flex flex-direction-colunm justify-content-c align-items-c">
          <img src="@/assets/images/share_left.png" class="share-img" alt />
          <span class="pt5">IOS</span>
        </div>
-        <div class="border-text w130 pv10 flex flex-direction-colunm justify-content-c align-items-c" >
+        <div class="border-text w130 pv10 flex flex-direction-colunm justify-content-c align-items-c">
          <img src="@/assets/images/share_right.png" class="share-img" alt />
          <span class="pt5">Android</span>
        </div>
@@ -29,7 +31,9 @@ export default {
      // 图片
      srcSuccess: this.$assetsUrl + 'images/success.png',
      srcPending: this.$assetsUrl + 'images/pending.png',
-      srcFail: this.$assetsUrl + 'images/fail.png'
+      srcFail: this.$assetsUrl + 'images/fail.png',
+      agentEnterApplyMobil: '',
+      agentEnterApplyIdNo: ''
    }
  },
  components: {
@@ -37,6 +41,11 @@ export default {
    [CellGroup.name]: CellGroup
  },
  methods: {
+    //获取新的被增人员的手机号、证件号
+    setLogAccount() {
+      this.agentEnterApplyMobil = this.$store.getters.getAgentEnterApplyMsg.agentEnterApplyMobil
+      this.agentEnterApplyIdNo = this.$store.getters.getAgentEnterApplyMsg.agentEnterApplyIdNo
+    }
    // goBack() {
    //   this.$jump({
    //     flag: 'goBack',
@@ -49,6 +58,7 @@ export default {
    // }
  },
  mounted() {
+    this.setLogAccount()
    document.body.style.backgroundColor = '#fff'
  },
  beforeRouteLeave(to, from, next) {
@@ -73,6 +83,6 @@ export default {
  }
 }
 .border-text {
-  border:1px solid #CCCCCC;
+  border: 1px solid #cccccc;
 }
 </style>
--- a/src/views/ebiz/common/CalculatePremium.vue
+++ b/src/views/ebiz/common/CalculatePremium.vue
@@ -19,7 +19,7 @@
      </div>
      <!-- 险种条件-->
      <div v-if="(item.isRemit == 1 && isTrial == '1') || (item.isRemit == 1 && isTrial != '1' && item.isMainRisk == 1)">
-      <!-- <div v-if="item.isRemit == 1 && isTrial == '1'"> -->
+        <!-- <div v-if="item.isRemit == 1 && isTrial == '1'"> -->
        <div v-for="(riskFactor, riskFactorIndex) in item.calFactorLst" :key="riskFactorIndex">
          <div class="flex justify-content-s pv10 border-bottom" v-if="riskFactor.type == 1">
            <div class="flex align-items-c">
@@ -109,9 +109,9 @@
        <div v-for="(riskFactor, riskFactorIndex) in item.calFactorLst" :key="riskFactorIndex">
          <div class="flex justify-content-s pv10 border-bottom" v-if="riskFactor.type == 1">
            <div class="flex align-items-c">
-              <span v-if="item.productTrialYearDTOS[payEndYearColumnsIndex].suffix" class="fs14">{{ riskFactor.name + '(' + item.productTrialYearDTOS
-
-[payEndYearColumnsIndex]['suffix'] + ')' }}</span>
+              <span v-if="item.productTrialYearDTOS[payEndYearColumnsIndex].suffix" class="fs14">{{
+                riskFactor.name + '(' + item.productTrialYearDTOS[payEndYearColumnsIndex]['suffix'] + ')'
+              }}</span>
              <span v-else class="fs14">{{ riskFactor.name }} &nbsp;&nbsp; &nbsp;&nbsp;</span>
              <van-stepper
                v-model="item.productTrialYearDTOS[payEndYearColumnsIndex].displayAmount"
@@ -215,8 +215,6 @@
        >
        <span style="font-weight:bold" v-else>保额（元）：</span>
        <span class="fee red" v-if="trialList && trialList.length > 0">{{ trialList[index].prem.toFixed(2) | moneyFormat }}</span>
-        <!-- <span class="fee red" v-if="isTrial === '0' && item.isMainRisk == '1'">0.00</span> -->
-        <!-- <span class="fee red" v-if="isTrial === '0' && item.isMainRisk == '0'">{{ defalutAmt }}</span> -->
      </div>
    </div>
    <div class="bottom-btn bg-white">
@@ -307,7 +305,7 @@ export default {
        this.saleInsuredPersonInfo = JSON.parse(localStorage.saleInsuredPersonInfo)
      }
      //构建提交数据、渲染险种
-      let chooseProducts = this.chooseProducts = JSON.parse(localStorage.chooseProducts)
+      let chooseProducts = (this.chooseProducts = JSON.parse(localStorage.chooseProducts))
      this.chooseProducts.map(item => {
        if (item.mainRiskCode == 'GFRS_M0006') {
          item.isHidden = true
@@ -315,9 +313,7 @@ export default {
        if (item.mainRiskCode != 'GFRS_M0008') {
          item.calFactorLst.map(i => {
            // this.defalutAmt = i.displayAmount || 1
-            // console.log('i.displayAmount ==', i.displayAmount)
-            // console.log('i.defaultValue ==', i.defaultValue)
-            this.mult = Number(i.displayAmount) / Number(i.defaultValue)
+            this.mult = Math.ceil(Number(i.displayAmount) / Number(i.defaultValue))
          })
        }
      })
@@ -333,11 +329,11 @@ export default {
              if (i.code === 'getLimit') {
                const text = isMedical ? '0元（意外医疗）' : '100元（意外医疗）'
                const value = isMedical ? '0' : '100'
-                
+
                //保存数据
                this.medicalInfo = this.medicalInfo || {}
                this.medicalInfo.getLimit = text
-                
+
                i.showContent = text
                i.getLimit = value
                i.columns = [{ text, value }]
@@ -346,11 +342,11 @@ export default {
              if (i.code === 'getRate') {
                const text = isMedical ? '80%（意外医疗）' : '70%（意外医疗）'
                const value = isMedical ? '0.8' : '0.7'
-                
+
                //保存数据
                this.medicalInfo = this.medicalInfo || {}
                this.medicalInfo.getRate = text
-                
+
                i.showContent = text
                i.getRate = value
                i.columns = [{ text, value }]
@@ -369,7 +365,6 @@ export default {
          }
        }
      })
-      

      // this.influenceAddRiskCodes

@@ -381,6 +376,7 @@ export default {
      }

      this.mainRiskInfluenceAddRisk()
+      //初始化数据试算
      this.getTrial()
    },
    // 责任保额份数变化
@@ -809,7 +805,11 @@ export default {
            }
          } else if (factor.type == 1) {
            if (factor.code == 'inputPrem') {
-              trialInfo['prem'] = this.isTrial == '0' ? Number(item.productTrialYearDTOS[this.payEndYearColumnsIndex].displayAmount) * Number(item.productTrialYearDTOS[this.payEndYearColumnsIndex].moneyUnit) : Number(factor.displayAmount) * Number(factor.moneyUnit)
+              trialInfo['prem'] =
+                this.isTrial == '0'
+                  ? Number(item.productTrialYearDTOS[this.payEndYearColumnsIndex].displayAmount) *
+                    Number(item.productTrialYearDTOS[this.payEndYearColumnsIndex].moneyUnit)
+                  : Number(factor.displayAmount) * Number(factor.moneyUnit)
            } else {
              if (item.isRemit == 0) {
                trialInfo['amt'] = Number(factor.displayAmount) * Number(factor.moneyUnit)
@@ -999,7 +999,7 @@ export default {
      // let currentEle = this.chooseProducts[this.productIndex].calFactorLst[this.calFactorIndex]
      // defalutValue = value
      console.log('进来几次')
-      this.mult = Number(defalutValue) / Number(defalutValue)
+      this.mult = Math.ceil(Number(defalutValue) / Number(riskFactor.defaultValue))
    },
    //下一步
    async nextStep() {