Merge branch 'liuin' into uat

src/pages/userBindNew/np/base-info.vue

@@ -215,7 +215,7 @@
           >
         </item>
         <item
-          v-if="baseInfo.bp_type === 'TENANT' || baseInfo.bp_type === 'GUTA'"
+          v-if="((baseInfo.bp_type === 'TENANT' || baseInfo.bp_type === 'GUTA')&&!multipleRole)||multipleRole=== 'TENANT' || multipleRole === 'GUTA'"
           :showArrow="true"
         >
           <div slot="name" class="required">婚姻状况</div>
@@ -230,7 +230,7 @@
         </item>
       </list-item>
       <div
-        v-if="(hasSP && baseInfo.bp_type === 'TENANT') || (hasSP && baseInfo.bp_type === 'GUTA')"
+        v-if="(hasSP && (((baseInfo.bp_type === 'TENANT'||baseInfo.bp_type === 'GUTA')&&!multipleRole)||multipleRole=== 'TENANT' || multipleRole === 'GUTA'))"
       >
         <!-- 主承租人活担保人为已婚显示-->
         <div class="userInfo">配偶信息</div>
@@ -449,7 +449,8 @@ export default {
         vm.isLesons = false
       }
     },
-    'baseInfo.marital_status_n': function (newVal, oldVal) {
+    'baseInfo.marital_status_n': {
+      handler: function (newVal, oldVal) {
         if (newVal === '已婚') {
           this.hasSP = true
         } else {
@@ -460,6 +461,10 @@ export default {
           this.baseInfo.address_sp = ''
         }
       },
+      deep: true,
+      immediate: true,
+    },
+
   },
   created () {
     this.getBpType()
@@ -486,7 +491,34 @@ export default {
         vm.upload_list = [] // 上传图片列表
         vm.dowload_list = [] // 下载图片列表
         vm.img_url = {}
-        vm.baseInfo = {}
+        vm.baseInfo = { bp_type_n: '',
+          academic_background_n: '',
+          marital_status_n: '',
+          bp_type: '',
+          bp_class: vm.$route.params.bp_class,
+          bp_name: '',
+          province_name: '',
+          province_id: '',
+          city_name: '',
+          city_id: '',
+          id_card_no: null,
+          id_card_date_from: '', // 身份证有效期从
+          id_card_date_to: '', // 身份证有效期到
+          cell_phone: window.localStorage.getItem('user_phone'),
+          living_address: '',
+          address_on_resident_booklit: '',
+          marital_status: '',
+          academic_background: '',
+          bp_name_sp: '',
+          id_card_no_sp: '', // 配偶身份证号
+          id_card_date_from_sp: '', // 配偶身份证有效期从
+          id_card_date_to_sp: '', // 配偶身份证有效期到
+          district_id: '',
+          district_name: '',
+          spouse_phone: '',
+          working_place_sp: '',
+          address_sp: '',
+          user_phone: window.localStorage.user_phone }
         vm.idCardFront = '' // 身份证正面图片
         vm.idCardBack = '' // 身份证反面图片
         vm.idCardFrontSp = '' // 配偶身份证正面图片
@@ -647,7 +679,8 @@ export default {
       vm.$post(url, param).then(function (res) {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
-          vm.baseInfo = res.info
+          Object.assign(vm.baseInfo, res.info)
+          // vm.baseInfo = res.info
           vm.from = true
           vm.addRows(vm.baseInfo.address_on_resident_booklit)
           vm.addRowsLive(vm.baseInfo.living_address)
@@ -973,30 +1006,30 @@ export default {
         vm.hlsPopup.showLongCenter('户籍地址不能为空！')
       } else if (!vm.baseInfo.academic_background) {
         vm.hlsPopup.showLongCenter('学历不能为空！')
-      } else if (!vm.baseInfo.marital_status && (vm.baseInfo.bp_type === 'TENANT' || vm.baseInfo.bp_type === 'GUTA')) {
+      } else if (!vm.baseInfo.marital_status && (((vm.baseInfo.bp_type === 'TENANT' || vm.baseInfo.bp_type === 'GUTA') && !vm.multipleRole) || vm.multipleRole === 'TENANT' || vm.multipleRole === 'GUTA')) {
         vm.hlsPopup.showLongCenter('婚姻状况不能为空！')
-      } else if (vm.marital_status_n === '已婚' && !vm.baseInfo.bp_name_sp) {
+      } else if (vm.baseInfo.marital_status_n === '已婚' && !vm.baseInfo.bp_name_sp) {
         vm.hlsPopup.showLongCenter('配偶姓名不能为空！')
-      } else if (vm.marital_status_n === '已婚' && !vm.baseInfo.id_card_no_sp) {
+      } else if (vm.baseInfo.marital_status_n === '已婚' && !vm.baseInfo.id_card_no_sp) {
         vm.hlsPopup.showLongCenter('配偶身份证号不能为空！')
       } else if (
-        vm.marital_status_n === '已婚' &&
+        vm.baseInfo.marital_status_n === '已婚' &&
         !vm.baseInfo.id_card_date_from_sp
       ) {
         vm.hlsPopup.showLongCenter('配偶身份证有效期从不能为空！')
       } else if (
-        vm.marital_status_n === '已婚' &&
+        vm.baseInfo.marital_status_n === '已婚' &&
         !vm.baseInfo.id_card_date_to_sp
       ) {
         vm.hlsPopup.showLongCenter('配偶身份证有效期到不能为空！')
-      } else if (vm.marital_status_n === '已婚' && !vm.baseInfo.spouse_phone) {
+      } else if (vm.baseInfo.marital_status_n === '已婚' && !vm.baseInfo.spouse_phone) {
         vm.hlsPopup.showLongCenter('配偶手机号不能为空！')
       } else if (
-        vm.marital_status_n === '已婚' &&
+        vm.baseInfo.marital_status_n === '已婚' &&
         !vm.baseInfo.working_place_sp
       ) {
         vm.hlsPopup.showLongCenter('配偶工作单位不能为空！')
-      } else if (vm.marital_status_n === '已婚' && !vm.baseInfo.address_sp) {
+      } else if (vm.baseInfo.marital_status_n === '已婚' && !vm.baseInfo.address_sp) {
         vm.hlsPopup.showLongCenter('配偶联系地址不能为空！')
       } else if (!vm.hlsUtil.phoneNumber(vm.baseInfo.cell_phone)) {
         vm.hlsPopup.showLongCenter('手机号码有误!')