From 6142cf02fe56fbc663211f95b0741b9c8679549f Mon Sep 17 00:00:00 2001
From: yuweiqi <yu.weiqi@ebiz-fooge.com>
Date: Tue, 18 Feb 2020 18:26:12 +0800
Subject: [PATCH] =?UTF-8?q?[FIX]=E5=85=A5=E5=8F=B8=E5=AE=A1=E6=89=B9-?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=E5=88=97=E8=A1=A8-=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E6=9B=B4=E6=AD=A3=E3=80=81=E6=8F=90=E4=BA=A4=E6=88=90=E5=8A=9F?=
 =?UTF-8?q?=E9=A1=B5-=E7=82=B9=E5=87=BB=E8=BF=94=E5=9B=9E=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E5=88=B0=E5=AE=A1=E6=89=B9=E5=88=97=E8=A1=A8=E9=A1=B5?=
 =?UTF-8?q?=E3=80=81=E5=AE=A1=E6=89=B9=E7=BB=93=E6=9E=9C=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E9=A1=B5-=E6=98=BE=E7=A4=BA=E5=AD=97=E6=AE=B5=E6=9B=B4?=
 =?UTF-8?q?=E6=AD=A3=EF=BC=9B=E8=87=AA=E5=8A=A9=E5=85=A5=E5=8F=B8-?=
 =?UTF-8?q?=E5=85=A5=E5=8F=B8=E6=B5=81=E7=A8=8B=E6=98=BE=E7=A4=BA=E9=A1=B5?=
 =?UTF-8?q?-=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/agentEenter/EntryProcess.vue   | 26 +++++++++++++++----
 .../ebiz/agentEenter/approve/ApproveInfo.vue  | 13 ++--------
 .../ebiz/agentEenter/approve/ApproveList.vue  |  8 ++----
 .../agentEenter/approve/SubmitSuccess.vue     |  3 ++-
 4 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/src/views/ebiz/agentEenter/EntryProcess.vue b/src/views/ebiz/agentEenter/EntryProcess.vue
index 9e4aa8dfb..0cf8595b2 100644
--- a/src/views/ebiz/agentEenter/EntryProcess.vue
+++ b/src/views/ebiz/agentEenter/EntryProcess.vue
@@ -27,8 +27,20 @@
         </div>
         <!-- 审批人审批 -->
         <div v-for="(item, index) in approveMapping" :key="index">
-          <div class="h60 flex relative border-right active" v-if="index == 0">
-            <i class="w10 h10 radius50 right-circle absolute  bottom0"></i>
+          <div
+            :class="['h60', 'flex', 'relative', 'border-right', proces.approvalStatus == '01' && proces.ebizExamineApproveDtoList.length == 0 ? '' : 'active']"
+            v-if="index == 0"
+          >
+            <i
+              :class="[
+                'w10',
+                'h10',
+                'radius50',
+                'absolute',
+                'bottom0',
+                proces.approvalStatus == '01' && proces.ebizExamineApproveDtoList.length == 0 ? 'right-cir' : 'right-circle'
+              ]"
+            ></i>
           </div>
           <div v-else :class="['h60', 'flex', 'relative', 'border-right', ebizExamineApproveDtoList[index - 1].examineApproveResult == '1' ? 'active' : '']">
             <i
@@ -52,7 +64,8 @@
                       proces.approvalStatus != '02' &&
                       proces.approvalStatus != '03' &&
                       proces.approvalStatus != '21' &&
-                      proces.approvalStatus != '04'
+                      proces.approvalStatus != '04' &&
+                      !(proces.approvalStatus == '01' && proces.ebizExamineApproveDtoList.length == 0)
                   "
                   class="w60 absolute approval-vag"
                   :color="
@@ -202,7 +215,9 @@ export default {
           that.proces = res.content
           console.log(' that.proces', that.ebizExamineApproveDtoList.length)
           that.approveMapping = that.proces.approveMapping
-          that.ebizExamineApproveDtoList = that.proces.ebizExamineApproveDtoList
+          that.proces.ebizExamineApproveDtoList.map(item => {
+            that.ebizExamineApproveDtoList.push(item)
+          })
           if (that.approveMapping.length == that.ebizExamineApproveDtoList.length) {
             that.approvalFlag = true
           }
@@ -230,6 +245,7 @@ export default {
               that.ebizExamineApproveDtoList.push({ examineApproveStatus: 0 })
             })
           }
