diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue
index 0196295af..134966daa 100644
--- a/jero-web/src/components/CollectionType/index.vue
+++ b/jero-web/src/components/CollectionType/index.vue
@@ -2,10 +2,10 @@
   <div style="height: 100%">
     <div class='box'>
       <!--      纯文本-->
-      <div v-if='detailDate.controlType === "1"' class='add_flex'>
-        <div v-for='(item,index) in detailDateList' :key='index' class='add-width'>
-          <div v-for='(val,index1) in item' :key='index1' class='valflex'>
-            <div v-for='(itemval,val) in val' :key='val'>
+      <div v-if='detailDate.controlType === "1" && detailDate.paramsConfigData' class='add_flex'>
+        <div v-for='(item,index) in Object.keys(detailDate.paramsConfigData)' :key='index' class='add-width'>
+          <div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1'
+               style="display: inline-block" class='valflex'>
               <div style='display: inline-block' v-if='itemval.type==="text"'>
                 <!--            文本校验  分情况-->
                 <!--            1 无-->
@@ -97,21 +97,20 @@
                                   v-model="itemval.dataValue"/>
                 </div>
               </div>
-            </div>
-            <div @click="addconfig" class='addicon' v-if='val'>
-              <a-icon type="plus"/>
-            </div>
-            <div @click="delconfig" class='delicon' v-if='val'>
-              <a-icon type="minus"/>
-            </div>
+          </div>
+          <div @click="addconfig" class='addicon' v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index">
+            <a-icon type="plus"/>
+          </div>
+          <div @click="delconfig" class='delicon' v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index > 0">
+            <a-icon type="minus"/>
           </div>
         </div>
       </div>
       <!--      默认值-->
-      <div v-if='detailDate.controlType === "11"' class='add_flex'>
-        <div v-for='(item,index) in detailDateList' :key='index' class='add-width'>
-          <div v-for='(val,index1) in item' :key='index1' class='valflex'>
-            <div v-for='(itemval,val) in val' :key='val'>
+      <div v-if='detailDate.controlType === "11" && detailDate.paramsConfigData' class='add_flex'>
+        <div v-for='(item,index) in Object.keys(detailDate.paramsConfigData)' :key='index' class='add-width'>
+          <div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1'
+               style="display: inline-block" class='valflex'>
               <div style='display: inline-block' v-if='itemval.type==="text"'>
                 <!--            文本校验  分情况-->
                 <!--            1 无-->
@@ -132,21 +131,20 @@
                            v-model="itemval.dataValue"/>
                 </div>
               </div>
-            </div>
-            <div @click="addconfig" class='addicon' v-if='val'>
-              <a-icon type="plus"/>
-            </div>
-            <div @click="delconfig" class='delicon' v-if='val'>
-              <a-icon type="minus"/>
-            </div>
+          </div>
+          <div @click="addconfig" class='addicon' v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index">
+            <a-icon type="plus"/>
+          </div>
+          <div @click="delconfig" class='delicon' v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index > 0">
+            <a-icon type="minus"/>
           </div>
         </div>
       </div>
       <!--      纯下拉单选-->
-      <div v-else-if='detailDate.controlType === "2"' class='add_flex'>
-        <div v-for='(item,index) in detailDateList' :key='index' class='add-width'>
-          <div v-for='(val,index1) in item' :key='index1' class='valflex'>
-            <div v-for='(itemval,val) in val' :key='val'>
+      <div v-else-if='detailDate.controlType === "2" && detailDate.paramsConfigData' class='add_flex'>
+        <div v-for='(item,index) in Object.keys(detailDate.paramsConfigData)' :key='index' class='add-width'>
+          <div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1'
+               style="display: inline-block" class='valflex'>
               <div style='display: inline-block' v-if='itemval.type === "pull"'>
                 <a-select v-model="itemval.dataValue" @change='selectChange'
                           :getPopupContainer="triggerNode=> triggerNode.parentNode"
@@ -159,21 +157,20 @@
                   </a-select-option>
                 </a-select>
               </div>
-            </div>
-            <div @click="addconfig" class='addicon' v-if='val'>
-              <a-icon type="plus"/>
-            </div>
-            <div @click="delconfig" class='delicon' v-if='val'>
-              <a-icon type="minus"/>
-            </div>
+          </div>
+          <div @click="addconfig" class='addicon' v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index">
+            <a-icon type="plus"/>
+          </div>
+          <div @click="delconfig" class='delicon' v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index > 0">
+            <a-icon type="minus"/>
           </div>
         </div>
       </div>
       <!--      纯下拉多选-->
