From 58235ba61d74bd90b9188f7f7c7ef29ca5b5af4c Mon Sep 17 00:00:00 2001
From: zhaomeijing <zhaomeijing@syxysoft.com>
Date: Thu, 9 Jun 2022 10:53:03 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |   7 +
 jero-web/src/common/lang/zh-cn.js             |   7 +
 .../src/components/CollectionType/index.vue   | 421 ++++++++++++++++--
 3 files changed, 406 insertions(+), 29 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index c820ebdde..7720a2d63 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -712,6 +712,13 @@ module.exports = {
   uploadTime: 'Upload time',
   enclosure: 'Enclosure',
   // 认证
+  chinese: 'chinese',
+  integerOrDecimal: 'integer Or Decimal',
+  OneDecimalPlace: 'One Decimal Place',
+  TwoDecimalplaces: 'Two Decimal places',
+  Threedecimalplaces: 'Threedecimalplaces',
+  FourDecimalplaces: 'FourDecimalplaces',
+  Positivefloatingpointnumber: 'Positive floating point number',
   oneconfigurationInformation: 'Contains at least one configuration information',
   Correspondingstandarddeleted: 'Correspondingstandarddeleted',
   changeTheTitle: 'Title already exists, please change the title',
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index ecb692dbe..14fbf2d2a 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -723,6 +723,13 @@ module.exports = {
   uploadTime: '上传时间',
   enclosure: '附件',
   // 认证
+  chinese: '中文',
+  integerOrDecimal: '整数或小数',
+  OneDecimalPlace: '一位小数',
+  TwoDecimalplaces: '两位小数',
+  Threedecimalplaces: '三位小数',
+  FourDecimalplaces:'四位小数',
+  Positivefloatingpointnumber: '正浮点数',
   oneconfigurationInformation: '至少含有一个配置信息',
   Correspondingstandarddeleted: '对应标准已删除',
   changeTheTitle: '标题已存在，请更换标题',
diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue
index e9235a513..29464e56a 100644
--- a/jero-web/src/components/CollectionType/index.vue
+++ b/jero-web/src/components/CollectionType/index.vue
@@ -4,23 +4,93 @@
 <!--      纯文本-->
       <div v-if='detailDate.controlType === "1"'>
         <div v-for='(item,index) in detailDate.list' :key='index'>
-          <div v-if='item.type==="text"' class='add-width'>
-<!--            文本校验  分情况-->
-<!--            1 无-->
-<!--            2 中文-->
-<!--            3 正整数-->
-<!--            4 政府点数-->
-<!--            5 证书或小数-->
-<!--            6 一位小数-->
-<!--            7 两位小数-->
-<!--            8 三位小数-->
-<!--            9 四为小数-->
-            <div v-if="item.controlVerify == '3'"></div>
-            <a-input-number class="box-input inputWid"
-                     :disabled="item.isLock == '1' ? true: false"
-                     :max="99999"
-                     :step="0"
-                     v-model="item.dataValue" />
+          <div v-if='item.type==="text"'>
+            <!--            文本校验  分情况-->
+            <!--            1 无-->
+            <!--            2 中文-->
+            <!--            3 正整数-->
+            <!--            4 政府点数-->
+            <!--            5 证书或小数-->
+            <!--            6 一位小数-->
+            <!--            7 两位小数-->
+            <!--            8 三位小数-->
+            <!--            9 四为小数-->
+            <!--           无 -->
+            <div v-if="item.controlVerify == '1'">
+              <a-input class="box-input inputWid"
+                       :disabled="item.isLock == '1' ? true: false"
+                       :placeholder="$t('pleaseEnter')"
+                       v-model="item.dataValue" />
+            </div>
+            <!--            中文-->
+            <div v-if="item.controlVerify == '2'">
+              <a-input class="box-input inputWid"
+                       :disabled="item.isLock == '1' ? true: false"
+                       :placeholder="$t('pleaseEnter')+$t('chinese')"
+                       onkeyup="value=value.replace(/[^\u4e00-\u9fa5]/g,'')"
+                       v-model="item.dataValue" />
+            </div>
+            <!--         正整数  -->
+            <div v-if="item.controlVerify == '3'">
+              <a-input-number class="box-input inputWid"
+                              :disabled="item.isLock == '1' ? true: false"
+                              :max="99999"
+                              :precision="0"
+                              :placeholder="$t('enterPositiveInteger')"
+                              v-model="item.dataValue" />
+            </div>
+            <!--         正浮点书  -->
+            <div v-if="item.controlVerify == '4'">
+              <a-input class="box-input inputWid"
+                              :disabled="item.isLock == '1' ? true: false"
+                              onkeyup="value=value.replace(/^[1-9]\d*\.\d*|0\.\d*[1-9]\d*$/g,'')"
+                              :placeholder="$t('pleaseEnter')+$t('Positivefloatingpointnumber')"
+                              v-model="item.dataValue" />
+            </div>
+            <!--         整数或小数  -->
+            <div v-if="item.controlVerify == '5'">
+              <a-input-number class="box-input inputWid"
+                              :disabled="item.isLock == '1' ? true: false"
+                              :max="99999"
+                              :placeholder="$t('pleaseEnter')+$t('integerOrDecimal')"
+                              v-model="item.dataValue" />
+            </div>
+            <!--        一位小数    -->
+            <div v-if="item.controlVerify == '6'">
+              <a-input-number class="box-input inputWid"
+                              :disabled="item.isLock == '1' ? true: false"
+                              :max="99999"
+                              :precision="1"
+                              :placeholder="$t('pleaseEnter')+$t('OneDecimalPlace')"
+                              v-model="item.dataValue" />
+            </div>
+            <!--            两位小数-->
+            <div v-if="item.controlVerify == '7'">
+              <a-input-number class="box-input inputWid"
+                              :disabled="item.isLock == '1' ? true: false"
+                              :max="99999"
+                              :precision="2"
+                              :placeholder="$t('pleaseEnter')+$t('TwoDecimalplaces')"
+                              v-model="item.dataValue" />
+            </div>
+            <!--            三位小数-->
+            <div v-if="item.controlVerify == '8'">
+              <a-input-number class="box-input inputWid"
+                              :disabled="item.isLock == '1' ? true: false"
+                              :max="99999"
+                              :precision="3"
+                              :placeholder="$t('pleaseEnter')+$t('Threedecimalplaces')"
+                              v-model="item.dataValue" />
+            </div>
+            <!--            四位小数-->
+            <div v-if="item.controlVerify == '9'">
+              <a-input-number class="box-input inputWid"
+                              :disabled="item.isLock == '1' ? true: false"
+                              :max="99999"
+                              :precision="4"
+                              :placeholder="$t('pleaseEnter')+$t('FourDecimalplaces')"
+                              v-model="item.dataValue" />
+            </div>
           </div>
         </div>
       </div>
@@ -76,20 +146,186 @@
               </a-select-option>
             </a-select>
           </div>
-          <div v-if='item.type==="text"' class='add-width'>
-            <a-input class="box-input inputWid"
-                     :disabled="item.isLock == '1' ? true: false"
-                     v-model="item.dataValue" />
+          <div v-if='item.type==="text"'>
+            <!--            文本校验  分情况-->
+            <!--            1 无-->
+            <!--            2 中文-->
+            <!--            3 正整数-->
+            <!--            4 政府点数-->
+            <!--            5 证书或小数-->
+            <!--            6 一位小数-->
+            <!--            7 两位小数-->
+            <!--            8 三位小数-->
+            <!--            9 四为小数-->
+            <!--           无 -->
+            <div v-if="item.controlVerify == '1'">
+              <a-input class="box-input inputWid"
+                       :disabled="item.isLock == '1' ? true: false"
+                       :placeholder="$t('pleaseEnter')"
+                       v-model="item.dataValue" />
+            </div>
+            <!--            中文-->
+            <div v-if="item.controlVerify == '2'">
+              <a-input class="box-input inputWid"
+                       :disabled="item.isLock == '1' ? true: false"
+                       :placeholder="$t('pleaseEnter')+$t('chinese')"
+                       onkeyup="value=value.replace(/[^\u4e00-\u9fa5]/g,'')"
+                       v-model="item.dataValue" />
+            </div>
+            <!--         正整数  -->
+            <div v-if="item.controlVerify == '3'">
+              <a-input-number class="box-input inputWid"
+                              :disabled="item.isLock == '1' ? true: false"
+                              :max="99999"
+                              :precision="0"
+                              :placeholder="$t('enterPositiveInteger')"
+                              v-model="item.dataValue" />
+            </div>
+            <!--         正浮点书  -->
+            <div v-if="item.controlVerify == '4'">
+              <a-input class="box-input inputWid"
+                       :disabled="item.isLock == '1' ? true: false"
+                       onkeyup="value=value.replace(/^[1-9]\d*\.\d*|0\.\d*[1-9]\d*$/g,'')"
+                       :placeholder="$t('pleaseEnter')+$t('Positivefloatingpointnumber')"
+                       v-model="item.dataValue" />
+            </div>
+            <!--         整数或小数  -->
+            <div v-if="item.controlVerify == '5'">
+              <a-input-number class="box-input inputWid"
+                              :disabled="item.isLock == '1' ? true: false"
+                              :max="99999"
+                              :placeholder="$t('pleaseEnter')+$t('integerOrDecimal')"
+                              v-model="item.dataValue" />
+            </div>
+            <!--        一位小数    -->
+            <div v-if="item.controlVerify == '6'">
+              <a-input-number class="box-input inputWid"
+                              :disabled="item.isLock == '1' ? true: false"
+                              :max="99999"
+                              :precision="1"
+                              :placeholder="$t('pleaseEnter')+$t('OneDecimalPlace')"
+                              v-model="item.dataValue" />
+            </div>
+            <!--            两位小数-->
+            <div v-if="item.controlVerify == '7'">
+              <a-input-number class="box-input inputWid"
+                              :disabled="item.isLock == '1' ? true: false"
+                              :max="99999"
+                              :precision="2"
+                              :placeholder="$t('pleaseEnter')+$t('TwoDecimalplaces')"
+                              v-model="item.dataValue" />
+            </div>
+            <!--            三位小数-->
+            <div v-if="item.controlVerify == '8'">
+              <a-input-number class="box-input inputWid"
+                              :disabled="item.isLock == '1' ? true: false"
+                              :max="99999"
+                              :precision="3"
+                              :placeholder="$t('pleaseEnter')+$t('Threedecimalplaces')"
+                              v-model="item.dataValue" />
+            </div>
+            <!--            四位小数-->
+            <div v-if="item.controlVerify == '9'">
+              <a-input-number class="box-input inputWid"
+                              :disabled="item.isLock == '1' ? true: false"
+                              :max="99999"
+                              :precision="4"
+                              :placeholder="$t('pleaseEnter')+$t('FourDecimalplaces')"
+                              v-model="item.dataValue" />
+            </div>
           </div>
         </div>
       </div>
 <!--      文本+下拉多选-->
       <div v-if='detailDate.controlType === "6"' class='add_flex'>
         <div v-for='(item,index) in detailDate.list' :key='index' class='add_flex_item'>
-          <div v-if='item.type==="text"' class='add-width'>
-            <a-input class="box-input inputWid"
-                     :disabled="item.isLock == '1' ? true: false"
-                     v-model="item.dataValue" />
+          <div v-if='item.type==="text"'>
+            <!--            文本校验  分情况-->
+            <!--            1 无-->
+            <!--            2 中文-->
+            <!--            3 正整数-->
+            <!--            4 政府点数-->
+            <!--            5 证书或小数-->
+            <!--            6 一位小数-->
+            <!--            7 两位小数-->
+            <!--            8 三位小数-->
+            <!--            9 四为小数-->
+            <!--           无 -->
+            <div v-if="item.controlVerify == '1'">
+              <a-input class="box-input inputWid"
+                       :disabled="item.isLock == '1' ? true: false"
+                       :placeholder="$t('pleaseEnter')"
+                       v-model="item.dataValue" />
+            </div>
+            <!--            中文-->
+            <div v-if="item.controlVerify == '2'">
+              <a-input class="box-input inputWid"
+                       :disabled="item.isLock == '1' ? true: false"
+                       :placeholder="$t('pleaseEnter')+$t('chinese')"
+                       onkeyup="value=value.replace(/[^\u4e00-\u9fa5]/g,'')"
+                       v-model="item.dataValue" />
+            </div>
+            <!--         正整数  -->
+            <div v-if="item.controlVerify == '3'">
+              <a-input-number class="box-input inputWid"
+                              :disabled="item.isLock == '1' ? true: false"
+                              :max="99999"
+                              :precision="0"
+                              :placeholder="$t('enterPositiveInteger')"
+                              v-model="item.dataValue" />
+            </div>
+            <!--         正浮点书  -->
+            <div v-if="item.controlVerify == '4'">
+              <a-input class="box-input inputWid"
+                       :disabled="item.isLock == '1' ? true: false"
+                       onkeyup="value=value.replace(/^[1-9]\d*\.\d*|0\.\d*[1-9]\d*$/g,'')"
+                       :placeholder="$t('pleaseEnter')+$t('Positivefloatingpointnumber')"
+                       v-model="item.dataValue" />
+            </div>
+            <!--         整数或小数  -->
+            <div v-if="item.controlVerify == '5'">
+              <a-input-number class="box-input inputWid"
+                              :disabled="item.isLock == '1' ? true: false"
+                              :max="99999"
+                              :placeholder="$t('pleaseEnter')+$t('integerOrDecimal')"
+                              v-model="item.dataValue" />
+            </div>
+            <!--        一位小数    -->
+            <div v-if="item.controlVerify == '6'">
+              <a-input-number class="box-input inputWid"
+                              :disabled="item.isLock == '1' ? true: false"
+                              :max="99999"
+                              :precision="1"
+                              :placeholder="$t('pleaseEnter')+$t('OneDecimalPlace')"
+                              v-model="item.dataValue" />
+            </div>
+            <!--            两位小数-->
+            <div v-if="item.controlVerify == '7'">
+              <a-input-number class="box-input inputWid"
+                              :disabled="item.isLock == '1' ? true: false"
+                              :max="99999"
+                              :precision="2"
+                              :placeholder="$t('pleaseEnter')+$t('TwoDecimalplaces')"
+                              v-model="item.dataValue" />
+            </div>
+            <!--            三位小数-->
+            <div v-if="item.controlVerify == '8'">
+              <a-input-number class="box-input inputWid"
+                              :disabled="item.isLock == '1' ? true: false"
+                              :max="99999"
+                              :precision="3"
+                              :placeholder="$t('pleaseEnter')+$t('Threedecimalplaces')"
+                              v-model="item.dataValue" />
+            </div>
+            <!--            四位小数-->
+            <div v-if="item.controlVerify == '9'">
+              <a-input-number class="box-input inputWid"
+                              :disabled="item.isLock == '1' ? true: false"
+                              :max="99999"
+                              :precision="4"
+                              :placeholder="$t('pleaseEnter')+$t('FourDecimalplaces')"
+                              v-model="item.dataValue" />
+            </div>
           </div>
           <div v-if='item.type==="pull_more"' class='add-width'>
             <a-select v-model="item.dataValue" mode="multiple" class='selectWid'  :disabled="item.isLock == '1' ? true: false" allowClear>
@@ -105,10 +341,93 @@
 <!--      文本+附件-->
       <div v-if='detailDate.controlType === "7"' class='add_flex'>
         <div v-for='(item,index) in detailDate.list' :key='index' class='add_flex_item'>
-          <div v-if='item.type==="text"' class='add-width'>
-            <a-input class="box-input inputWid"
-                     :disabled="item.isLock == '1' ? true: false"
-                     v-model="item.dataValue"/>
+          <div v-if='item.type==="text"'>
+            <!--            文本校验  分情况-->
+            <!--            1 无-->
+            <!--            2 中文-->
+            <!--            3 正整数-->
+            <!--            4 政府点数-->
+            <!--            5 证书或小数-->
+            <!--            6 一位小数-->
+            <!--            7 两位小数-->
+            <!--            8 三位小数-->
+            <!--            9 四为小数-->
+            <!--           无 -->
+            <div v-if="item.controlVerify == '1'">
+              <a-input class="box-input inputWid"
+                       :disabled="item.isLock == '1' ? true: false"
+                       :placeholder="$t('pleaseEnter')"
+                       v-model="item.dataValue" />
+            </div>
+            <!--            中文-->
+            <div v-if="item.controlVerify == '2'">
+              <a-input class="box-input inputWid"
+                       :disabled="item.isLock == '1' ? true: false"
+                       :placeholder="$t('pleaseEnter')+$t('chinese')"
+                       onkeyup="value=value.replace(/[^\u4e00-\u9fa5]/g,'')"
+                       v-model="item.dataValue" />
+            </div>
+            <!--         正整数  -->
+            <div v-if="item.controlVerify == '3'">
+              <a-input-number class="box-input inputWid"
+                              :disabled="item.isLock == '1' ? true: false"
+                              :max="99999"
+                              :precision="0"
+                              :placeholder="$t('enterPositiveInteger')"
+                              v-model="item.dataValue" />
+            </div>
+            <!--         正浮点书  -->
+            <div v-if="item.controlVerify == '4'">
+              <a-input class="box-input inputWid"
+                       :disabled="item.isLock == '1' ? true: false"
+                       onkeyup="value=value.replace(/^[1-9]\d*\.\d*|0\.\d*[1-9]\d*$/g,'')"
+                       :placeholder="$t('pleaseEnter')+$t('Positivefloatingpointnumber')"
+                       v-model="item.dataValue" />
+            </div>
+            <!--         整数或小数  -->
+            <div v-if="item.controlVerify == '5'">
+              <a-input-number class="box-input inputWid"
+                              :disabled="item.isLock == '1' ? true: false"
+                              :max="99999"
+                              :placeholder="$t('pleaseEnter')+$t('integerOrDecimal')"
+                              v-model="item.dataValue" />
+            </div>
+            <!--        一位小数    -->
+            <div v-if="item.controlVerify == '6'">
+              <a-input-number class="box-input inputWid"
+                              :disabled="item.isLock == '1' ? true: false"
+                              :max="99999"
+                              :precision="1"
+                              :placeholder="$t('pleaseEnter')+$t('OneDecimalPlace')"
+                              v-model="item.dataValue" />
+            </div>
+            <!--            两位小数-->
+            <div v-if="item.controlVerify == '7'">
+              <a-input-number class="box-input inputWid"
+                              :disabled="item.isLock == '1' ? true: false"
+                              :max="99999"
+                              :precision="2"
+                              :placeholder="$t('pleaseEnter')+$t('TwoDecimalplaces')"
+                              v-model="item.dataValue" />
+            </div>
+            <!--            三位小数-->
+            <div v-if="item.controlVerify == '8'">
+              <a-input-number class="box-input inputWid"
+                              :disabled="item.isLock == '1' ? true: false"
+                              :max="99999"
+                              :precision="3"
+                              :placeholder="$t('pleaseEnter')+$t('Threedecimalplaces')"
+                              v-model="item.dataValue" />
+            </div>
+            <!--            四位小数-->
+            <div v-if="item.controlVerify == '9'">
+              <a-input-number class="box-input inputWid"
+                              :disabled="item.isLock == '1' ? true: false"
+                              :max="99999"
+                              :precision="4"
+                              :placeholder="$t('pleaseEnter')+$t('FourDecimalplaces')"
+                              v-model="item.dataValue" />
+            </div>
           </div>
           <div v-if='item.type==="file"' class='add-width'>
             <a-button type="primary" class="button-text inputWid"
@@ -186,39 +505,80 @@
             <!--            7 两位小数-->
             <!--            8 三位小数-->
             <!--            9 四为小数-->
+            <!--           无 -->
+            <div v-if="item.controlVerify == '1'">
+              <a-input class="box-input inputWid"
+                       :disabled="item.isLock == '1' ? true: false"
+                       :placeholder="$t('pleaseEnter')"
+                       v-model="item.dataValue" />
+            </div>
+            <!--            中文-->
+            <div v-if="item.controlVerify == '2'">
+              <a-input class="box-input inputWid"
+                       :disabled="item.isLock == '1' ? true: false"
+                       :placeholder="$t('pleaseEnter')+$t('chinese')"
+                       onkeyup="value=value.replace(/[^\u4e00-\u9fa5]/g,'')"
+                       v-model="item.dataValue" />
+            </div>
+            <!--         正整数  -->
             <div v-if="item.controlVerify == '3'">
               <a-input-number class="box-input inputWid"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
                               :precision="0"
+                              :placeholder="$t('enterPositiveInteger')"
                               v-model="item.dataValue" />
             </div>
+            <!--         正浮点书  -->
+            <div v-if="item.controlVerify == '4'">
+              <a-input class="box-input inputWid"
+                       :disabled="item.isLock == '1' ? true: false"
+                       onkeyup="value=value.replace(/^[1-9]\d*\.\d*|0\.\d*[1-9]\d*$/g,'')"
+                       :placeholder="$t('pleaseEnter')+$t('Positivefloatingpointnumber')"
+                       v-model="item.dataValue" />
+            </div>
+            <!--         整数或小数  -->
+            <div v-if="item.controlVerify == '5'">
+              <a-input-number class="box-input inputWid"
+                              :disabled="item.isLock == '1' ? true: false"
+                              :max="99999"
+                              :placeholder="$t('pleaseEnter')+$t('integerOrDecimal')"
+                              v-model="item.dataValue" />
+            </div>
+            <!--        一位小数    -->
             <div v-if="item.controlVerify == '6'">
               <a-input-number class="box-input inputWid"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
                               :precision="1"
+                              :placeholder="$t('pleaseEnter')+$t('OneDecimalPlace')"
                               v-model="item.dataValue" />
             </div>
+            <!--            两位小数-->
             <div v-if="item.controlVerify == '7'">
               <a-input-number class="box-input inputWid"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
                               :precision="2"
+                              :placeholder="$t('pleaseEnter')+$t('TwoDecimalplaces')"
                               v-model="item.dataValue" />
             </div>
+            <!--            三位小数-->
             <div v-if="item.controlVerify == '8'">
               <a-input-number class="box-input inputWid"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
                               :precision="3"
+                              :placeholder="$t('pleaseEnter')+$t('Threedecimalplaces')"
                               v-model="item.dataValue" />
             </div>
+            <!--            四位小数-->
             <div v-if="item.controlVerify == '9'">
               <a-input-number class="box-input inputWid"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
                               :precision="4"
+                              :placeholder="$t('pleaseEnter')+$t('FourDecimalplaces')"
                               v-model="item.dataValue" />
             </div>
           </div>
@@ -358,4 +718,7 @@ export default {
 .add-width{
   width: 30%;
 }
+/deep/.ant-table-column-sort .ant-table-row-cell-ellipsis{
+  text-align: left;
+}
 </style>