diff --git a/jero-web/src/components/CollectionTypeDisabled/index.vue b/jero-web/src/components/CollectionTypeDisabled/index.vue
new file mode 100644
index 000000000..4e30ff1bf
--- /dev/null
+++ b/jero-web/src/components/CollectionTypeDisabled/index.vue
@@ -0,0 +1,795 @@
+<template>
+  <div style="height: 100%">
+    <div class='box'>
+      <!--      纯文本-->
+      <div v-if='detailDate.controlType === "1"' 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 v-if="item.controlVerify == '1'">
+              <a-input class="box-input inputWid"
+                       :maxLength="1000"
+                       :placeholder="$t('pleaseEnter')"
+                       v-model="item.dataValue"/>
+            </div>
+            <!--            中文-->
+            <div v-else-if="item.controlVerify == '2'">
+              <a-input class="box-input inputWid"
+                       :placeholder="$t('pleaseEnter')+$t('chinese')"
+                       @input="onInput"
+                       onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\u4E00-\u9FA5]/g,''))"
+                       v-model="item.dataValue"/>
+            </div>
+            <!--         正整数  -->
+            <div v-else-if="item.controlVerify == '3'">
+              <a-input-number class="box-input inputWid add--number"
+                              :max="99999"
+                              :precision="0"
+                              :placeholder="$t('enterPositiveInteger')"
+                              v-model="item.dataValue"/>
+            </div>
+            <!--         正浮点书  -->
+            <div v-else-if="item.controlVerify == '4'">
+              <a-input class="box-input inputWid"
+                       onkeyup="(this.v=function(){this.value=this.value.replace(/[^\d\.]/g,'');}).call(this)"
+                       :placeholder="$t('pleaseEnter')+$t('Positivefloatingpointnumber')"
+                       v-model="item.dataValue"/>
+            </div>
+            <!--         整数或小数  -->
+            <div v-else-if="item.controlVerify == '5'">
+              <a-input-number class="box-input inputWid add--number"
+                              :max="99999"
+                              :placeholder="$t('pleaseEnter')+$t('integerOrDecimal')"
+                              v-model="item.dataValue"/>
+            </div>
+            <!--        一位小数    -->
+            <div v-else-if="item.controlVerify == '6'">
+              <a-input-number class="box-input inputWid add--number"
+                              :max="99999"
+                              :precision="1"
+                              :placeholder="$t('pleaseEnter')+$t('OneDecimalPlace')"
+                              v-model="item.dataValue"/>
+            </div>
+            <!--            两位小数-->
+            <div v-else-if="item.controlVerify == '7'">
+              <a-input-number class="box-input inputWid add--number"
+                              :max="99999"
+                              :precision="2"
+                              :placeholder="$t('pleaseEnter')+$t('TwoDecimalplaces')"
+                              v-model="item.dataValue"/>
+            </div>
+            <!--            三位小数-->
+            <div v-else-if="item.controlVerify == '8'">
+              <a-input-number class="box-input inputWid add--number"
+                              :max="99999"
+                              :precision="3"
+                              :placeholder="$t('pleaseEnter')+$t('Threedecimalplaces')"
+                              v-model="item.dataValue"/>
+            </div>
+            <!--            四位小数-->
+            <div v-else-if="item.controlVerify == '9'">
+              <a-input-number class="box-input inputWid add--number"
+                              :max="99999"
+                              :precision="4"
+                              :placeholder="$t('pleaseEnter')+$t('FourDecimalplaces')"
+                              v-model="item.dataValue"/>
+            </div>
+          </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"
+                       :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'>
+          <div v-if='item.type === "pull"'>
+            <a-select v-model="item.dataValue"
+                      :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                      class='selectWid'
+                      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 }}
+                    </span>
+              </a-select-option>
+            </a-select>
+          </div>
+        </div>
+      </div>
+      <!--      纯下拉多选-->
+      <div v-else-if='detailDate.controlType === "3"' class='add_flex'>
+        <div v-for='(item,index) in detailDate.list' :key='index' style='flex: 1' class='add-width'>
+          <div v-if='item.type==="pull_more"'>
+            <a-select v-model="item.dataValue"
+                      :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                      mode="multiple" class='selectWid'
+                      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 }}
+                    </span>
+              </a-select-option>
+            </a-select>
+          </div>
+        </div>
+      </div>
+      <!--      纯附件-->
+      <div v-else-if='detailDate.controlType === "4"' class='add_flex'>
+        <div v-for='(item,index) in detailDate.list' :key='index' style='flex: 1' class='add-width'>
+          <div v-if='item.type==="file"'>
+            <a-button type="primary" class="button-text inputWid"
+                      @click="clickButtonToUpload(item)">
+              {{ (item.dataValue === 'null' || item.dataValue === '' ||
+              item.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}}
+            </a-button>
+          </div>
+        </div>
+      </div>
+      <!--      文本+下拉单选-->
+      <div v-else-if='detailDate.controlType === "5"' class='add_flex'>
+        <div v-for='(item,index) in detailDate.list' :key='index' class='add-width'>
+          <div v-if='item.type==="pull"'>
+            <a-select v-model="item.dataValue"
+                      :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                      class='selectWid'
+                      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 }}
+                    </span>
+              </a-select-option>
+            </a-select>
+          </div>
+          <div v-else-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"
+                       :maxLength="1000"
+                       :placeholder="$t('pleaseEnter')"
+                       v-model="item.dataValue"/>
+            </div>
+            <!--            中文-->
+            <div v-else-if="item.controlVerify == '2'">
+              <a-input class="box-input inputWid"
+                       :maxLength="1000"
+                       :placeholder="$t('pleaseEnter')+$t('chinese')"
+                       @input="onInput"
+                       onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\u4E00-\u9FA5]/g,''))"
+                       v-model="item.dataValue"/>
+            </div>
+            <!--         正整数  -->
+            <div v-else-if="item.controlVerify == '3'">
+              <a-input-number class="box-input inputWid add--number"
+                              :max="99999"
+                              :precision="0"
+                              :placeholder="$t('enterPositiveInteger')"
+                              v-model="item.dataValue"/>
+            </div>
+            <!--         正浮点书  -->
+            <div v-else-if="item.controlVerify == '4'">
+              <a-input class="box-input inputWid"
+                       onkeyup="(this.v=function(){this.value=this.value.replace(/[^\d\.]/g,'');}).call(this)"
+                       :placeholder="$t('pleaseEnter')+$t('Positivefloatingpointnumber')"
+                       v-model="item.dataValue"/>
+            </div>
+            <!--         整数或小数  -->
+            <div v-else-if="item.controlVerify == '5'">
+              <a-input-number class="box-input inputWid add--number"
+                              :max="99999"
+                              :placeholder="$t('pleaseEnter')+$t('integerOrDecimal')"
+                              v-model="item.dataValue"/>
+            </div>
+            <!--        一位小数    -->
+            <div v-else-if="item.controlVerify == '6'">
+              <a-input-number class="box-input inputWid add--number"
+                              :max="99999"
+                              :precision="1"
+                              :placeholder="$t('pleaseEnter')+$t('OneDecimalPlace')"
+                              v-model="item.dataValue"/>
+            </div>
+            <!--            两位小数-->
+            <div v-else-if="item.controlVerify == '7'">
+              <a-input-number class="box-input inputWid add--number"
+                              :max="99999"
+                              :precision="2"
+                              :placeholder="$t('pleaseEnter')+$t('TwoDecimalplaces')"
+                              v-model="item.dataValue"/>
+            </div>
+            <!--            三位小数-->
+            <div v-else-if="item.controlVerify == '8'">
+              <a-input-number class="box-input inputWid add--number"
+                              :max="99999"
+                              :precision="3"
+                              :placeholder="$t('pleaseEnter')+$t('Threedecimalplaces')"
+                              v-model="item.dataValue"/>
+            </div>
+            <!--            四位小数-->
+            <div v-else-if="item.controlVerify == '9'">
+              <a-input-number class="box-input inputWid add--number"
+                              :max="99999"
+                              :precision="4"
+                              :placeholder="$t('pleaseEnter')+$t('FourDecimalplaces')"
+                              v-model="item.dataValue"/>
+            </div>
+          </div>
+        </div>
+      </div>
+      <!--      文本+下拉多选-->
+      <div v-else-if='detailDate.controlType === "6"' 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 v-if="item.controlVerify == '1'">
+              <a-input class="box-input inputWid"
+                       :maxLength="1000"
+                       :placeholder="$t('pleaseEnter')"
+                       v-model="item.dataValue"/>
+            </div>
+            <!--            中文-->
+            <div v-else-if="item.controlVerify == '2'">
+              <a-input class="box-input inputWid"
+                       :maxLength="1000"
+                       @input="onInput"
+                       onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\u4E00-\u9FA5]/g,''))"
+                       :placeholder="$t('pleaseEnter')+$t('chinese')"
+                       v-model="item.dataValue"/>
+            </div>
+            <!--         正整数  -->
+            <div v-else-if="item.controlVerify == '3'">
+              <a-input-number class="box-input inputWid add--number"
+                              :max="99999"
+                              :precision="0"
+                              :placeholder="$t('enterPositiveInteger')"
+                              v-model="item.dataValue"/>
+            </div>
+            <!--         正浮点书  -->
+            <div v-else-if="item.controlVerify == '4'">
+              <a-input class="box-input inputWid"
+                       onkeyup="(this.v=function(){this.value=this.value.replace(/[^\d\.]/g,'');}).call(this)"
+                       :placeholder="$t('pleaseEnter')+$t('Positivefloatingpointnumber')"
+                       v-model="item.dataValue"/>
+            </div>
+            <!--         整数或小数  -->
+            <div v-else-if="item.controlVerify == '5'">
+              <a-input-number class="box-input inputWid add--number"
+                              :max="99999"
+                              :placeholder="$t('pleaseEnter')+$t('integerOrDecimal')"
+                              v-model="item.dataValue"/>
+            </div>
+            <!--        一位小数    -->
+            <div v-else-if="item.controlVerify == '6'">
+              <a-input-number class="box-input inputWid add--number"
+                              :max="99999"
+                              :precision="1"
+                              :placeholder="$t('pleaseEnter')+$t('OneDecimalPlace')"
+                              v-model="item.dataValue"/>
+            </div>
+            <!--            两位小数-->
+            <div v-else-if="item.controlVerify == '7'">
+              <a-input-number class="box-input inputWid add--number"
+                              :max="99999"
+                              :precision="2"
+                              :placeholder="$t('pleaseEnter')+$t('TwoDecimalplaces')"
+                              v-model="item.dataValue"/>
+            </div>
+            <!--            三位小数-->
+            <div v-else-if="item.controlVerify == '8'">
+              <a-input-number class="box-input inputWid"
+                              :max="99999"
+                              :precision="3"
+                              :placeholder="$t('pleaseEnter')+$t('Threedecimalplaces')"
+                              v-model="item.dataValue"/>
+            </div>
+            <!--            四位小数-->
+            <div v-else-if="item.controlVerify == '9'">
+              <a-input-number class="box-input inputWid add--number"
+                              :max="99999"
+                              :precision="4"
+                              :placeholder="$t('pleaseEnter')+$t('FourDecimalplaces')"
+                              v-model="item.dataValue"/>
+            </div>
+          </div>
+          <div v-if='item.type==="pull_more"'>
+            <a-select v-model="item.dataValue"
+                      :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                      mode="multiple" class='selectWid'
+                      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 }}
+                    </span>
+              </a-select-option>
+            </a-select>
+          </div>
+        </div>
+      </div>
+      <!--      文本+附件-->
+      <div v-else-if='detailDate.controlType === "7"' 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 v-if="item.controlVerify == '1'">
+              <a-input class="box-input inputWid"
+                       :maxLength="1000"
+                       :placeholder="$t('pleaseEnter')"
+                       v-model="item.dataValue"/>
+            </div>
+            <!--            中文-->
+            <div v-else-if="item.controlVerify == '2'">
+              <a-input class="box-input inputWid"
+                       :maxLength="1000"
+                       @input="onInput"
+                       onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\u4E00-\u9FA5]/g,''))"
+                       :placeholder="$t('pleaseEnter')+$t('chinese')"
+                       v-model="item.dataValue"/>
+            </div>
+            <!--         正整数  -->
+            <div v-else-if="item.controlVerify == '3'">
+              <a-input-number class="box-input inputWid add--number"
+                              :max="99999"
+                              :precision="0"
+                              :placeholder="$t('enterPositiveInteger')"
+                              v-model="item.dataValue"/>
+            </div>
+            <!--         正浮点书  -->
+            <div v-else-if="item.controlVerify == '4'">
+              <a-input class="box-input inputWid"
+                       onkeyup="(this.v=function(){this.value=this.value.replace(/[^\d\.]/g,'');}).call(this)"
+                       :placeholder="$t('pleaseEnter')+$t('Positivefloatingpointnumber')"
+                       v-model="item.dataValue"/>
+            </div>
+            <!--         整数或小数  -->
+            <div v-else-if="item.controlVerify == '5'">
+              <a-input-number class="box-input inputWid add--number"
+                              :max="99999"
+                              :placeholder="$t('pleaseEnter')+$t('integerOrDecimal')"
+                              v-model="item.dataValue"/>
+            </div>
+            <!--        一位小数    -->
+            <div v-else-if="item.controlVerify == '6'">
+              <a-input-number class="box-input inputWid add--number"
+                              :max="99999"
+                              :precision="1"
+                              :placeholder="$t('pleaseEnter')+$t('OneDecimalPlace')"
+                              v-model="item.dataValue"/>
+            </div>
+            <!--            两位小数-->
+            <div v-else-if="item.controlVerify == '7'">
+              <a-input-number class="box-input inputWid add--number"
+                              :max="99999"
+                              :precision="2"
+                              :placeholder="$t('pleaseEnter')+$t('TwoDecimalplaces')"
+                              v-model="item.dataValue"/>
+            </div>
+            <!--            三位小数-->
+            <div v-else-if="item.controlVerify == '8'">
+              <a-input-number class="box-input inputWid add--number"
+                              :max="99999"
+                              :precision="3"
+                              :placeholder="$t('pleaseEnter')+$t('Threedecimalplaces')"
+                              v-model="item.dataValue"/>
+            </div>
+            <!--            四位小数-->
+            <div v-else-if="item.controlVerify == '9'">
+              <a-input-number class="box-input inputWid add--number"
+                              :max="99999"
+                              :precision="4"
+                              :placeholder="$t('pleaseEnter')+$t('FourDecimalplaces')"
+                              v-model="item.dataValue"/>
+            </div>
+          </div>
+          <div v-if='item.type==="file"'>
+            <a-button type="primary" class="button-text inputWid"
+                      @click="clickButtonToUpload(item)">
+              {{ (item.dataValue === 'null' || item.dataValue === '' ||
+              item.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}}
+            </a-button>
+          </div>
+        </div>
+      </div>
+      <!--      下拉单选+附件-->
+      <div v-else-if='detailDate.controlType === "8"' class='add_flex'>
+        <div v-for='(item,index) in detailDate.list' :key='index' class='add-width'>
+          <div v-if='item.type==="pull"'>
+            <a-select v-model="item.dataValue"
+                      :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                      class='selectWid'
+                      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 }}
+                    </span>
+              </a-select-option>
+            </a-select>
+          </div>
+          <div v-else-if='item.type==="file"'>
+            <a-button type="primary" class="button-text inputWid"
+                      @click="clickButtonToUpload(item)">
+              {{ (item.dataValue === 'null' || item.dataValue === '' ||
+              item.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}}
+            </a-button>
+          </div>
+        </div>
+      </div>
+      <!--      下拉多选+附件-->
+      <div v-else-if='detailDate.controlType === "9"' class='add_flex'>
+        <div v-for='(item,index) in detailDate.list' :key='index' class='add-width'>
+          <div v-if='item.type==="pull_more"'>
+            <a-select v-model="item.dataValue"
+                      :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                      mode="multiple" class='selectWid'
+                      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 }}
+                    </span>
+              </a-select-option>
+            </a-select>
+          </div>
+          <div v-else-if='item.type==="file"'>
+            <a-button type="primary" class="button-text inputWid"
+                      @click="clickButtonToUpload(item)">
+              {{ (item.dataValue === 'null' || item.dataValue === '' ||
+              item.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}}
+            </a-button>
+          </div>
+        </div>
+      </div>
+      <!--      文本+下拉单选+附件-->
+      <div v-else-if='detailDate.controlType === "10"' class='add_flex'>
+        <div v-for='(item,index) in detailDate.list' :key='index' class='add-width'>
+          <div v-if='item.type==="pull"'>
+            <a-select v-model="item.dataValue"
+                      :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                      class='selectWid'
+                      allowClear>
+              <a-select-option v-for="(itemin, key) in item.controlValue" :key="key" :value="itemin.value">
+                    <span style="display: inline-block;width: 100%" class="itemOption" :title=" itemin.label ">
+                      {{ itemin.label }}
+                    </span>
+              </a-select-option>
+            </a-select>
+          </div>
+          <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"
+                       :maxLength="1000"
+                       :placeholder="$t('pleaseEnter')"
+                       v-model="item.dataValue"/>
+            </div>
+            <!--            中文-->
+            <div v-else-if="item.controlVerify == '2'">
+              <a-input class="box-input inputWid"
+                       :maxLength="1000"
+                       :placeholder="$t('pleaseEnter')+$t('chinese')"
+                       @input="onInput"
+                       onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\u4E00-\u9FA5]/g,''))"
+                       v-model="item.dataValue"/>
+            </div>
+            <!--         正整数  -->
+            <div v-else-if="item.controlVerify == '3'">
+              <a-input-number class="box-input inputWid add--number"
+                              :max="99999"
+                              :precision="0"
+                              :placeholder="$t('enterPositiveInteger')"
+                              v-model="item.dataValue"/>
+            </div>
+            <!--         正浮点书  -->
+            <div v-else-if="item.controlVerify == '4'">
+              <a-input class="box-input inputWid"
+                       onkeyup="(this.v=function(){this.value=this.value.replace(/[^\d\.]/g,'');}).call(this)"
+                       :placeholder="$t('pleaseEnter')+$t('Positivefloatingpointnumber')"
+                       v-model="item.dataValue"/>
+            </div>
+            <!--         整数或小数  -->
+            <div v-else-if="item.controlVerify == '5'">
+              <a-input-number class="box-input inputWid add--number"
+                              :max="99999"
+                              :placeholder="$t('pleaseEnter')+$t('integerOrDecimal')"
+                              v-model="item.dataValue"/>
+            </div>
+            <!--        一位小数    -->
+            <div v-else-if="item.controlVerify == '6'">
+              <a-input-number class="box-input inputWid add--number"
+                              :max="99999"
+                              :precision="1"
+                              :placeholder="$t('pleaseEnter')+$t('OneDecimalPlace')"
+                              v-model="item.dataValue"/>
+            </div>
+            <!--            两位小数-->
+            <div v-else-if="item.controlVerify == '7'">
+              <a-input-number class="box-input inputWid add--number"
+                              :max="99999"
+                              :precision="2"
+                              :placeholder="$t('pleaseEnter')+$t('TwoDecimalplaces')"
+                              v-model="item.dataValue"/>
+            </div>
+            <!--            三位小数-->
+            <div v-else-if="item.controlVerify == '8'">
+              <a-input-number class="box-input inputWid add--number"
+                              :max="99999"
+                              :precision="3"
+                              :placeholder="$t('pleaseEnter')+$t('Threedecimalplaces')"
+                              v-model="item.dataValue"/>
+            </div>
+            <!--            四位小数-->
+            <div v-else-if="item.controlVerify == '9'">
+              <a-input-number class="box-input inputWid add--number"
+                              :max="99999"
+                              :precision="4"
+                              :placeholder="$t('pleaseEnter')+$t('FourDecimalplaces')"
+                              v-model="item.dataValue"/>
+            </div>
+          </div>
+          <div v-if='item.type==="file"'>
+            <a-button type="primary" class="button-text inputWid"
+                      @click="clickButtonToUpload(item)">
+              {{ (item.dataValue === 'null' || item.dataValue === '' ||
+              item.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}}
+            </a-button>
+          </div>
+        </div>
+      </div>
+    </div>
+    <uploadFileChangeDown ref="uploadFile" @uploadSuccess="uploadSuccess"
+                          :detailDate='detailDate'></uploadFileChangeDown>
+  </div>
+</template>
+
+<script>
+  import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
+  import uploadFileChangeDown from '@/components/uploadFileChangeDown/file'
+
+  export default {
+    name: 'index',
+    props: {
+      detailDate: {
+        type: Object,
+        default: {},
+        require: true
+      }
+    },
+    data() {
+      return {
+        isLock: '0',
+        formInline: {},
+        visible: false,
+        detailDatetransformation: []
+      }
+    },
+    components: {
+      uploadFileChangeDown
+    },
+    mounted() {
+      this.detailDate.list.forEach((item) => {
+        if (item.type === 'pull_more') {
+          item.dataValue = []
+        }
+        // this.detailDatetransformation.push(item)
+      })
+    },
+    methods: {
+      onInput(r) {
+        let value = r.target.value
+        r.target.value = value.replace(/[^\u4e00-\u9fa5]/g, '')
+        this.detailDate.list.forEach((item) => {
+          if (item.controlVerify == '2') {
+            item.dataValue = r.target.value
+          }
+        })
+      },
+      uploadSuccess(data) {
+        let attIdList = []
+        if (data && data.length > 0) {
+          data.map(item => {
+            attIdList.push(item.id || data.name)
+          })
+          /** 赋值给当前对应的表单文件 */
+          // this.formInline[this.uploadName] = attIdList.join(',')
+          // this.formInline = { ...this.formInline }
+          // console.log('form',this.formInline)
+        } else {
+          // this.formInline[this.uploadName]=''
+          // this.formInline = { ...this.formInline }
+          // console.log('form',this.formInline)
+
+        }
+        this.detailDate.list.forEach((item, index) => {
+          if (item.type === 'file') {
+            item.dataValue = attIdList.join(',')
+          }
+        })
+      },
+      clickButtonToUpload(item) {
+        // if (item.isLock == '1') {
+        //   this.$refs.uploadFile.disabled = true
+        // } else {
+        //   this.$refs.uploadFile.disabled = false
+        // }
+        this.$refs.uploadFile.visible = true
+        getAction('sys/common/getFileInfos', { id: item.dataValue }).then((res) => {
+          if (res.success) {
+            this.$refs.uploadFile.perentHandleFunc(res.result)
+          } else {
+            this.$refs.uploadFile.perentHandleFunc()
+          }
+        })
+      }
+    },
+    watch: {
+      detailDate(newold, oldold) {
+        console.log(newold, oldold, 'll')
+      },
+      formInline: {
+        handler(newOld, oldval) {
+          console.log(newOld, oldval, 'll')
+        },
+        deep: true
+      }
+    }
+  }
+</script>
+<style>
+  .table .ant-table-column-title {
+    font-weight: bold;
+  }
+
+  /*.ant-table td {*/
+  /*  white-space: nowrap;*/
+  /*}*/
+  .selectWid .ant-select-selection--multiple {
+    overflow: auto;
+  }
+
+  .selectWid .ant-select-selection--multiple::-webkit-scrollbar {
+    display: none; /* Chrome Safari */
+  }
+
+  .selectWid .ant-select-selection {
+    height: 38px !important;
+    line-height: 38px !important;
+  }
+
+  .selectWid .ant-select-selection__rendered {
+    line-height: 36px !important;
+  }
+</style>
+<style lang="less" scoped>
+  .box {
+    width: 100%;
+    height: calc(100% - 100px);
+    overflow: auto;
+  }
+
+  .text {
+    margin-right: 10px;
+  }
+
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+
+  .add_flex {
+    /*display: flex;*/
+  }
+
+  /deep/ .box {
+    overflow: hidden;
+  }
+
+  .add_flex_item {
+    width: 30%;
+    flex: 1;
+  }
+
+  .selectWid {
+    min-width: 150px;
+  }
+
+  .inputWid {
+    min-width: 150px;
+    height: 38px;
+    display: inline-block;
+  }
+
+  .add-width {
+    width: calc(33.3% - 5px);
+    margin-right: 5px;
+    float: left;
+  }
+
+  .add--number {
+    width: 101%;
+  }
+
+  .ant-input-disabled {
+    color: rgba(0, 0, 0, 0.65);
+  }
+
+  .ant-select-disabled {
+    color: rgba(0, 0, 0, 0.65);
+  }
+
+  .itemOption {
+    display: inline-block;
+    width: 100%;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    -o-text-overflow: ellipsis;
+  }
+</style>
diff --git a/jero-web/src/components/exporthistory/index.vue b/jero-web/src/components/exporthistory/index.vue
index 1b353803e..cd59122b3 100644
--- a/jero-web/src/components/exporthistory/index.vue
+++ b/jero-web/src/components/exporthistory/index.vue
@@ -1,36 +1,36 @@
 <template>
   <div class='diolag-area'>
-    <a-spin :spinning='spinLoading'>
-      <a-form-model
-        class='tag-module'
-        ref='ruleForm'
-        :model='formData'
-        :rules='rules'
-        :label-col='labelCol'
-        :wrapper-col='wrapperCol'
-      >
-        <a-row :gutter='24'>
-          <a-col :span='9'>
-            <a-form-model-item :label="$t('entryName')" prop='projectName'>
-              <a-input
-                       :placeholder="$t('PleaseEnter')+$t('entryName')"
-                       v-model='formData.projectName' />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span='9'>
-            <a-form-model-item :label="$t('ListTitle')" prop='ListTitle'>
-              <a-input
-                       :placeholder="$t('PleaseEnter')+$t('ListTitle')"
-                       v-model='formData.title' />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span='6' style='margin-top: 4px;'>
-            <a-button class='box-button' type='primary' @click='searchQuery'>{{ $t('query') }}</a-button>
-            <a-button class='box-button' style='margin-left: 8px' @click='searchReset'>{{ $t('reset') }}</a-button>
-          </a-col>
-        </a-row>
-      </a-form-model>
-    </a-spin>
+<!--    <a-spin :spinning='spinLoading'>-->
+<!--      <a-form-model-->
+<!--        class='tag-module'-->
+<!--        ref='ruleForm'-->
+<!--        :model='formData'-->
+<!--        :rules='rules'-->
+<!--        :label-col='labelCol'-->
+<!--        :wrapper-col='wrapperCol'-->
+<!--      >-->
+<!--        <a-row :gutter='24'>-->
+<!--          <a-col :span='9'>-->
+<!--            <a-form-model-item :label="$t('entryName')" prop='projectName'>-->
+<!--              <a-input-->
+<!--                       :placeholder="$t('PleaseEnter')+$t('entryName')"-->
+<!--                       v-model='formData.projectName' />-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
+<!--          <a-col :span='9'>-->
+<!--            <a-form-model-item :label="$t('ListTitle')" prop='ListTitle'>-->
+<!--              <a-input-->
+<!--                       :placeholder="$t('PleaseEnter')+$t('ListTitle')"-->
+<!--                       v-model='formData.title' />-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
+<!--          <a-col :span='6' style='margin-top: 4px;'>-->
+<!--            <a-button class='box-button' type='primary' @click='searchQuery'>{{ $t('query') }}</a-button>-->
+<!--            <a-button class='box-button' style='margin-left: 8px' @click='searchReset'>{{ $t('reset') }}</a-button>-->
+<!--          </a-col>-->
+<!--        </a-row>-->
+<!--      </a-form-model>-->
+<!--    </a-spin>-->
     <a-table
       class='table-area'
       ref='table'
@@ -85,19 +85,19 @@ export default {
       loading: false,
       editId: '',
       columns: [
-        {
-          title: this.$t('entryName'),
-          dataIndex: 'projectName',
-          key: 'showArea',
-          align: 'center',
-          ellipsis: true
-        },
-        {
-          title: this.$t('ListTitle'),
-          align: 'center',
-          dataIndex: 'title',
-          ellipsis: true
-        },
+        // {
+        //   title: this.$t('entryName'),
+        //   dataIndex: 'projectName',
+        //   key: 'showArea',
+        //   align: 'center',
+        //   ellipsis: true
+        // },
+        // {
+        //   title: this.$t('ListTitle'),
+        //   align: 'center',
+        //   dataIndex: 'title',
+        //   ellipsis: true
+        // },
         {
           title: this.$t('Exporttype'),
           align: 'center',
diff --git a/jero-web/src/components/tableCollection/index1.vue b/jero-web/src/components/tableCollection/index1.vue
index 2faa372e5..ffd25c5b7 100644
--- a/jero-web/src/components/tableCollection/index1.vue
+++ b/jero-web/src/components/tableCollection/index1.vue
@@ -136,7 +136,7 @@
 <script>
   import eventBUs from '../../common/event'
   import { getAction, postAction } from '@/api/manage'
-  import CollectionType from '@/components/CollectionType'
+  import CollectionType from '@/components/CollectionTypeDisabled'
   import { ACCESS_TOKEN } from '@/store/mutation-types'
   import axios from 'axios'
   import Vue from 'vue'
diff --git a/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue b/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue
index ed60ad494..f255960da 100644
--- a/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue
+++ b/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue
@@ -66,7 +66,7 @@
                       :title="$t('WhetherMergeParameters')">{{$t('WhetherMergeParameters')}}</span>
                   </div>
                   <a-form-model-item class="itemModel" prop="combineFlag">
-                    <a-radio-group style="margin-top: 2px" @change="flagChange" class="box-input" v-model="formInline.combineFlag">
+                    <a-radio-group style="margin-top: 2px" @change="flagChange" defaultValue='1' class="box-input" v-model="formInline.combineFlag">
                       <a-radio value="1">
                         {{$t('nonjoinder')}}
                       </a-radio>
@@ -82,11 +82,11 @@
               <a-col :span="24">
                 <div class="box-title-text">
                   <div class="title-text">
-                    <span class="Required" v-if='required'>*</span>
+                    <span class="Required" v-if='!required'>*</span>
                 <span class="title-text-text"
                       :title="$t('MergeSeparator')">{{$t('MergeSeparator')}}</span>
                   </div>
-                  <a-form-model-item class="itemModel" :prop="required?'separator':''">
+                  <a-form-model-item class="itemModel" :prop="!required?'separator':''">
 <!--                    :disabled="disabled"-->
                     <a-input class="box-input"
                              v-model="formInline.separator"
@@ -132,6 +132,11 @@ export default {
       rules: {
         separator:[
           { required: true, message: this.$t('PleaseEnter')+this.$t('MergeSeparator'), trigger: 'change' },
+          {
+            pattern: /[`~!@$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~！@￥%……&*（）——\-+={}|《》？：“”【】、；‘'，。、]/,
+            message: this.$t('punctuationmark'),
+            trigger: 'blur'
+          }
         ],
         certCategory:[
           { required: true, message: this.$t('PleaseEnter')+this.$t('certificationCategory'), trigger: 'change' },
@@ -188,9 +193,9 @@ export default {
     flagChange(value){
       console.log(value.target.value)
       if(value.target.value == 2){
-        this.required = true
-      }else{
         this.required = false
+      }else{
+        this.required = true
       }
     },
     getNameList() {
diff --git a/jero-web/src/views/parameter/managementdetails/index.vue b/jero-web/src/views/parameter/managementdetails/index.vue
index 47bc18363..a74fec733 100644
--- a/jero-web/src/views/parameter/managementdetails/index.vue
+++ b/jero-web/src/views/parameter/managementdetails/index.vue
@@ -81,12 +81,17 @@
       </div>
     </div>
     <div class="table-operator">
+      <!--      保存-->
+      <div @click="handlePreservation" class="operator-text" v-has="'report:detail:export:save'">
+        <a-icon type="check-circle"/>
+        {{$t('preservation')}}
+      </div>
       <div @click="ConventionalExport" class="operator-text" v-has="'report:detail:export:normal'">
-<!--        <a-icon type="plus"/>-->
+        <a-icon type="download"/>
         {{$t('ConventionalExport')}}
       </div>
       <div @click="CustomExport" class="operator-text" v-has="'report:detail:export:custom'">
-<!--        <a-icon type="delete"/>-->
+        <a-icon type="download"/>
         {{$t('CustomExport')}}
       </div>
     </div>
@@ -134,6 +139,7 @@
 <!--    </div>-->
     <conventionalModel :url="url" ref="conventionalModel"/>
     <customelModel :url="url" ref="customelModel"/>
+    <JLoading :loading="textLoading">{{this.$t('pleaseWaitWhileRunning')}}</JLoading>
   </a-card>
 </template>
 
@@ -159,6 +165,7 @@ export default {
       columns:[],
       selectedRowKeys: [],
       formInline: {},
+      textLoading:false,
       url: {
         tableHeader: 'report/detail/getHeader',
         tableList: 'report/detail/list',
@@ -286,6 +293,58 @@ export default {
       this.formInline[value] = id
       this.formInline = { ...this.formInline }
     },
+    // 保存
+    handlePreservation(num) {
+      let _this = this
+      let postDate = []
+      let data = JSON.parse(JSON.stringify(this.dataSource))
+      let selectedRowKeysValue = []
+      data.forEach(res => {
+          selectedRowKeysValue.push(res)
+      })
+      console.log(selectedRowKeysValue)
+      for (let i = 0; i < selectedRowKeysValue.length; i++) {
+        let postDateobj = {}
+        let itemIn = Object.keys(selectedRowKeysValue[i])
+        console.log(itemIn)
+        for (let j = 0; j < itemIn.length; j++) {
+          if (itemIn[j] !== 'sdt' && selectedRowKeysValue[i][itemIn[j]].list) {
+            if (selectedRowKeysValue[i][itemIn[j]] instanceof Object && !(selectedRowKeysValue[i][itemIn[j]] instanceof Array)) {
+              postDateobj[itemIn[j]] = selectedRowKeysValue[i][itemIn[j]]
+              // for (let k = 0; k < selectedRowKeysValue[i][itemIn[j]].list.length; k++) {
+              //   if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'pull_more') {
+              //     console.log(selectedRowKeysValue[i][itemIn[j]].list[k].dataValue)
+              //     selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.join(',')
+              //   }
+              //   if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'text' && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue !== null) {
+              //     selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.toString()
+              //   }
+              // }
+            }
+          }
+        }
+        postDateobj.id = selectedRowKeysValue[i].id
+        postDate.push(postDateobj)
+      }
+      let configDataList = { configDataList: postDate }
+      if (selectedRowKeysValue && selectedRowKeysValue.length > 0) {
+          this.textLoading = true
+        let query = {
+          ...configDataList,
+          paramsManifestId: this.$route.query.id
+        }
+        postAction('/report/detail/save', query).then((res) => {
+          if (res.success) {
+              _this.$message.success(_this.$t('OperationSuccessful'))
+              this.textLoading = false
+          } else {
+              _this.$message.warning(_this.$t('operationFailed'))
+              this.textLoading = false
+          }
+        })
+      } else {
+      }
+    },
     getTableList() {
       // console.log('this.searchParmestable',this.searchParmes)
       let pageNo = JSON.parse(JSON.stringify(this.pageNo))
@@ -319,70 +378,6 @@ export default {
     getDataSource(data) {
       this.dataSource = data
     },
-    handlePreservation(num) {
-      let _this = this
-      let postDate = []
-      let data = JSON.parse(JSON.stringify(this.dataSource))
-      let selectedRowKeysValue = []
-      data.forEach(res => {
-        if (res.state == 'Wait Fill' || res.state == '待填写') {
-          selectedRowKeysValue.push(res)
-        }
-      })
-      for (let i = 0; i < selectedRowKeysValue.length; i++) {
-        let postDateobj = {}
-        let itemIn = Object.keys(selectedRowKeysValue[i])
-        for (let j = 0; j < itemIn.length; j++) {
-          if (itemIn[j] !== 'sdt') {
-            if (selectedRowKeysValue[i][itemIn[j]] instanceof Object && !(selectedRowKeysValue[i][itemIn[j]] instanceof Array)) {
-              postDateobj[itemIn[j]] = selectedRowKeysValue[i][itemIn[j]]
-              for (let k = 0; k < selectedRowKeysValue[i][itemIn[j]].list.length; k++) {
-                if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'pull_more') {
-                  selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.join(',')
-                }
-                if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'text' && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue !== null) {
-                  selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.toString()
-                }
-              }
-            }
-          }
-        }
-        postDateobj.id = selectedRowKeysValue[i].id
-        postDate.push(postDateobj)
-      }
-      let configDataList = { configDataList: postDate }
-      if (selectedRowKeysValue && selectedRowKeysValue.length > 0) {
-        if (num && num == 1) {
-          this.textLoading = true
-        }
-        let query = {
-          ...configDataList,
-          paramsManifestId: this.paramsManifest.id
-        }
-        postAction('/params/collectManifest/save', query).then((res) => {
-          if (res.success) {
-            if (num && num == 1) {
-              _this.$message.success(_this.$t('OperationSuccessful'))
-              this.textLoading = false
-            }
-            setTimeout(() => {
-              if (this.currentPersonRole == 'dre') {
-                this.handlePreservation()
-              }
-            }, 10000)
-          } else {
-            if (num && num == 1) {
-              _this.$message.warning(_this.$t('operationFailed'))
-              this.textLoading = false
-            }
-          }
-        })
-      } else {
-        if (num && num == 1) {
-          this.$message.warning(this.$t('theCurrentListSaved'))
-        }
-      }
-    },
     LoginUserType(val, currentPersonRole, userType) {
       this.RoleType = []
       if (this.currentPersonRole == '') {
diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue
index c3bf52f65..046e8655d 100644
--- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue
+++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue
@@ -376,7 +376,7 @@ export default {
           { required: true, message: this.$t('PleaseEnter')+this.$t('NiONumber'), trigger: 'blur' },
           { min:1, max: 15, message: this.$t('cantExeed')+'15'+this.$t('characters'), trigger: 'blur' },
           {
-            pattern: /^[0-9a-zA-Z-/. ]{1,}$/,
+            pattern: /^[0-9a-zA-Z-/ ]{1,}$/,
             message: this.$t('onlyThree'),
             trigger: 'blur'
           }