From 04a79c30323b8828f321eaedb42e9edd30b789a1 Mon Sep 17 00:00:00 2001
From: WUSIJIAN <13825895+wsj0228@user.noreply.gitee.com>
Date: Thu, 26 Feb 2026 18:00:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E4=BB=93=E5=BA=93=E3=80=81=E5=BA=93?=
 =?UTF-8?q?=E5=8C=BA=E5=92=8C=E9=83=A8=E9=97=A8=E7=AE=A1=E7=90=86=E4=B8=AD?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=B5=E8=AF=9D=E5=8F=B7=E7=A0=81=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E9=AA=8C=E8=AF=81,=E7=A7=BB=E9=99=A4=E5=BA=93?=
 =?UTF-8?q?=E5=8C=BA=E5=AE=B9=E9=87=8F=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../warehouse/component/editWarehouse.vue     | 16 ++++++++++++++++
 src/views/assets/zone/component/editZone.vue  | 11 -----------
 src/views/system/dept/component/editDept.vue  | 19 ++++++++++++++++++-
 3 files changed, 34 insertions(+), 12 deletions(-)

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<FormRules>({
 	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 @@
 					</el-form-item>
 				</el-col>
 			</el-row>
-			<el-row :gutter="20">
-				<el-col :span="12">
-					<el-form-item label="容量" prop="capacity">
-						<el-input-number v-model="ruleForm.capacity" :min="0" placeholder="请输入容量" style="width: 100%" />
-					</el-form-item>
-				</el-col>
-			</el-row>
 			<el-row :gutter="20">
 				<el-col :span="24">
 					<el-form-item label="备注" prop="remark">
@@ -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 @@
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="手机号">
+						<el-form-item label="手机号" prop="phone">
 							<el-input v-model="ruleForm.phone" placeholder="请输入手机号" clearable></el-input>
 						</el-form-item>
 					</el-col>
@@ -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'
+          }
         ]
       }
 		});