From bf1c76abb9f60c0acbded722949c99d39c31604e Mon Sep 17 00:00:00 2001
From: zhangqi1 <zhang.qi1@ebiz-digits.com>
Date: Thu, 30 Sep 2021 15:00:13 +0800
Subject: [PATCH] =?UTF-8?q?GFRS-2618=E3=80=90=E5=89=8D=E7=AB=AF=E3=80=91?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=89=8D=E7=AB=AFbug=20--=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E4=BA=BA=EF=BC=9A=E5=BC=A0=E9=BD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ebiz/parentList/ParentPicker.vue          |  2 +-
 src/views/ebiz/allowance/application/List.vue | 28 ++++++++++---------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/components/ebiz/parentList/ParentPicker.vue b/src/components/ebiz/parentList/ParentPicker.vue
index 52e4ebd19..a69163e94 100644
--- a/src/components/ebiz/parentList/ParentPicker.vue
+++ b/src/components/ebiz/parentList/ParentPicker.vue
@@ -112,7 +112,7 @@ export default {
       this.$emit('input', value)
     },
     choose(data) {
-      this.name = data.name
+      this.name = data.allowanceBaseEnjoyDTO.name
       this.$emit('on-choose', data)
     },
     closeParentPicker() {
diff --git a/src/views/ebiz/allowance/application/List.vue b/src/views/ebiz/allowance/application/List.vue
index 6f5c1a65a..6513a5d8e 100644
--- a/src/views/ebiz/allowance/application/List.vue
+++ b/src/views/ebiz/allowance/application/List.vue
@@ -114,14 +114,16 @@ export default {
       })
     }, 100)
     // 右上角的显示
-    window.EWebBridge.webCallAppInJs('webview_right_button', {
-      btns: [
-        {
-          title: '我的资料',
-          title_color: '2e4591'
-        }
-      ]
-    })
+    setTimeout(() => {
+      window.EWebBridge.webCallAppInJs('webview_right_button', {
+        btns: [
+          {
+            title: '我的资料',
+            title_color: '2e4591'
+          }
+        ]
+      })
+    }, 100)
     window.appCallBack = this.appCallBack
     this.getList()
     this.remindFunc()
@@ -197,16 +199,16 @@ export default {
       let url = ''
       switch (allowanceType) {
         case 'APPLY_ALLOWANCE': //账户信息
-          url = '/allowance/application/AccountInfo?allowanceNo=' + order.allowanceNo + '&allowancePageFlag='+allowancePageFlag+'&edit=1'
+          url = '/allowance/application/AccountInfo?allowanceNo=' + order.allowanceNo + '&allowancePageFlag=' + allowancePageFlag + '&edit=1'
           break
         case 'BANK_ALLOWANCE': //影像附件
-          url = '/allowance/application/AttachmentManagement?allowanceNo=' + order.allowanceNo + '&allowancePageFlag='+allowancePageFlag+'&edit=1'
+          url = '/allowance/application/AttachmentManagement?allowanceNo=' + order.allowanceNo + '&allowancePageFlag=' + allowancePageFlag + '&edit=1'
           break
         case 'MEDIA_ALLOWANCE': //签字页面
-          url = '/allowance/application/SignatureConfirmation?allowanceNo=' + order.allowanceNo + '&allowancePageFlag='+allowancePageFlag+'&edit=1'
+          url = '/allowance/application/SignatureConfirmation?allowanceNo=' + order.allowanceNo + '&allowancePageFlag=' + allowancePageFlag + '&edit=1'
           break
         case 'SIGN_ALLOWANCE': //签字页面
-          url = '/allowance/application/SignatureConfirmation?allowanceNo=' + order.allowanceNo + '&allowancePageFlag='+allowancePageFlag+'&edit=1'
+          url = '/allowance/application/SignatureConfirmation?allowanceNo=' + order.allowanceNo + '&allowancePageFlag=' + allowancePageFlag + '&edit=1'
           break
         default:
           break
@@ -223,7 +225,7 @@ export default {
           query: {
             allowanceNo: order.allowanceNo,
             edit: '1',
-            allowancePageFlag:allowancePageFlag
+            allowancePageFlag: allowancePageFlag
           }
         }
       })