From f70d800586a22d4b189974f0c86af4fff328ba6c Mon Sep 17 00:00:00 2001
From: yuweiqi <yu.weiqi@ebiz-fooge.com>
Date: Thu, 4 Jun 2020 14:14:24 +0800
Subject: [PATCH] =?UTF-8?q?[FIX]=E3=80=90=E4=BF=9D=E5=85=A8=E3=80=91?=
 =?UTF-8?q?=E4=BF=9D=E5=85=A8=E8=BF=9B=E5=BA=A6=E6=9F=A5=E8=AF=A2=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ebiz/preserve/preserve.js             |   8 +
 src/assets/js/utils/request.js                |   3 +-
 src/views/ebiz/preserve/Progress.vue          | 322 +++---------------
 src/views/ebiz/preserve/Search.vue            |   1 +
 .../preserve/bc/BeneficiaryInfoDetail.vue     |   4 +-
 src/views/ebiz/preserve/js/data-dictionary.js |  93 +++--
 6 files changed, 127 insertions(+), 304 deletions(-)

diff --git a/src/api/ebiz/preserve/preserve.js b/src/api/ebiz/preserve/preserve.js
index 44985f9bd..acbee4395 100644
--- a/src/api/ebiz/preserve/preserve.js
+++ b/src/api/ebiz/preserve/preserve.js
@@ -43,6 +43,14 @@ export function changeEdor(data) {
   })
 }
 
