Merge branch 'develop' into FOTON

src/components/CustomFormComponents/File.vue

@@ -22,13 +22,23 @@
           v-if="reUpload || showUploadBtn">{{ uploadText || '重新上传' }}</el-button>
       </ul>
       <template style="margin-left: 105px;" v-else>
+        <ul class="file-file__wrap">
+          <li class="file-item"
+              v-for="(file, index) in showFileList"
+              :key="index"
+              :title="file.name"
+              @click="handlePreview(file)">
+            {{ file.name }}
+          </li>
+        </ul>
         <el-button
             size="small"
             @click="clickButtonToUpload('opinionFileList')"
             icon="el-icon-upload"
             class="form-upload-btn"
         >
-          {{ (value === 'null' || value === '' || value == null) && (!processModel || (processModel && !disabled)) ? '点击上传' : '查看已上传的文件' }}
+<!--          {{ (value === 'null' || value === '' || value == null) && (!processModel || (processModel && !disabled)) ? '点击上传' : '查看已上传的文件' }}-->
+          上传
         </el-button>
       </template>
       <el-dialog
@@ -152,6 +162,7 @@ export default {
     }
   },
   mounted() {
+    this.getShowFileList()
     if (this.showFileModel) {
       this.getShowFileList()
     }

src/components/CustomFormComponents/SelectArray.vue

@@ -10,6 +10,7 @@
       <el-select
         v-model="valueArr"
         :placeholder="placeholder"
+        filterable
         :disabled="disabled"
         clearable
         multiple

src/components/treeSelect/treeSelectModule.vue

@@ -177,7 +177,7 @@
 
                 if (node.level >= 1) {
                     setTimeout(() => {
-                        this.getChildByList(node.data.level,node.data.id, resolve);
+                        this.getChildByList(node.data.level,node.data.id,node.data.model, resolve);
                     }, 500);
                     return resolve([]); // 加上这个，防止在该节点没有子节点时一直转圈的问题发生。
                 }
@@ -194,8 +194,8 @@
                     }
                 })
             },
-            getChildByList( level,id,resolve) {     // 获取子节点请求
-                let params = {level : level,id :id,type : this.type};
+            getChildByList( level,id,model,resolve) {     // 获取子节点请求
+                let params = {level : level,id :id,type : this.type,model :model};
                 this.$http.get(this.urlChild, params, {
                     _this: this
                 }, res => {