Merge branch 'master' of http://192.168.168.218/xiaminwei/xxx_phase2_web

src/components/common/bigfileUpload.vue

@@ -144,6 +144,10 @@ export default {
     );
     //创建实例
     var uploader = WebUploader.create({
+      accept: {
+        extensions: "pdf,doc,ppt,pptx,xls,xlsx,docx,txt,flv,mp4,avi,mvb,rmvb,rm",
+        mimeTypes: ".pdf,.doc,.ppt,.pptx,.xls,.xlsx,.docx,.txt,.flv,.mp4,.avi,.mvb,.rmvb,.rm"
+      },
       pick: {
         id: '#picker',
         label: '点击选择文件'

src/view/sjgl/wx_data_public.vue

@@ -231,7 +231,6 @@ export default {
       this.tree_data = [];
       get("api/rest/3z/document/queryDocumentTree?module="+this.module_name)
         .then((res) => {
-            console.log(1122);
           this.tree_data = [{
             id:this.fl_type,
             label:'文档列表',

src/view/sjgl/wxk_public.vue

@@ -796,7 +796,7 @@ export default {
                     this.form_add.fileList = [fileList[fileList.length - 1]]; // 这一步，是展示最后一次选择的文件
                     this.$refs.forms.validateField('fileList')
                     //选中文件，将文件名绑定到文档名称中
-                    // this.form_add.name = file.name;
+                    this.form_add.name || (this.form_add.name = file.name);
                     // if (lastIndexOf(file.name, ".") != -1) {
                     //   this.form_add.name = file.name.substring(0, lastIndexOf(file.name, "."));
                     // }