Merge remote-tracking branch 'origin/feature_职代会' into feature_职代会

src/main/resources/views/platform/zhgh/democratic/congress/materials/issue/index.html

@@ -83,7 +83,7 @@ layout("/layouts/platform.html"){
                         <el-option v-for="item in materialOptions" :key="item.id"
                                    :label="item.name" :value="item.id"></el-option>
                     </el-select>
-                    <el-upload action="/platform/sys/file/uploadDynamicReturnUrl" :show-file-list="false"
+                    <!--<el-upload action="/platform/sys/file/uploadDynamicReturnUrl" :show-file-list="false"
                                style="width:180px; flex:0 0 180px;"
                                :disabled="materialUploadDisabled || materialUploadLoading"
                                :before-upload="beforeMaterialUpload"
@@ -93,7 +93,7 @@ layout("/layouts/platform.html"){
                         <el-button type="primary" icon="el-icon-upload" style="width:180px"
                                    :loading="materialUploadLoading"
                                    :disabled="materialUploadDisabled || materialUploadLoading">上传资料</el-button>
-                    </el-upload>
+                    </el-upload>-->
                 </div>
             </el-form-item>
             <el-row :gutter="16">