-      <div v-else-if='detailDate.controlType === "3"' class='add_flex'>
-        <div v-for='(item,index) in detailDateList' :key='index' style='flex: 1' class='add-width'>
-          <div v-for='(val,index1) in item' :key='index1' class='valflex'>
-            <div v-for='(itemval,val) in val' :key='val'>
+      <div v-else-if='detailDate.controlType === "3" && detailDate.paramsConfigData' class='add_flex'>
+        <div v-for='(item,index) in Object.keys(detailDate.paramsConfigData)' :key='index' style='flex: 1' class='add-width'>
+          <div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1'
+               style="display: inline-block" class='valflex'>
               <div style='display: inline-block' v-if='itemval.type==="pull_more"'>
                 <a-select v-model="itemval.dataValue"
                           :getPopupContainer="triggerNode=> triggerNode.parentNode"
@@ -186,22 +183,20 @@
                   </a-select-option>
                 </a-select>
               </div>
-            </div>
-            <div @click="addconfig" class='addicon' v-if='val'>
-              <a-icon type="plus"/>
-            </div>
-            <div @click="delconfig" class='delicon' v-if='val'>
-              <a-icon type="minus"/>
-            </div>
+          </div>
+          <div @click="addconfig" class='addicon' v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index">
+            <a-icon type="plus"/>
+          </div>
+          <div @click="delconfig" class='delicon' v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index > 0">
+            <a-icon type="minus"/>
           </div>
         </div>
-
       </div>
       <!--      纯附件-->
-      <div v-else-if='detailDate.controlType === "4"' class='add_flex'>
-        <div v-for='(item,index) in detailDateList' :key='index' style='flex: 1' class='add-width'>
-          <div v-for='(val,index1) in item' :key='index1' class='valflex'>
-            <div v-for='(itemval,val) in val' :key='val'>
+      <div v-else-if='detailDate.controlType === "4" && detailDate.paramsConfigData' class='add_flex'>
+        <div v-for='(item,index) in Object.keys(detailDate.paramsConfigData)' :key='index' style='flex: 1' class='add-width'>
+          <div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1'
+               style="display: inline-block" class='valflex'>
               <div style='display: inline-block' v-if='itemval.type==="file"'>
                 <a-button type="primary" class="button-text inputWid"
                           @click="clickButtonToUpload(itemval)">
@@ -209,21 +204,20 @@
                   itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}}
                 </a-button>
               </div>
-            </div>
-            <div @click="addconfig" class='addicon' v-if='val'>
-              <a-icon type="plus"/>
-            </div>
-            <div @click="delconfig" class='delicon' v-if='val'>
-              <a-icon type="minus"/>
-            </div>
+          </div>
+          <div @click="addconfig" class='addicon' v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index">
+            <a-icon type="plus"/>
+          </div>
+          <div @click="delconfig" class='delicon' v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index > 0">
+            <a-icon type="minus"/>
           </div>
         </div>
       </div>
       <!--      文本+下拉单选-->
-      <div v-else-if='detailDate.controlType === "5"' class='add_flex'>
-        <div v-for='(item,index) in detailDateList' :key='index' class='add-width'>
-          <div v-for='(val,index1) in item' :key='index1' class='valflex'>
-            <div v-for='(itemval,val) in val' :key='val'>
+      <div v-else-if='detailDate.controlType === "5" && detailDate.paramsConfigData' class='add_flex'>
+        <div v-for='(item,index) in Object.keys(detailDate.paramsConfigData)' :key='index' class='add-width'>
+          <div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1'
+               style="display: inline-block" class='valflex'>
               <div style='display: inline-block' v-if='itemval.type==="pull"'>
                 <a-select v-model="itemval.dataValue"
                           :getPopupContainer="triggerNode=> triggerNode.parentNode"
@@ -327,21 +321,20 @@
                                   v-model="itemval.dataValue"/>
                 </div>
               </div>
-            </div>
-            <div @click="addconfig" class='addicon' v-if='val'>
-              <a-icon type="plus"/>
-            </div>
-            <div @click="delconfig" class='delicon' v-if='val'>
-              <a-icon type="minus"/>
-            </div>
+          </div>
+          <div @click="addconfig" class='addicon' v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index">
+            <a-icon type="plus"/>
+          </div>
+          <div @click="delconfig" class='delicon' v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index > 0">
+            <a-icon type="minus"/>
           </div>
         </div>
       </div>
       <!--      文本+下拉多选-->
