From f79fb1e0b181d96745c939bf7a6ad3a19a348f95 Mon Sep 17 00:00:00 2001 From: "na.guo" Date: Mon, 10 Aug 2020 13:32:08 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E8=AF=81=E4=BB=B6=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/sale/InsuredInfo.vue | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/views/ebiz/sale/InsuredInfo.vue b/src/views/ebiz/sale/InsuredInfo.vue index 12aebfb9c..44816a18b 100644 --- a/src/views/ebiz/sale/InsuredInfo.vue +++ b/src/views/ebiz/sale/InsuredInfo.vue @@ -112,7 +112,7 @@ v-validate="'required|mobileLength11|mobileStartWith1|mobile'" maxlength="11" /> - + {{ codeDisabled ? `${countDown}s后重新获取` : '发送验证码' }} @@ -313,23 +313,12 @@ clearable maxlength="5" /> --> - + Date: Mon, 10 Aug 2020 13:45:29 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E8=AF=81=E4=BB=B6=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/sale/InsuredInfo.vue | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/views/ebiz/sale/InsuredInfo.vue b/src/views/ebiz/sale/InsuredInfo.vue index 12aebfb9c..e7436b0c1 100644 --- a/src/views/ebiz/sale/InsuredInfo.vue +++ b/src/views/ebiz/sale/InsuredInfo.vue @@ -667,7 +667,10 @@ export default { // this.columns = DataDictionary.degree // break case '4': - this.columns = [{ id: 0, text: '有' }, { id: 1, text: '无' }] + this.columns = [ + { id: 0, text: '有' }, + { id: 1, text: '无' } + ] break case '5': this.columns = DataDictionary.taxIdentity @@ -953,7 +956,7 @@ export default { console.log('证件类型是身份证') if (this.userInfo.nativeplace != '1') { - return this.$toast('证件类型”为“身份证，国籍必须为中国哦') + return this.$toast('证件类型”为“身份证，国籍必须为中国大陆哦') } //校验性别是否与身份证号码位相符 @@ -1110,7 +1113,9 @@ export default { // 通过国籍判断 证件是否符合要求 // 如果是国籍选择中国大陆 - if (this.userInfo.nativeplace == '1') { + console.log('nativeplace', this.userInfo.nativeplace) + + if (this.userInfo.nativeplace <= '4') { // “身份证”或“台湾居民来往大陆通行证”或“港澳居民来往内地通行证” let obj = { '1': true, @@ -1156,7 +1161,7 @@ export default { } } - this.infoUpdate() + //this.infoUpdate() // console.log('success') } else { return this.$toast(this.$validator.errors.all()[0]) From c6addb60d9d2b58943aae1c23e04936a251034fe Mon Sep 17 00:00:00 2001 From: "na.guo" Date: Mon, 10 Aug 2020 13:54:01 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/sale/InsuredInfo.vue | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/views/ebiz/sale/InsuredInfo.vue b/src/views/ebiz/sale/InsuredInfo.vue index 44816a18b..a3a0d30e7 100644 --- a/src/views/ebiz/sale/InsuredInfo.vue +++ b/src/views/ebiz/sale/InsuredInfo.vue @@ -112,7 +112,7 @@ v-validate="'required|mobileLength11|mobileStartWith1|mobile'" maxlength="11" /> - + {{ codeDisabled ? `${countDown}s后重新获取` : '发送验证码' }} @@ -313,12 +313,23 @@ clearable maxlength="5" /> --> - + Date: Mon, 10 Aug 2020 14:19:50 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/sale/InsuredInfo.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/ebiz/sale/InsuredInfo.vue b/src/views/ebiz/sale/InsuredInfo.vue index a3a0d30e7..bbb4b799d 100644 --- a/src/views/ebiz/sale/InsuredInfo.vue +++ b/src/views/ebiz/sale/InsuredInfo.vue @@ -1113,7 +1113,6 @@ export default { // 通过国籍判断 证件是否符合要求 // 如果是国籍选择中国大陆 - console.log('nativeplace', this.userInfo.nativeplace) if (this.userInfo.nativeplace <= '4') { // “身份证”或“台湾居民来往大陆通行证”或“港澳居民来往内地通行证” From 08a266cee0fd0a4a188e7a0357d692db26738e2a Mon Sep 17 00:00:00 2001 From: "na.guo" Date: Mon, 10 Aug 2020 15:03:34 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E9=AA=8C=E8=AF=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/sale/InsuredInfo.vue | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/views/ebiz/sale/InsuredInfo.vue b/src/views/ebiz/sale/InsuredInfo.vue index bbb4b799d..a65ec5510 100644 --- a/src/views/ebiz/sale/InsuredInfo.vue +++ b/src/views/ebiz/sale/InsuredInfo.vue @@ -1039,6 +1039,15 @@ export default { if (this.userInfo.nativeplace == '1') { return this.$toast('“证件类型”为“外国人护照”，“国籍”不能选择为“中国”哦~') } + } else if (this.userInfo.idType == '5') { + console.log(this.userInfo.nativeplace, 'nativeplace') + if (this.userInfo.nativeplace != 2 && this.userInfo.nativeplace != 3) { + return this.$toast('“证件类型”为“港澳居民来往内地通行证”，“国籍”请选择“中国香港”或“中国澳门”哦~') + } + } else if (this.userInfo.idType == '6') { + if (this.userInfo.nativeplace != 4) { + return this.$toast('“证件类型”为“台湾居民来往大陆通行证”，“国籍”请选择“中国台湾”~') + } } // else if (this.userInfo.idType == '4' && this.userInfo.idNo.length < 3) { // console.log('证件类型是护照') @@ -1414,6 +1423,7 @@ export default { } } }, + computed: { isShowOthenSalarySource() { if (this.userInfo.salarySource == '4') { From 7efd246bd6ce34afec29f1d83a45e73d5591960a Mon Sep 17 00:00:00 2001 From: "na.guo" Date: Mon, 10 Aug 2020 16:14:00 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E6=B8=AF=E6=BE=B3=E5=8F=B0=E5=B1=85?= =?UTF-8?q?=E6=B0=91=E5=B1=85=E4=BD=8F=E8=AF=81=E9=AA=8C=E8=AF=81=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/sale/InsuredInfo.vue | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/views/ebiz/sale/InsuredInfo.vue b/src/views/ebiz/sale/InsuredInfo.vue index a65ec5510..81516017c 100644 --- a/src/views/ebiz/sale/InsuredInfo.vue +++ b/src/views/ebiz/sale/InsuredInfo.vue @@ -1048,6 +1048,10 @@ export default { if (this.userInfo.nativeplace != 4) { return this.$toast('“证件类型”为“台湾居民来往大陆通行证”，“国籍”请选择“中国台湾”~') } + } else if (this.userInfo.idType == '9') { + if (this.userInfo.nativeplace != 2 && this.userInfo.nativeplace != 3 && this.userInfo.nativeplace != 4) { + return this.$toast('“证件类型”为“港澳台居民居住证”，“国籍”请选择“中国香港”、“中国澳门”或“中国台湾”~') + } } // else if (this.userInfo.idType == '4' && this.userInfo.idNo.length < 3) { // console.log('证件类型是护照') @@ -1128,7 +1132,8 @@ export default { let obj = { '1': true, '5': true, - '6': true + '6': true, + '9': true } let idType = this.userInfo.idType // 通过年龄 判断证件是否符合要求 From 5abc97848c7020b606c8d81a7bf365ad67a0f3a0 Mon Sep 17 00:00:00 2001 From: "na.guo" Date: Mon, 10 Aug 2020 17:06:27 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E8=A2=AB=E4=BF=9D=E4=BA=BA=E8=AF=81?= =?UTF-8?q?=E4=BB=B6=E9=AA=8C=E8=AF=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/sale/InsuredPerson.vue | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/src/views/ebiz/sale/InsuredPerson.vue b/src/views/ebiz/sale/InsuredPerson.vue index 64b49e314..a2834e8b5 100644 --- a/src/views/ebiz/sale/InsuredPerson.vue +++ b/src/views/ebiz/sale/InsuredPerson.vue @@ -504,7 +504,7 @@ export default { areaShow: false, //省级联动 homeShow: false, certiexpiredateShow: true, //证件截止日期是否可编辑 - // censusShow: false, //户籍联动 + censusShow: false, //户籍联动 pickerType: undefined, columns: [], valueKey: 'text', @@ -782,7 +782,10 @@ export default { } /*else if (pickerType == '3') { this.columns = DataDictionary.degree } */ else if (pickerType == '4') { - this.columns = [{ id: 0, text: '有' }, { id: 1, text: '无' }] + this.columns = [ + { id: 0, text: '有' }, + { id: 1, text: '无' } + ] } else if (pickerType == '5') { this.columns = DataDictionary.taxIdentity } /* else if (pickerType == '6') { @@ -1352,6 +1355,19 @@ export default { if (this.userInfo.nativeplace == '1') { return this.$toast('“证件类型”为“外国人护照”，“国籍”不能选择为“中国”哦~') } + } else if (this.userInfo.idType == '5') { + console.log(this.userInfo.nativeplace, 'nativeplace') + if (this.userInfo.nativeplace != 2 && this.userInfo.nativeplace != 3) { + return this.$toast('“证件类型”为“港澳居民来往内地通行证”，“国籍”请选择“中国香港”或“中国澳门”哦~') + } + } else if (this.userInfo.idType == '6') { + if (this.userInfo.nativeplace != 4) { + return this.$toast('“证件类型”为“台湾居民来往大陆通行证”，“国籍”请选择“中国台湾”~') + } + } else if (this.userInfo.idType == '9') { + if (this.userInfo.nativeplace != 2 && this.userInfo.nativeplace != 3 && this.userInfo.nativeplace != 4) { + return this.$toast('“证件类型”为“港澳台居民居住证”，“国籍”请选择“中国香港”、“中国澳门”或“中国台湾”~') + } } // else if (this.userInfo.idType == '4' && this.userInfo.idNo.length < 3) { // return this.$toast('护照须大于等于3个字符') @@ -1387,12 +1403,13 @@ export default { // 通过国籍判断 证件是否符合要求 // 如果是国籍选择中国大陆 - if (this.userInfo.nativeplace == '1') { + if (this.userInfo.nativeplace <= '4') { // “身份证”或“台湾居民来往大陆通行证”或“港澳居民来往内地通行证” let obj = { '1': true, '5': true, - '6': true + '6': true, + '9': true } let idType = this.userInfo.idType // 通过年龄 判断证件是否符合要求