Merge remote-tracking branch 'origin/sdl_20220916_护理站人员功能' into yan_0916_护理类型信息

This commit is contained in:
闫晓茹 2022-09-26 13:50:16 +08:00
commit 26e6c30c65
2 changed files with 11 additions and 5 deletions

View File

@ -243,14 +243,20 @@ export default {
} }
cb(new Error("请输入正确的联系电话")); cb(new Error("请输入正确的联系电话"));
}; };
var checkMobile2 = (rule, value, cb) => { var checkMobile2 = (rule, value, cb) => {
// //
const regMobile = const regMobile =
/^(0|86|17951)?(13[0-9]|15[012356789]|17[678]|18[0-9]|14[57]|19[0-9])[0-9]{8}$/; /^(0|86|17951)?(13[0-9]|15[012356789]|17[678]|18[0-9]|14[57]|19[0-9])[0-9]{8}$/;
if (regMobile.test(value)) { if (!value) { //callback
return cb()
}else{
if (regMobile.test(value)) {
return cb(); return cb();
}else{
cb(new Error("请输入正确的紧急联系电话"));
}
} }
cb(new Error("请输入正确的紧急联系电话"));
}; };
// //
@ -367,7 +373,7 @@ export default {
// { required: true, message: "", trigger: "blur" } // { required: true, message: "", trigger: "blur" }
// ], // ],
urgentContactPhone: [ urgentContactPhone: [
{ validator: checkMobile2,message: "", trigger: "blur" } { validator: checkMobile2,trigger: "blur"}
], ],
// homeLongitude: [ // homeLongitude: [
// { required: true, message: "", trigger: "blur" } // { required: true, message: "", trigger: "blur" }

View File

@ -1010,7 +1010,7 @@ export default {
}, },
// //
clickarea(item) { clickarea(item) {
// this.value3 = ""; this.value3 = "";
console.log(item); console.log(item);
getSecondaryLevelInfo(item.id).then((res) => { getSecondaryLevelInfo(item.id).then((res) => {
console.log(res); console.log(res);
@ -1020,7 +1020,7 @@ export default {
// //
clickcity(item) { clickcity(item) {
this.value2 = ""; this.value2 = "";
// this.value3 = ""; this.value3 = "";
console.log(item); console.log(item);
getSecondaryLevelInfo(item.id).then((res) => { getSecondaryLevelInfo(item.id).then((res) => {
console.log(res); console.log(res);