-      <div v-else-if='detailDate.controlType === "6"' class='add_flex'>
-        <div v-for='(item,index) in detailDateList' :key='index' class='add-width'>
-          <div v-for='(val,index1) in item' :key='index1' class='valflex'>
-            <div v-for='(itemval,val) in val' :key='val'>
+      <div v-else-if='detailDate.controlType === "6" && detailDate.paramsConfigData' class='add_flex'>
+        <div v-for='(item,index) in Object.keys(detailDate.paramsConfigData)' :key='index' class='add-width'>
+          <div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1'
+               style="display: inline-block" class='valflex'>
               <div style='display: inline-block' v-if='itemval.type==="pull_more"'>
                 <a-select v-model="itemval.dataValue"
                           :getPopupContainer="triggerNode=> triggerNode.parentNode"
@@ -445,22 +438,20 @@
                                   v-model="itemval.dataValue"/>
                 </div>
               </div>
-            </div>
-            <div @click="addconfig" class='addicon' v-if='val'>
-              <a-icon type="plus"/>
-            </div>
-            <div @click="delconfig" class='delicon' v-if='val'>
-              <a-icon type="minus"/>
-            </div>
+          </div>
+          <div @click="addconfig" class='addicon' v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index">
+            <a-icon type="plus"/>
+          </div>
+          <div @click="delconfig" class='delicon' v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index > 0">
+            <a-icon type="minus"/>
           </div>
         </div>
-
       </div>
       <!--      文本+附件-->
-      <div v-else-if='detailDate.controlType === "7"' class='add_flex'>
-        <div v-for='(item,index) in detailDateList' :key='index' class='add-width'>
-          <div v-for='(val,index1) in item' :key='index1' class='valflex'>
-            <div v-for='(itemval,val) in val' :key='val'>
+      <div v-else-if='detailDate.controlType === "7" && detailDate.paramsConfigData' class='add_flex'>
+        <div v-for='(item,index) in Object.keys(detailDate.paramsConfigData)' :key='index' class='add-width'>
+          <div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1'
+               style="display: inline-block" class='valflex'>
               <div style='display: inline-block' v-if='itemval.type==="text"'>
                 <!--            文本校验  分情况-->
                 <!--            1 无-->
@@ -559,22 +550,21 @@
                   itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}}
                 </a-button>
               </div>
-            </div>
           </div>
-          <div @click="addconfig" class='addicon' v-if='val'>
+          <div @click="addconfig" class='addicon' v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index">
             <a-icon type="plus"/>
           </div>
-          <div @click="delconfig" class='delicon' v-if='val'>
+          <div @click="delconfig" class='delicon' v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index > 0">
             <a-icon type="minus"/>
           </div>
         </div>
-
       </div>
       <!--      下拉单选+附件-->
-      <div v-else-if='detailDate.controlType === "8"' class='add_flex'>
-        <div v-for='(item,index) in detailDateList' :key='index' class='add-width'>
-          <div v-for='(val,index1) in item' :key='index1' class='valflex'>
-            <div v-for='(itemval,val) in val' :key='val'>
+      <div v-else-if='detailDate.controlType === "8" && detailDate.paramsConfigData' class='add_flex'>
+        <div v-for='(item,index) in Object.keys(detailDate.paramsConfigData)' :key='index' class='add-width'>
+          <div v-for='(itemval,index1) in detailDate.paramsConfigData[item]'
+               :key='index1' style="display: inline-block" class='valflex'>
+<!--            <div v-for='(itemval,val) in val' :key='val'>-->
               <div style='display: inline-block' v-if='itemval.type==="pull"'>
                 <a-select v-model="itemval.dataValue"
                           :getPopupContainer="triggerNode=> triggerNode.parentNode"
@@ -594,21 +584,22 @@
                   itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}}
                 </a-button>
               </div>
-            </div>
-            <div @click="addconfig" class='addicon' v-if='val'>
-              <a-icon type="plus"/>
-            </div>
-            <div @click="delconfig" class='delicon' v-if='val'>
-              <a-icon type="minus"/>
-            </div>
+<!--            </div>-->
+          </div>
+          <div @click="addconfig" class='addicon' v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index">
+            <a-icon type="plus"/>
+          </div>
+          <div @click="delconfig" class='delicon' v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index > 0">
+            <a-icon type="minus"/>
           </div>
         </div>
       </div>
       <!--      下拉多选+附件-->