+//保全进度查询列表
+export function queryEdorList(data) {
+  return request({
+    url: getUrl('/edor/edor/queryEdorList', 1),
+    method: 'post',
+    data
+  })
+}
 //签名信息保存
 export function edorSignSave(data) {
   return request({
diff --git a/src/assets/js/utils/request.js b/src/assets/js/utils/request.js
index 85c6fb1c3..046d56327 100644
--- a/src/assets/js/utils/request.js
+++ b/src/assets/js/utils/request.js
@@ -69,7 +69,8 @@ let manpower = [
 //保全
 let preserve = [
   '/edor/customer/customerList', //客户搜索
-  '/edor/policy/policyList' //保单列表
+  '/edor/policy/policyList', //保单列表
+  '/edor/edor/queryEdorList' //保全进度查询
 ]
 let whiteList = ['/customer/agent/getCustomersList', ...proposal, ...sale, ...agentEnter, ...claims, ...survey, ...preserve, ...manpower]
 
diff --git a/src/views/ebiz/preserve/Progress.vue b/src/views/ebiz/preserve/Progress.vue
index 9137220f8..0d120f5f1 100644
--- a/src/views/ebiz/preserve/Progress.vue
+++ b/src/views/ebiz/preserve/Progress.vue
@@ -1,7 +1,7 @@
 <!-- 保全进度查询 -->
 <template>
   <div class="progress container">
-    <van-list
+    <!-- <van-list
       v-model="loading"
       :immediate-check="false"
       :finished="finished"
@@ -10,48 +10,48 @@
       :error.sync="error"
       @load="getList"
       class="pb45"
-    >
-      <div v-if="isSuccess">
-        <div class="fs12" v-for="(item, index) in list" :key="index">
-          <div class="flex align-items-c justify-content-c h40 gray">
-            <div>{{ item.edorapplyNo | date }}</div>
-          </div>
-          <div class="bg-white pv15 pr15 pl10 ml15 mr15">
-            <div class="flex justify-content-s align-items-c">
-              <div>
-                <div class="w80 inline-b"><van-tag plain color="#DD9C56">客户</van-tag></div>
-                <span class="fs14 c-gray-dark">{{ item.customerName }}</span>
-              </div>
-            </div>
-            <div class="flex justify-content-s align-items-c pt15 pb15">
-              <div>
-                <div class="w80 inline-b"><van-tag plain color="#5ca7de">状态</van-tag></div>
-                <span class="fs14 c-gray-dark">{{ item.surrenderStatus | idToText('preserveState') }}</span>
-              </div>
-            </div>
-            <div class="pt15" style="border-top:1px solid #dadada">
-              <div>
-                <div class="w80 inline-b"><van-tag plain color="#999">保全项</van-tag></div>
-                <span class="fs14 c-gray-dark">{{ item.surrenderType | idToText('preserveTypeT') }}</span>
-              </div>
-            </div>
-            <div class="mt10 flex justify-content-fe">
-              <van-button round @click="detail(item)" size="small" class="mr5" type="danger" plain v-no-more-click="2000">查看详情</van-button>
+    > -->
+    <div v-if="isSuccess">
+      <div class="fs12" v-for="(item, index) in list" :key="index">
+        <div class="flex align-items-c justify-content-c h40 gray">
+          <div>{{ item.edorAppDate | date }}</div>
+        </div>
+        <div class="bg-white pv15 pr15 pl10 ml15 mr15">
+          <div class="flex justify-content-s align-items-c">
+            <div>
+              <div class="w80 inline-b"><van-tag plain color="#DD9C56">客户</van-tag></div>
+              <span class="fs14 c-gray-dark">{{ item.appntName }}</span>
             </div>
           </div>
+          <div class="flex justify-content-s align-items-c pt15 pb15">
+            <div>
+              <div class="w80 inline-b"><van-tag plain color="#5ca7de">状态</van-tag></div>
+              <span class="fs14 c-gray-dark">{{ item.edorState | idToText('preserveState') }}</span>
+            </div>
+          </div>
+          <div class="pt15" style="border-top:1px solid #dadada">
+            <div>
+              <div class="w80 inline-b"><van-tag plain color="#999">保全项</van-tag></div>
+              <span class="fs14 c-gray-dark">{{ item.edorType }}</span>
+            </div>
+          </div>
+          <!-- <div class="mt10 flex justify-content-fe">
+            <van-button round @click="detail(item)" size="small" class="mr5" type="danger" plain v-no-more-click="2000">查看详情</van-button>
+          </div> -->
         </div>
       </div>
-      <div v-else class="text-center">
-        <img class="mt40 w250" src="@/assets/images/pic_page-non.png" />
-        <div class="fs17 c-gray-dark mt40">暂无数据</div>
-      </div>
-    </van-list>
+    </div>
+    <div v-else class="text-center">
+      <img class="mt40 w250" src="@/assets/images/pic_page-non.png" />
+      <div class="fs17 c-gray-dark mt40">暂无数据</div>
+    </div>
+    <!-- </van-list> -->
   </div>
 </template>
 
 <script>
 import { Divider, Tag, Row, Col, Checkbox, CheckboxGroup, List } from 'vant'
-import { progressListQuery } from '@/api/ebiz/preserve/preserve'
+import { queryEdorList } from '@/api/ebiz/preserve/preserve'
 import dataDic from './js/data-dictionary.js'
 import dateUtils from '@/assets/js/utils/date-utils'
 export default {
@@ -59,25 +59,22 @@ export default {
   data() {
     return {
       list: [], //保全进度列表
-      loading: false,
-      finished: false,
-      pageSize: 5, //页面条数
-      pageNum: 1, //页码数
-      currentPage: 1, //当前页数
-      error: false,
-      finishedText: '没有更多了',
       isSuccess: false,
       dataDic: dataDic
     }
   },
   filters: {
-    idToText: function(value, key) {
-      if (value !== undefined) {
-        return dataDic[key][value]
-      } else {
-        return value
-      }
+    // 数据字典 id 转 text
+    idToText: function(id, type) {
+      let text = ''
+      dataDic[type].some(item => {
+        if (item.id == id) {
+          text = item.text
+        }
+      })
+      return text
     },
+
     date: function(value) {
       let date = new Date(value)
       if (date.toString() != 'Invalid Date') {
@@ -117,237 +114,12 @@ export default {
       })
     },
     getList() {
-      this.$toast.loading({
-        // 持续展示 toast
-        duration: 0,
-        // 禁用背景点击
-        forbidClick: true,
-        loadingType: 'spinner',
-        message: '加载中……'
-      })
-      progressListQuery({
-        pageSize: this.pageSize,
-        pageNum: this.currentPage
-      }).then(res => {
+      queryEdorList({}).then(res => {
         this.$toast.clear()
         if (res.result == 0) {
+          console.log(res)
           this.isSuccess = true
-          this.currentPage++
-          if (res.content.list.length == 0) {
-            this.finishedText = ''
-          } else {
-            this.finishedText = '已经全部加载'
-          }
-          this.loading = false
-          if (res.content.nextPage == 0) {
-            this.finished = true
-          }
-          this.list = this.list.concat(res.content.list)
-
-          this.list = [
-            {
-              surrenderId: 5102898,
-              edorapplyNo: 5585154,
-              edoracceptNo: 679891,
-              surrenderType: 1,
-              surrenderStatus: 2,
-              customerNo: 906473,
-              customerId: 4339487,
-              customerName: 8200072
-            },
-            {
-              surrenderId: 9696988,
-              edorapplyNo: 1741393,
-              edoracceptNo: 6079324,
-              surrenderType: 2,
-              surrenderStatus: 4,
-              customerNo: 3330232,
-              customerId: 2880507,
-              customerName: 9109817
-            },
-            {
-              surrenderId: 4897798,
-              edorapplyNo: 6876344,
-              edoracceptNo: 8360171,
-              surrenderType: 3,
-              surrenderStatus: 0,
-              customerNo: 3087814,
-              customerId: 8258533,
-              customerName: 3066420
-            },
-            {
-              surrenderId: 7812198,
-              edorapplyNo: 1333423,
-              edoracceptNo: 1425471,
-              surrenderType: 4,
-              surrenderStatus: 1,
-              customerNo: 1411430,
-              customerId: 8670617,
-              customerName: 3576056
-            },
-            {
-              surrenderId: 7388124,
-              edorapplyNo: 5622976,
-              edoracceptNo: 5010809,
-              surrenderType: 5,
-              surrenderStatus: 3,
-              customerNo: 7363316,
-              customerId: 5234486,
-              customerName: 8018362
-            },
-            {
-              surrenderId: 4357552,
-              edorapplyNo: 9701949,
-              edoracceptNo: 7429151,
-              surrenderType: 1,
-              surrenderStatus: 1,
-              customerNo: 6782150,
-              customerId: 6663599,
-              customerName: 9394689
-            },
-            {
-              surrenderId: 3911227,
-              edorapplyNo: 6410336,
-              edoracceptNo: 9487320,
-              surrenderType: 2,
-              surrenderStatus: 1,
-              customerNo: 8853912,
-              customerId: 4991652,
-              customerName: 9087882
-            },
-            {
-              surrenderId: 4231177,
-              edorapplyNo: 9844235,
-              edoracceptNo: 8677040,
-              surrenderType: 3,
-              surrenderStatus: 4,
-              customerNo: 500637,
-              customerId: 4436172,
-              customerName: 3719912
-            },
-            {
-              surrenderId: 397706,
-              edorapplyNo: 4282268,
-              edoracceptNo: 5110503,
-              surrenderType: 4,
-              surrenderStatus: 2,
-              customerNo: 7400002,
-              customerId: 6757490,
-              customerName: 9817134
-            },
-            {
-              surrenderId: 7120189,
-              edorapplyNo: 5690793,
-              edoracceptNo: 2822224,
-              surrenderType: 5,
-              surrenderStatus: 2,
-              customerNo: 7170594,
-              customerId: 4586358,
-              customerName: 4112579
-            },
-            {
-              surrenderId: 4855291,
-              edorapplyNo: 8371289,
-              edoracceptNo: 7828600,
-              surrenderType: 1,
-              surrenderStatus: 3,
-              customerNo: 8831495,
-              customerId: 630958,
-              customerName: 5048478
-            },
-            {
-              surrenderId: 6075558,
-              edorapplyNo: 2691672,
-              edoracceptNo: 2689542,
-              surrenderType: 2,
-              surrenderStatus: 5,
-              customerNo: 1768919,
-              customerId: 6230908,
-              customerName: 8155312
-            },
-            {
-              surrenderId: 7401509,
-              edorapplyNo: 9039925,
-              edoracceptNo: 3784166,
-              surrenderType: 3,
-              surrenderStatus: 4,
-              customerNo: 1878104,
-              customerId: 8160525,
-              customerName: 702626
-            },
-            {
-              surrenderId: 7859199,
-              edorapplyNo: 9330858,
-              edoracceptNo: 8777920,
-              surrenderType: 4,
-              surrenderStatus: 6,
-              customerNo: 8840132,
-              customerId: 1643253,
-              customerName: 9217322
-            },
-            {
-              surrenderId: 4045685,
-              edorapplyNo: 7938751,
-              edoracceptNo: 7381440,
-              surrenderType: 5,
-              surrenderStatus: 3,
-              customerNo: 4696734,
-              customerId: 6224371,
-              customerName: 924475
-            },
-            {
-              surrenderId: 6717692,
-              edorapplyNo: 8439143,
-              edoracceptNo: 948668,
-              surrenderType: 1,
-              surrenderStatus: 4,
-              customerNo: 9809608,
-              customerId: 9221624,
-              customerName: 994759
-            },
-            {
-              surrenderId: 5910317,
-              edorapplyNo: 4817194,
-              edoracceptNo: 2886042,
-              surrenderType: 2,
-              surrenderStatus: 5,
-              customerNo: 3241928,
-              customerId: 7272050,
-              customerName: 8834252
-            },
-            {
-              surrenderId: 1979874,
-              edorapplyNo: 1402263,
-              edoracceptNo: 1349984,
-              surrenderType: 3,
-              surrenderStatus: 2,
-              customerNo: 987972,
-              customerId: 2094223,
-              customerName: 7936866
-            },
-            {
-              surrenderId: 875854,
-              edorapplyNo: 4952714,
-              edoracceptNo: 2754563,
-              surrenderType: 4,
-              surrenderStatus: 3,
-              customerNo: 7439861,
-              customerId: 5127485,
-              customerName: 2538480
-            },
-            {
-              surrenderId: 606738,
-              edorapplyNo: 3884417,
-              edoracceptNo: 2434220,
-              surrenderType: 5,
-              surrenderStatus: 5,
-              customerNo: 6024894,
-              customerId: 3507209,
-              customerName: 2801584
-            }
-          ]
-
-          // this.list = res.content.list
+          this.list = res.content.content.edorResDTOList
         } else {
           this.finished = true
           this.loading = false
diff --git a/src/views/ebiz/preserve/Search.vue b/src/views/ebiz/preserve/Search.vue
index e982c675e..44f644411 100644
--- a/src/views/ebiz/preserve/Search.vue
+++ b/src/views/ebiz/preserve/Search.vue
@@ -1,3 +1,4 @@
+<!-- 保全搜索客户页面-->
 <template>
   <div class="search-container bg-white">
     <div class="search-content flex relative">
diff --git a/src/views/ebiz/preserve/bc/BeneficiaryInfoDetail.vue b/src/views/ebiz/preserve/bc/BeneficiaryInfoDetail.vue
index 383923f92..41525788c 100644
--- a/src/views/ebiz/preserve/bc/BeneficiaryInfoDetail.vue
+++ b/src/views/ebiz/preserve/bc/BeneficiaryInfoDetail.vue
@@ -247,7 +247,9 @@ export default {
   },
   created() {
     this.policy = JSON.parse(localStorage['preserve-policy'])
-    this.bnfDTOs = this.policy.bnfDTOs
+    this.bnfDTOs = this.policy.bnfDTOs.filter(i => {
+      return i.isNewInfo == '0'
+    })
     if (this.$route.query.edit) {
       this.editIndex = this.$route.query.edit
       this.userInfo = this.bnfDTOs[this.$route.query.edit]
diff --git a/src/views/ebiz/preserve/js/data-dictionary.js b/src/views/ebiz/preserve/js/data-dictionary.js
index 650cb408c..8ef21e267 100644
--- a/src/views/ebiz/preserve/js/data-dictionary.js
+++ b/src/views/ebiz/preserve/js/data-dictionary.js
@@ -2,48 +2,86 @@
 export default {
   //保全类型
   preserveType: [
+    {
+      id: 'BB',
+      text: '客户基本资料变更'
+    },
+    {
+      id: 'BC',
+      text: '受益人变更'
+    },
+    {
+      id: 'CT',
+      text: '退保'
+    },
+    {
+      id: 'PC',
+      text: '续期账号变更'
+    },
+    {
+      id: 'WT',
+      text: '犹豫期退保'
+    }
+  ],
+  preserveState: [
+    {
+      id: '0',
+      text: '确认生效'
+    },
     {
       id: '1',
-      label: '客户基本资料变更',
-      type: 'BB'
+      text: '录入完成'
     },
     {
       id: '2',
-      label: '受益人变更',
-      type: 'BC'
+      text: '申请确认'
     },
     {
       id: '3',
-      label: '退保',
-      type: 'CT'
+      text: '等待录入'
     },
     {
       id: '4',
-      label: '续期账号变更',
-      type: 'PC'
+      text: '预期终止'
     },
     {
       id: '5',
-      label: '犹豫期退保',
-      type: 'WT'
+      text: '审批修改'
+    },
+    {
+      id: '6',
+      text: '确认未生效'
+    },
+    {
+      id: '7',
+      text: '保全撤销'
+    },
+    {
+      id: '8',
+      text: '核保终止'
+    },
+    {
+      id: '9',
+      text: '审批终止'
+    },
+    {
+      id: 'a',
+      text: '审批通过'
+    },
+    {
+      id: 'b',
+      text: '保全回退'
+    },
+    {
+      id: 'c',
+      text: '保全终止'
+    },
+    {
+      id: 'd',
+      text: '强制终止'
     }
-  ],
-  preserveState: {
-    0: '申请成功',
-    1: '待导入核心',
-    2: '保全失败',
-    3: '保全申请失败待导入核心',
-    4: '待打款',
-    5: '保全成功',
-    6: '转核'
-  },
-  preserveTypeT: {
-    1: '联系方式变更',
-    2: '受益人变更',
-    3: '续期账号变更',
-    4: '犹豫期退保',
-    5: '退保'
-  },
+  ]
+  /*
   preserveUserType: {
     1: '联系方式变更保存的客户',
     2: '受益人变更保存的客户',
@@ -65,4 +103,5 @@ export default {
     4: 'CoolingOffperiodSurrender',
     5: 'Surrender'
   }
+  */
 }