#

src/components/tool/getExcel.js

@@ -23,6 +23,7 @@ let getBuffer = function(){
 
 
 export default async function getExcel(data){
+    console.log(data);
     const content = await getBuffer();
     const workbook = new Excel.Workbook();
     await workbook.xlsx.load(content);

src/views/fundManage/makerfundApply.vue

@@ -422,6 +422,10 @@
 <script>
     import BeUpload from "../../components/tool/beUpload.vue";
     import getExcel from "@/components/tool/getExcel";
+<<<<<<< HEAD
+=======
+
+>>>>>>> 7a1d3a286a28d4688126313b674db18dd9691a99
 export default {
 
     components: {
@@ -476,7 +480,15 @@ export default {
                 {
                     id:4,
                     name:'创客活动'
-                }
+                },
+                {
+                    id:3,
+                    name:'创客空间'
+                },
+                {
+                    id:4,
+                    name:'创客实践室'
+                },
             ],      
             directFundBlock:[   //直接经费
                 {
@@ -646,7 +658,7 @@ export default {
                 xz:0,
                 qt:0,
             },
-            indirectDataReason:{
+            indirectDataReason:{   //间接理由
                 reason:'',
                 reason1:'',
                 reason2:'',
@@ -962,7 +974,7 @@ export default {
                     console.log(err);
                 })
         },
-        getFile(val) {       //上传封面
+        getFile(val) {       //上传文件
             this.file.push(val)
             this.progress.show = false;
             // this.imageUrl=require("../../assets/img/jj.jpg")
@@ -982,6 +994,7 @@ export default {
                 })
         },
         addDirectFund(){           //添加直接经费
+
             //判断如果已经写满
             if(this.directFundBlock.length==this.newDirectFundBlock.directFundSelects.length)return this.$message.warning("已无法继续添加")
             let oldArr={};