Skip to content

dev / pingan-life-index-pro

Go to a project
Toggle navigation
Toggle navigation pinning
8a1eff7f by simon
Options

Merge branch 'master' of 120.27.44.69:dev/pingan-life-index-pro

2 parents f27a6b1e 99cdf947
Inline Side-by-side
Showing 4 changed files with 29 additions and 17 deletions
...@@ -282,13 +282,16 @@ module.exports = { ...@@ -282,13 +282,16 @@ module.exports = {
282 value: "6" 282 value: "6"
283 }, { 283 }, {
284 name: "外國人永久居留身份證", 284 name: "外國人永久居留身份證",
285 value: "0" 285 value: "O"
286 }, { 286 }, {
287 name: "港澳台居民居住證", 287 name: "港澳台居民居住證",
288 value: "V" 288 value: "V"
289 }, { 289 }, {
290 name: "台灣居民居住證", 290 name: "台灣居民居住證",
291 value: "W" 291 value: "W"
292 }, {
293 name: "其他",
294 value: "0"
292 }] 295 }]
293 }, 296 },
294 successMsg: "更新成功", 297 successMsg: "更新成功",
......
...@@ -280,13 +280,16 @@ module.exports = { ...@@ -280,13 +280,16 @@ module.exports = {
280 value: "6" 280 value: "6"
281 }, { 281 }, {
282 name: "外國人永久居留身份證", 282 name: "外國人永久居留身份證",
283 value: "0" 283 value: "O"
284 }, { 284 }, {
285 name: "港澳台居民居住證", 285 name: "港澳台居民居住證",
286 value: "V" 286 value: "V"
287 }, { 287 }, {
288 name: "台灣居民居住證", 288 name: "台灣居民居住證",
289 value: "W" 289 value: "W"
290 }, {
291 name: "其他",
292 value: "0"
290 }] 293 }]
291 }, 294 },
292 successMsg: "更新成功", 295 successMsg: "更新成功",
......
...@@ -280,13 +280,16 @@ module.exports = { ...@@ -280,13 +280,16 @@ module.exports = {
280 value: "6" 280 value: "6"
281 }, { 281 }, {
282 name: "外国人永久居留身份证", 282 name: "外国人永久居留身份证",
283 value: "0" 283 value: "O"
284 }, { 284 }, {
285 name: "港澳居民居住证", 285 name: "港澳居民居住证",
286 value: "V" 286 value: "V"
287 }, { 287 }, {
288 name: "台湾居民居住证", 288 name: "台湾居民居住证",
289 value: "W" 289 value: "W"
290 }, {
291 name: "其他",
292 value: "0"
290 }] 293 }]
291 }, 294 },
292 successMsg: "更新成功", 295 successMsg: "更新成功",
......
...@@ -68,7 +68,8 @@ export default { ...@@ -68,7 +68,8 @@ export default {
68 this.modalContent = content; 68 this.modalContent = content;
69 this.modalVisiable = true; 69 this.modalVisiable = true;
70 }, 70 },
71 initData() {}, 71 initData() {
72 },
72 onUpdateHandler() { 73 onUpdateHandler() {
73 let b1 = this.checkCnName(); 74 let b1 = this.checkCnName();
74 let b2 = this.checkIdNo(); 75 let b2 = this.checkIdNo();
...@@ -168,12 +169,6 @@ export default { ...@@ -168,12 +169,6 @@ export default {
168 message = this.i18n.infomationImprove.errorTips.e6; 169 message = this.i18n.infomationImprove.errorTips.e6;
169 let idNo = this.information.idNo + ""; 170 let idNo = this.information.idNo + "";
170 switch (this.information.idType) { 171 switch (this.information.idType) {
171 case "0": // 外國人永久居留身份證
172 // if (/[a-z][A-Z]{3}[0-9]{12}/.test(idNo)) {
173 // message = "";
174 // }
175 message = "";
176 break;
177 case "1": // 身份證 172 case "1": // 身份證
178 message = idNo.length == 18 ? "" : message; 173 message = idNo.length == 18 ? "" : message;
179 break; 174 break;
...@@ -184,17 +179,25 @@ export default { ...@@ -184,17 +179,25 @@ export default {
184 message = idNo.length > 6 && idNo.length < 50 ? "" : message; 179 message = idNo.length > 6 && idNo.length < 50 ? "" : message;
185 break; 180 break;
186 case "6": // 港澳通行證/回鄉證或台胞證 181 case "6": // 港澳通行證/回鄉證或台胞證
187 message = idNo.length > 5 && idNo.length < 50 ? "" : message; 182 if (idNo.indexOf("81") == 0 || idNo.indexOf("82") == 0) {
183 if ((/\\d{15}/.test(idNo) || /\\d{17}/.test(idNo))) {
184 message = "";
185 }
186 }
188 break; 187 break;
189 case "V": // 港澳台居民居住證 188 case "V": // 港澳居民居住證
190 // if ((/8[1|2]0000\\d{11}/.text(idNo) && (/\\d{15}/.test(idNo) || /\\d{17}/.test(idNo)))) { 189 if (idNo.indexOf("81") == 0 || idNo.indexOf("82") == 0) {
190 if ((/\\d{15}/.test(idNo) || /\\d{17}/.test(idNo))) {
191 message = ""; 191 message = "";
192 // } 192 }
193 }
193 break; 194 break;
194 case "W": //台灣居民居住證 195 case "W": //台灣居民居住證
195 // if ((/830000\\d{11}/.text(idNo) && (/\\d{15}/.test(idNo) || /\\d{17}/.test(idNo)))) { 196 if (idNo.indexOf("83") == 0 || idNo.indexOf("82") == 0) {
197 if ((/\\d{15}/.test(idNo) || /\\d{17}/.test(idNo))) {
196 message = ""; 198 message = "";
197 // } 199 }
200 }
198 break; 201 break;
199 default: 202 default:
200 message = ""; 203 message = "";
...@@ -231,5 +234,5 @@ export default { ...@@ -231,5 +234,5 @@ export default {
231 this.errorTips.e5 = ""; 234 this.errorTips.e5 = "";
232 } 235 }
233 }, 236 },
234 created() {} 237 created() { }
235 } 238 }
......