-      <div v-else-if='detailDate.controlType === "9"' class='add_flex'>
-        <div v-for='(item,index) in detailDateList' :key='index' class='add-width'>
-          <div v-for='(val,index1) in item' :key='index1' class='valflex'>
-            <div v-for='(itemval,val) in val' :key='val'>
+      <div v-else-if='detailDate.controlType === "9" && detailDate.paramsConfigData' class='add_flex'>
+        <div v-for='(item,index) in Object.keys(detailDate.paramsConfigData)' :key='index' class='add-width'>
+          <div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1'
+               style="display: inline-block" class='valflex'>
+<!--            <div v-for='(itemval,val) in val' :key='val'>-->
               <div style='display: inline-block' v-if='itemval.type==="pull_more"'>
                 <a-select v-model="itemval.dataValue"
                           :getPopupContainer="triggerNode=> triggerNode.parentNode"
@@ -628,21 +619,23 @@
                   itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}}
                 </a-button>
               </div>
-            </div>
-            <div @click="addconfig" class='addicon' v-if='val'>
-              <a-icon type="plus"/>
-            </div>
-            <div @click="delconfig" class='delicon' v-if='val'>
-              <a-icon type="minus"/>
-            </div>
+<!--            </div>-->
+          </div>
+          <div @click="addconfig" class='addicon' v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index">
+            <a-icon type="plus"/>
+          </div>
+          <div @click="delconfig" class='delicon' v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index > 0">
+            <a-icon type="minus"/>
           </div>
         </div>
       </div>
       <!--      文本+下拉单选+附件-->
-      <div v-else-if='detailDate.controlType === "10"' class='add_flex'>
-        <div v-for='(item,index) in detailDateList' :key='index' class='add-width'>
-          <div v-for='(val,index1) in item' :key='index1' class='valflex'>
-            <div v-for='(itemval,val) in val' :key='val'>
+      <div v-else-if='detailDate.controlType === "10" && detailDate.paramsConfigData' class='add_flex'>
+        <div v-for='(item,index) in Object.keys(detailDate.paramsConfigData)' :key='index' class='add-width'>
+<!--        <div v-for='(item,index) in detailDateList' :key='index' class='add-width'>-->
+          <div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1'
+               style="display: inline-block" class='valflex'>
+<!--            <div v-for='(itemval,val) in val' :key='val'>-->
               <div style='display: inline-block' v-if='itemval.type==="pull"'>
                 <a-select v-model="itemval.dataValue"
                           :getPopupContainer="triggerNode=> triggerNode.parentNode"
@@ -753,16 +746,15 @@
                   itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}}
                 </a-button>
               </div>
-            </div>
-              <div @click="addconfig" class='addicon' v-if='val'>
-                <a-icon type="plus"/>
-              </div>
-              <div @click="delconfig" class='delicon'  v-if='val'>
-                <a-icon type="minus"/>
-              </div>
           </div>
+          <div @click="addconfig" class='addicon' v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index">
+            <a-icon type="plus"/>
+          </div>
+          <div @click="delconfig" class='delicon' v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index > 0">
+            <a-icon type="minus"/>
           </div>
         </div>
+      </div>
 
     </div>
     <uploadFileChangeDown ref="uploadFile" @uploadSuccess="uploadSuccess"
@@ -791,7 +783,7 @@
         type: String,
         default: ''
       },
