Merge branch 'feature/入司优化' into dev

src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue

@@ -431,7 +431,8 @@ export default {
         sameTrade: '', //是否同业
         nationality: 'CHN', //国籍/地区
         foreigners: '', //是否境外人员
-        applGrade: '' //职级
+        applGrade: '', //职级
+        isRevoke: 0
       },
       areaList: areaList,
       currentPopupIndex: '',

src/views/ebiz/agentEenter/SignContract.vue

@@ -17,7 +17,15 @@
             <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' && agentInfo.audit == '04' " @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 +48,15 @@
           <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' && agentInfo.audit == '04' " @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,13 +1,5 @@
 <template>
   <div class="sale-list-container pb50">
-    <van-sticky>
-      <van-tabs v-model="appntNode" v-if="branchType === '1'" @change="change">
-        <van-tab title="营业区经理" name="1" />
-        <van-tab title="三级机构负责人" name="3" />
-        <van-tab title="人员管理岗" name="5" />
-        <van-tab title="执业证" />
-      </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">
@@ -40,7 +32,7 @@
                 <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="revokeApply(item.baseId)">撤销申请</van-button>
+                <van-button v-if="item.isRevoke == 0" round size="small" class="mr5" type="danger" @click="revokeApply(item.baseId)">撤销申请</van-button>
                 <van-button round size="small" class="mr5" type="danger" @click="goApprove(item.baseId)">审批</van-button>
               </div>
             </div>
