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

---
 .../src/components/CollectionType/index.vue   | 43 ++++++++++---------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue
index 19f3e7369..b09722ca4 100644
--- a/jero-web/src/components/CollectionType/index.vue
+++ b/jero-web/src/components/CollectionType/index.vue
@@ -2,9 +2,9 @@
   <div style="height: 100%">
     <div class='box'>
 <!--      纯文本-->
-      <div v-if='detailDate.controlType === "1"'>
-        <div v-for='(item,index) in detailDate.list' :key='index'>
-          <div v-if='item.type==="text"'>
+      <div v-if='detailDate.controlType === "1"' 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'>
             <!--            文本校验  分情况-->
             <!--            1 无-->
             <!--            2 中文-->
@@ -135,8 +135,8 @@
         </div>
       </div>
 <!--      文本+下拉单选-->
-      <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='detailDate.controlType === "5"'>
+        <div v-for='(item,index) in detailDate.list' :key='index'>
           <div v-if='item.type==="pull"' class='add-width'>
             <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">
@@ -146,7 +146,7 @@
               </a-select-option>
             </a-select>
           </div>
-          <div v-if='item.type==="text"'>
+          <div v-if='item.type==="text"' class='add-width'>
             <!--            文本校验  分情况-->
             <!--            1 无-->
             <!--            2 中文-->
@@ -238,8 +238,8 @@
       </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"'>
+        <div v-for='(item,index) in detailDate.list' :key='index'>
+          <div v-if='item.type==="text"' class='add-width'>
             <!--            文本校验  分情况-->
             <!--            1 无-->
             <!--            2 中文-->
@@ -251,14 +251,14 @@
             <!--            8 三位小数-->
             <!--            9 四为小数-->
             <!--           无 -->
-            <div v-if="item.controlVerify == '1'">
+            <div v-if="item.controlVerify == '1'" class='add-width'>
               <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'">
+            <div v-if="item.controlVerify == '2'" class='add-width'>
               <a-input class="box-input inputWid"
                        :disabled="item.isLock == '1' ? true: false"
                        :placeholder="$t('pleaseEnter')+$t('chinese')"
@@ -266,7 +266,7 @@
                        v-model="item.dataValue" />
             </div>
             <!--         正整数  -->
-            <div v-if="item.controlVerify == '3'">
+            <div v-if="item.controlVerify == '3'" class='add-width'>
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -275,7 +275,7 @@
                               v-model="item.dataValue" />
             </div>
             <!--         正浮点书  -->
-            <div v-if="item.controlVerify == '4'">
+            <div v-if="item.controlVerify == '4'" class='add-width'>
               <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,'')"
@@ -283,7 +283,7 @@
                        v-model="item.dataValue" />
             </div>
             <!--         整数或小数  -->
-            <div v-if="item.controlVerify == '5'">
+            <div v-if="item.controlVerify == '5'" class='add-width'>
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -291,7 +291,7 @@
                               v-model="item.dataValue" />
             </div>
             <!--        一位小数    -->
-            <div v-if="item.controlVerify == '6'">
+            <div v-if="item.controlVerify == '6'" class='add-width'>
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -300,7 +300,7 @@
                               v-model="item.dataValue" />
             </div>
             <!--            两位小数-->
-            <div v-if="item.controlVerify == '7'">
+            <div v-if="item.controlVerify == '7'" class='add-width'>
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -309,8 +309,8 @@
                               v-model="item.dataValue" />
             </div>
             <!--            三位小数-->
-            <div v-if="item.controlVerify == '8'">
-              <a-input-number class="box-input inputWid add--number"
+            <div v-if="item.controlVerify == '8'" class='add-width'>
+              <a-input-number class="box-input inputWid"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
                               :precision="3"
@@ -318,7 +318,7 @@
                               v-model="item.dataValue" />
             </div>
             <!--            四位小数-->
-            <div v-if="item.controlVerify == '9'">
+            <div v-if="item.controlVerify == '9'" class='add-width'>
               <a-input-number class="box-input inputWid add--number"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
@@ -328,7 +328,7 @@
             </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>
+            <a-select v-model="item.dataValue" mode="multiple" class='selectWid add-width'  :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 }}
@@ -341,7 +341,7 @@
 <!--      文本+附件-->
       <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"'>
+          <div v-if='item.type==="text"' class='add-width'>
             <!--            文本校验  分情况-->
             <!--            1 无-->
             <!--            2 中文-->
@@ -494,7 +494,7 @@
               </a-select-option>
             </a-select>
           </div>
-          <div v-if='item.type==="text"'>
+          <div v-if='item.type==="text"' class='add-width'>
             <!--            文本校验  分情况-->
             <!--            1 无-->
             <!--            2 中文-->
@@ -717,6 +717,7 @@ export default {
 }
 .add-width{
   width: 30%;
+  margin-right: 15px;
 }
 .add--number{
   width: 101%;