diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue
index 0e2b2642b..c42f4b3ae 100644
--- a/jero-web/src/components/CollectionType/index.vue
+++ b/jero-web/src/components/CollectionType/index.vue
@@ -17,7 +17,7 @@
         <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">
+              <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>
@@ -28,40 +28,36 @@
       </div>
 <!--      纯下拉多选-->
       <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 }}
+                    </span>
+            </j-multi-select-tag>
+          </div>
+        </div>
       </div>
 <!--      纯附件-->
       <div v-if='detailDate.controlType === "4"'>
-
+        <div v-for='(item,index) in detailDate.list' :key='index' style='flex: 1'>
+          <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 === "5"'>
-
-      </div>
-<!--      文本+下拉多选-->
-      <div v-if='detailDate.controlType === "6"'>
-
-      </div>
-<!--      文本+附件-->
-      <div v-if='detailDate.controlType === "7"'>
-
-      </div>
-<!--      下拉单选+附件-->
-      <div v-if='detailDate.controlType === "8"'>
-
-      </div>
-<!--      下拉多选+附件-->
-      <div v-if='detailDate.controlType === "9"'>
-
-      </div>
-<!--      文本+下拉单选+附件-->
-      <div v-if='detailDate.controlType === "10"' style='display: flex'>
-        <div v-for='(item,index) in detailDate.list' :key='index'>
+        <div v-for='(item,index) in detailDate.list' :key='index' style='flex: 1'>
           <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 }}
+              <a-select-option v-for="(itemin, key) in item.controlValue" :key="key" :value="itemin.value">
+                    <span style="display: inline-block;width: 100%" :title=" itemin.lable ">
+                      {{ itemin.lable }}
                     </span>
               </a-select-option>
             </a-select>
@@ -74,13 +70,117 @@
           </div>
         </div>
       </div>
+<!--      文本+下拉多选-->
+      <div v-if='detailDate.controlType === "6"'>
+        <div v-for='(item,index) in detailDate.list' :key='index' style='flex: 1'>
+          <div v-if='item.type==="text"'>
+            <a-input class="box-input"
+                     :disabled="disabled"
+                     v-model="formInline.nioNumber"
+                     :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 }}
+                    </span>
+            </j-multi-select-tag>
+          </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='item.type==="text"'>
+            <a-input class="box-input"
+                     :disabled="disabled"
+                     v-model="formInline.nioNumber"
+                     :placeholder="$t('PleaseEnter')+$t('NiONumber')"/>
+          </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 === "8"'>
+        <div v-for='(item,index) in detailDate.list' :key='index' style='flex: 1'>
+          <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">
+                    <span style="display: inline-block;width: 100%" :title=" itemin.lable ">
+                      {{ itemin.lable }}
+                    </span>
+              </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 === "9"'>
+        <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 }}
+                    </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>
+          </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='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">
+                    <span style="display: inline-block;width: 100%" :title=" itemin.lable ">
+                      {{ itemin.lable }}
+                    </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 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>
+    <uploadFile ref="uploadFile" @uploadSuccess="uploadSuccess"></uploadFile>
   </div>
 </template>
 
 <script>
 
-
+import uploadFile from '@/components/uploadFile/file'
 export default {
   name: 'index',
   props: {
@@ -93,13 +193,23 @@ export default {
   data() {
     return {
       disabled: false,
-      formInline: {}
+      formInline: {},
+      visible: false
     }
   },
+  components: {
+    uploadFile
+  },
   mounted() {
   },
   methods: {
-
+    uploadSuccess() {
+      console.log('pppp')
+    },
+    clickButtonToUpload() {
+      this.$refs.uploadFile.visible = true
+      console.log('pppp')
+    },
   },
   watch: {
     detailDate(newold,oldold) {