@@ -88,28 +80,111 @@ export default {
       finishedText: '',
       isSuccess: false,
       basicId: 0,
-      idNo: ''
+      idNo: '',
+      innerNodes: [
+        { type: 1, isFinished: false },
+        { type: 3, isFinished: false },
+        { type: 5, isFinished: false }
+      ]
     }
   },
   async mounted() {
     // 获取代理人信息
     const res = await getAgentInfo({})
     if (res.result == 0) {
-      this.branchType = /^N{1}/.test(res.branchType) ? '1' : '0' //res.branchType 以N打头的是内勤 其他是外勤
+      // res.branchType 以N打头的是内勤 其他是外勤
+      this.branchType = /^N{1}/.test(res.branchType) ? '1' : '0'
       this.approveName = encodeURI(res.name)
+      // 0: 外勤
       if (this.branchType == '0') {
-        this.getOrderList({
+        this.getOuterDataList()
-          pageNum: this.currentPage
+      }
-        })
+      // 1: 内勤
+      else {
+        this.getInnerDataList()
       }
     } else {
       return this.$toast(res.resultMessage)
     }
-    this.getOrderList({
-      pageNum: this.currentPage
-    })
   },
   methods: {
+    // 外勤查询数据
+    async getOuterDataList() {
+      let data = {
+        pageNum: this.currentPage,
+        types: ['01'],
+        appntNode: null
+      }
+      const res = await agentAddApproval(data)
+      this.$toast.clear()
+      if (res.result == '0') {
+        this.currentPage++
+        let resData = res.content.approveWaitPageInfo
+        if (resData.list.length > 0) {
+          this.isSuccess = true
+          for (let data of resData.list) {
+            let exist = this.approveList.findIndex(item => {
+              return item.baseId === data.baseId
+            })
+            if (exist === -1) {
+              this.approveList.push(data)
+            }
+          }
+          if (resData.pageNum == resData.pages) {
+            this.finished = true
+            this.finishedText = '没有更多了'
+          }
+          this.loading = false
+        }
+      } else {
+        this.finished = true
+        this.loading = false
+        this.finishedText = res.resultMessage
+      }
+    },
+    async getInnerDataList() {
+      // 遍历内勤需要查询的节点
+      for (let node of this.innerNodes) {
+        let data = {
+          pageNum: this.currentPage,
+          types: ['01'],
+          appntNode: node.type
+        }
+        const res = await agentAddApproval(data)
+        console.log(res)
+        if (res.result == '0') {
+          let resData = res.content.approveWaitPageInfo
+          if (resData && resData.list.length > 0) {
+            this.isSuccess = true
+            for (let data of resData.list) {
+              let exist = this.approveList.findIndex(item => {
+                return item.baseId === data.baseId
+              })
+              if (exist === -1) {
+                node.type === 5 ? (data.canAddCertificateInfo = true) : (data.canAddCertificateInfo = false)
+                this.approveList.push(data)
+              }
+            }
+            this.loading = false
+          }
+        }
+        // 标记节点数据查询完成
+        else {
+          node.isFinished = true
+          this.loading = false
+        }
+      }
+      // 无数据将节点移除, 后续触发loadMore时不再查询该节点数据
+      this.innerNodes = this.innerNodes.filter(item => {
+        return !item.isFinished
+      })
+      if (!this.innerNodes.length) {
+        this.finished = true
+        this.finishedText = '没有更多了'
+      } else {
+        this.currentPage++
+      }
+    },
     async checkData(action, done) {
       if (action === 'confirm') {
         if (!this.idNo.trim()) {
@@ -153,66 +228,11 @@ export default {
       this.dialogShow = true
       this.basicId = basicId
     },
-    change(tab) {
-      this.currentPage = 1
-      this.approveList = []
-      this.finished = false
-      this.loading = true
-      this.finishedText = ''
-      this.getOrderList(
-        {
-          pageNum: this.currentPage
-        },
-        tab
-      )
-    },
     loadMore() {
-      let pageInfo = {
+      this.branchType === '1' ? this.getInnerDataList() : this.getOuterDataList()
-        pageNum: this.currentPage
-        // pageSize: this.pageSize
-      }
-      console.log('pageInfo==', pageInfo)
-      this.getOrderList(pageInfo, this.appntNode)
     },
-    //初始化审批列表
-    getOrderList(pageInfo, appntNode = '1') {
-      let data = {
-        ...pageInfo,
-        types: ['01'],
-        appntNode: this.branchType === '1' ? appntNode : null
-      }
-      agentAddApproval(data).then(res => {
-        this.$toast.clear()
-        if (res.result == '0') {
-          this.currentPage++
-          let resData = res.content.approveWaitPageInfo
-          if (resData.list.length > 0) {
-            this.isSuccess = true
-            for (let data of resData.list) {
-              let exist = this.approveList.findIndex(item => {
-                return item.baseId === data.baseId
-              })
-              if (exist === -1) {
-                this.approveList.push(data)
-              }
-            }
-            if (resData.pageNum == resData.pages) {
-              this.finished = true
-              this.finishedText = '没有更多了'
-            }
-            this.loading = false
-          }
-        } else {
-          this.finished = true
-          this.loading = false
-          this.finishedText = res.resultMessage
-        }
-      })
-    },
-
     //审批
     goApprove(baseId) {
-      console.log(baseId)
       this.$jump({
         flag: 'h5',
         extra: {
@@ -222,20 +242,6 @@ export default {
         routerInfo: { path: `/agentEenter/approve/BasicInfo/${baseId}/${this.branchType}/${this.approveName}/${this.appntNode}` }
       })
     }
-  },
-  watch: {
-    //审批级别变化时触发
-    // appntNode(val) {
-    //   this.currentPage = 1
-    //   this.finished = false
-    //   this.loading = false
-    //   let pageInfo = {
-    //     pageNum: this.currentPage
-    //   }
-    //   this.approveList = []
-    //   // this.getOrderList(pageInfo, val)
-    //   this.loadMore()
-    // }
   }
 }
 </script>

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

@@ -87,7 +87,7 @@
     </div>
     <div class="protocolFile" v-show="active === 2">
       <van-cell-group>
-        <van-cell is-link :title="protocol.name" v-for="(protocol, index) in agreements" :key="index" @click="handlePdf(protocol.rgssUrl)" />
+        <van-cell is-link :title="protocol.name" v-for="(protocol, index) in agreements" :key="index" @click="handlePdf(protocol.thirdUrl)" />
       </van-cell-group>
       <van-popup v-model="pdfShow" position="bottom" :style="{ height: '100%' }">
         <div style="display: flex; flex-direction: column; height: 100vh;">
@@ -179,6 +179,7 @@ export default {
         if (res.result == '0') {
           if (res.content) {
             this.BasicInfoDTO = res.content.ebizEnterCustomerDto
+            localStorage.setItem('ebizEnterCustomerDto', this.BasicInfoDTO)
             this.agreements = res.content.ebizEnterCustomerDto.agreements
             this.medias = res.content.ebizEnterCustomerDto.ebizMediaDtoLst
             this.guarantorList = res.content.ebizEnterCustomerDto.ebizGuarantorList