From 8a51c42091047913e28ebd3b10661b440c49a0f4 Mon Sep 17 00:00:00 2001
From: proudlx <965752348@qq.com>
Date: Thu, 22 Apr 2021 10:25:54 +0800
Subject: [PATCH 1/2] =?UTF-8?q?'=E5=8D=8F=E5=90=8C=E5=8D=95=E4=BD=8D'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/SearchField.vue |   9 +-
 src/views/ebiz/sale/InsuredInfo.vue   | 171 ++++++++++++++++----------
 src/views/ebiz/sale/InsuredPerson.vue | 153 ++++++++++++++---------
 3 files changed, 209 insertions(+), 124 deletions(-)

diff --git a/src/components/common/SearchField.vue b/src/components/common/SearchField.vue
index 127b8b1bc..54bfac43e 100644
--- a/src/components/common/SearchField.vue
+++ b/src/components/common/SearchField.vue
@@ -70,6 +70,7 @@ export default {
     const result = await getTreasureMenus(param)
     if (result.result === '0') {
       this.customerList = result.content
+      this.$emit('workcompanys',result.content)
     } else {
       this.$toast(result.resultMessage)
     }
@@ -80,11 +81,11 @@ export default {
     },
     onInputBlur() {
       this.showCustomer = false
-      if (this.isAsync) {
-        this.$emit('input', '')
-      } else {
+      // if (this.isAsync) {
+      //   this.$emit('input', '')
+      // } else {
         this.$emit('input', this.value)
-      }
+      // }
     },
     onInputFocus() {
       this.showCustomer = true
diff --git a/src/views/ebiz/sale/InsuredInfo.vue b/src/views/ebiz/sale/InsuredInfo.vue
index 4e3cd96c8..76592f758 100644
--- a/src/views/ebiz/sale/InsuredInfo.vue
+++ b/src/views/ebiz/sale/InsuredInfo.vue
@@ -122,7 +122,7 @@
         placeholder="请输入"
         v-validate="'required|mobileLength11|mobileStartWith1|mobile'"
         maxlength="11"
-      /> 
+      />
       <van-field v-model="userInfo.email" required label="电子邮箱" name="电子邮箱" placeholder="请输入" v-validate="'required|email'" clearable />
       <van-field
         v-model="userInfo.stature"
@@ -159,7 +159,7 @@
     <!-- <van-radio-group :border="false" v-model="userInfo.addressStatus" v-validate="'required'" label="设置为联系地址" name="设置为联系地址"> -->
     <!-- 工作信息 -->
     <van-cell-group :border="false">
-      <p style=" border-bottom: 1px solid #ebedf0" class="fs15 fwb pl10 mt10 pv12">工作信息</p>
+      <p style="border-bottom: 1px solid #ebedf0" class="fs15 fwb pl10 mt10 pv12">工作信息</p>
       <!-- <van-field
         :value="userInfo.degree | idToText('degree')"
         readonly
@@ -279,7 +279,15 @@
         @click="toSelect('9')"
       /> -->
       <select-radio required :radios="Asyncs" label="是否协同工作单位" name="是否协同工作单位" v-validate="'required'" :value.sync="isAsync"></select-radio>
-      <SearchField :isAsync="isAsync" v-model="userInfo.workcompany" label="工作单位" placeholder="无工作单位，请输入无" v-validate="'required'" name="工作单位" />
+      <SearchField
+        :isAsync="isAsync"
+        @workcompanys="workcompanys"
+        v-model="userInfo.workcompany"
+        label="工作单位"
+        placeholder="无工作单位，请输入无"
+        v-validate="'required'"
+        name="工作单位"
+      />
       <!-- <van-field
           v-model="areaName"
           readonly
@@ -342,7 +350,7 @@
         v-validate="'required|homeAddressNum|homeAddressCh'"
         clearable
         maxlength="30"
-        style="font-size: 3.5vw;"
+        style="font-size: 3.5vw"
       />
       <!-- <div class="border-bt relative fs14 p10 flex align-center">
           <van-checkbox v-model="homeDefault" :disabled="companyDefault" class="fr" @change="setAddress">设为联系地址</van-checkbox>
@@ -354,7 +362,7 @@
     <van-button type="danger" class="bottom-btn" @click="nextStep" v-no-more-click="1000">下一步</van-button>
 
     <!-- 字段选择 -->
-    <van-popup v-model="popupShow" position="bottom"><van-picker show-toolbar :columns="columns" @confirm="onConfirm" @cancel="popupShow = false"/></van-popup>
+    <van-popup v-model="popupShow" position="bottom"><van-picker show-toolbar :columns="columns" @confirm="onConfirm" @cancel="popupShow = false" /></van-popup>
     <!-- 地区选择 -->
     <!-- <van-popup v-model="areaShow" position="bottom">
       <van-area :area-list="areaList" value="110101" @confirm="sureArea($event, '1')" @cancel="areaShow = false" />
@@ -410,44 +418,45 @@ export default {
     [IdentityCardScan.name]: IdentityCardScan,
     [IndexBar.name]: IndexBar,
     [Dialog.name]: Dialog,
-    SearchField
+    SearchField,
   },
   data() {
     return {
       specilFlag: '', //特殊显示-为桂企产品专写 1-桂企 undefind-其他
       productCodes: [], //产品编码-用于“产品允许投保人单位列表获取”接口，作为请求参数
       isScan: false, //是否显示证件扫描组件
-      isAsync:false,
-      Asyncs:[
+      isAsync: false,
+      Asyncs: [
         {
-          label:'是',
-          value:true,
-        },{
-          label:'否',
-          value:false,
+          label: '是',
+          value: true,
+        },
+        {
+          label: '否',
+          value: false,
         },
       ],
       sexRadio: [
         {
           label: '男',
-          value: '0'
+          value: '0',
         },
         {
           label: '女',
-          value: '1'
-        }
+          value: '1',
+        },
       ],
       medicalRadio: [
         {
           label: '有',
-          value: '0'
+          value: '0',
         },
         {
           label: '无',
-          value: '1'
-        }
+          value: '1',
+        },
       ],
-      maxDate: beforeDate.getBeforeYear(16),       
+      maxDate: beforeDate.getBeforeYear(16),
       certiexpiredateRequired: true, //证件截止日期是否需要校验
       popupShow: false,
       // areaShow: false, //省级联动
@@ -485,7 +494,7 @@ export default {
         healthGrade: '', //健康等级
         mobile: '', //移动电话
         stature: '', //身高
-        avoirdupois: '', //体重        
+        avoirdupois: '', //体重
         // degree: '', //文化程度
         medical: '1', //有无社保
         taxResidentId: '', //税收居民身份
@@ -509,7 +518,7 @@ export default {
         homeProvince: '', //家庭省
         homeCity: '', //家庭市
         homeArea: '', //家庭区
-        homeAddress: '' //家庭详细地址
+        homeAddress: '', //家庭详细地址
         // homeZip: '', //家庭邮编
         // homePhone: '' //家庭电话
         // householdProvince: '', //户籍省
@@ -523,7 +532,8 @@ export default {
       occupationShowPicker: false,
       timeId: null,
       idLimit: false, //证件起止日期是否只读
-      salePageFlag: '1'
+      salePageFlag: '1',
+      userWorkcompanys: [], //单位数据
     }
   },
   created() {
@@ -541,7 +551,7 @@ export default {
     //如果是编辑/导航进来
     this.isElecCont = '0'
     if (this.$route.query.edit) {
-      getOrderDetail({ orderNo: localStorage.orderNo }).then(res => {
+      getOrderDetail({ orderNo: localStorage.orderNo }).then((res) => {
         if (res.result == 0) {
           //投保人信息返显
           this.userInfo = res.orderDTO.appntDTO
@@ -568,13 +578,13 @@ export default {
             this.homeName = getAreaName([
               { code: res.orderDTO.appntDTO.homeProvince },
               { code: res.orderDTO.appntDTO.homeCity },
-              { code: res.orderDTO.appntDTO.homeArea }
+              { code: res.orderDTO.appntDTO.homeArea },
             ]) //获取联系地址
             // this.census = getAreaName([{ code: res.orderDTO.appntDTO.householdProvince }, { code: res.orderDTO.appntDTO.householdCity }]) //获取户籍
           }
           //------------------------专为桂企写死--begin---------------//
           if (res.orderDTO.insuredDTOs[0] && res.orderDTO.insuredDTOs[0].riskDTOLst) {
-            this.specilFlag = res.orderDTO.insuredDTOs[0].riskDTOLst.some(v => {
+            this.specilFlag = res.orderDTO.insuredDTOs[0].riskDTOLst.some((v) => {
               return v.riskCode == 'GFRS_M0024' || v.riskCode == 'GFRS_M0040'
             })
               ? '1'
@@ -597,13 +607,18 @@ export default {
       // eslint-disable-next-line no-undef
       EWebBridge.webCallAppInJs('webview_left_button', {
         img: this.$assetsUrl + 'images/del-close-btn@3x.png',
-        intercept: '1' //是否拦截原生返回事件 1是 其他否
+        intercept: '1', //是否拦截原生返回事件 1是 其他否
       })
     }, 100)
     // 筛选按钮的点击事件
     window.appCallBack = this.appCallBack
   },
   methods: {
+    workcompanys(list) {
+      // 单位数据
+      console.log(list)
+      this.userWorkcompanys = list
+    },
     setCustomerMarriage(marriageCode) {
       for (let status of DataDictionary.marriage) {
         if (status.id == marriageCode) {
@@ -627,7 +642,7 @@ export default {
             title: '提示',
             message: '退出流程可能会丢失部分数据，是否确认退出？',
             cancelButtonColor: '#E9332E',
-            confirmButtonColor: '#FFFFFF'
+            confirmButtonColor: '#FFFFFF',
           })
           .then(() => {
             this.$jump({
@@ -635,12 +650,12 @@ export default {
               extra: {
                 title: '电子投保单列表',
                 forbidSwipeBack: 1, //当前页面禁止右滑返回
-                url: location.origin + `/#/sale/list`
+                url: location.origin + `/#/sale/list`,
               },
               routerInfo: {
                 path: `/sale/list`,
-                type: '1'
-              }
+                type: '1',
+              },
             })
           })
           .catch(() => {
@@ -652,8 +667,8 @@ export default {
           flag: 'navigation',
           extra: {
             title: '投保人信息',
-            hiddenRight: '1'
-          }
+            hiddenRight: '1',
+          },
         })
         if (this.currentPopupIndex == 1) {
           this.customerShowPicker = false
@@ -669,8 +684,8 @@ export default {
         flag: 'navigation',
         extra: {
           title: '投保人信息',
-          hiddenRight: '1'
-        }
+          hiddenRight: '1',
+        },
       })
       this.occupationShowPicker = false
     },
@@ -694,7 +709,7 @@ export default {
         case '4':
           this.columns = [
             { id: 0, text: '有' },
-            { id: 1, text: '无' }
+            { id: 1, text: '无' },
           ]
           break
         case '5':
@@ -711,9 +726,9 @@ export default {
           break
         case '9':
           this.productCodes.length = 0
-            // 已丢弃
+          // 已丢弃
           this.productCodes.push('GFRS_M0024')
-          getCompany({ productCodes: this.productCodes }).then(res => {
+          getCompany({ productCodes: this.productCodes }).then((res) => {
             if (res.result == 0) {
               this.columns = res.content
             } else {
@@ -904,8 +919,8 @@ export default {
         flag: 'navigation',
         extra: {
           title: '投保人信息',
-          hiddenRight: '1'
-        }
+          hiddenRight: '1',
+        },
       })
       let { customerName, customerSex } = data
       this.userInfo.name = customerName //用户名
@@ -971,6 +986,22 @@ export default {
       this.getRelatedData(this.userInfo.idNo, '1')
     },
     async nextStep() {
+      if (this.isAsync) {
+          if (
+            !this.userWorkcompanys.some((item) => {
+              return item.label == this.userInfo.workcompany
+            })
+          ) {
+            if (
+              this.userWorkcompanys.some((item) => {
+                return item.label.search(this.userInfo.workcompany) != -1
+              })
+            ) {
+              return this.$toast('请填写完整的协同单位名称')
+            }
+            return this.$toast('您选择的为非协同单位，请重新选择。')
+          }
+        }
       //表单校验, 成功跳转
       let valid = await this.$validator.validate()
       // .then(valid => {
@@ -1158,10 +1189,10 @@ export default {
         if (Number(this.userInfo.nativeplace) <= 4) {
           // “身份证”或“台湾居民来往大陆通行证”或“港澳居民来往内地通行证”
           let obj = {
-            '1': true,
-            '5': true,
-            '6': true,
-            '9': true
+            1: true,
+            5: true,
+            6: true,
+            9: true,
           }
           let idType = this.userInfo.idType
           // 通过年龄 判断证件是否符合要求
@@ -1193,15 +1224,30 @@ export default {
         } else {
           // 非大陆人员按外籍人员
           let obj = {
-            '4': true,
-            '8': true
+            4: true,
+            8: true,
           }
           let idType = this.userInfo.idType
           if (obj[idType] === undefined) {
             return this.$toast('亲，国籍为外籍，证件类型必须为护照或外国人永久居留身份证投保')
           }
         }
-
+        if (this.isAsync) {
+          if (
+            !this.userWorkcompanys.some((item) => {
+              return item.label == this.userInfo.workcompany
+            })
+          ) {
+            if (
+              this.userWorkcompanys.some((item) => {
+                return item.label.search(this.userInfo.workcompany) != -1
+              })
+            ) {
+              return this.$toast('请填写完整的协同单位名称')
+            }
+            return this.$toast('您选择的为非协同单位，请重新选择。')
+          }
+        }
         this.infoUpdate()
         // console.log('success')
       } else {
@@ -1230,7 +1276,7 @@ export default {
                 title: '提示',
                 message: '当前信息已经发生改变，有可能影响险种费率，是否确认修改并清除险种信息?',
                 cancelButtonColor: '#E9332E',
-                confirmButtonColor: '#FFFFFF'
+                confirmButtonColor: '#FFFFFF',
               })
               .then(() => {
                 this.save()
@@ -1248,10 +1294,10 @@ export default {
         orderDTO: {
           orderInfoDTO: {
             orderNo: localStorage.orderNo,
-            isElecCont: this.isElecCont
-          },          
-          appntDTO: {}
-        }
+            isElecCont: this.isElecCont,
+          },
+          appntDTO: {},
+        },
       }
       let str = ''
       params.orderDTO.appntDTO = this.userInfo
@@ -1282,28 +1328,28 @@ export default {
           this.$dialog
             .alert({
               message: '年龄≥60周岁投保人，如果投保一年期以上产品，请根据监管要求对销售过程进行录音录像！',
-              confirmButtonColor: '#000000'
+              confirmButtonColor: '#000000',
             })
             .then(() => {
               this.$jump({
                 flag: 'h5',
                 extra: {
-                  url: location.origin + `/#/sale/insuredPerson?${str}`
+                  url: location.origin + `/#/sale/insuredPerson?${str}`,
                 },
                 routerInfo: {
-                  path: `/sale/insuredPerson?${str}`
-                }
+                  path: `/sale/insuredPerson?${str}`,
+                },
               })
             })
         } else {
           this.$jump({
             flag: 'h5',
             extra: {
-              url: location.origin + `/#/sale/insuredPerson?${str}`
+              url: location.origin + `/#/sale/insuredPerson?${str}`,
             },
             routerInfo: {
-              path: `/sale/insuredPerson?${str}`
-            }
+              path: `/sale/insuredPerson?${str}`,
+            },
           })
         }
       } else {
@@ -1413,13 +1459,13 @@ export default {
       } else {
         // this.userInfo.effectiveDateType = false
       }
-    }
+    },
   },
 
   computed: {
     isShowOthenSalarySource() {
       return this.userInfo.salarySource == '4'
-    }
+    },
   },
   watch: {
     isShowOthenSalarySource(nVal) {
@@ -1433,9 +1479,8 @@ export default {
           this.userInfo.marriage = status.id
         }
       }
-    }
+    },
   },
-
 }
 </script>
 <style lang="scss" scoped>
diff --git a/src/views/ebiz/sale/InsuredPerson.vue b/src/views/ebiz/sale/InsuredPerson.vue
index d2bea8f89..105af9a57 100644
--- a/src/views/ebiz/sale/InsuredPerson.vue
+++ b/src/views/ebiz/sale/InsuredPerson.vue
@@ -194,7 +194,7 @@
     </van-cell-group>
     <!-- 工作信息 -->
     <van-cell-group class="mt5" v-if="!isScan">
-      <p style=" border-bottom: 1px solid #ebedf0" class=" fs15 mt10 fwb pl10 pv12">工作信息</p>
+      <p style="border-bottom: 1px solid #ebedf0" class="fs15 mt10 fwb pl10 pv12">工作信息</p>
       <!-- <van-field
         :value="userInfo.degree | idToText('degree')"
         readonly
@@ -308,7 +308,16 @@
         clearable
         :readonly="isAppnt"
       /> -->
-      <SearchField v-model="userInfo.workcompany" label="工作单位" placeholder="无工作单位，请输入无" v-validate="'required'" name="工作单位" />
+      <select-radio required :radios="Asyncs" label="是否协同工作单位" name="是否协同工作单位" v-validate="'required'" :value.sync="isAsync"></select-radio>
+      <SearchField
+        v-model="userInfo.workcompany"
+        @workcompanys="workcompanys"
+        :isAsync="isAsync"
+        label="工作单位"
+        placeholder="无工作单位，请输入无"
+        v-validate="'required'"
+        name="工作单位"
+      />
       <!-- <van-field
         v-model="areaName"
         readonly
@@ -345,9 +354,7 @@
     </van-cell-group>
     <!-- 家庭信息 -->
     <van-cell-group class="mt5" v-if="!isScan">
-      <p style=" border-bottom: 1px solid #ebedf0" class=" fs15 fwb pl10 pr10 mt10 pv12">
-        地址信息
-      </p>
+      <p style="border-bottom: 1px solid #ebedf0" class="fs15 fwb pl10 pr10 mt10 pv12">地址信息</p>
       <!-- <van-field
         :value="userInfo.marriage | idToText('marriage')"
         readonly
@@ -390,7 +397,7 @@
         clearable
         maxlength="30"
         :readonly="isAppnt"
-        style="font-size: 3.5vw;"
+        style="font-size: 3.5vw"
       />
       <!-- <van-field
         v-model="userInfo.homeZip"
@@ -473,36 +480,47 @@ export default {
     [IdentityCardScan.name]: IdentityCardScan,
     [IndexBar.name]: IndexBar,
     [Dialog.name]: Dialog,
-    SearchField
+    SearchField,
   },
   data() {
     return {
       isMarriageStatusShow: false,
       withRootUser: {
         load: false, //防止重复请求
-        value: false
+        value: false,
       },
       isScan: false, //是否显示证件扫描组件
       effectiveDateTypeAble: false, //长期按钮是否禁用
+      isAsync: false,
+      Asyncs: [
+        {
+          label: '是',
+          value: true,
+        },
+        {
+          label: '否',
+          value: false,
+        },
+      ],
       sexRadio: [
         {
           label: '男',
-          value: '0'
+          value: '0',
         },
         {
           label: '女',
-          value: '1'
-        }
+          value: '1',
+        },
       ],
       medicalRadio: [
         {
           label: '有',
-          value: '0'
+          value: '0',
         },
         {
           label: '无',
-          value: '1'
-        }
+          value: '1',
+        },
       ],
       currentTime: beforeDate.getBeforeDays(28),
       fromCustomer: false, //是否从客户列表拉取的数据
@@ -569,7 +587,7 @@ export default {
         homeProvince: '', //家庭省
         homeCity: '', //家庭市
         homeArea: '', //家庭区
-        homeAddress: '' //家庭详细地址
+        homeAddress: '', //家庭详细地址
         // homeZip: '', //家庭邮编
         // homePhone: '' //家庭电话
         // householdProvince: '', //户籍省
@@ -584,7 +602,8 @@ export default {
       isAppnt: false, // 是否投被同人
       // appntMarriage: '', //投保人婚姻状况
       idLimit: false, //证件起止日期是否只读
-      salePageFlag: '2'
+      salePageFlag: '2',
+      userWorkcompanys: [], //单位数据
     }
   },
   created() {
@@ -592,7 +611,7 @@ export default {
     //如果是编辑/导航进来
     // if (this.$route.query.edit) {
     if (localStorage.orderNo) {
-      getOrderDetail({ orderNo: localStorage.orderNo }).then(res => {
+      getOrderDetail({ orderNo: localStorage.orderNo }).then((res) => {
         if (res.result == 0) {
           //投被同人
           if (res.orderDTO.insuredDTOs.length && res.orderDTO.insuredDTOs[0].relationToAppnt == '1') {
@@ -664,7 +683,7 @@ export default {
               this.homeName = getAreaName([
                 { code: insuredPersonInfo.homeProvince },
                 { code: insuredPersonInfo.homeCity },
-                { code: insuredPersonInfo.homeArea }
+                { code: insuredPersonInfo.homeArea },
               ])
             }
             //是否长期
@@ -686,7 +705,7 @@ export default {
           }
           //------------------------专为惠企写死--begin---------------//
           if (res.orderDTO.insuredDTOs[0] && res.orderDTO.insuredDTOs[0].riskDTOLst) {
-            this.specilFlag = res.orderDTO.insuredDTOs[0].riskDTOLst.some(v => {
+            this.specilFlag = res.orderDTO.insuredDTOs[0].riskDTOLst.some((v) => {
               return v.riskCode == 'GFRS_M0024' || v.riskCode == 'GFRS_M0040'
             })
               ? '1'
@@ -715,13 +734,18 @@ export default {
       // eslint-disable-next-line no-undef
       EWebBridge.webCallAppInJs('webview_left_button', {
         img: this.$assetsUrl + 'images/del-close-btn@3x.png',
-        intercept: '1' //是否拦截原生返回事件 1是 其他否
+        intercept: '1', //是否拦截原生返回事件 1是 其他否
       })
     }, 100)
     window.appCallBack = this.appCallBack
     //   // document.body.style.backgroundColor = '#F5F5F5'
   },
   methods: {
+    workcompanys(list) {
+      // 单位数据
+      console.log(list)
+      this.userWorkcompanys = list
+    },
     setCustomerMarriage(marriageCode) {
       for (let status of DataDictionary.marriage) {
         if (status.id == marriageCode) {
@@ -776,8 +800,8 @@ export default {
         flag: 'navigation',
         extra: {
           title: '被保险人信息',
-          hiddenRight: '1'
-        }
+          hiddenRight: '1',
+        },
       })
       this.occupationShowPicker = false
     },
@@ -799,17 +823,17 @@ export default {
       } */ else if (pickerType == '4') {
         this.columns = [
           { id: 0, text: '有' },
-          { id: 1, text: '无' }
+          { id: 1, text: '无' },
         ]
       } else if (pickerType == '5') {
         this.columns = DataDictionary.taxIdentity
       } /* else if (pickerType == '6') {
         this.columns = DataDictionary.marriage
       }*/ else if (pickerType == '7') {
-        if(this.specilFlag == '1') {
+        if (this.specilFlag == '1') {
           // 惠企保 投被关系限制
           this.columns = DataDictionary.hqbRelationToAppnt
-        }else {
+        } else {
           this.columns = DataDictionary.relationToAppnt
         }
       } else if (pickerType == '8') {
@@ -889,7 +913,7 @@ export default {
         //如果关系是本人
         if (value.id == 1) {
           //获取订单详情
-          getOrderDetail({ orderNo: localStorage.orderNo }).then(res => {
+          getOrderDetail({ orderNo: localStorage.orderNo }).then((res) => {
             if (res.result == 0) {
               this.isAppnt = true
               //获取投保人信息
@@ -1085,7 +1109,7 @@ export default {
             title: '提示',
             message: '退出流程可能会丢失部分数据，是否确认退出？',
             cancelButtonColor: '#E9332E',
-            confirmButtonColor: '#FFFFFF'
+            confirmButtonColor: '#FFFFFF',
           })
           .then(() => {
             this.$jump({
@@ -1093,12 +1117,12 @@ export default {
               extra: {
                 title: '电子投保单列表',
                 forbidSwipeBack: 1, //当前页面禁止右滑返回
-                url: location.origin + `/#/sale/list`
+                url: location.origin + `/#/sale/list`,
               },
               routerInfo: {
                 path: `/sale/list`,
-                type: '1'
-              }
+                type: '1',
+              },
             })
           })
           .catch(() => {
@@ -1110,8 +1134,8 @@ export default {
           flag: 'navigation',
           extra: {
             title: '被保人信息',
-            hiddenRight: '1'
-          }
+            hiddenRight: '1',
+          },
         })
         console.log(this.currentPopupIndex)
         if (this.currentPopupIndex == 1) {
@@ -1131,8 +1155,8 @@ export default {
         flag: 'navigation',
         extra: {
           title: '被保险人信息',
-          hiddenRight: '1'
-        }
+          hiddenRight: '1',
+        },
       })
       let { customerName, customerSex } = data
       this.userInfo.name = customerName //用户名
@@ -1253,7 +1277,7 @@ export default {
               title: '提示',
               message: '亲，请确认被保险人与投保人关系哦~',
               confirmButtonText: '继续填写',
-              cancelButtonText: '返回修改'
+              cancelButtonText: '返回修改',
             })
           }
         } else if (this.userInfo.relationToAppnt == '3') {
@@ -1263,7 +1287,7 @@ export default {
               title: '提示',
               message: '亲，请确认被保险人与投保人关系哦~',
               confirmButtonText: '继续填写',
-              cancelButtonText: '返回修改'
+              cancelButtonText: '返回修改',
             })
           }
         }
@@ -1435,10 +1459,10 @@ export default {
         if (Number(this.userInfo.nativeplace) <= 4) {
           // “身份证”或“台湾居民来往大陆通行证”或“港澳居民来往内地通行证”
           let obj = {
-            '1': true,
-            '5': true,
-            '6': true,
-            '9': true
+            1: true,
+            5: true,
+            6: true,
+            9: true,
           }
           let idType = this.userInfo.idType
           // 通过年龄 判断证件是否符合要求
@@ -1470,15 +1494,30 @@ export default {
         } else {
           // 非大陆人员按外籍人员
           let obj = {
-            '4': true,
-            '8': true
+            4: true,
+            8: true,
           }
           let idType = this.userInfo.idType
           if (obj[idType] === undefined) {
             return this.$toast('亲，国籍为外籍，证件类型必须为护照或外国人永久居留身份证投保')
           }
         }
-
+        if (this.isAsync) {
+          if (
+            !this.userWorkcompanys.some((item) => {
+              return item.label == this.userInfo.workcompany
+            })
+          ) {
+            if (
+              this.userWorkcompanys.some((item) => {
+                return item.label.search(this.userInfo.workcompany) != -1
+              })
+            ) {
+              return this.$toast('请填写完整的协同单位名称')
+            }
+            return this.$toast('您选择的为非协同单位，请重新选择。')
+          }
+        }
         this.infoUpdate()
       } else {
         return this.$toast(this.$validator.errors.all()[0])
@@ -1508,7 +1547,7 @@ export default {
               title: '提示',
               message: '当前信息已经发生改变，有可能影响险种费率，是否确认修改并清除险种信息?',
               cancelButtonColor: '#4FC6B3',
-              confirmButtonColor: '#FFFFFF'
+              confirmButtonColor: '#FFFFFF',
             })
               .then(() => {
                 // on confirm
@@ -1529,10 +1568,10 @@ export default {
         orderType: 'INSURED_ORDER',
         orderDTO: {
           orderInfoDTO: {
-            orderNo: localStorage.orderNo
+            orderNo: localStorage.orderNo,
           },
-          appntDTO: {}
-        }
+          appntDTO: {},
+        },
       }
       if (this.userInfo.mediaDTOS == '') {
         delete this.userInfo.mediaDTOS
@@ -1562,11 +1601,11 @@ export default {
           flag: 'h5',
           extra: {
             forbidSwipeBack: '1',
-            url: location.origin + `/#/common/selectedProduct?${str}`
+            url: location.origin + `/#/common/selectedProduct?${str}`,
           },
           routerInfo: {
-            path: `/common/selectedProduct?${str}`
-          }
+            path: `/common/selectedProduct?${str}`,
+          },
         })
       } else {
         return this.$toast(resultData.resultMessage)
@@ -1603,7 +1642,7 @@ export default {
         type: 'H5',
         operateCode: this.userInfo.mobile,
         system: 'agentApp',
-        operateCodeType: '0'
+        operateCodeType: '0',
       }
       this.codeDisabled = true
       //倒计时
@@ -1616,7 +1655,7 @@ export default {
         }
       }, 1000)
       //获取验证码
-      getAuthCode(data).then(res => {
+      getAuthCode(data).then((res) => {
         console.log(res)
         if (res.result == 0) {
           this.sessionId = res.sessionId
@@ -1759,7 +1798,7 @@ export default {
       // } else {
       //   this.idLimit = false
       // }
-    }
+    },
   },
   computed: {
     isShowOthenSalarySource() {
@@ -1769,7 +1808,7 @@ export default {
         this.userInfo.otherSalarySource = ''
         return false
       }
-    }
+    },
   },
   beforeDestroy() {
     //清理计时器
@@ -1785,7 +1824,7 @@ export default {
         this.homeName = getAreaName([
           { code: rs.orderDTO.appntDTO.homeProvince },
           { code: rs.orderDTO.appntDTO.homeCity },
-          { code: rs.orderDTO.appntDTO.homeArea }
+          { code: rs.orderDTO.appntDTO.homeArea },
         ])
         this.userInfo.homeProvince = rs.orderDTO.appntDTO.homeProvince
         this.userInfo.homeCity = rs.orderDTO.appntDTO.homeCity
@@ -1801,8 +1840,8 @@ export default {
           this.userInfo.marriage = status.id
         }
       }
-    }
-  }
+    },
+  },
 }
 </script>
 <style lang="scss" scoped>

From 78a41b1c3c8f4a30b90ccd4a0a3430608169b1c2 Mon Sep 17 00:00:00 2001
From: proudlx <965752348@qq.com>
Date: Thu, 22 Apr 2021 10:40:38 +0800
Subject: [PATCH 2/2] =?UTF-8?q?'=E5=8D=8F=E5=90=8C=E5=8D=95=E4=BD=8D'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ebiz/SelectRadio.vue |  2 +-
 src/views/ebiz/sale/InsuredInfo.vue | 16 ----------------
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/src/components/ebiz/SelectRadio.vue b/src/components/ebiz/SelectRadio.vue
index 5ae80d7b2..2610a4e1a 100644
--- a/src/components/ebiz/SelectRadio.vue
+++ b/src/components/ebiz/SelectRadio.vue
@@ -21,7 +21,7 @@ export default {
   name: 'select-radio',
   props: {
     value: {
-      type: String,
+      type: String|Boolean,
       default: '0'
     },
     label: {
diff --git a/src/views/ebiz/sale/InsuredInfo.vue b/src/views/ebiz/sale/InsuredInfo.vue
index 76592f758..e88c48dcf 100644
--- a/src/views/ebiz/sale/InsuredInfo.vue
+++ b/src/views/ebiz/sale/InsuredInfo.vue
@@ -986,22 +986,6 @@ export default {
       this.getRelatedData(this.userInfo.idNo, '1')
     },
     async nextStep() {
-      if (this.isAsync) {
-          if (
-            !this.userWorkcompanys.some((item) => {
-              return item.label == this.userInfo.workcompany
-            })
-          ) {
-            if (
-              this.userWorkcompanys.some((item) => {
-                return item.label.search(this.userInfo.workcompany) != -1
-              })
-            ) {
-              return this.$toast('请填写完整的协同单位名称')
-            }
-            return this.$toast('您选择的为非协同单位，请重新选择。')
-          }
-        }
       //表单校验, 成功跳转
       let valid = await this.$validator.validate()
       // .then(valid => {