From 83b3fab86f63c9d9896021fa62f28abc9a44d6ec Mon Sep 17 00:00:00 2001
From: zhaomeijing <zhaomeijing@syxysoft.com>
Date: Wed, 8 Jun 2022 17:53:17 +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

---
 .../src/components/CollectionType/index.vue   | 65 ++++++++++++++-----
 .../ParameterItemCollectionList.vue           |  1 +
 2 files changed, 50 insertions(+), 16 deletions(-)

diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue
index ade1d8ce2..188431e6d 100644
--- a/jero-web/src/components/CollectionType/index.vue
+++ b/jero-web/src/components/CollectionType/index.vue
@@ -5,8 +5,21 @@
       <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'>
-            <a-input class="box-input inputWid"
+<!--            文本校验  分情况-->
+<!--            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>
         </div>
@@ -15,7 +28,7 @@
       <div v-if='detailDate.controlType === "2"'>
         <div v-for='(item,index) in detailDate.list' :key='index'>
           <div v-if='item.type === "pull"' class='add-width'>
-            <a-select :placeholder="$t('PleaseSelect')+$t('controlType')" v-model="item.dataValue" class='selectWid' :disabled="item.isLock == '1' ? true: false" allowClear>
+            <a-select v-model="item.dataValue" class='selectWid' :disabled="item.isLock == '1' ? true: false" allowClear>
               <a-select-option v-for="(item, key) in item.controlValue" :key="key" :value="item.value">
                     <span style="display: inline-block;width: 100%" :title=" item.label ">
                       {{ item.label }}
@@ -29,7 +42,7 @@
       <div v-if='detailDate.controlType === "3"'>
         <div v-for='(item,index) in detailDate.list' :key='index' style='flex: 1'>
           <div v-if='item.type==="pull_more"' class='add-width'>
-            <a-select :placeholder="$t('PleaseSelect')+$t('controlType')" v-model="item.dataValue" mode="multiple" class='selectWid'  :disabled="item.isLock == '1' ? true: false" allowClear>
+            <a-select v-model="item.dataValue" mode="multiple" class='selectWid'  :disabled="item.isLock == '1' ? true: false" allowClear>
               <a-select-option v-for="(item, key) in item.controlValue" :key="key" :value="item.value">
                     <span style="display: inline-block;width: 100%" :title=" item.label ">
                       {{ item.label }}
@@ -55,7 +68,7 @@
       <div v-if='detailDate.controlType === "5"' class='add_flex'>
         <div v-for='(item,index) in detailDate.list' :key='index' class='add_flex_item'>
           <div v-if='item.type==="pull"' class='add-width'>
-            <a-select :placeholder="$t('PleaseSelect')+$t('controlType')" v-model="item.dataValue" class='selectWid'  :disabled="item.isLock == '1' ? true: false" allowClear>
+            <a-select v-model="item.dataValue" class='selectWid'  :disabled="item.isLock == '1' ? true: false" allowClear>
               <a-select-option v-for="(itemin, key) in item.controlValue" :key="key" :value="itemin.value">
                     <span style="display: inline-block;width: 100%" :title=" itemin.label ">
                       {{ itemin.label }}
@@ -79,7 +92,7 @@
                      v-model="item.dataValue" />
           </div>
           <div v-if='item.type==="pull_more"' class='add-width'>
-            <a-select :placeholder="$t('PleaseSelect')+$t('controlType')" v-model="item.dataValue" mode="multiple" class='selectWid'  :disabled="item.isLock == '1' ? true: false" allowClear>
+            <a-select v-model="item.dataValue" mode="multiple" class='selectWid'  :disabled="item.isLock == '1' ? true: false" allowClear>
               <a-select-option v-for="(item, key) in item.controlValue" :key="key" :value="item.value">
                     <span style="display: inline-block;width: 100%" :title=" item.label ">
                       {{ item.label }}
@@ -110,7 +123,7 @@
       <div v-if='detailDate.controlType === "8"' class='add_flex'>
         <div v-for='(item,index) in detailDate.list' :key='index' class='add_flex_item'>
           <div v-if='item.type==="pull"' class='add-width'>
