From 2c31f175e730ba01edd428cab74c17ee01efbd8e Mon Sep 17 00:00:00 2001
From: "tian.guangyuan" <tian.guangyuan@ebiz-fooge.com>
Date: Fri, 29 May 2020 20:55:58 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E3=80=90fix=E3=80=91=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=AF=A5=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/common/MainRiskList.vue | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/views/ebiz/common/MainRiskList.vue b/src/views/ebiz/common/MainRiskList.vue
index a99e48afb..976393928 100644
--- a/src/views/ebiz/common/MainRiskList.vue
+++ b/src/views/ebiz/common/MainRiskList.vue
@@ -35,7 +35,8 @@ export default {
       list: [],
       result: '',
       delList: [],
-      radioVal: ''
+      radioVal: '',
+      isFrom: localStorage.isFrom
     }
   },
   mounted() {
@@ -45,7 +46,16 @@ export default {
     //获取主险列表
     async getMainRiskList() {
       let mainRiskCodes = localStorage.mainRiskCodes && JSON.parse(localStorage.mainRiskCodes)
-      let resultData = await mainRiskList({ platform: 'app' })
+      let mainListDate = { platform: 'app' }
+      switch (this.isFrom){
+        case 'proposal':
+          mainListDate.platform = 'proposal'
+          break;
+        case 'sale':
+          mainListDate.platform = 'app'
+          break;
+      }
+      let resultData = await mainRiskList(mainListDate)
       if (resultData.result == 0) {
         resultData.mainRiskDTOS.forEach(item => {
           //已选主险不能再选、险种互斥

From 970306780b2bee0906bfb01d1c2a8010231bc896 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: Tue, 11 Aug 2020 14:10:11 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E5=85=A5=E5=8F=B8=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=EF=BC=9A=E5=90=88=E5=B9=B6=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=20=20--=E6=8F=90=E4=BA=A4=E4=BA=BA=EF=BC=9A=E9=98=B3=E5=8D=8E?=
 =?UTF-8?q?=E7=A5=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/ebiz/agentEenter.js         | 11 -----------
 src/views/ebiz/agentEenter/Paction.vue |  2 --
 2 files changed, 13 deletions(-)

diff --git a/src/router/ebiz/agentEenter.js b/src/router/ebiz/agentEenter.js
index 7757b4605..d42f1301f 100644
--- a/src/router/ebiz/agentEenter.js
+++ b/src/router/ebiz/agentEenter.js
@@ -24,8 +24,6 @@ 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 ResultEnd = () => import('@/views/ebiz/agentEenter/ResultEnd')
-
 const recordList = () => import('@/views/ebiz/agentEenter/approve/RecordList')
 const recordDetail = () => import('@/views/ebiz/agentEenter/approve/RecordDetail')
 const ResultEnd = () => import('@/views/ebiz/agentEenter/ResultEnd')
@@ -274,15 +272,6 @@ export default [
       index: 1
     }
   },
-  {
-    path: '/agentEenter/ResultEnd',
-    name: 'ResultEnd',
-    component: ResultEnd,
-    meta: {
-      title: '入司成功',
-      index: 1
-    }
-  },
   {
     path: '/agentEenter/ResultEnd',
     name: 'ResultEnd',
diff --git a/src/views/ebiz/agentEenter/Paction.vue b/src/views/ebiz/agentEenter/Paction.vue
index 3f1ea8963..0c70064a8 100644
--- a/src/views/ebiz/agentEenter/Paction.vue
+++ b/src/views/ebiz/agentEenter/Paction.vue
@@ -158,8 +158,6 @@ export default {
         pageNo: '1',
         index: '2',
         offset: '220',
-        pos: '2'
-        offset: '220',
         pos: '2',
         signatureWidth: this.$utils.signParams().signatureWidth,
         signatureHeight: this.$utils.signParams().signatureHeight

From cc7937dd9444e39715a5b74694aca2d975870f66 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: Tue, 11 Aug 2020 21:52:53 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E5=85=A5=E5=8F=B8=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=EF=BC=9A=E5=85=A5=E5=8F=B8=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=20--=E6=8F=90=E4=BA=A4=E4=BA=BA=EF=BC=9A=E9=98=B3=E5=8D=8E?=
 =?UTF-8?q?=E7=A5=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/sale/InsuredInfo.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/ebiz/sale/InsuredInfo.vue b/src/views/ebiz/sale/InsuredInfo.vue
index 81516017c..0f4b7859a 100644
--- a/src/views/ebiz/sale/InsuredInfo.vue
+++ b/src/views/ebiz/sale/InsuredInfo.vue
@@ -1174,7 +1174,7 @@ export default {
           }
         }
 
-        //this.infoUpdate()
+        this.infoUpdate()
         // console.log('success')
       } else {
         return this.$toast(this.$validator.errors.all()[0])

From f8533ff58e2ca57aa8d0dc381c345a82d28828e0 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: Tue, 11 Aug 2020 23:00:42 +0800
Subject: [PATCH 4/5] =?UTF-8?q?NBS=20=E7=BB=9F=E8=AE=A1=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86=20=20--?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BA=BA=EF=BC=9A=E9=98=B3=E5=8D=8E=E7=A5=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/nbs/InternalService.vue       | 2 +-
 src/views/ebiz/nbs/InternalServiceItem.vue   | 2 +-
 src/views/ebiz/nbs/InternalServiceItem_2.vue | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/ebiz/nbs/InternalService.vue b/src/views/ebiz/nbs/InternalService.vue
index a6586bd56..c19e0519c 100644
--- a/src/views/ebiz/nbs/InternalService.vue
+++ b/src/views/ebiz/nbs/InternalService.vue
@@ -13,7 +13,7 @@
       </div>
       <unit-nav :total="tableData.total"></unit-nav>
     </van-sticky>
-    <unit-list v-if="tableData" level="1" :dataLoading="tableData.list" :list="tableData.list" url="/nbs/internalItem"></unit-list>
+    <unit-list v-if="tableData" level="1" :dataLoading="tableData.list" :list="tableData.list" url="/#/nbs/internalItem"></unit-list>
     <van-popup v-model="showTime" position="bottom">
       <van-datetime-picker
         v-model="currentDate"
diff --git a/src/views/ebiz/nbs/InternalServiceItem.vue b/src/views/ebiz/nbs/InternalServiceItem.vue
index 2d4d61a05..f25664c4b 100644
--- a/src/views/ebiz/nbs/InternalServiceItem.vue
+++ b/src/views/ebiz/nbs/InternalServiceItem.vue
@@ -6,7 +6,7 @@
       </div>
       <unit-nav :titleArr="titleArr" :key="changeKey"></unit-nav>
     </van-sticky>
-    <unit-list v-if="tableData" :list="searchList" :dataLoading="tableData.list" :level="level" url="/nbs/internalItem_2"></unit-list>
+    <unit-list v-if="tableData" :list="searchList" :dataLoading="tableData.list" :level="level" url="/#/nbs/internalItem_2"></unit-list>
   </div>
 </template>
 <script>
diff --git a/src/views/ebiz/nbs/InternalServiceItem_2.vue b/src/views/ebiz/nbs/InternalServiceItem_2.vue
index b50acecbb..c69647595 100644
--- a/src/views/ebiz/nbs/InternalServiceItem_2.vue
+++ b/src/views/ebiz/nbs/InternalServiceItem_2.vue
@@ -6,7 +6,7 @@
       </div>
       <unit-nav :titleArr="titleArr" :key="changeKey"></unit-nav>
     </van-sticky>
-    <unit-list v-if="tableData" :list="searchList" :dataLoading="tableData.list" :level="level" url="/nbs/internalItem_2"></unit-list>
+    <unit-list v-if="tableData" :list="searchList" :dataLoading="tableData.list" :level="level" url="/#/nbs/internalItem_2"></unit-list>
   </div>
 </template>
 <script>

From ce2af7eaf18d68b1b4e1a20da6efcbb45dabd111 Mon Sep 17 00:00:00 2001
From: mengxiaolong <meng.xiaolong@ebiz-digits.com>
Date: Wed, 12 Aug 2020 15:33:47 +0800
Subject: [PATCH 5/5] =?UTF-8?q?nbs=E7=BB=9F=E8=AE=A1=E6=96=87=E6=9C=AC?=
 =?UTF-8?q?=E8=BF=87=E9=95=BF=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/nbs/CrewList.vue | 49 +++++++++++++++++++++++----------
 1 file changed, 35 insertions(+), 14 deletions(-)

diff --git a/src/views/ebiz/nbs/CrewList.vue b/src/views/ebiz/nbs/CrewList.vue
index 298103f53..9076101b1 100644
--- a/src/views/ebiz/nbs/CrewList.vue
+++ b/src/views/ebiz/nbs/CrewList.vue
@@ -93,7 +93,7 @@
     </table>
 
     <div style="overflow-x:auto;" class="max" @scroll="scrollChange" v-else>
-      <table class="max main-table" v-if="tableData">
+      <table class="max main-table" v-if="tableData && !isLoading">
         <tr v-for="(item, i) in tableData.list" :key="i">
           <td v-if="nbsAgentGrade >= 400">
             <div class="status">{{ item.departmentCode }}</div>
@@ -124,6 +124,10 @@
           </td>
         </tr>
       </table>
+
+      <div class="loading" v-else>
+        <van-loading />
+      </div>
     </div>
     <van-popup v-model="showPiker" position="bottom">
       <van-picker
@@ -143,7 +147,7 @@
   </div>
 </template>
 <script>
-import { Sticky, Popup, Picker, DatetimePicker, Tag, Button } from 'vant'
+import { Sticky, Popup, Picker, DatetimePicker, Tag, Button, Loading } from 'vant'
 import { nbsTable, makeCustomerPDF, getRankList, getGankLevel, getTableList, exportExcel } from '@/api/ebiz/nbs'
 import config from '@/config'
 import dateUtil from '@/assets/js/utils/date-utils'
@@ -154,6 +158,7 @@ export default {
     [Popup.name]: Popup,
     [Picker.name]: Picker,
     [DatetimePicker.name]: DatetimePicker,
+    [Loading.name]: Loading,
     [Tag.name]: Tag,
     [Button.name]: Button
   },
@@ -204,6 +209,7 @@ export default {
         list: []
       },
       excelUrl: '',
+      isLoading: '',
       nbsAgentGrade: ''
     }
   },
@@ -225,7 +231,7 @@ export default {
     }
   },
   async created() {
-    this.nbsAgentGrade = window.localStorage.getItem('nbsAgentGrade')
+    this.nbsAgentGrade = Number(window.localStorage.getItem('nbsAgentGrade'))
     setTimeout(() => {
       this.filterBtn() // 初始化下载按钮
       window.appCallBack = this.appCallBack //app回调
@@ -245,6 +251,7 @@ export default {
   },
   methods: {
     async getTableList() {
+      this.isLoading = true
       let condition = {
         departmentCode: this.params.picker_1.agentgroup ? this.params.picker_1.agentgroup : '',
         branchCode: this.params.picker_2.agentgroup ? this.params.picker_2.agentgroup : '',
@@ -369,15 +376,19 @@ export default {
     },
     async appCallBack(data) {
       if (data.trigger == 'right_button_click') {
-        let params = { nbsState: this.$route.params.code }
-        makeCustomerPDF(params).then(res => {
-          if (res.result == '0') {
-            if (res.content.length > 0) {
-              this.downLoadUrl = config.imgDomain + '/returnDirectStream?imgPath=' + res.content
-            }
-          } else return this.$toast(res.resultMessage)
-        })
-        await this.exportExcel()
+        if (window.localStorage.getItem('nbsAgentGrade') < 200) {
+          let params = { nbsState: this.$route.params.code }
+          makeCustomerPDF(params).then(res => {
+            if (res.result == '0') {
+              if (res.content.length > 0) {
+                this.downLoadUrl = config.imgDomain + '/returnDirectStream?imgPath=' + res.content
+                console.log('this.downLoadUrl == ', this.downLoadUrl)
+              }
+            } else return this.$toast(res.resultMessage)
+          })
+        } else {
+          await this.exportExcel()
+        }
         setTimeout(() => {
           // eslint-disable-next-line no-undef
           EWebBridge.webCallAppInJs('download', {
@@ -452,10 +463,11 @@ div.max {
   .status,
   .name,
   .date {
-    height: 27px;
     font-size: 14px;
     text-align: center;
-    line-height: 27px;
+    word-wrap: break-word;
+    word-break: normal;
+    line-height: 1.5em;
   }
   .status,
   .name {
@@ -552,4 +564,13 @@ div.max {
     }
   }
 }
+.loading {
+  display: flex;
+  justify-content: center;
+  padding-top: 100px;
+}
+
+/deep/ .van-icon {
+  vertical-align: middle;
+}
 </style>