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

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

@@ -1397,6 +1397,14 @@ export default {
   ],
   //入司文化程度
   rsdegree: [
+    {
+      id: 11,
+      text: '博士后'
+    },
+    {
+      id: 10,
+      text: '博士'
+    },
     {
       id: 2,
       text: '硕士'
@@ -1413,41 +1421,29 @@ export default {
       id: 5,
       text: '高中'
     },
-    {
-      id: 6,
-      text: '初中'
-    },
     {
       id: 7,
       text: '中专'
     },
-    {
-      id: 8,
-      text: '小学'
-    },
-    {
-      id: 12,
-      text: '其他'
-    },
-    {
-      id: 13,
-      text: '文盲'
-    },
     {
       id: 14,
       text: '中技'
     },
+    {
+      id: 6,
+      text: '初中'
+    },
+    {
+      id: 8,
+      text: '小学'
+    },
+    {
+      id: 13,
+      text: '文盲'
+    },
     {
       id: 12,
       text: '其他'
-    },
-    {
-      id: 10,
-      text: '博士'
-    },
-    {
-      id: 11,
-      text: '博士后'
     }
   ],
   rsRankAgent: [
@@ -1466,7 +1462,7 @@ export default {
   ],
   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: '司外' }],
+  classification: [{ id: '1', text: '司外' }],
   //入司国籍/地区
   rsnativeplace: [
     { id: 'AGO', text: '安哥拉' },

src/router/ebiz/agentEenter.js

@@ -26,6 +26,7 @@ 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')
+const ResultEnd = () => import('@/views/ebiz/agentEenter/ResultEnd')
 
 export default [
   {
@@ -227,7 +228,7 @@ export default [
     }
   },
   {
-    path: '/agentEenter/approve/BasicInfo/:baseId',
+    path: '/agentEenter/approve/BasicInfo/:baseId/:branchType/:appntNode',
     name: 'BasicInfo',
     component: BasicInfo,
     meta: {
@@ -236,7 +237,7 @@ export default [
     }
   },
   {
-    path: '/agentEenter/approve/ApproveInfo/:baseId',
+    path: '/agentEenter/approve/ApproveInfo/:baseId/:branchType/:appntNode',
     name: 'ApproveInfo',
     component: ApproveInfo,
     meta: {
@@ -270,5 +271,14 @@ export default [
       title: '审批详细信息',
       index: 1
     }
+  },
+  {
+    path: '/agentEenter/ResultEnd',
+    name: 'ResultEnd',
+    component: ResultEnd,
+    meta: {
+      title: '入司成功',
+      index: 1
+    }
   }
 ]

src/views/ebiz/agentEenter/AgentEenterBasicHealth.vue

@@ -290,7 +290,7 @@ export default {
               })
             }
             if (item.impartType == '03') {
-              item.impartId = item.impartCode
+              item.impartId = '8'
               if (item.itemDtoLst) {
                 item.itemDtoLst.map(itm => {
                   itm.impartId = item.impartCode

src/views/ebiz/agentEenter/AgentEenterBasicImage.vue

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

src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue

@@ -218,14 +218,14 @@
     </van-cell-group>
     <van-cell-group class="" :border="false">
       <p style=" border-bottom: 1px solid #ebedf0" class="fs15 fwb pl10 mt10 pv12">推荐人信息</p>
-      <van-field class="referrerW" v-model="ebiz_referrer.referCode" label="推荐人编号" name="推荐人编号" readonly />
+      <van-field class="referrerW" v-model="ebiz_referrer.referCode" label="推荐人工号" name="推荐人工号" readonly />
       <van-field class="referrerW" v-model="ebiz_referrer.referName" label="推荐人姓名" name="推荐人姓名" readonly />
-      <van-field class="referrerW" v-model="ebiz_referrer.teamManger" label="营业组主管代码" name="营业组主管代码" readonly />
+      <van-field class="referrerW" v-model="ebiz_referrer.teamManger" label="营业组主管工号" name="营业组主管工号" readonly />
       <van-field class="referrerW" v-model="ebiz_referrer.teamMangerName" label="营业组主管姓名" name="营业组主管姓名" readonly />
-      <van-field class="referrerW" v-model="ebiz_referrer.officeManger" label="营业部经理代码" name="营业部经理代码" readonly />
+      <van-field class="referrerW" v-model="ebiz_referrer.officeManger" label="营业部经理工号" name="营业部经理工号" readonly />
       <van-field class="referrerW" v-model="ebiz_referrer.officeMangerName" label="营业部经理姓名" name="营业部经理姓名" readonly />
-      <van-field class="referrerW" v-model="ebiz_referrer.areaManger" label=" 营业区经理代码" name=" 营业区经理代码" readonly />
+      <van-field class="referrerW" v-model="ebiz_referrer.areaManger" label=" 总监工号" name=" 总监工号" readonly />
-      <van-field class="referrerW" v-model="ebiz_referrer.areaMangerName" label="营业区经理姓名" name="营业区经理姓名" readonly />
+      <van-field class="referrerW" v-model="ebiz_referrer.areaMangerName" label="总监姓名" name="总监姓名" readonly />
     </van-cell-group>
     <van-button type="danger" class="bottom-btn" @click="nextStep" v-no-more-click="1000">下一步</van-button>
     <!-- 字段选择 -->
@@ -558,7 +558,7 @@ export default {
             Number(this.userInfo.degree) == 8 ||
             Number(this.userInfo.degree) == 6
           ) {
-            return this.$toast('学历不符合入司条件')
+            return this.$toast('您的学历不符合入司要求，不允许入司。')
           }
           this.checkShow = true //
         } else {

src/views/ebiz/agentEenter/Paction.vue

@@ -154,11 +154,10 @@ export default {
         name: localStorage.idName,
         //身份证号码id
         type: '1',
-        // keyword: '不属于公司招聘员工',
         keyword: '本合同履行期间，本人保证不从事与代',
         pageNo: '1',
         index: '2',
-        offset: '110',
+        offset: '220',
         pos: '2'
       }).then(data => {
         this.$toast.clear()

src/views/ebiz/agentEenter/ResultEnd.vue

@@ -0,0 +1,79 @@
+<template>
+  <div class="signContract-result-container bg-white">
+    <div class="flex justify-content-c align-items-c p20 pt150">
+      <van-icon  v-if="submitStatus == '0'" color="#1296DB" size="100px" name="passed" />
+    </div>
+    <div class="flex justify-content-c flex-direction-colunm align-items-c">
+      <h3 v-if="submitStatus == '0' ">入司成功</h3>
+      <h4 class="pt15" v-if="submitStatus == '0'">您的工号为：{{jobNumber}}</h4>
+    </div>
+    <div class="p20">
+      <p v-if="submitStatus == '0' ">&emsp;&emsp;恭喜您加入国富人寿这个大家庭，您可以使用工号及初始登录密码登录APP进行展业啦，初始密码为证件号码后6位。</p>
+    </div>
+    <div class="flex justify-content-a align-items-c p20">
+      <van-button class="radius50 bg-white green" type="danger" v-if="submitStatus == '0'" @click="goToLogin" >去登录</van-button>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { Field, Icon, Button, Checkbox, CheckboxGroup } from 'vant'
+  import { enterQuery } from '@/api/ebiz/agentEenter/agentEenter.js'
+  export default {
+    data() {
+      return {
+        pdfUrl: '',
+        checked: false,
+        submitStatus: '0',
+        jobNumber: ''
+      }
+    },
+    created() {
+      this.enterQuery()
+    },
+    methods: {
+      //获取签署协议人信息
+      enterQuery() {
+        let that = this
+        that.$toast.loading({
+          duration: 0, // 持续展示 toast
+          forbidClick: true, // 禁用背景点击
+          loadingType: 'spinner',
+          message: '加载中……'
+        })
+        let data = {
+          // userModel: { mobile: 13000000000 }, //线上去掉
+        }
+        enterQuery(data).then(res => {
+          console.log(res)
+          if (res.result == '0') {
+            that.$toast.clear()
+            that.jobNumber=res.content.agentCode
+          } else {
+            this.$toast(res.resultMessage)
+          }
+        })
+      },
+      goToLogin(){
+        EWebBridge.webCallAppInJs('bridge', {
+          flag: 'login'
+        })
+      }
+    },
+    components: {
+      [Field.name]: Field,
+      [Icon.name]: Icon,
+      [Button.name]: Button,
+      [Checkbox.name]: Checkbox,
+      [CheckboxGroup.name]: CheckboxGroup
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .signContract-result-container {
+    width: 100vw;
+    height: 100vh;
+  }
+</style>
+

src/views/ebiz/agentEenter/ShowPDF.vue

@@ -1,22 +1,32 @@
 <template>
+  <div>
     <div class="pdf">
-    <iframe style="width:100vw;height:100vh" :src="src + pdfUrl"></iframe>
+      <iframe style="width:100vw;height:90vh;" :src="src + pdfUrl"></iframe>
+    </div>
+    <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 { agreementQuery } from '@/api/ebiz/agentEenter/agentEenter.js'
+    import {agreementQuery} from '@/api/ebiz/agentEenter/agentEenter.js'
-import { Toast } from 'vant'
+    import {Toast, Button} from 'vant'
-import config from '@/config'
+    import config from '@/config'
-export default {
+
+    export default {
         data() {
             return {
                 src: location.origin + '/pdfjs/web/viewer.html?file=',
                 pdfUrl: '',
-      appntSign:''
+                appntSign: ''
             }
         },
         components: {
+            [Button.name]: Button,
             [Toast.name]: Toast
+
         },
 
         mounted() {
@@ -44,7 +54,18 @@ export default {
                         this.$toast(res.resultMessage)
                     }
                 })
+            },
+            nextStep() {
+                this.$jump({
+                    flag: 'h5',
+                    extra: {
+                        url: location.origin + `/#/agentEenter/ResultEnd`
+                    },
+                    routerInfo: {
+                        path: ` /agentEenter/ResultEnd`
+                    }
+                })
+            }
         }
     }
-}
 </script>

src/views/ebiz/agentEenter/SignContract.vue

@@ -17,7 +17,7 @@
             <div class="w240 blue">{{ sign.name }}</div>
             <div class="pt5 pb5">
               <van-icon v-if="sign.signState === '1'" color="green" name="checked" />
-              <van-button v-if="sign.signState === '1'" @click="changeSign(sign, '0')" v-no-more-click="1000" plain type="danger" round size="small" class="ml5"
+              <van-button v-if="sign.signState === '1' && agentInfo.audit == '04' " @click="changeSign(sign, '0')" v-no-more-click="1000" plain type="danger" round size="small" class="ml5"
                 >重新签名</van-button
               >
             </div>
@@ -40,7 +40,7 @@
           <li class="flex" v-for="(sign, index) in guaranteeSignList" :key="index">
             <div class="w240 blue">{{ sign.name }}</div>
             <van-icon v-if="sign.signState === '1'" color="green" name="checked" />
-            <van-button v-if="sign.signState === '1'" @click="changeSign(sign, '1')" v-no-more-click="1000" plain type="danger" round size="small" class="ml5"
+            <van-button v-if="sign.signState === '1' && agentInfo.audit == '04' " @click="changeSign(sign, '1')" v-no-more-click="1000" plain type="danger" round size="small" class="ml5"
               >重新签名</van-button
             >
           </li>

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

@@ -1,5 +1,12 @@
 <template>
   <div class="sale-list-container pb50">
+    <van-sticky>
+      <van-tabs v-model="appntNode" @click="changeTab" v-if="branchType === '1'">
+        <van-tab title="营业区经理" name="1"> </van-tab>
+        <van-tab title="三级机构负责人" name="3"> </van-tab>
+        <van-tab title="人员管理岗" name="5"> </van-tab>
+      </van-tabs>
+    </van-sticky>
     <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">
@@ -47,8 +54,9 @@
 </template>
 
 <script>
-import { List, Tag, Sticky, Toast, Dialog } from 'vant'
+import { List, Tag, Tab, Sticky, Tabs } from 'vant'
 import { agentAddApproval } from '@/api/ebiz/agentEenter/agentEenter.js'
+import { getAgentInfo } from '@/api/ebiz/my/my.js'
 
 export default {
   name: 'approveList',
@@ -56,11 +64,14 @@ export default {
     [List.name]: List,
     [Tag.name]: Tag,
     [Sticky.name]: Sticky,
-    [Dialog.name]: Dialog
+    [Tab.name]: Tab,
+    [Tabs.name]: Tabs
   },
   data() {
     return {
       approveList: [], //审批列表信息
+      branchType: '', //是否是内勤审批 0-不是内勤审批 1-是内勤审批
+      appntNode: '', //审批级别 1：区经理审批  3、三级机构审批  5、人员管理岗
       loading: false,
       finished: false,
       currentPage: 1, //当前页数
@@ -68,7 +79,14 @@ export default {
       isSuccess: false
     }
   },
-  mounted() {
+  async mounted() {
+    // 获取代理人信息
+    const res = await getAgentInfo({})
+    if (res.result == 0) {
+      this.branchType = /^N{1}/.test(res.branchType) ? '1' : '0' //res.branchType 以N打头的是内勤 其他是外勤
+    } else {
+      return this.$toast(res.resultMessage)
+    }
     this.loadMore()
   },
   methods: {
@@ -81,10 +99,11 @@ export default {
       this.getOrderList(pageInfo)
     },
     //初始化审批列表
-    getOrderList(pageInfo) {
+    getOrderList(pageInfo, appntNode = '1') {
       let data = {
         ...pageInfo,
-        types: ['01']
+        types: ['01'],
+        appntNode: this.branchType === '1' ? appntNode : null
       }
       agentAddApproval(data).then(res => {
         this.$toast.clear()
@@ -108,17 +127,23 @@ export default {
         }
       })
     },
-
+    //切换审批级别
+    changeTab(e) {
+      let pageInfo = {
+        pageNum: this.currentPage
+      }
+      this.getOrderList(pageInfo, e)
+    },
     //审批
     goApprove(baseId) {
       console.log(baseId)
       this.$jump({
         flag: 'h5',
         extra: {
-          url: location.origin + `/#/agentEenter/approve/BasicInfo/${baseId}`,
+          url: location.origin + `/#/agentEenter/approve/BasicInfo/${baseId}/${this.branchType}/${this.appntNode}`,
           pullRefresh: '1' //1:需要开启下拉刷新
         },
-        routerInfo: { path: `/agentEenter/approve/BasicInfo/${baseId}` }
+        routerInfo: { path: `/agentEenter/approve/BasicInfo/${baseId}/${this.branchType}/${this.appntNode}` }
       })
     }
   }

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

@@ -34,14 +34,14 @@
       </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.referCode" />
         <van-cell title="推荐人姓名" :value="referrerInfoDTO.referName" />
-        <van-cell title="营业组主管代码" :value="referrerInfoDTO.teamManger" />
+        <van-cell title="营业组主管工号" :value="referrerInfoDTO.teamManger" />
         <van-cell title="营业组主管姓名" :value="referrerInfoDTO.teamMangerName" />
-        <van-cell title="营业处经理代码" :value="referrerInfoDTO.officeManger" />
+        <van-cell title="营业处经理工号" :value="referrerInfoDTO.officeManger" />
         <van-cell title="营业处经理姓名" :value="referrerInfoDTO.officeMangerName" />
-        <van-cell title="营业区经理代码" :value="referrerInfoDTO.areaManger" />
+        <van-cell title="总监工号" :value="referrerInfoDTO.areaManger" />
-        <van-cell title="营业区经理姓名" :value="referrerInfoDTO.areaMangerName" />
+        <van-cell title="总监姓名" :value="referrerInfoDTO.areaMangerName" />
       </van-cell-group>
     </div>
     <div class="flex justify-content-s bottom-btn  bg-white">
@@ -52,7 +52,6 @@
 <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: 'approveInfo',
@@ -76,6 +75,7 @@ export default {
     getOrderList() {
       let BasicParams = {
         types: ['02', '03'],
+        appntNode: this.$route.params.branchType == '1' ? this.$route.params.appntNode : null,
         ebizEnterCustomerDto: {
           id: this.$route.params.baseId
         }
@@ -96,9 +96,9 @@ export default {
       this.$jump({
         flag: 'h5',
         extra: {
-          url: location.origin + `/#/agentEenter/approve/ApproveInfo/${baseId}`
+          url: location.origin + `/#/agentEenter/approve/ApproveInfo/${baseId}/${this.$route.params.branchType}/${this.$route.params.appntNode}`
         },
-        routerInfo: { path: `/agentEenter/approve/ApproveInfo/${baseId}` }
+        routerInfo: { path: `/agentEenter/approve/ApproveInfo/${baseId}/${this.$route.params.branchType}/${this.$route.params.appntNode}` }
       })
     }
   }

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

@@ -55,7 +55,6 @@
 <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',

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

@@ -71,7 +71,6 @@ export default {
   },
   mounted() {
     document.getElementsByTagName('body')[0].classList.add('bg-white')
-    // this.getOrderList()
     this.loadMore()
   },
   destroyed() {