-      columName:{
+      columName: {
         type: Array,
         default: [],
         require: true
@@ -803,47 +795,53 @@
         formInline: {},
         visible: false,
         detailDatetransformation: [],
-        detailDateList:[]
+        detailDateList: []
       }
     },
     components: {
       uploadFileChangeDown
     },
     mounted() {
-      this.detailDateList =[]
-      let name=[]
-      this.columName.forEach(item=>{
-        if(item.db_field_name&&item.db_field_name!=''){
-          name.push(item.db_field_name)
-        }
-      })
-      for (let key in this.recordList){
-        if(name.toString().indexOf(key)>-1){
-          if(this.recordList[key].paramsConfigData){
-            this.detailDateList.push(this.recordList[key].paramsConfigData)
-          }
-
-        }
-      }
-      this.detailDateList.forEach((item) => {
-        if (item.type === 'pull_more' && !item.dataValue) {
-          item.dataValue = []
-        }
+      this.detailDateList = []
+      let name = []
+      console.log(this.detailDate)
+      // this.columName.forEach(item => {
+      //   if (item.db_field_name && item.db_field_name != '') {
+      //     name.push(item.db_field_name)
+      //   }
+      // })
+      // for (let key in this.recordList) {
+      //   if (name.toString().indexOf(key) > -1) {
+      //     if (this.recordList[key].paramsConfigData) {
+      //       console.log(this.recordList[key].paramsConfigData)
+      //       this.detailDateList = this.recordList[key].paramsConfigData
+      //     }
+      //   }
+      // }
+      this.detailDateList = this.detailDate.paramsConfigData
+      // this.detailDateList.forEach((item) => {
+        Object.keys(this.detailDateList).forEach(res => {
+          this.detailDateList[res].forEach(val => {
+            if (val.type === 'pull_more' && !val.dataValue) {
+              val.dataValue = []
+            }
+          })
+        // })
         // this.detailDatetransformation.push(item)
       })
-      console.log(this.detailDateList,"oooooo")
+      console.log(this.detailDateList, 'oooooo')
     },
     methods: {
-      selectChange(val){
+      selectChange(val) {
         this.$nextTick(() => {
           let element = document.querySelectorAll(
-            ".tableclassname .ant-table-expanded-row"
-          );
-          let len = element.length / 2;
+            '.tableclassname .ant-table-expanded-row'
+          )
+          let len = element.length / 2
           for (let i = 0; i < len; i++) {
-            element[i + len].style.height = element[i].offsetHeight + "px";
+            element[i + len].style.height = element[i].offsetHeight + 'px'
           }
-        });
+        })
       },
       onInput(r) {
         let value = r.target.value
@@ -891,24 +889,27 @@
           }
         })
       },
-      addconfig(){
-        postAction('params/configData/add', { paramsCollectManifestId: this.recordList.id , paramsConfigId :this.detailDate.configId }).then((res) => {
+      addconfig() {
+        postAction('params/configData/add', {
+          paramsCollectManifestId: this.recordList.id,
+          paramsConfigId: this.detailDate.configId
+        }).then((res) => {
           if (res.success) {
             this.$emit('collectionForm')
           } else {
           }
         })
       },
-      delconfig(){
-        for (const key in this.detailDate.paramsConfigData){
-          deleteAction('params/configData/delete', { id :key }).then((res) => {
+      delconfig() {
+        for (const key in this.detailDate.paramsConfigData) {
+          deleteAction('params/configData/delete', { id: key }).then((res) => {
             if (res.success) {
               this.$emit('collectionForm')
             } else {
             }
           })
         }
-      },
+      }
     },
     watch: {
       detailDate(newold, oldold) {
@@ -943,9 +944,11 @@
     height: 38px !important;
     line-height: 38px !important;
   }
-  .ant-select-selection-selected-value{
-    height:100%;
+
+  .ant-select-selection-selected-value {
+    height: 100%;
   }
+
   .selectWid .ant-select-selection__rendered {
     line-height: 36px !important;
   }
@@ -956,12 +959,14 @@
     height: calc(100% - 100px);
     overflow: auto;
   }
-///deep/ .ant-select-allow-clear{
-//  height: 30px;
-//}
-  /deep/.ant-table-row{
-    height:69px;
+
+  ///deep/ .ant-select-allow-clear{
+  //  height: 30px;
+  //}
+  /deep/ .ant-table-row {
+    height: 69px;
   }
+
   .text {
     margin-right: 10px;
   }
@@ -976,7 +981,8 @@
     display: flex;
     flex-direction: column;
   }
-  .iconRow,.valflex{
+
+  .iconRow, .valflex {
     display: flex;
   }
 
@@ -1003,21 +1009,25 @@
     width: calc(33.3% - 5px);
     margin-right: 5px;
     float: left;
+    display: flex;
   }
 
   .add--number {
     width: 101%;
   }
-  .addicon{
+
+  .addicon {
     display: inline-block;
     //margin-left: -34px;
     margin-top: 8px;
   }
-  .delicon{
+
+  .delicon {
     display: inline-block;
     margin-left: 5px;
     margin-top: 8px;
   }
+
   .ant-input-disabled {
     color: rgba(0, 0, 0, 0.65);
   }