From 857251e18300f35dc2ca4db4589aa812a7f6ca68 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Wed, 13 Jul 2022 17:31:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=A8=A1=E6=9D=BF=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=20=E4=B8=8A=E6=8A=A5=E5=BA=93=E6=9F=A5=E7=9C=8B-?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=88=97=E5=A2=9E=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/CollectionType/index.vue   | 25 +++++++++++++++++++
 .../parameterlist/components/addModel.vue     |  5 ++--
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue
index 635d03811..94961b84c 100644
--- a/jero-web/src/components/CollectionType/index.vue
+++ b/jero-web/src/components/CollectionType/index.vue
@@ -96,6 +96,31 @@
           </div>
         </div>
       </div>
+      <!--      默认值-->
+      <div v-if='detailDate.controlType === "11"' class='add_flex'>
+        <div v-for='(item,index) in detailDate.list' :key='index' class='add-width'>
+          <div v-if='item.type==="text"'>
+            <!--            文本校验  分情况-->
+            <!--            1 无-->
+            <!--            2 中文-->
+            <!--            3 正整数-->
+            <!--            4 政府点数-->
+            <!--            5 证书或小数-->
+            <!--            6 一位小数-->
+            <!--            7 两位小数-->
+            <!--            8 三位小数-->
+            <!--            9 四为小数-->
+            <!--           无 -->
+            <div>
+              <a-input class="box-input inputWid"
+                       :maxLength="1000"
+                       :disabled="item.isLock == '1' ? true: false"
+                       :placeholder="$t('pleaseEnter')"
+                       v-model="item.dataValue"/>
+            </div>
+          </div>
+        </div>
+      </div>
       <!--      纯下拉单选-->
       <div v-else-if='detailDate.controlType === "2"' class='add_flex'>
         <div v-for='(item,index) in detailDate.list' :key='index' class='add-width'>
diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue
index d04ec6657..705be6cec 100644
--- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue
+++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue
@@ -191,7 +191,7 @@
                 </a-form-model-item>
               </div>
             </a-col>
-            <a-col :span="12" v-if='this.formInline.controlType =="11"'>
+            <a-col :span="12" v-else-if='this.formInline.controlType =="11"'>
               <div class="box-title-text">
                 <div class="title-text">
                   <span class="Required">*</span>
@@ -199,7 +199,8 @@
                         :title="$t('DefaultValue')">{{$t('DefaultValue')}}</span>
                 </div>
                 <a-form-model-item class="itemModel" prop="titleDefaultValue">
-                  <a-input class="box-input add-input"
+                  <a-input class="box-input"
+                           style="height:33px"
                            :disabled="disabled"
                            :maxlength="100"
                            v-model="formInline.titleDefaultValue"