diff --git a/src/views/system/Activity/addActivity.vue b/src/views/system/Activity/addActivity.vue index 42de67b..edc3ee8 100644 --- a/src/views/system/Activity/addActivity.vue +++ b/src/views/system/Activity/addActivity.vue @@ -310,7 +310,14 @@ const rules = { trigger: 'blur' } ], - contactPhone: [{ required: true, message: '请输入联系方式', trigger: 'blur' }], + contactPhone: [ + { required: true, message: '请输入联系方式', trigger: 'blur' }, + { + validator: (_: any, value: string | number) => validator(value, 'Character'), + message: '请输入中文,字母,数字等字符', + trigger: 'blur' + } + ], coverImage: [{ required: true, message: '请上传活动封面', trigger: 'blur' }], content: [{ required: true, message: '请输入内容', trigger: 'blur' }] }; diff --git a/src/views/system/Sdb/ChargeItem/index.vue b/src/views/system/Sdb/ChargeItem/index.vue index 843fc5a..af818e3 100644 --- a/src/views/system/Sdb/ChargeItem/index.vue +++ b/src/views/system/Sdb/ChargeItem/index.vue @@ -6,7 +6,13 @@ - + 搜索 @@ -131,12 +137,22 @@ const data = reactive>({ rules: { itemName: [ { - validator: (_: any, value: string | number, callback: (arg0?: Error) => any) => { - if (value === '' || value === undefined) { - return callback(); + validator: (_: any, value: string, callback: (error?: Error) => void) => { + if (!value || value.trim() === '') { + callback(); + return; } - return !validator(value, 'fullFilterReg') ? callback() : callback(new Error('请输入正确的项目名称')); - } + + // 使用 Character 正则验证(只允许字母、数字、中文、下划线、横线) + const isValid = validator(value, 'Character'); + + if (!isValid) { + callback(new Error('只能输入中文、字母、数字、下划线和横线')); + } else { + callback(); + } + }, + trigger: 'blur' } ] } @@ -159,13 +175,19 @@ const getList = async () => { /** 搜索按钮操作 */ const handleQuery = () => { - queryParams.value.pageNum = 1; - getList(); + queryFormRef.value.validate((valid: boolean) => { + console.log(valid); + if (valid) { + queryParams.value.pageNum = 1; + getList(); + } + }); }; /** 重置按钮操作 */ const resetQuery = () => { queryFormRef.value?.resetFields(); + queryParams.value.itemName = undefined; handleQuery(); }; diff --git a/src/views/system/house/components/unit.vue b/src/views/system/house/components/unit.vue index ee8b808..8193ea0 100644 --- a/src/views/system/house/components/unit.vue +++ b/src/views/system/house/components/unit.vue @@ -59,6 +59,7 @@ import TableUnit from './components/table.vue'; import { useHouseStore } from '@/store/modules/house'; import { listHouseUseType_add_house } from '@/api/system/houseUse'; import { addUnitNo, delUnitNo, getUnitNo, updateUnitNo } from '@/api/system/houseUnit'; +import { validator } from '@/utils/Reg'; const { proxy } = getCurrentInstance() as ComponentInternalInstance; @@ -94,7 +95,25 @@ const form = ref({ }); const rules = { - name: [{ required: true, message: '单元名称不能为空', trigger: 'blur' }], + name: [ + { required: true, message: '单元名称不能为空', trigger: 'blur' }, + { + validator: (_: any, value: string, callback: (error?: Error) => void) => { + if (!value || value.trim() === '') { + callback(); + return; + } + // 使用 Character 正则验证(只允许字母、数字、中文、下划线、横线) + const isValid = validator(value, 'Character'); + if (!isValid) { + callback(new Error('只能输入中文、字母、数字、下划线和横线')); + } else { + callback(); + } + }, + trigger: 'blur' + } + ], buildingId: [{ required: true, message: '所属楼栋不能为空', trigger: 'blur' }] }; /** 新增按钮操作 */ diff --git a/src/views/system/warehouse/PurchaseIn/Main.vue b/src/views/system/warehouse/PurchaseIn/Main.vue index 7254e49..cb62bb7 100644 --- a/src/views/system/warehouse/PurchaseIn/Main.vue +++ b/src/views/system/warehouse/PurchaseIn/Main.vue @@ -13,7 +13,7 @@ - + @@ -48,8 +48,8 @@
制单人:{{ form.leader }}
仓库:{{ form.warehouseName }}
日期: {{ form.createTime }}
-
备注: {{ form.remark }}
+
备注: {{ form.remark }}
@@ -161,10 +161,14 @@ const cancelForm = () => { .foorter { display: grid; grid-template-columns: repeat(3, 1fr); - width: 85%; + width: 100%; gap: 30px; margin: 30px auto 0; } + .formark { + font-size: smaller; + margin-top: 10px; + } } } diff --git a/src/views/system/warehouse/PurchaseIn/add.vue b/src/views/system/warehouse/PurchaseIn/add.vue index ffc0c94..393f0da 100644 --- a/src/views/system/warehouse/PurchaseIn/add.vue +++ b/src/views/system/warehouse/PurchaseIn/add.vue @@ -166,15 +166,20 @@ function handleChangeitem(row: MaterialVO[]) { .map((item) => { if (!item.id) return null; const find = form.value.items.find((i) => i.id === item.id); + console.log(item, find); if (find || form.value.items.length <= 0) { return { ...item, + costPrice: 0, + inNum: 0, materialId: item.id, ...find }; } else { return { ...item, + costPrice: 0, + inNum: 0, materialId: item.id }; }
序号序号 物资名称 品牌 规格型号