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 } } }) diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue index e98298d7a..9eedbe862 100644 --- a/src/views/ebiz/common/CalculatePremium.vue +++ b/src/views/ebiz/common/CalculatePremium.vue @@ -533,8 +533,7 @@ export default { } } let payEndYearVal - //初始化时交费期间为一次性交清时,在就是中介渠道, 附加险GFRS_A0007, - // 去掉后,附加险list就为空--隐藏’附‘icon + //初始化时交费期间为一次性交清时,在就是中介渠道, 附加险GFRS_A0007,GFRS_A0009,GFRS_A0010去掉后,附加险list就为空--隐藏’附‘icon item.calFactorLst.map((i) => { if (i.code == 'payEndYear') { if (i.payEndYear == '1000' && i.payEndYearFlag == 'Y') { @@ -870,10 +869,10 @@ export default { }) this.defalutAmt = 1 } - //中介渠道,交费期间为一次性交清时,附加险GFRS_A0007,GFRS_A0009去掉后,附加险list就为空--隐藏’附‘icon + //中介渠道,交费期间为一次性交清时,附加险GFRS_A0007,GFRS_A0009,GFRS_A0010去掉后,附加险list就为空--隐藏’附‘icon if (currentEle.code == 'payEndYear' && value.value == '1000') { this.isEnterAddtionRiskListFunc() - //交费期间为一次性交清时,清空豁免险GFRS_A0007,GFRS_A0009,并更新localStorage + //交费期间为一次性交清时,清空豁免险GFRS_A0007,GFRS_A0009,GFRS_A0010,并更新localStorage this.isClearAddtionRiskListFunc() } else if (this.chooseProducts[this.productIndex].mainRiskCode == 'GFRS_M0046') { if (this.saleInsuredPersonInfo.relationToAppnt == 1) { @@ -945,7 +944,7 @@ export default { this.popupShow = false }, - //交费期间为一次性交清时,清空豁免险GFRS_A0007,GFRS_A0009,并更新localStorage + //交费期间为一次性交清时,清空豁免险GFRS_A0007,GFRS_A0009,GFRS_A0010并更新localStorage isClearAddtionRiskListFunc() { let chooseProductsNew = [] this.chooseProducts.forEach((item01) => { @@ -1142,7 +1141,7 @@ export default { return false } }, - //中介渠道,交费期间为一次性交清时,附加险GFRS_A0007,GFRS_A0009去掉后,附加险list就为空--隐藏’附‘icon + //中介渠道,交费期间为一次性交清时,附加险GFRS_A0007,GFRS_A0009,GFRS_A0010去掉后,附加险list就为空--隐藏’附‘icon isEnterAddtionRiskListFunc() { let addtionRiskLst = JSON.parse(localStorage.addtionRiskLst) if (addtionRiskLst) { @@ -1488,7 +1487,11 @@ export default { } else if (item.productCode == 'GFRS_A0010') { //(被保险人)国富人寿附加豁免保险费重大疾病保险(B款)GFRS_A0010 //投被同人,不同人:被保人豁免险搭配两全时,可选责任为必选,豁免两全保费 + if (showPrem001) { showPrem = Number(showPrem001) + }else{ + showPrem = Number(that.trialList[0].showPrem) + } } item.calFactorLst.map((item2) => { if (item2.code == 'dutyGroup') {