From 7c8c50ca6c04fed98edf9ace05b24281d6760813 Mon Sep 17 00:00:00 2001
From: fanlin <fanlin@91isoft.com>
Date: Fri, 23 Jul 2021 14:09:09 +0800
Subject: [PATCH] =?UTF-8?q?bug=EF=BC=9A=E5=9B=BD=E5=86=85=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E7=BC=96=E8=BE=91-=E6=A0=87=E5=87=86=E5=B9=B4?=
 =?UTF-8?q?=E4=BB=BD=E9=9C=80=E4=BF=AE=E6=94=B9=E5=8F=AA=E5=85=81=E8=AE=B8?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=95=B0=E5=AD=97,=E9=99=90=E5=88=B6?=
 =?UTF-8?q?=E5=AD=97=E7=AC=A6100?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/verify/index.js                               | 9 +++++++++
 .../domesticStandardsAndRegulations/index.vue            | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/common/verify/index.js b/src/common/verify/index.js
index acb0272ba..2f030082a 100644
--- a/src/common/verify/index.js
+++ b/src/common/verify/index.js
@@ -457,6 +457,15 @@ export default {
       callback()
     }
   },
+  // 验证输入数字和英文
+  testNumberCode (rule, value, callback) {
+    let reg = /[0-9\-]/
+    if (value !== '' && !value.match(reg)) {
+      return callback(new Error('只能输入数字'))
+    } else {
+      callback()
+    }
+  },
   validUrl (rule, value, callback) {
     let reg = /(^((https|ftp|http|file):\/\/)|www\.)*([a-zA-Z0-9.-]+(:[a-zA-Z0-9.&%$-]+)*@)*((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}|([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.(com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(:[0-9]+)*(\/($|[a-zA-Z0-9.,?'\\+&%$#=~_-]+))*$/gm
     if (!value.match(reg)) {
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index abc7e6b24..732e58cb5 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -1765,8 +1765,8 @@ export default {
         ],
         standYear: [
           {required: true, message: '标准年份不能为空', trigger: 'change'},
-          {validator: this.verify.testItemCode, trigger: 'change'},
-          {type: 'string', max: 20, message: '标准年份不能超过20个字符', trigger: 'change'}
+          {validator: this.verify.testNumberCode, trigger: 'change'},
+          {type: 'string', max: 100, message: '标准年份不能超过100个字符', trigger: 'change'}
         ],
         standName: [
           {required: true, message: '中文名称不能为空', trigger: 'change'},