#

src/components/tool/downloadExcel.js

@@ -5,8 +5,8 @@ import FileSaver, { saveAs } from 'file-saver';
 import JSZipUtils from 'jszip-utils'
 import Pizzip from 'pizzip';
 
-function getExcel(val,intro){
-console.log(val,intro);
+function getExcel(val,intro,tit,ty){
+// return console.log(val,intro,tit,ty);
     // 下载Excel文件
     JSZipUtils.getBinaryContent('file/学校创客专项资金使用申请表 (1).xlsx', (err, data) => {
         if (err) {
@@ -31,6 +31,12 @@ console.log(val,intro);
             // thisApply   这次申请
             // remark     备注
 
+            worksheet.getCell("G2").value=`项目类型： 个人创客 ${ty==1?'√':'□'}     创客活动 ${ty==0?'√':'□'}   `
+            //项目名称
+            worksheet.getCell('G3').value=`项目名称:${tit}`;
+
+
+
             worksheet.getCell('C7').value=val[0].budget;
             worksheet.getCell('D7').value=val[0].havePaid;
             worksheet.getCell('E7').value=val[0].thisApply;
@@ -146,7 +152,7 @@ console.log(val,intro);
     });
 } 
 
-function getExcel2(val,intro){
+function getExcel2(val,intro,tit,ty){
     // return console.log(val,intro);
         // 下载Excel文件
         JSZipUtils.getBinaryContent('file/附件 5 ：学校创客专项资金使用申请表.xlsx', (err, data) => {
@@ -171,7 +177,12 @@ function getExcel2(val,intro){
                 // havePaid   已支付
                 // thisApply   这次申请
                 // remark     备注
-    
+                
+                worksheet.getCell("G2").value=`项目类型： 个人创客 ${ty==1?'√':'□'}     创客活动 ${ty==0?'√':'□'}   `
+                //项目名称
+                worksheet.getCell('G3').value=`项目名称:${tit}`;
+
+
                 worksheet.getCell('C7').value=val[0].budget;
                 worksheet.getCell('D7').value=val[0].havePaid;
                 worksheet.getCell('E7').value=val[0].thisApply;

src/views/fundManage/newMarkerfundApply.vue

@@ -144,6 +144,8 @@ export default {
                 {fundName:'知识产权事务费',budget:'',havePaid:0,thisApply:'',remark:'论文版面费、专利及其他知识产权事务等费用。'},
             ],
             intro:'',   //事由
+            tit:'',
+            ty:''
         }
     },
     methods:{
@@ -194,11 +196,15 @@ export default {
                 this.fundList[5].budget=data.entery 
                 this.fundList[6].budget=data.activities 
                 this.fundList[7].budget=data.Transaction
+                this.tit=res.data[0][0].title
+                this.ty=res.data[0][0].type
 
-                let arr= res['data'][0].filter(e=>{
+
+
+                let arr= res['data'][1].filter(e=>{
                     return e.actualuse!=null
                 })
-                console.log(arr);
+                // console.log(arr);
 
                 // let isUse = arr;
                 if (arr) {
@@ -223,14 +229,22 @@ export default {
         },
         download(){
             if(!this.projectName) return this.$message.error('请选择项目名称')
+            let data= this.fundList.filter(e=>{
+                return e.thisApply==''
+            })
+            if (data.length==8) return this.$message.error('请填写本次申请金额')
             this.downLoadExcelDig=true
         },
         downLoadExcel(){   //生成表单
-            getExcel(this.fundList,this.intro)
+            getExcel(this.fundList,this.intro,this.tit,this.ty)
             this.downLoadExcelDig=false
         },
         submitData(){
             if(!this.projectName) return this.$message.error('请选择项目名称')
+            let data= this.fundList.filter(e=>{
+                return e.thisApply==''
+            })
+            if (data.length==8) return this.$message.error('请填写本次申请金额')
             let arr=[this.fundList[0].thisApply,this.fundList[1].thisApply,this.fundList[2].thisApply,this.fundList[3].thisApply,this.fundList[4].thisApply,this.fundList[5].thisApply,this.fundList[6].thisApply,this.fundList[7].thisApply]
             let arr2=[this.fundList[0].havePaid,this.fundList[1].havePaid,this.fundList[2].havePaid,this.fundList[3].havePaid,this.fundList[4].havePaid,this.fundList[5].havePaid,this.fundList[6].havePaid,this.fundList[7].havePaid]
             

src/views/fundManage/newMarkerfundDetails.vue

@@ -152,6 +152,8 @@ export default {
             ],
             haveFund:'', //已支付经费
             intro:'',   //事由
+            tit:'',//活动名称
+            ty:'',//活动类型
             state:0,
         }
     },
@@ -176,14 +178,15 @@ export default {
             this.ajax
             .get(this.$store.state.api+'/selectActivityFundDetail',param)
             .then(res=>{
-                // console.log(res.data[1]);
+                console.log(res.data);
                 let data=res.data[0][0]
                 // console.log(data);
                 let applyfund=JSON.parse(data['applyfund'])
                 let fund=JSON.parse(data['fund'])
                 let usedFund=JSON.parse(data['usedFund'])
                 let actualuse=JSON.parse(data['actualuse'])
-
+                this.tit=data.title;
+                this.ty=data.type;
 
                 let arr= res['data'][1].filter(e=>{
                     return e.actualuse!=null
@@ -267,7 +270,7 @@ export default {
             this.downLoadExcelDig=true
         },
         downLoadExcel(){   //生成表单
-            getExcel2(this.fundList,this.intro)
+            getExcel2(this.fundList,this.intro,this.tit,this.ty)
             this.downLoadExcelDig=false
         },
         submitData(){

src/views/fundManage/newNomMarkerFundApply.vue

@@ -144,6 +144,8 @@ export default {
                 {fundName:'知识产权事务费',budget:'',havePaid:0,thisApply:'',remark:'论文版面费、专利及其他知识产权事务等费用。'},
             ],
             intro:'',   //事由
+            tit:'',
+            ty:''
         }
     },
     methods:{
@@ -194,7 +196,8 @@ export default {
                 this.fundList[5].budget=data.entery 
                 this.fundList[6].budget=data.activities 
                 this.fundList[7].budget=data.Transaction
-
+                this.tit=res.data[0][0].title
+                this.ty=res.data[0][0].type
                 let arr= res['data'][0].filter(e=>{
                     return e.actualuse!=null
                 })
@@ -223,14 +226,23 @@ export default {
         },
         download(){
             if(!this.projectName) return this.$message.error('请选择项目名称')
+            let data= this.fundList.filter(e=>{
+                return e.thisApply==''
+            })
+            if (data.length==8) return this.$message.error('请填写本次申请金额')
+            // return console.log(data);
             this.downLoadExcelDig=true
         },
         downLoadExcel(){   //生成表单
-            getExcel(this.fundList,this.intro)
+            getExcel(this.fundList,this.intro,this.tit,this.ty)
             this.downLoadExcelDig=false
         },
         submitData(){
             if(!this.projectName) return this.$message.error('请选择项目名称')
+            let data= this.fundList.filter(e=>{
+                return e.thisApply==''
+            })
+            if (data.length==8) return this.$message.error('请填写本次申请金额')
             let arr=[this.fundList[0].thisApply,this.fundList[1].thisApply,this.fundList[2].thisApply,this.fundList[3].thisApply,this.fundList[4].thisApply,this.fundList[5].thisApply,this.fundList[6].thisApply,this.fundList[7].thisApply]
             let arr2=[this.fundList[0].havePaid,this.fundList[1].havePaid,this.fundList[2].havePaid,this.fundList[3].havePaid,this.fundList[4].havePaid,this.fundList[5].havePaid,this.fundList[6].havePaid,this.fundList[7].havePaid]