Commit c1644b6a3d8321d0da1016cfee8ad3afaf176114
1 parent
74f833af
fix 表单优化
Showing
3 changed files
with
13 additions
and
5 deletions
src/utils/validate.ts
| @@ -51,6 +51,14 @@ export function tphone(value) { | @@ -51,6 +51,14 @@ export function tphone(value) { | ||
| 51 | export function price(value) { | 51 | export function price(value) { |
| 52 | return /^\d+.?\d{0,2}$/.test(value) | 52 | return /^\d+.?\d{0,2}$/.test(value) |
| 53 | } | 53 | } |
| 54 | +/** | ||
| 55 | + * 身份证号简易校验 | ||
| 56 | + * @param {string} str | ||
| 57 | + * @returns {Boolean} | ||
| 58 | + */ | ||
| 59 | +export function idcardEasy(value) { | ||
| 60 | + return /(^\d{15}$)|(^\d{17}(\d|X)$)/.test(value) | ||
| 61 | +} | ||
| 54 | 62 | ||
| 55 | /** | 63 | /** |
| 56 | * 身份证号码校验 | 64 | * 身份证号码校验 |
src/views/community/housekeeper/houseDetail.vue
| @@ -60,7 +60,7 @@ const checkPrice = (rules, value, callback) => { | @@ -60,7 +60,7 @@ const checkPrice = (rules, value, callback) => { | ||
| 60 | if ([undefined, "", null].includes(value)) { | 60 | if ([undefined, "", null].includes(value)) { |
| 61 | callback(); | 61 | callback(); |
| 62 | } else if (price(value)) { | 62 | } else if (price(value)) { |
| 63 | - if (value > 50000) { | 63 | + if (value > 100000) { |
| 64 | callback(new Error("请输入正确的数值")); | 64 | callback(new Error("请输入正确的数值")); |
| 65 | } else { | 65 | } else { |
| 66 | callback(); | 66 | callback(); |
| @@ -222,10 +222,10 @@ defineExpose({ | @@ -222,10 +222,10 @@ defineExpose({ | ||
| 222 | placeholder="请输入楼宇名称" | 222 | placeholder="请输入楼宇名称" |
| 223 | ></el-input> | 223 | ></el-input> |
| 224 | </el-form-item> | 224 | </el-form-item> |
| 225 | - <el-form-item label="单元:" prop="unitCount"> | 225 | + <el-form-item label="单元数:" prop="unitCount"> |
| 226 | <el-input | 226 | <el-input |
| 227 | v-model.number="props.formObj.unitCount" | 227 | v-model.number="props.formObj.unitCount" |
| 228 | - placeholder="请输入单元" | 228 | + placeholder="请输入单元数" |
| 229 | ></el-input> | 229 | ></el-input> |
| 230 | </el-form-item> | 230 | </el-form-item> |
| 231 | <el-form-item label="建成日期:" prop="createTime"> | 231 | <el-form-item label="建成日期:" prop="createTime"> |
src/views/serviceman/detail.vue
| @@ -9,7 +9,7 @@ import { | @@ -9,7 +9,7 @@ import { | ||
| 9 | import type { ElForm } from "element-plus"; | 9 | import type { ElForm } from "element-plus"; |
| 10 | import { addOrUpdate } from "@/api/notify/serviceman.ts"; | 10 | import { addOrUpdate } from "@/api/notify/serviceman.ts"; |
| 11 | import { getTableList } from "@/api/community/residence.ts"; | 11 | import { getTableList } from "@/api/community/residence.ts"; |
| 12 | -import { validMobile, checkIdcard } from "@/utils/validate"; | 12 | +import { validMobile, idcardEasy } from "@/utils/validate"; |
| 13 | 13 | ||
| 14 | const ruleFormRef = ref<InstanceType<typeof ElForm>>(); | 14 | const ruleFormRef = ref<InstanceType<typeof ElForm>>(); |
| 15 | let instance: ComponentInternalInstance | null = getCurrentInstance(); //获取app实例 | 15 | let instance: ComponentInternalInstance | null = getCurrentInstance(); //获取app实例 |
| @@ -52,7 +52,7 @@ const checkPhone = (rules, value, callback) => { | @@ -52,7 +52,7 @@ const checkPhone = (rules, value, callback) => { | ||
| 52 | * @callback checkCard~checkCallback | 52 | * @callback checkCard~checkCallback |
| 53 | */ | 53 | */ |
| 54 | const checkCard = (rules, value, callback) => { | 54 | const checkCard = (rules, value, callback) => { |
| 55 | - if (checkIdcard(value)) { | 55 | + if (idcardEasy(value)) { |
| 56 | callback(); | 56 | callback(); |
| 57 | } else { | 57 | } else { |
| 58 | callback(new Error("请填写正确的身份证")); | 58 | callback(new Error("请填写正确的身份证")); |