From 9c32d240b5d4cbdd79eaf3ede7e4230bc9455c5f Mon Sep 17 00:00:00 2001
From: zhaomeijing <zhaomeijing@syxysoft.com>
Date: Wed, 11 May 2022 10:48:48 +0800
Subject: [PATCH] =?UTF-8?q?[add]=20=E5=8F=82=E6=95=B0=E9=A1=B9=E6=94=B6?=
 =?UTF-8?q?=E9=9B=86=E6=B8=85=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/CollectionType/index.vue   | 78 +++++++++++--------
 1 file changed, 45 insertions(+), 33 deletions(-)

diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue
index c42f4b3ae..14eb7619a 100644
--- a/jero-web/src/components/CollectionType/index.vue
+++ b/jero-web/src/components/CollectionType/index.vue
@@ -18,8 +18,8 @@
           <div v-if='item.type === "pull"'>
             <a-select :placeholder="$t('PleaseSelect')+$t('controlType')" v-model="formInline.controlType">
               <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 }}
+                    <span style="display: inline-block;width: 100%" :title=" item.lable ">
+                      {{ item.lable }}
                     </span>
               </a-select-option>
             </a-select>
@@ -30,11 +30,13 @@
       <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"'>
-            <j-multi-select-tag v-for="(item, key) in item.controlValue" :key="key" :value="item.value">
-                    <span style="display: inline-block;width: 100%" :title=" item.label ">
-                      {{ item.label }}
+            <a-select :placeholder="$t('PleaseSelect')+$t('controlType')" v-model="formInline.controlType" mode="multiple">
+              <a-select-option v-for="(item, key) in item.controlValue" :key="key" :value="item.value">
+                    <span style="display: inline-block;width: 100%" :title=" item.lable ">
+                      {{ item.lable }}
                     </span>
-            </j-multi-select-tag>
+              </a-select-option>
+            </a-select>
           </div>
         </div>
       </div>
@@ -51,8 +53,8 @@
         </div>
       </div>
 <!--      文本+下拉单选-->
-      <div v-if='detailDate.controlType === "5"'>
-        <div v-for='(item,index) in detailDate.list' :key='index' style='flex: 1'>
+      <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"'>
             <a-select :placeholder="$t('PleaseSelect')+$t('controlType')" v-model="formInline.controlType">
               <a-select-option v-for="(itemin, key) in item.controlValue" :key="key" :value="itemin.value">
@@ -71,8 +73,8 @@
         </div>
       </div>
 <!--      文本+下拉多选-->
-      <div v-if='detailDate.controlType === "6"'>
-        <div v-for='(item,index) in detailDate.list' :key='index' style='flex: 1'>
+      <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"'>
             <a-input class="box-input"
                      :disabled="disabled"
@@ -80,17 +82,19 @@
                      :placeholder="$t('PleaseEnter')+$t('NiONumber')"/>
           </div>
           <div v-if='item.type==="pull_more"'>
-            <j-multi-select-tag v-for="(item, key) in item.controlValue" :key="key" :value="item.value">
-                    <span style="display: inline-block;width: 100%" :title=" item.label ">
-                      {{ item.label }}
+            <a-select :placeholder="$t('PleaseSelect')+$t('controlType')" v-model="formInline.controlType" mode="multiple">
+              <a-select-option v-for="(item, key) in item.controlValue" :key="key" :value="item.value">
+                    <span style="display: inline-block;width: 100%" :title=" item.lable ">
+                      {{ item.lable }}
                     </span>
-            </j-multi-select-tag>
+              </a-select-option>
+            </a-select>
           </div>
         </div>
       </div>
 <!--      文本+附件-->
-      <div v-if='detailDate.controlType === "7"'>
-        <div v-for='(item,index) in detailDate.list' :key='index' style='flex: 1'>
+      <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"'>
             <a-input class="box-input"
                      :disabled="disabled"
@@ -107,8 +111,8 @@
         </div>
       </div>
 <!--      下拉单选+附件-->
-      <div v-if='detailDate.controlType === "8"'>
-        <div v-for='(item,index) in detailDate.list' :key='index' style='flex: 1'>
+      <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"'>
             <a-select :placeholder="$t('PleaseSelect')+$t('controlType')" v-model="formInline.controlType">
               <a-select-option v-for="(itemin, key) in item.controlValue" :key="key" :value="itemin.value">
@@ -128,27 +132,29 @@
         </div>
       </div>
 <!--      下拉多选+附件-->
-      <div v-if='detailDate.controlType === "9"'>
-        <div v-for='(item,index) in detailDate.list' :key='index' style='flex: 1'>
+      <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"'>
-            <j-multi-select-tag v-for="(item, key) in item.controlValue" :key="key" :value="item.value">
-                    <span style="display: inline-block;width: 100%" :title=" item.label ">
-                      {{ item.label }}
+            <a-select :placeholder="$t('PleaseSelect')+$t('controlType')" v-model="formInline.controlType" mode="multiple">
+              <a-select-option v-for="(item, key) in item.controlValue" :key="key" :value="item.value">
+                    <span style="display: inline-block;width: 100%" :title=" item.lable ">
+                      {{ item.lable }}
                     </span>
-            </j-multi-select-tag>
-          </div>
-          <div v-if='item.type==="file"'>
-            <a-button type="primary" class="button-text"
-                      @click="clickButtonToUpload('fileTemplateConnectId')">
-              {{ (formInline.fileTemplateConnectId === 'null' || formInline.fileTemplateConnectId === '' ||
-              formInline.fileTemplateConnectId == null) ? $t('clickUpload') : $t('viewUploadedFiles')}}
-            </a-button>
+              </a-select-option>
+            </a-select>
           </div>
+<!--          <div v-if='item.type==="file"'>-->
+<!--            <a-button type="primary" class="button-text"-->
+<!--                      @click="clickButtonToUpload('fileTemplateConnectId')">-->
+<!--              {{ (formInline.fileTemplateConnectId === 'null' || formInline.fileTemplateConnectId === '' ||-->
+<!--              formInline.fileTemplateConnectId == null) ? $t('clickUpload') : $t('viewUploadedFiles')}}-->
+<!--            </a-button>-->
+<!--          </div>-->
         </div>
       </div>
 <!--      文本+下拉单选+附件-->
-      <div v-if='detailDate.controlType === "10"' style='display: flex'>
-        <div v-for='(item,index) in detailDate.list' :key='index' style='flex: 1'>
+      <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="formInline.controlType">
               <a-select-option v-for="(itemin, key) in item.controlValue" :key="key" :value="itemin.value">
@@ -242,4 +248,10 @@ export default {
   text-align: right;
   margin-top: 20px;
 }
+.add_flex{
+  display: flex;
+}
+.add_flex_item{
+  flex: 1;
+}
 </style>