From 8547edf6e5dade6e48f95a701994bc3d6790b058 Mon Sep 17 00:00:00 2001
From: tengxiaofei <302828528@qq.com>
Date: Mon, 23 Sep 2024 09:12:06 +0800
Subject: [PATCH] =?UTF-8?q?HL-6097=20=E5=B7=A5=E4=BD=8D=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E4=BF=9D=E5=AD=98=EF=BC=8C=E5=B7=A5=E4=BD=8D?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=AD=97=E6=AE=B5=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/validator.ts                              | 13 +++++++++++++
 .../factoryModeling/workstation/workstation.data.ts |  4 ++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/utils/validator.ts b/src/utils/validator.ts
index b040b2ddf..83e031265 100644
--- a/src/utils/validator.ts
+++ b/src/utils/validator.ts
@@ -776,6 +776,19 @@ export function validateYS(rule, value, callback) {
         callback()
     }
 }
+//校验只可输入大小写字母、数字、空格
+export function validateYSK(rule, value, callback) {
+  if (value) {
+    const regs = /^[a-zA-Z0-9-_. ]+$/
+    if (regs.test(value)) {
+      callback()
+    } else {
+      callback(new Error('只能输入大小写字母、数字及空格'))
+    }
+  } else {
+    callback()
+  }
+}
 // 校验百分比
 export function validatePercent(rule, value, callback){
   if (!value) {
diff --git a/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts b/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts
index cebf01a68..11c47c112 100644
--- a/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts
@@ -13,7 +13,7 @@ import * as confgiApi  from '@/api/infra/config'
 
 import * as WorkstationApi from '@/api/wms/workstation'
 
-import { validateYS } from '@/utils/validator'
+import {validateYS, validateYSK} from '@/utils/validator'
 
 
 const { t } = useI18n() // 国际化
@@ -355,7 +355,7 @@ export const WorkstationRules = reactive({
   code: [
     { required: true, message: '请输入代码', trigger: 'blur' },
     { max: 50, message: '不得超过50个字符', trigger: 'blur' },
-    { validator:validateYS, message: '请输入正确的代码', trigger: 'blur'}
+    { validator:validateYSK, message: '请输入正确的代码', trigger: 'blur'}
   ],
   name: [
     { required: true, message: '请输入名称', trigger: 'change' },