diff --git a/src/views/assets/warehouse/component/editWarehouse.vue b/src/views/assets/warehouse/component/editWarehouse.vue index be9c040..c633132 100644 --- a/src/views/assets/warehouse/component/editWarehouse.vue +++ b/src/views/assets/warehouse/component/editWarehouse.vue @@ -89,9 +89,25 @@ const ruleForm = reactive({ remark: '', }); +// 电话号码验证 +const validatePhone = (rule: any, value: string, callback: any) => { + if (value && value.trim()) { + const phoneReg = /^1[3-9]\d{9}$/; + const telReg = /^0\d{2,3}-?\d{7,8}$/; + if (!phoneReg.test(value) && !telReg.test(value)) { + callback(new Error('请输入正确的电话号码')); + } else { + callback(); + } + } else { + callback(); + } +}; + // 表单验证规则 const rules = reactive({ warehouseName: [{ required: true, message: '请输入仓库名称', trigger: 'blur' }], + contactPhone: [{ validator: validatePhone, trigger: 'blur' }], }); // 重置表单 diff --git a/src/views/assets/zone/component/editZone.vue b/src/views/assets/zone/component/editZone.vue index 4bdbc48..c6232e3 100644 --- a/src/views/assets/zone/component/editZone.vue +++ b/src/views/assets/zone/component/editZone.vue @@ -39,13 +39,6 @@ - - - - - - - @@ -98,7 +91,6 @@ const ruleForm = reactive({ zoneCode: '', zoneType: '', warehouseId: '', - capacity: 0, remark: '', }); @@ -115,7 +107,6 @@ const resetForm = () => { ruleForm.zoneCode = ''; ruleForm.zoneType = ''; ruleForm.warehouseId = ''; - ruleForm.capacity = 0; ruleForm.remark = ''; }; @@ -133,7 +124,6 @@ const openDialog = async (row?: any) => { ruleForm.zoneCode = data.zoneCode || ''; ruleForm.zoneType = data.zoneType || ''; ruleForm.warehouseId = data.warehouseId || ''; - ruleForm.capacity = data.capacity || 0; ruleForm.remark = data.remark || ''; } catch (error) { console.error('获取库区详情失败:', error); @@ -164,7 +154,6 @@ const onSubmit = async () => { zoneCode: ruleForm.zoneCode, zoneType: ruleForm.zoneType, warehouseId: ruleForm.warehouseId, - capacity: ruleForm.capacity, remark: ruleForm.remark, }; diff --git a/src/views/system/dept/component/editDept.vue b/src/views/system/dept/component/editDept.vue index 23fa4bf..999e137 100644 --- a/src/views/system/dept/component/editDept.vue +++ b/src/views/system/dept/component/editDept.vue @@ -31,7 +31,7 @@ - + @@ -112,6 +112,23 @@ export default defineComponent({ rules: { deptName:[ {required: true, message: "部门名称不能为空", trigger: "blur"}, + ], + phone:[ + { + validator: (rule: any, value: string, callback: any) => { + if (value && value.toString().trim()) { + const phoneReg = /^1[3-9]\d{9}$/; + if (!phoneReg.test(value.toString())) { + callback(new Error('请输入正确的手机号')); + } else { + callback(); + } + } else { + callback(); + } + }, + trigger: 'blur' + } ] } });