#

src/components/tool/downloadExcel.js

@@ -146,6 +146,6 @@ console.log(val,intro);
     });
 } 
 
-export{
+export default{
     getExcel
 }

src/views/fundManage/newMarkerfundApply.vue

@@ -176,7 +176,7 @@
 <script>
     import BeUpload from "../../components/tool/beUpload.vue";
     // import getExcel from "@/components/tool/getExcel";
-    import downloadExcel from '@/components/tool/downloadExcel'
+    import getExcel from '@/components/tool/downloadExcel'
 export default {
     components: {
         BeUpload,
@@ -260,7 +260,7 @@ export default {
                 })
         },
         submitCreateFrom(){   //生成表单
-            downloadExcel(this.fundList,this.intro)
+            getExcel(this.fundList,this.intro)
         },
         handleChange(value) {
             console.log(value);

src/views/projectApply/projectApplication.vue

@@ -203,7 +203,7 @@
 
 
 
-                        <el-button type="primary"  size="mini" @click="appTable(scope.row.typeid,scope.row.courseId)" >申请表</el-button>
+                        <!-- <el-button type="primary"  size="mini" @click="appTable(scope.row.typeid,scope.row.courseId)" >申请表</el-button> -->
 
                         <el-button type="primary"  size="mini" @click="del(scope.row)">删除</el-button>
               </div>
@@ -283,7 +283,7 @@
 
 <!-- 下载申请表开始 -->
 
-      <el-dialog
+      <!-- <el-dialog
         title="下载申请表"
         :visible.sync="downloadWord"
         width="600px"
@@ -294,7 +294,7 @@
           <el-button type="primary" @click="downloadProjectWord" class="AllDialogBtn">下载</el-button>
           <el-button @click="downloadWord=false" class="AllDialogBtn" >取消</el-button>
         </span>
-      </el-dialog>
+      </el-dialog> -->
 
 <!-- 下载申请表结束 -->
 
@@ -316,7 +316,20 @@
       </span>
       </el-dialog>
 <!-- 删除通知结束-->
-
+      <!-- 文档预览开始 -->
+        <!-- <el-dialog
+        title="文档预览"
+        :visible.sync="WordPreview"
+        width="60%"
+        class="pageSubmitData">
+        <div class="addDialogLogo">LOGO</div>
+        <MakerSpaceWordPreview v-if="PreviewTid == '5f7a66d5-c206-11ed-a4cd-509a4c5b67cf' && WordPreview " :data="PreviewData"/>
+        <studentMakerProjectPreview v-if="PreviewTid == '5e21b204-c206-11ed-a4cd-509a4c5b67cf' && WordPreview" :data="PreviewData"/>
+        <span slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="downWord" class="AllDialogBtn">下载文档</el-button>
+          <el-button @click="WordPreview = false" class="AllDialogBtn" >取消</el-button>
+        </span>
+        </el-dialog> -->
   </div>
 </template>
 
@@ -434,9 +447,6 @@ import studentMakerProjectPreview from '@/components/studentMakerProjectPreview.
               let data=res['data']
               this.downloadWord=true
               // this.downWord(data)
-              this.PreviewData=data
-              this.PreviewTid = tid;
-
               // this.PreviewData = [res['data'][0][0],res['data'][1]];
               
               // return console.log(this.PreviewData);
@@ -461,13 +471,6 @@ import studentMakerProjectPreview from '@/components/studentMakerProjectPreview.
             this.$message.error("错误")
           }
         },
-        downloadProjectWord(){
-          if(this.PreviewTid=='5f7a66d5-c206-11ed-a4cd-509a4c5b67cf'){
-            MakerSpaceWord(this.PreviewData[0],this.PreviewData[1]);
-          }else{
-            getWord(this.PreviewData[0][0]);
-          }
-        },
         downWord(data){
           if(this.PreviewTid=='5f7a66d5-c206-11ed-a4cd-509a4c5b67cf'){
             MakerSpaceWord(this.PreviewData[0],this.PreviewData[1]);
@@ -648,80 +651,6 @@ import studentMakerProjectPreview from '@/components/studentMakerProjectPreview.
     height: 0;
   }
 
-//   .addDialog{          //文档预览
-//   font-size: 18px;
-//   .el-dialog{
-//     border-radius: 5px;
-//     overflow: hidden;
-//   }
-//   .el-dialog__body{
-//     display: flex;
-//     justify-content: center;
-//   }
-//   .deleteContent{
-//     // margin: 30px 0;
-//     font-size: 22px;
-//     color: #000;
-//   }
-//   .addDialogLogo{
-//     width: 60px;
-//         height: 30px;
-//         display: flex;
-//         justify-content: center;
-//         line-height: 30px;
-//         border-radius: 5px;
-//         background: #f2f2f2;
-//         position: absolute;
-//         left: 20px; top: 15px; 
-//   }
-//   .el-dialog__header{
-//       background: #32455b;
-//      position: relative;
-//      top: -2px;
-//   }
-//   .el-dialog__title{
-//     color:#fff;
-//         display: flex;
-//         justify-content: center;
-//         font-size: 18px;
-//         position: relative;
-//         top: -2px;
-//   }
-//   .addDialogMid{
-//     box-sizing: border-box;
-//     padding:0 60px 0 10px;
-//     .addDialogTit{
-//       display: flex;
-//       span{
-//         width: 80px;
-//         font-size: 16px;
-//         line-height: 40px;
-//         text-align: left;
-        
-//       }
-//     }
-//     .addDialogTit1{
-//       display: flex;
-//       justify-content: space-between;
-//       margin-bottom: 15px;
-//     }
-//     .addDialogTit2{
-//       margin-top: 10px;
-//       font-size: 16px;
-//       color: #000;
-//       text-indent: 2em;
-//     }
-//     .addDialogCon{
-//       margin-top: 20px;
-//     }
-//   }
-//   .dialog-footer{
-//     display: flex;
-//     justify-content: center;
-//     box-sizing: border-box;
-//   }
-// }
-
  
 }