#

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

@@ -414,6 +414,7 @@
 
 <script>
     import BeUpload from "../../components/tool/beUpload.vue";
+    import getExcel from "@/components/tool/getExcel";
 
 export default {
     components: {
@@ -460,7 +461,15 @@ export default {
                 {
                     id:2,
                     name:'创客活动'
-                }
+                },
+                {
+                    id:3,
+                    name:'创客空间'
+                },
+                {
+                    id:4,
+                    name:'创客实践室'
+                },
             ],      
             directFundBlock:[   //直接经费
                 {
@@ -618,7 +627,7 @@ export default {
                 xz:0,
                 qt:0,
             },
-            indirectDataReason:{
+            indirectDataReason:{   //间接理由
                 reason:'',
                 reason1:'',
                 reason2:'',
@@ -743,10 +752,17 @@ export default {
                 reason3:'',
                 reason4:''
             },
+            this.indirectDataReason={   //间接理由
+                reason:'',
+                reason1:'',
+                reason2:'',
+                reason3:'',
+                reason4:''
+            },
             this.AllEquipment();
         },
         submitCreateFrom(){   //生成表单
-
+            getExcel([this.directData,this.usedDirectData,this.indirectData,this.usedInDirectData,this.directDataReason,this.indirectDataReason])
         },
         ProgressFormat(value){        //进度条
           return value ==100?'100%':`${value}%`
@@ -817,7 +833,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")
@@ -837,8 +853,23 @@ export default {
                 })
         },
         addDirectFund(){           //添加直接经费
+            let ok=true;
             let oldArr={};
-            Object.assign(oldArr,this.newDirectFundBlock)
+            Object.assign(oldArr,this.newDirectFundBlock) 
+            this.directFundBlock.forEach((e,i)=>{
+                if (e.directFundData=='') {
+                    this.$message.error('请先填写直接经费类型')
+                    return ok=false
+                }else{        //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+                    // oldArr.directFundSelects = oldArr.directFundSelects.filter((k)=>{
+                    //     console.log(e.directFundSelects);
+                    //     return k.value!=e.value
+                    // })
+                }
+            })
+            if(!ok) return false
+              
+            
             this.directFundBlock.push(oldArr)
             for(let k in this.newDirectFundBlock) return this.newDirectFundBlock[k]=''
         },