diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue
index cc4edb1aa..0e2b2642b 100644
--- a/jero-web/src/components/CollectionType/index.vue
+++ b/jero-web/src/components/CollectionType/index.vue
@@ -3,43 +3,78 @@
     <div class='box'>
 <!--      纯文本-->
       <div v-if='detailDate.controlType === "1"'>
-        <a-input class="box-input"
-                 :disabled="disabled"
-                 v-model="formInline.nioNumber"
-                 :placeholder="$t('PleaseEnter')+$t('NiONumber')"/>
+        <div v-for='(item,index) in detailDate.list' :key='index'>
+          <div v-if='item.type==="text"'>
+            <a-input class="box-input"
+                     :disabled="disabled"
+                     v-model="formInline.nioNumber"
+                     :placeholder="$t('PleaseEnter')+$t('NiONumber')"/>
+          </div>
+        </div>
       </div>
 <!--      纯下拉单选-->
       <div v-if='detailDate.controlType === "2"'>
-        <a-select :placeholder="$t('PleaseSelect')+$t('controlType')" v-model="formInline.controlType">
-          <a-select-option v-for="(item, key) in detailDate.list" :key="key" :value="item.value">
+        <div v-for='(item,index) in detailDate.list' :key='index'>
+          <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.list" :key="key" :value="item.value">
                     <span style="display: inline-block;width: 100%" :title=" item.label ">
                       {{ item.label }}
                     </span>
-          </a-select-option>
-        </a-select>
-        <a-input class="box-input"
-                 :disabled="disabled"
-                 v-model="formInline.nioNumber"
-                 :placeholder="$t('PleaseEnter')+$t('NiONumber')"/>
+              </a-select-option>
+            </a-select>
+          </div>
+        </div>
       </div>
 <!--      纯下拉多选-->
-      <div v-if='detailDate.controlType === "3"'>22</div>
+      <div v-if='detailDate.controlType === "3"'>
+
+      </div>
 <!--      纯附件-->
-      <div v-if='detailDate.controlType === "4"'>22</div>
+      <div v-if='detailDate.controlType === "4"'>
+
+      </div>
 <!--      文本+下拉单选-->
-      <div v-if='detailDate.controlType === "5"'>22</div>
+      <div v-if='detailDate.controlType === "5"'>
+
+      </div>
 <!--      文本+下拉多选-->
-      <div v-if='detailDate.controlType === "6"'>22</div>
+      <div v-if='detailDate.controlType === "6"'>
+
+      </div>
 <!--      文本+附件-->
-      <div v-if='detailDate.controlType === "7"'>22</div>
+      <div v-if='detailDate.controlType === "7"'>
+
+      </div>
 <!--      下拉单选+附件-->
-      <div v-if='detailDate.controlType === "8"'>22</div>
+      <div v-if='detailDate.controlType === "8"'>
+
+      </div>
 <!--      下拉多选+附件-->
-      <div v-if='detailDate.controlType === "9"'>22</div>
+      <div v-if='detailDate.controlType === "9"'>
+
+      </div>
 <!--      文本+下拉单选+附件-->
-      <div v-if='detailDate.controlType === "10"'>22</div>
+      <div v-if='detailDate.controlType === "10"' style='display: flex'>
+        <div v-for='(item,index) in detailDate.list' :key='index'>
+          <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>
+              </a-select-option>
+            </a-select>
+          </div>
+          <div v-if='item.type==="text"'>
+            <a-input class="box-input"
+                     :disabled="disabled"
+                     v-model="formInline.nioNumber"
+                     :placeholder="$t('PleaseEnter')+$t('NiONumber')"/>
+          </div>
+        </div>
+      </div>
     </div>
-<!--   {{  detailDate.controlType }}-->
   </div>
 </template>
 
@@ -67,6 +102,9 @@ export default {
 
   },
   watch: {
+    detailDate(newold,oldold) {
+      console.log(newold,oldold,'ll')
+    }
   }
 }
 </script>
diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue
index 3373728b2..745e0c38e 100644
--- a/jero-web/src/components/tableCollection/index.vue
+++ b/jero-web/src/components/tableCollection/index.vue
@@ -27,7 +27,7 @@
                      </a>
          </span>
         <span slot="detailClick" slot-scope="text,record">
-          <collection-type :detailDate='record' />
+          <collection-type :detailDate='text' />
         </span>
       </a-table>
     </div>