Merge branch 'hotfix/【20210120】婚姻状况未保存问题' into release/20210120

src/views/ebiz/sale/AddBeneficiaryInfo.vue

@@ -358,6 +358,14 @@ export default {
     }
   },
   methods: {
+    setCustomerMarriage(marriageCode) {
+      for (let status of DataDictionary.marriage) {
+        if (status.id == marriageCode) {
+          this.userInfo.marriageStatus = status.text
+          // this.userInfo.marriage = status.id
+        }
+      }
+    },
     setBankArea(areaInfo) {
       let province = areaInfo[0]
       let city = areaInfo[1]
@@ -370,19 +378,16 @@ export default {
     },
     onMarriageConfirm(value) {
       this.userInfo.marriageStatus = value.text
-      if (value.text === '已婚') {
+      for (let status of DataDictionary.marriage) {
-        this.userInfo.marriage = '1'
+        if (status.text === value.text) {
-      } else {
+          this.userInfo.marriage = status.id
-        this.userInfo.marriage = '2'
+        }
       }
       this.isMarriageStatusShow = false
     },
     setMarriageStatus() {
       this.isMarriageStatusShow = true
-      this.columns = [
+      this.columns = DataDictionary.marriage
-        { id: 1, text: '已婚' },
-        { id: 2, text: '单身' }
-      ]
     },
     //监听名字变化
     nameChange(name) {
@@ -649,8 +654,7 @@ export default {
       this.userInfo.birthday = data.birthday //出生日期
       this.userInfo.idType = data.customerIdType //证件类型
       this.userInfo.idNo = data.customerIdNumber //证件号码
-      this.userInfo.marriageStatus = data.marryStatus === '1' ? '已婚' : data.marryStatus === '2' ? '单身' : null
+      this.setCustomerMarriage(data.marryStatus)
-      this.userInfo.marriage = data.marryStatus
       this.userInfo.village = data.homeAddress
       this.userInfo.mobile = data.customerPhone
       if (data.homeProvince && data.homeCity && data.homeArea) {
@@ -695,6 +699,13 @@ export default {
       // if (insuredSex == appntSex) {
       //   return this.$toast('性别输入有误')
       // }
+
+      for (let status of DataDictionary.marriage) {
+        if (status.text === this.userInfo.marriageStatus) {
+          this.userInfo.marriage = status.id
+        }
+      }
+
       console.log(insuredDetail)
       // 页面跳转
       let valid = await this.$validator.validate()

src/views/ebiz/sale/InsuredInfo.vue

@@ -599,6 +599,7 @@ export default {
       for (let status of DataDictionary.marriage) {
         if (status.id == marriageCode) {
           this.userInfo.marriageStatus = status.text
+          this.userInfo.marriage = status.id
         }
       }
     },
@@ -1121,6 +1122,14 @@ export default {
             return this.$toast('请输入其它收入来源')
           }
         }
+
+        // 婚姻状况处理: 使用computed/watch可能会出现检测不到的情况
+        for (let status of DataDictionary.marriage) {
+          if (status.text === this.userInfo.marriageStatus) {
+            this.userInfo.marriage = status.id
+          }
+        }
+
         /*
         //如果是已婚
         if ((this.userInfo.sex == '0' && age < 22) || (this.userInfo.sex == '1' && age < 20)) {
@@ -1241,6 +1250,7 @@ export default {
       }
       let str = ''
       params.orderDTO.appntDTO = this.userInfo
+      console.log('params :>> ', params)
       //------------------------专为桂企写死--begin---------------//
       if (this.specilFlag == '1') {
         params.orderDTO.orderInfoDTO.productCode = 'GFRS_M0024'
@@ -1444,13 +1454,6 @@ export default {
       if (!nVal) {
         this.userInfo.otherSalarySource = ''
       }
-    },
-    'userInfo.marriageStatus'(nv) {
-      for (let status of DataDictionary.marriage) {
-        if (status.text === nv) {
-          this.userInfo.marriage = status.id
-        }
-      }
     }
   },
   beforeDestroy() {

src/views/ebiz/sale/InsuredPerson.vue

@@ -708,6 +708,7 @@ export default {
       for (let status of DataDictionary.marriage) {
         if (status.id == marriageCode) {
           this.userInfo.marriageStatus = status.text
+          this.userInfo.marriage = status.id
         }
       }
     },
@@ -1392,6 +1393,13 @@ export default {
           }
         }
 
+        // 婚姻状况处理: 使用computed/watch可能会出现检测不到的情况
+        for (let status of DataDictionary.marriage) {
+          if (status.text === this.userInfo.marriageStatus) {
+            this.userInfo.marriage = status.id
+          }
+        }
+
         //如果是已婚
         // if ((this.userInfo.sex == '0' && age < 22) || (this.userInfo.sex == '1' && age < 20)) {
         //   if (this.userInfo.marriage != '2') {
@@ -1763,13 +1771,6 @@ export default {
       } else {
         this.homeName = this.userInfo.homeAddress = ''
       }
-    },
-    'userInfo.marriageStatus'(nv) {
-      for (let status of DataDictionary.marriage) {
-        if (status.text === nv) {
-          this.userInfo.marriage = status.id
-        }
-      }
     }
   }
 }