+          console.log('proces.ebizExamineApproveDtoList.length ==', this.proces.ebizExamineApproveDtoList.length)
         } else {
           this.$toast(res.resultMessage)
         }
@@ -268,7 +284,7 @@ export default {
         })
       } else {
         let obj = this.proces.ebizExamineApproveDtoList[Number(val)]
-        this.refusalCause = obj['examineApproveMsg']
+        this.refusalCause = obj.examineApproveMsg
       }
       this.$store.commit('updateRefusalCause', this.refusalCause)
       this.$jump({
diff --git a/src/views/ebiz/agentEenter/approve/ApproveInfo.vue b/src/views/ebiz/agentEenter/approve/ApproveInfo.vue
index a268881f5..42325c9f6 100644
--- a/src/views/ebiz/agentEenter/approve/ApproveInfo.vue
+++ b/src/views/ebiz/agentEenter/approve/ApproveInfo.vue
@@ -4,8 +4,8 @@
     <van-cell-group v-for="item in approvalInfo" :key="item.examineApproveName" class="fs15">
       <van-cell title="审批人" :value="item.examineApproveName" />
       <van-cell title="职级" :value="item.examineApproveTitle" />
-      <van-cell title="所属团队" :value="item.examineApproveTeam" />
-      <van-cell title="审批结论" :value="item.examineApproveResult" />
+      <van-cell title="所属团队" :value="item.team" />
+      <van-cell title="审批结论" :value="item.examineApproveResult == '0' ? '拒绝审批' : '审批通过'" />
       <van-cell title="退回原因" :value="item.examineApproveMsg" />
     </van-cell-group>
     <van-cell-group class="pt10 fs15">
@@ -123,15 +123,6 @@ export default {
             result: this.approvalResult, //审批结果 0-拒绝审批  1-通过
             msg: this.approvalMsg //审批原因
           }
-          // this.$jump({
-          //   flag: 'h5',
-          //   extra: {
-          //     url: location.origin + `/#/agentEenter/approve/SubmitSuccess`,
-          //     forbidSwipeBack: '1', //1:禁止右滑返回
-          //     backToFirst: '1' //1:点击左上角，返回到入口第一个webview
-          //   },
-          //   routerInfo: { path: `/agentEenter/approve/SubmitSuccess` }
-          // })
           console.log('审批结果==', params)
           agentAddApproval(params).then(res => {
             console.log('res ==', res)
diff --git a/src/views/ebiz/agentEenter/approve/ApproveList.vue b/src/views/ebiz/agentEenter/approve/ApproveList.vue
index e0c6c6c6f..981d5f6fb 100644
--- a/src/views/ebiz/agentEenter/approve/ApproveList.vue
+++ b/src/views/ebiz/agentEenter/approve/ApproveList.vue
@@ -76,11 +76,7 @@ export default {
         message: '加载中……'
       })
       let data = {
-        types: ['01'],
-        userModel: {
-          //线上去掉
-          id: 'A864501000001' //审批人工号
-        }
+        types: ['01']
       }
       agentAddApproval(data).then(res => {
         this.$toast.clear()
@@ -91,7 +87,7 @@ export default {
             this.isSuccess = true
             resData.forEach(ele => {
               obj = {}
-              obj.name = ele.createdUser //申请人姓名
+              obj.name = ele.name //申请人姓名
               obj.referName = ele.referName //推荐人姓名
               obj.team = ele.team //所属团队
               obj.createdDate = ele.createdDate //申请时间
diff --git a/src/views/ebiz/agentEenter/approve/SubmitSuccess.vue b/src/views/ebiz/agentEenter/approve/SubmitSuccess.vue
index f3da879b3..be00abb24 100644
--- a/src/views/ebiz/agentEenter/approve/SubmitSuccess.vue
+++ b/src/views/ebiz/agentEenter/approve/SubmitSuccess.vue
@@ -24,7 +24,8 @@ export default {
       this.$jump({
         flag: 'h5',
         extra: {
-          url: location.origin + `/#/agentEenter/approve/ApproveList`
+          url: location.origin + `/#/agentEenter/approve/ApproveList`,
+          backToFirst: '1'
         },
         routerInfo: {
           path: '/agentEenter/approve/ApproveList'