1、进入国富app建议书界面，在生成建议书过程中，点击每个页面右上角的关闭按钮

src/views/ebiz/common/CalculatePremium.vue

@@ -556,12 +556,27 @@ export default {
     } 
   },
   mounted() {
+    this.isFrom = window.localStorage.isFrom
     this.$jump({
       flag: 'navigation',
       extra: {
         title: '保费计算'
       },
     })
+    if(this.isFrom === 'proposal'){
+      // eslint-disable-next-line no-undef
+      setTimeout(() => {
+        EWebBridge.webCallAppInJs('webview_right_button', {
+          btns: [
+            {
+              img: this.$assetsUrl + 'images/del-close.png',
+              route: { flag: '', extra: {} }
+            }
+          ]
+        })
+      }, 500)
+    }
+    window.appCallBack = this.appCallBack
     getAgentInfo({}).then(res => {
       // branchType N1、1代表个险渠道 和 N5、5 代表中介渠道，N代表内勤
       if (res.branchType == 'N1' || res.branchType == '1') {
@@ -589,6 +604,35 @@ export default {
     }
   },
   methods: {
+    appCallBack(data) {
+      if (data.trigger == 'right_button_click' && localStorage.isFrom == 'proposal') {
+        return this.$dialog
+          .confirm({
+            className: 'dialog-delete',
+            title: '提示',
+            message: '退出流程可能会丢失部分数据，是否确认退出？',
+            cancelButtonColor: '#E9332E',
+            confirmButtonColor: '#FFFFFF'
+          })
+          .then(() => {
+            this.$jump({
+              flag: 'h5',
+              extra: {
+                title: '建议书列表',
+                forbidSwipeBack: 1, //当前页面禁止右滑返回
+                url: location.origin + `/#/proposal/list`
+              },
+              routerInfo: {
+                path: `/proposal/list`,
+                type: '1'
+              }
+            })
+        })
+          .catch(() => {
+            return
+        })
+      }
+    },
     renewalShow(productCode) {
       let codes = ['GFRS_M0016', 'GFRS_M0005', 'GFRS_M0018','GFRS_M0070']
       return codes.find((item) => {
@@ -599,7 +643,6 @@ export default {
     async init() {
       // 获取是否从建议书过来的
       let that = this
-      this.isFrom = window.localStorage.isFrom
       //获取投保人信息
       if (this.$CacheUtils.getLocItem('saleInsuredInfo')) {
         this.saleInsuredInfo = JSON.parse(this.$CacheUtils.getLocItem('saleInsuredInfo'))

src/views/ebiz/common/SelectedProduct.vue

@@ -180,13 +180,17 @@ export default {
     }
     //建议书--右上角为退出流程键(到建议书列表)×,并清除浏览记录
     if (localStorage.isFrom == 'proposal') {
-      setTimeout(() => {
         // eslint-disable-next-line no-undef
-        EWebBridge.webCallAppInJs('webview_right_button', {
+        setTimeout(() => {
-          img: this.$assetsUrl + 'images/del-close-btn@3x.png',
+          EWebBridge.webCallAppInJs('webview_right_button', {
-          intercept: '1' //是否拦截原生返回事件 1是 其他否
+            btns: [
-        })
+              {
-      }, 100)
+                img: this.$assetsUrl + 'images/del-close.png',
+                route: { flag: '', extra: {} }
+              }
+            ]
+          })
+        }, 500)
     }
     window.appCallBack = this.appCallBack
     document.body.style.backgroundColor = '#fff'

src/views/ebiz/proposal/Appnt.vue

@@ -23,7 +23,7 @@
         :flag="true"
       ></FieldDatePicter>
       <div class="border-bottom">
-        <van-field :border="false" required v-model="appntDTO.age" clearable label="年龄" @blur="ageBlur" v-validate="'required'" placeholder="投保人年龄" />
+        <van-field type="digit" :border="false" required v-model="appntDTO.age" clearable label="年龄" name="年龄" @blur="ageBlur" v-validate="'required|onlyInteger'" placeholder="投保人年龄" />
         <!-- <van-field :border="false" v-model="appntDTO.age" clearable label="年龄" v-validate="'appntAge'" placeholder="投保人年龄" :readonly="ageFlag" /> -->
       </div>
       <occupation-picker
@@ -151,12 +151,15 @@ export default {
         reset:"1" //1：重制 其他值不变
       })
       setTimeout(() => {
-        // eslint-disable-next-line no-undef
         EWebBridge.webCallAppInJs('webview_right_button', {
-          img: this.$assetsUrl + 'images/del-close-btn@3x.png',
+          btns: [
-          intercept: '1' //是否拦截原生返回事件 1是 其他否
+            {
+              img: this.$assetsUrl + 'images/del-close.png',
+              route: { flag: '', extra: {} }
+            }
+          ]
         })
-      }, 100)
+      }, 500)
       // 筛选按钮的点击事件
       window.appCallBack = this.appCallBack
     },
@@ -195,45 +198,40 @@ export default {
       })
     },
     appCallBack(data) {
-      // 筛选按钮的点击事件
-      this.$jump({
-        flag: 'navigation',
-        extra: {
-          title: '投保人信息',
-          hiddenRight: '1'
-        }
-      })
       if (this.currentPopupIndex == 1) {
         this.customerShowPicker = false
+        this.currentPopupIndex = ''
       } else if (this.currentPopupIndex == 2) {
         this.occupationShowPicker = false
-      }
+        this.currentPopupIndex = ''
-      if (data.trigger == 'right_button_click') {
+      } else if (this.currentPopupIndex == '') {
-        return this.$dialog
+        if (data.trigger == 'right_button_click') {
-          .confirm({
+          return this.$dialog
-            className: 'dialog-delete',
+            .confirm({
-            title: '提示',
+              className: 'dialog-delete',
-            message: '退出流程可能会丢失部分数据，是否确认退出？',
+              title: '提示',
-            cancelButtonColor: '#E9332E',
+              message: '退出流程可能会丢失部分数据，是否确认退出？',
-            confirmButtonColor: '#FFFFFF'
+              cancelButtonColor: '#E9332E',
-          })
+              confirmButtonColor: '#FFFFFF'
-          .then(() => {
-            this.$jump({
-              flag: 'h5',
-              extra: {
-                title: '建议书列表',
-                forbidSwipeBack: 1, //当前页面禁止右滑返回
-                url: location.origin + `/#/proposal/list`
-              },
-              routerInfo: {
-                path: `/proposal/list`,
-                type: '1'
-              }
             })
-        })
+            .then(() => {
-          .catch(() => {
+              this.$jump({
-            return
+                flag: 'h5',
-        })
+                extra: {
+                  title: '建议书列表',
+                  forbidSwipeBack: 1, //当前页面禁止右滑返回
+                  url: location.origin + `/#/proposal/list`
+                },
+                routerInfo: {
+                  path: `/proposal/list`,
+                  type: '1'
+                }
+              })
+          })
+            .catch(() => {
+              return
+          })
+        }
       }
     },
     chooseOccupation() {
@@ -241,7 +239,7 @@ export default {
         flag: 'navigation',
         extra: {
           title: '投保人信息',
-          hiddenRight: '1'
+          // hiddenRight: '1'
         }
       })
       this.occupationShowPicker = false
@@ -272,7 +270,7 @@ export default {
         flag: 'navigation',
         extra: {
           title: '投保人信息',
-          hiddenRight: '1'
+          // hiddenRight: '1'
         }
       })
       let { customerName, customerSex, birthday, customerPhone, age, occupationName, occupationCode, lifeGrade, healthGrade, socialSecurity } = data

src/views/ebiz/proposal/ChooseInsuredPerson.vue

@@ -137,6 +137,18 @@ export default {
         title: '选择被保险人'
       },
     })
+    setTimeout(() => {
+      EWebBridge.webCallAppInJs('webview_right_button', {
+        btns: [
+          {
+            img: this.$assetsUrl + 'images/del-close.png',
+            route: { flag: '', extra: {} }
+          }
+        ]
+      })
+    }, 500)
+    window.appCallBack = this.appCallBack
+
     if (this.$route.query.proposalOrderNo) {
       this.proposalOrderNo = this.$route.query.proposalOrderNo
     }else if (this.$CacheUtils.getLocItem('proposalNo')) {
@@ -210,6 +222,35 @@ export default {
     })
   },
   methods: {
+    appCallBack(data) {
+      if (data.trigger == 'right_button_click') {
+        return this.$dialog
+          .confirm({
+            className: 'dialog-delete',
+            title: '提示',
+            message: '退出流程可能会丢失部分数据，是否确认退出？',
+            cancelButtonColor: '#E9332E',
+            confirmButtonColor: '#FFFFFF'
+          })
+          .then(() => {
+            this.$jump({
+              flag: 'h5',
+              extra: {
+                title: '建议书列表',
+                forbidSwipeBack: 1, //当前页面禁止右滑返回
+                url: location.origin + `/#/proposal/list`
+              },
+              routerInfo: {
+                path: `/proposal/list`,
+                type: '1'
+              }
+            })
+        })
+          .catch(() => {
+            return
+        })
+      }
+    },
     stepIn() {
       this.$router.push({ path: '/proposal/appnt' })
       // this.$jump({

src/views/ebiz/proposal/InsuredPerson.vue

@@ -30,7 +30,7 @@
         @confirm="dateConfirm"
       ></FieldDatePicter>
       <div class="border-bottom">
-        <van-field type="digit" :readonly="disabled" v-model="insured.insuredAge" required v-validate="'required'" :value="ageShow" @blur="ageBlur" clearable label="年龄" placeholder="被保险人年龄" />
+        <van-field type="digit" :readonly="disabled" v-model="insured.insuredAge" required v-validate="'required|onlyInteger'" :value="ageShow" @blur="ageBlur" clearable label="年龄" name="年龄" placeholder="被保险人年龄" />
         <!-- <van-field :readonly="disabled" :value="ageShow" @input="changeAgeInput($event)" clearable label="年龄" placeholder="被保险人年龄" /> -->
       </div>
       <occupation-picker
@@ -143,12 +143,15 @@ export default {
   methods: {
     init() {
       setTimeout(() => {
-      // eslint-disable-next-line no-undef
+        EWebBridge.webCallAppInJs('webview_right_button', {
-      EWebBridge.webCallAppInJs('webview_right_button', {
+          btns: [
-        img: this.$assetsUrl + 'images/del-close-btn@3x.png',
+            {
-        intercept: '1' //是否拦截原生返回事件 1是 其他否
+              img: this.$assetsUrl + 'images/del-close.png',
-      })
+              route: { flag: '', extra: {} }
-    }, 100)
+            }
+          ]
+        })
+      }, 500)
       window.appCallBack = this.appCallBack
       this.localInfo = JSON.parse(this.$CacheUtils.getLocItem('saleInsuredPersonInfo'))
       let { relationToAppnt, relationName } = this.localInfo
@@ -231,45 +234,38 @@ export default {
       })
     },
     appCallBack(data) {
-      // 筛选按钮的点击事件
-      this.$jump({
-        flag: 'navigation',
-        extra: {
-          title: '被保险人信息',
-          hiddenRight: '1'
-        }
-      })
       if (this.currentPopupIndex == 1) {
         this.customerShowPicker = false
       } else if (this.currentPopupIndex == 2) {
         this.occupationShowPicker = false
-      }
+      } else if (this.currentPopupIndex == '') {
-      if (data.trigger == 'right_button_click') {
+        if (data.trigger == 'right_button_click') {
-        return this.$dialog
+          return this.$dialog
-          .confirm({
+            .confirm({
-            className: 'dialog-delete',
+              className: 'dialog-delete',
-            title: '提示',
+              title: '提示',
-            message: '退出流程可能会丢失部分数据，是否确认退出？',
+              message: '退出流程可能会丢失部分数据，是否确认退出？',
-            cancelButtonColor: '#E9332E',
+              cancelButtonColor: '#E9332E',
-            confirmButtonColor: '#FFFFFF'
+              confirmButtonColor: '#FFFFFF'
-          })
-          .then(() => {
-            this.$jump({
-              flag: 'h5',
-              extra: {
-                title: '建议书列表',
-                forbidSwipeBack: 1, //当前页面禁止右滑返回
-                url: location.origin + `/#/proposal/list`
-              },
-              routerInfo: {
-                path: `/proposal/list`,
-                type: '1'
-              }
             })
-        })
+            .then(() => {
-          .catch(() => {
+              this.$jump({
-            return
+                flag: 'h5',
-        })
+                extra: {
+                  title: '建议书列表',
+                  forbidSwipeBack: 1, //当前页面禁止右滑返回
+                  url: location.origin + `/#/proposal/list`
+                },
+                routerInfo: {
+                  path: `/proposal/list`,
+                  type: '1'
+                }
+              })
+          })
+            .catch(() => {
+              return
+          })
+        }
       }
     },
     chooseOccupation() {
@@ -277,7 +273,7 @@ export default {
         flag: 'navigation',
         extra: {
           title: '被保险人信息',
-          hiddenRight: '1'
+          // hiddenRight: '1'
         }
       })
       this.occupationShowPicker = false
@@ -402,7 +398,7 @@ export default {
         flag: 'navigation',
         extra: {
           title: '被保险人信息',
-          hiddenRight: '1'
+          // hiddenRight: '1'
         }
       })
       console.log('data == ', data)

src/views/ebiz/proposal/List.vue

@@ -124,7 +124,15 @@ export default {
       this.isCheck = res.result
     })
   },
-  mounted() {},
+  mounted() {
+    this.$jump({
+      flag: 'navigation',
+      extra: {
+        title: '建议书列表',
+        hiddenRight: '1'
+      }
+    })
+  },
   methods: {
     initThisPage(showFlag) {
       if (showFlag) {
@@ -170,7 +178,21 @@ export default {
           list = formatRiskList(list, 'insuredDTOs', 'riskDTOLst') //格式化数据为本地显示结果
 
           this.proposalList = this.proposalList.concat(list)
-          console.log(this.proposalList)
+          this.proposalList.forEach(item => {
+            // 建议书投保人/被保人姓名不必填, 填写姓名时展示姓名(落库),不填写姓名时展示性别+年龄,如:男30岁(不落库)
+            if(!item.appntDTO.name){
+              let sexAppnt = item.appntDTO.sex == '0'?'男':'女'
+              item.appntDTO.name = sexAppnt + item.appntDTO.age+'岁'
+            }
+            if(item.insuredDTOs.length){
+              item.insuredDTOs.forEach(item01 => {
+                if(!item01.name){
+                  let sex = item01.sex == '0'?'男':'女'
+                  item01.name = sex + item01.insuredAge+'岁'
+                }
+              })
+            } 
+          })
           if (this.proposalList.length == 0) {
             this.isSuccess = false
           }

src/views/ebiz/proposal/ProposalInfo.vue

@@ -407,12 +407,13 @@ export default {
       return Number(val*0.085).toFixed(2)
     },
   },
-  async mounted() {
+  mounted() {
     this.$jump({
       flag: 'navigation',
       extra: {
-        title: '建议书预览'
+        title: '建议书预览',
-      },
+        hiddenRight: '1'
+      }
     })
     setTimeout(() => {
       // eslint-disable-next-line no-undef