From 298e699d7c426d8091ce8611e5a3e1990eef8f50 Mon Sep 17 00:00:00 2001
From: zhaomeijing <zhaomeijing@syxysoft.com>
Date: Thu, 5 May 2022 14:59:38 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=8F=82=E6=95=B0=E9=A1=B9=E5=88=97=E8=A1=A8]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |  1 +
 jero-web/src/common/lang/zh-cn.js             |  1 +
 .../parameterlist/components/addModel.vue     | 70 ++++++++++++-------
 3 files changed, 45 insertions(+), 27 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index bea14f54d..1fe0d26f7 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -706,6 +706,7 @@ module.exports = {
   uploadTime: 'Upload time',
   enclosure: 'enclosure',
   // 认证
+  onlyThree: 'Only letters, numbers and horizontal bars (-) can be entered',
   templateName: 'template Name',
   pleaseSelectData: 'please Select Data',
   templateCopy: 'template Copy',
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 6d00c2a16..42eaf3398 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -712,6 +712,7 @@ module.exports = {
   uploadTime:'上传时间',
   enclosure:'附件',
   // 认证
+  onlyThree: '只能输入字母，数字，横杠（-）三种内容',
   templateName: '模板名称',
   pleaseSelectData: '请选择数据',
   templateCopy: '模板复制',
diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue
index a51b72e89..48cec5a17 100644
--- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue
+++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue
@@ -18,7 +18,7 @@
                 <span class="title-text-text"
                       :title="$t('NiONumber')">{{$t('NiONumber')}}</span>
                 </div>
-                <a-form-model-item class="itemModel" prop="paramsTemplateName">
+                <a-form-model-item class="itemModel" prop="nioNumber">
                   <a-input class="box-input"
                            :disabled="disabled"
                            v-model="formInline.nioNumber"
@@ -31,7 +31,7 @@
                 <div class="title-text">
                   <span class="title-text-text" :title="$t('Required')">{{$t('Required')}}</span>
                 </div>
-                <a-form-model-item class="itemModel" prop="state">
+                <a-form-model-item class="itemModel" prop="isMust">
                   <a-select :placeholder="$t('PleaseSelect')+$t('Required')" v-model='formInline.isMust'>
                     <a-select-option :key="'1'" :value="'1'">{{$t('yes')}}
                     </a-select-option>
@@ -49,7 +49,7 @@
                 <span class="title-text-text"
                       :title="$t('ParameterName')">{{$t('ParameterName')}}</span>
                 </div>
-                <a-form-model-item class="itemModel" prop="paramsTemplateName">
+                <a-form-model-item class="itemModel" prop="paramsName">
                   <a-input class="box-input"
                            :disabled="disabled"
                            v-model="formInline.paramsName"
@@ -83,7 +83,7 @@
                 <span class="title-text-text"
                       :title="$t('parameterBatch')">{{$t('parameterBatch')}}</span>
                 </div>
-                <a-form-model-item class="itemModel" prop="paramsTemplateName">
+                <a-form-model-item class="itemModel" prop="paramsBatch">
                   <j-dict-select-tag class="box-input" v-model="formInline.paramsBatch"
                                      :disabled="disabled"
                                      :placeholder="$t('PleaseSelect')+$t('parameterBatch')"
@@ -97,7 +97,7 @@
                 <div class="title-text">
                   <span class="title-text-text" :title="$t('areaOfResponsibility')">{{$t('areaOfResponsibility')}}</span>
                 </div>
-                <a-form-model-item class="itemModel" prop="technologyTerritory">
+                <a-form-model-item class="itemModel" prop="dutyTerritory">
                   <j-dict-select-tag class="box-input" v-model="formInline.dutyTerritory"
                                      :disabled="disabled"
                                      :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
@@ -114,7 +114,7 @@
                 <span class="title-text-text"
                       :title="$t('ParameterDescription')">{{$t('ParameterDescription')}}</span>
                 </div>
-                <a-form-model-item class="itemModel" prop="paramsTemplateName">
+                <a-form-model-item class="itemModel" prop="description">
                   <a-input class="box-input"
                            :disabled="disabled"
                            v-model="formInline.description"
@@ -130,7 +130,7 @@
                 <span class="title-text-text"
                       :title="$t('ParameterName')">{{$t('certificationCategory')}}</span>
                 </div>
-                <a-form-model-item class="itemModel" prop="paramsTemplateName">
+                <a-form-model-item class="itemModel" prop="certCategory">
                   <j-multi-select-tag class="box-input" v-model="formInline.certCategory"
                                       @change='Onchange'
                                       v-on:changelabel='Onchangelabel'
@@ -184,7 +184,7 @@
                 <span class="title-text-text"
                       :title="$t('controlAlternatives')">{{$t('controlAlternatives')}}</span>
                 </div>
-                <a-form-model-item class="itemModel" prop="paramsTemplateName">
+                <a-form-model-item class="itemModel" prop="controlValues">
                   <a-input class="box-input"
                            :disabled="disabled"
                            v-model="formInline.controlValues"
@@ -221,7 +221,7 @@
                         <span class="title-text-text"
                               :title="$t('standard')">{{$t('standard')}}</span>
                         </div>
-                        <a-form-model-item class="itemModel" prop="paramsTemplateName">
+                        <a-form-model-item class="itemModel" prop="paramsNumber">
                           <a-input class="box-input"
                                    :disabled="disabled"
                                    v-model="item.paramsNumber"
@@ -234,7 +234,7 @@
                         <div class="title-text">
                           <span class="title-text-text" :title="$t('ParameterName')">{{$t('ParameterName')}}</span>
                         </div>
-                        <a-form-model-item class="itemModel" prop="technologyTerritory">
+                        <a-form-model-item class="itemModel" prop="paramsName">
                           <a-input class="box-input"
                                    :disabled="disabled"
                                    v-model="item.paramsName"
@@ -250,7 +250,7 @@
                       <span class="title-text-text"
                             :title="$t('ParameterDescription')">{{$t('ParameterDescription')}}</span>
                         </div>
-                        <a-form-model-item class="itemModel" prop="paramsTemplateName">
+                        <a-form-model-item class="itemModel" prop="description">
                           <a-input class="box-input"
                                    :disabled="disabled"
                                    v-model="item.description"
@@ -316,24 +316,40 @@ export default {
       confirmLoading: false,
       visible: false,
       rules: {
-        ipdInfo: [
-          {
-            pattern: /(ht|f)tp(s?)\:\/\/[0-9a-zA-Z]([-.\w]*[0-9a-zA-Z])*(:(0-9)*)*(\/?)([a-zA-Z0-9\-\.\?\,\'\/\\\+&amp;%$#_]*)?/,
-            message: this.$t('pleaseEnterTheCorrectWebAddress')
-          }
+        nioNumber:[
+          { required: true, message: this.$t('PleaseEnter')+this.$t('NiONumber'), trigger: 'change' },
+          // {
+          //   pattern: /(?!^\d+$)(?!^[a-zA-Z]+$)[0-9a-zA-Z]{1,15}/,
+          //   message: this.$t('onlyThree'),
+          //   trigger: 'change'
+          // }
         ],
-        vehicleDevelopmentPlan: [
-          {
-            pattern: /(ht|f)tp(s?)\:\/\/[0-9a-zA-Z]([-.\w]*[0-9a-zA-Z])*(:(0-9)*)*(\/?)([a-zA-Z0-9\-\.\?\,\'\/\\\+&amp;%$#_]*)?/,
-            message: this.$t('pleaseEnterTheCorrectWebAddress')
-          }
+        isMust: [
+          { required: true, message: this.$t('pleaseSelect')+this.$t('Required'), trigger: 'change' },
+        ],
+        paramsName: [
+          { required: true, message: this.$t('pleaseSelect')+this.$t('Required'), trigger: 'change' },
+          { min:1, max: 30, message: this.$t('cantExeed')+'30'+this.$t('characters'), trigger: 'blur' },
+        ],
+        technologyTerritory: [
+          { required: true, message: this.$t('pleaseSelect')+this.$t('technicalField'), trigger: 'change' },
+        ],
+        paramsBatch: [
+          { required: true, message: this.$t('PleaseSelect')+this.$t('parameterBatch'), trigger: 'change' },
+        ],
+        dutyTerritory: [
+          { required: true, message: this.$t('PleaseSelect')+this.$t('areaOfResponsibility'), trigger: 'change' },
+        ],
+        description: [
+          { min:1, max: 200, message: this.$t('cantExeed')+'200'+this.$t('characters'), trigger: 'blur' },
+        ],
+        controlType: [
+          { required: true, message: this.$t('pleaseSelect')+this.$t('controlType'), trigger: 'change' },
+        ],
+        controlValues: [
+          { required: true, message: this.$t('PleaseEnter')+this.$t('controlAlternatives'), trigger: 'change' },
+          { min:1, max: 500, message: this.$t('cantExeed')+'500'+this.$t('characters'), trigger: 'blur' },
         ],
-        attestationPlan: [
-          {
-            pattern: /(ht|f)tp(s?)\:\/\/[0-9a-zA-Z]([-.\w]*[0-9a-zA-Z])*(:(0-9)*)*(\/?)([a-zA-Z0-9\-\.\?\,\'\/\\\+&amp;%$#_]*)?/,
-            message: this.$t('pleaseEnterTheCorrectWebAddress')
-          }
-        ]
       },
       disabled: false,
       projectNameList: [],