From 19145928eb84fb0c954e642cfcb5cc2f11f2e20b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=98=B3=E5=8D=8E=E7=A5=A5?= <yang.huaxiang@ebiz-fooge.com>
Date: Fri, 7 Aug 2020 18:26:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=8F=B8=E4=BC=98=E5=8C=96=EF=BC=9A?=
 =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=86=85=E5=8B=A4=E5=AE=A1=E6=89=B9=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=20--=E6=8F=90=E4=BA=A4=E4=BA=BA=EF=BC=9A=E9=98=B3?=
 =?UTF-8?q?=E5=8D=8E=E7=A5=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ebiz/agentEenter/approve/ApproveList.vue     | 12 +++++++-----
 .../ebiz/agentEenter/approve/RecordList.vue      | 16 +++++++++++++---
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/views/ebiz/agentEenter/approve/ApproveList.vue b/src/views/ebiz/agentEenter/approve/ApproveList.vue
index f5f58eaf5..285689f13 100644
--- a/src/views/ebiz/agentEenter/approve/ApproveList.vue
+++ b/src/views/ebiz/agentEenter/approve/ApproveList.vue
@@ -1,12 +1,12 @@
 <template>
   <div class="sale-list-container pb50">
-    <van-sticky>
+    <!--<van-sticky>
       <van-tabs v-model="appntNode" v-if="branchType === '1'" @change="change">
         <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-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">
@@ -86,12 +86,14 @@ export default {
     if (res.result == 0) {
       this.branchType = /^N{1}/.test(res.branchType) ? '1' : '0' //res.branchType 以N打头的是内勤 其他是外勤
       this.approveName = encodeURI(res.name)
+      if(this.branchType == '0'){
+        this.getOrderList({
+          pageNum: this.currentPage
+        })
+      }
     } else {
       return this.$toast(res.resultMessage)
     }
-    this.getOrderList({
-      pageNum: this.currentPage
-    })
   },
   methods: {
     change(tab) {
diff --git a/src/views/ebiz/agentEenter/approve/RecordList.vue b/src/views/ebiz/agentEenter/approve/RecordList.vue
index 98f9bcbf8..109b2c447 100644
--- a/src/views/ebiz/agentEenter/approve/RecordList.vue
+++ b/src/views/ebiz/agentEenter/approve/RecordList.vue
@@ -49,6 +49,7 @@
 <script>
 import { List, Tag, Sticky, Toast, Dialog } from 'vant'
 import { agentAddApproval } from '@/api/ebiz/agentEenter/agentEenter.js'
+import { getAgentInfo } from '@/api/ebiz/my/my.js'
 
 export default {
   name: 'approveList',
@@ -66,12 +67,21 @@ export default {
       currentPage: 1, //当前页数
       finishedText: '',
       // pageSize: 15, //每页数据条数
-      isSuccess: false
+      isSuccess: false,
+      branchType: '1'
     }
   },
-  mounted() {
+  async mounted() {
     document.getElementsByTagName('body')[0].classList.add('bg-white')
-    this.loadMore()
+    const res = await getAgentInfo({})
+    if (res.result == 0) {
+      this.branchType = /^N{1}/.test(res.branchType) ? '1' : '0' //res.branchType 以N打头的是内勤 其他是外勤
+      if(this.branchType == '0'){
+        this.loadMore()
+      }
+    } else {
+      return this.$toast(res.resultMessage)
+    }
   },
   destroyed() {
     document.getElementsByTagName('body')[0].classList.remove('bg-white')