-            <a-select :placeholder="$t('PleaseSelect')+$t('controlType')" v-model="item.dataValue" class='selectWid'  :disabled="item.isLock == '1' ? true: false" allowClear>
+            <a-select v-model="item.dataValue" class='selectWid'  :disabled="item.isLock == '1' ? true: false" allowClear>
               <a-select-option v-for="(itemin, key) in item.controlValue" :key="key" :value="itemin.value">
                     <span style="display: inline-block;width: 100%" :title=" itemin.label ">
                       {{ itemin.label }}
@@ -132,7 +145,7 @@
       <div v-if='detailDate.controlType === "9"' class='add_flex'>
         <div v-for='(item,index) in detailDate.list' :key='index' class='add_flex_item'>
           <div v-if='item.type==="pull_more"' class='add-width'>
-            <a-select :placeholder="$t('PleaseSelect')+$t('controlType')" v-model="item.dataValue" mode="multiple" class='selectWid'  :disabled="item.isLock == '1' ? true: false" allowClear>
+            <a-select v-model="item.dataValue" mode="multiple" class='selectWid'  :disabled="item.isLock == '1' ? true: false" allowClear>
               <a-select-option v-for="(item, key) in item.controlValue" :key="key" :value="item.value">
                     <span style="display: inline-block;width: 100%" :title=" item.label ">
                       {{ item.label }}
@@ -154,7 +167,7 @@
       <div v-if='detailDate.controlType === "10"' class='add_flex'>
         <div v-for='(item,index) in detailDate.list' :key='index' class='add_flex_item'>
           <div v-if='item.type==="pull"'>
-            <a-select :placeholder="$t('PleaseSelect')+$t('controlType')" v-model="item.dataValue" class='selectWid' :disabled="item.isLock == '1' ? true: false" allowClear>
+            <a-select v-model="item.dataValue" class='selectWid' :disabled="item.isLock == '1' ? true: false" allowClear>
               <a-select-option v-for="(itemin, key) in item.controlValue" :key="key" :value="itemin.value">
                     <span style="display: inline-block;width: 100%" :title=" itemin.label ">
                       {{ itemin.label }}
@@ -163,9 +176,22 @@
             </a-select>
           </div>
           <div v-if='item.type==="text"'>
-            <a-input class="box-input inputWid"
-                     :disabled="item.isLock == '1' ? true: false"
-                     v-model="item.dataValue"/>
+            <!--            文本校验  分情况-->
+            <!--            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"
+                            :precision='0'
+                            v-model="item.dataValue" />
           </div>
           <div v-if='item.type==="file"'>
             <a-button type="primary" class="button-text inputWid"
@@ -197,16 +223,20 @@ export default {
     return {
       isLock: '0',
       formInline: {},
-      visible: false
+      visible: false,
+      detailDatetransformation: []
     }
   },
   components: {
     uploadFileChangeDown
   },
   mounted() {
-    if(this.detailDate.list[0].type === 'pull_more') {
-      this.detailDate.list[0].dataValue = []
-    }
+    this.detailDate.list.forEach((item) => {
+      if(item.type === 'pull_more') {
+        item.dataValue = []
+      }
+      // this.detailDatetransformation.push(item)
+    })
   },
   methods: {
     uploadSuccess(data) {
@@ -264,7 +294,7 @@ export default {
   white-space: nowrap;
 }
 </style>
-<style scoped>
+<style lang="less" scoped>
 .box {
   width: 100%;
   height: calc(100% - 100px);
@@ -282,6 +312,9 @@ export default {
 .add_flex{
   display: flex;
 }
+/deep/.box{
+  overflow: hidden;
+}
 .add_flex_item{
   width: 30%;
   /*flex: 1;*/
diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index 561a80bd8..45cce2ea1 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -826,6 +826,7 @@ export default {
                   postDateobj[itemIn] = item[itemIn]
                   if(item[itemIn].list[0].dataValue instanceof Array) {
                     item[itemIn].list[0].dataValue = item[itemIn].list[0].dataValue.join(',')
+                  //  todo 校验
                   }
                 }
               }