#

src/components/tool/downloadExcel.js

@@ -5,7 +5,7 @@ import FileSaver, { saveAs } from 'file-saver';
 import JSZipUtils from 'jszip-utils'
 import Pizzip from 'pizzip';
 
-export default function getExcel(val,intro){
+function getExcel(val,intro){
 console.log(val,intro);
     // 下载Excel文件
     JSZipUtils.getBinaryContent('file/学校创客专项资金使用申请表 (1).xlsx', (err, data) => {
@@ -146,6 +146,150 @@ console.log(val,intro);
     });
 } 
 
-// export{
-//     getExcel
-// }
+function getExcel2(val,intro){
+    // return console.log(val,intro);
+        // 下载Excel文件
+        JSZipUtils.getBinaryContent('file/附件 5 ：学校创客专项资金使用申请表.xlsx', (err, data) => {
+            if (err) {
+                console.error(err);
+                return;
+            }
+        
+            // 创建一个新的Excel工作簿
+            const workbook = new ExcelJS.Workbook();
+        
+            // 从Excel文件的Buffer中加载工作簿
+            workbook.xlsx.load(data)
+            .then(() => {
+                //获取第一个工作表
+                let worksheet = workbook.getWorksheet(1);
+    
+                // 添加一个工作表
+                // const sheet = workbook.addWorksheet('My Sheet');
+    
+                // budget   预算
+                // havePaid   已支付
+                // thisApply   这次申请
+                // remark     备注
+    
+                worksheet.getCell('C7').value=val[0].budget;
+                worksheet.getCell('D7').value=val[0].havePaid;
+                worksheet.getCell('E7').value=val[0].thisApply;
+                worksheet.getCell('F7').value=val[0].actualuse;
+                worksheet.getCell('H7').value=val[0].remark;
+    
+                worksheet.getCell('C8').value=val[1].budget;
+                worksheet.getCell('D8').value=val[1].havePaid;
+                worksheet.getCell('E8').value=val[1].thisApply;
+                worksheet.getCell('F8').value=val[1].actualuse;
+                worksheet.getCell('H8').value=val[1].remark;
+    
+                worksheet.getCell('C9').value=val[2].budget;
+                worksheet.getCell('D9').value=val[2].havePaid;
+                worksheet.getCell('E9').value=val[2].thisApply;
+                worksheet.getCell('F9').value=val[2].actualuse;
+                worksheet.getCell('H9').value=val[2].remark;
+    
+                worksheet.getCell('C10').value=val[3].budget;
+                worksheet.getCell('D10').value=val[3].havePaid;
+                worksheet.getCell('E10').value=val[3].thisApply;
+                worksheet.getCell('F10').value=val[3].actualuse;
+                worksheet.getCell('H10').value=val[3].remark;
+    
+                worksheet.getCell('C13').value=val[4].budget;
+                worksheet.getCell('D13').value=val[4].havePaid;
+                worksheet.getCell('E13').value=val[4].thisApply;
+                worksheet.getCell('F13').value=val[4].actualuse;
+                worksheet.getCell('H13').value=val[4].remark;
+    
+                worksheet.getCell('C14').value=val[5].budget;
+                worksheet.getCell('D14').value=val[5].havePaid;
+                worksheet.getCell('E14').value=val[5].thisApply;
+                worksheet.getCell('F14').value=val[5].actualuse;
+                worksheet.getCell('H14').value=val[5].remark;
+    
+                worksheet.getCell('C15').value=val[6].budget;
+                worksheet.getCell('D15').value=val[6].havePaid;
+                worksheet.getCell('E15').value=val[6].thisApply;
+                worksheet.getCell('F15').value=val[6].actualuse;
+                worksheet.getCell('H15').value=val[6].remark;
+    
+                worksheet.getCell('C16').value=val[7].budget;
+                worksheet.getCell('D16').value=val[7].havePaid;
+                worksheet.getCell('E16').value=val[7].thisApply;
+                worksheet.getCell('F16').value=val[7].actualuse;
+                worksheet.getCell('H16').value=val[7].remark;
+    
+                // worksheet.getCell('B18').value=val.intro;
+                worksheet.getCell("B18").value=intro;
+                worksheet.getCell('B18').alignment = { vertical: 'top', horizontal: 'left' };
+    
+    
+        //自动计算的单元格
+        //直接经费
+            //小型仪器设备费余额
+            worksheet.getCell("G7").value = {formula:"C7-D7-E7",result:worksheet.getCell("C7")-worksheet.getCell("D7")-worksheet.getCell("E7")}
+            //材料费余额
+            worksheet.getCell("G8").value = {formula:"C8-D8-E8",result:worksheet.getCell("C8")-worksheet.getCell("D8")-worksheet.getCell("E8")}
+            //测试化验加工费余额
+            worksheet.getCell("G9").value = {formula:"C9-D9-E9",result:worksheet.getCell("C9")-worksheet.getCell("D9")-worksheet.getCell("E9")}
+            //项目协作费余额
+            worksheet.getCell("G10").value = {formula:"C10-D10-E10",result:worksheet.getCell("C10")-worksheet.getCell("D10")-worksheet.getCell("E10")}
+            //其他支出余额
+            worksheet.getCell("G11").value = {formula:"C11-D11-E11",result:worksheet.getCell("C11")-worksheet.getCell("D11")-worksheet.getCell("E11")}
+            //总预算
+            worksheet.getCell("C6").value = {formula:"SUM(C7:C11)",result:worksheet.getCell("C7")*1+worksheet.getCell("C8")*1+worksheet.getCell("C9")*1+worksheet.getCell("C10")*1+worksheet.getCell("C11")*1}
+            //已支付
+            worksheet.getCell("D6").value = {formula:"SUM(D7:D11)",result:worksheet.getCell("D7")*1+worksheet.getCell("D8")*1+worksheet.getCell("D9")*1+worksheet.getCell("D10")*1+worksheet.getCell("D11")*1}
+            //本次申请
+            worksheet.getCell("E6").value = {formula:"SUM(E7:E11)",result:worksheet.getCell("E7")*1+worksheet.getCell("E8")*1+worksheet.getCell("E9")*1+worksheet.getCell("E10")*1+worksheet.getCell("E11")*1}
+            //实际使用
+            worksheet.getCell("F6").value = {formula:"SUM(F7:F11)",result:worksheet.getCell("F7")*1+worksheet.getCell("F8")*1+worksheet.getCell("F9")*1+worksheet.getCell("F10")*1+worksheet.getCell("F11")*1}
+            //余额
+            worksheet.getCell("G6").value = {formula:"C6-D6-F6",result:worksheet.getCell("C6")*1-worksheet.getCell("D6")*1-worksheet.getCell("F6")*1}
+        //间接经费
+            //项目成果鉴定费余额
+            worksheet.getCell("G13").value = {formula:"C13-D13-E13",result:worksheet.getCell("C13")-worksheet.getCell("D13")-worksheet.getCell("E13")}
+            //参展参赛费余额
+            worksheet.getCell("G14").value = {formula:"C14-D14-E14",result:worksheet.getCell("C14")-worksheet.getCell("D14")-worksheet.getCell("E14")}
+            //创客交流活动费余额
+            worksheet.getCell("G15").value = {formula:"C15-D15-E15",result:worksheet.getCell("C15")-worksheet.getCell("D15")-worksheet.getCell("E15")}
+            //知识产权事务费余额
+            worksheet.getCell("G16").value = {formula:"C16-D16-E16",result:worksheet.getCell("C16")-worksheet.getCell("D16")-worksheet.getCell("E16")}
+            //其他支出余额
+            worksheet.getCell("G17").value = {formula:"C17-D17-E17",result:worksheet.getCell("C17")-worksheet.getCell("D17")-worksheet.getCell("E17")}
+            //总预算
+            worksheet.getCell("C12").value = {formula:"SUM(C13:C17)",result:worksheet.getCell("C13")*1+worksheet.getCell("C14")*1+worksheet.getCell("C15")*1+worksheet.getCell("C16")*1+worksheet.getCell("C17")*1}
+            //已支付
+            worksheet.getCell("D12").value = {formula:"SUM(D13:D17)",result:worksheet.getCell("D13")*1+worksheet.getCell("D14")*1+worksheet.getCell("D15")*1+worksheet.getCell("D16")*1+worksheet.getCell("D17")*1}
+            //本次申请
+            worksheet.getCell("E12").value = {formula:"SUM(E13:E17)",result:worksheet.getCell("E13")*1+worksheet.getCell("E14")*1+worksheet.getCell("E15")*1+worksheet.getCell("E16")*1+worksheet.getCell("E17")*1}
+            //实际使用
+            worksheet.getCell("F12").value = {formula:"SUM(F13:F17)",result:worksheet.getCell("F13")*1+worksheet.getCell("F14")*1+worksheet.getCell("F15")*1+worksheet.getCell("F16")*1+worksheet.getCell("F17")*1}
+            //余额
+            worksheet.getCell("G12").value = {formula:"C12-D12-F12",result:worksheet.getCell("C12")*1-worksheet.getCell("D12")*1-worksheet.getCell("F12")*1}
+        //经费支出
+            //总预算
+            worksheet.getCell("C5").value = {formula:"SUM(C6+C12)",result:worksheet.getCell("C6")*1+worksheet.getCell("C12")*1}
+            //总支出
+            worksheet.getCell("D5").value=  {formula:"SUM(D6+D12)",result:worksheet.getCell("D6")*1+worksheet.getCell("D12")*1}
+            //总申请
+            worksheet.getCell("E5").value = {formula:"SUM(E6+E12)",result:worksheet.getCell("E6")*1+worksheet.getCell("E12")*1}
+            //总实际使用
+            worksheet.getCell("F5").value = {formula:"SUM(F6+F12)",result:worksheet.getCell("F6")*1+worksheet.getCell("F12")*1}
+            //总余额
+            worksheet.getCell("G5").value = {formula:"SUM(G6+G12)",result:worksheet.getCell("G6")*1+worksheet.getCell("G12")*1}
+    
+    
+                // 将工作簿保存为Excel文件
+                return workbook.xlsx.writeBuffer();
+            })
+            .then(buffer => {
+                // 将Excel文件保存到本地计算机
+                const excelBlob = new Blob([buffer], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
+                FileSaver.saveAs(excelBlob, '学校创客专项资金使用申请表.xlsx');
+            });
+        });
+    } 
+
+    export {getExcel,getExcel2}

src/views/fundManage/makerfund.vue

@@ -124,7 +124,7 @@
           >
           <template #default="scope">
             <div>
-              <span>{{ scope.row.actualuse==null?0:scope.row.actualuse }}</span>
+              <span>{{ scope.row.actualuse==null?'':scope.row.actualuse }}</span>
             </div>
           </template>
         </el-table-column>

src/views/fundManage/newMarkerfundApply.vue

@@ -121,7 +121,7 @@
     import getFundNo from '@/components/tool/getProjectNo';
     import BeUpload from "../../components/tool/beUpload.vue";
     // import getExcel from "@/components/tool/getExcel";
-    import getExcel from '@/components/tool/downloadExcel'
+    import {getExcel} from '@/components/tool/downloadExcel'
 export default {
     components: {
         BeUpload,
@@ -134,14 +134,14 @@ export default {
             submitDataDig:false,//提交对话框
             allFund:'',//总经费
             fundList:[
-                {fundName:'小型仪器设备费',budget:'',havePaid:'0',thisApply:'',remark:'项目开展所需的小型专用仪器设备、工具、配件购置或租赁费用。'},
-                {fundName:'材料费',budget:'',havePaid:'0',thisApply:'',remark:'项目开展需消耗的各种原材料、辅助材料等低值易耗品的采购费用。'},
-                {fundName:'测试化验加工费',budget:'',havePaid:'0',thisApply:'',remark:'项目开展过程中支付给外单位的检验、测试、化验、计算、分析及加工费等费用。'},
-                {fundName:'项目协作费',budget:'',havePaid:'0',thisApply:'',remark:'按合同规定支付给协作单位的费用'},
-                {fundName:'项目成功鉴定费',budget:'',havePaid:'0',thisApply:'',remark:'学术会务费、评审费、鉴定费、成果集制作费等费用。'},
-                {fundName:'参展参赛费',budget:'',havePaid:'0',thisApply:'',remark:'参加创客展会、竞赛等所需的报名费、展位费、布展费、宣传推广费及差旅费等费用。'},
-                {fundName:'创客交流活动费',budget:'',havePaid:'0',thisApply:'',remark:'创客交流活动中支付给校外专家的指导费、咨询费、授课费等费用。'},
-                {fundName:'知识产权事务费',budget:'',havePaid:'0',thisApply:'',remark:'论文版面费、专利及其他知识产权事务等费用。'},
+                {fundName:'小型仪器设备费',budget:'',havePaid:0,thisApply:'',remark:'项目开展所需的小型专用仪器设备、工具、配件购置或租赁费用。'},
+                {fundName:'材料费',budget:'',havePaid:0,thisApply:'',remark:'项目开展需消耗的各种原材料、辅助材料等低值易耗品的采购费用。'},
+                {fundName:'测试化验加工费',budget:'',havePaid:0,thisApply:'',remark:'项目开展过程中支付给外单位的检验、测试、化验、计算、分析及加工费等费用。'},
+                {fundName:'项目协作费',budget:'',havePaid:0,thisApply:'',remark:'按合同规定支付给协作单位的费用'},
+                {fundName:'项目成功鉴定费',budget:'',havePaid:0,thisApply:'',remark:'学术会务费、评审费、鉴定费、成果集制作费等费用。'},
+                {fundName:'参展参赛费',budget:'',havePaid:0,thisApply:'',remark:'参加创客展会、竞赛等所需的报名费、展位费、布展费、宣传推广费及差旅费等费用。'},
+                {fundName:'创客交流活动费',budget:'',havePaid:0,thisApply:'',remark:'创客交流活动中支付给校外专家的指导费、咨询费、授课费等费用。'},
+                {fundName:'知识产权事务费',budget:'',havePaid:0,thisApply:'',remark:'论文版面费、专利及其他知识产权事务等费用。'},
             ],
             intro:'',   //事由
         }
@@ -184,7 +184,7 @@ export default {
             .then(res=>{
                 console.log(res.data);
                 let data=JSON.parse(res.data[0][0]['fund']);
-                let usedFund=JSON.parse(res.data[0][0]['usedFund']);
+                // let usedFund=JSON.parse(res.data[0][0]['usedFund']);
                 // console.log(data);
                 this.fundList[0].budget=data.device
                 this.fundList[1].budget=data.Material
@@ -195,18 +195,26 @@ export default {
                 this.fundList[6].budget=data.activities 
                 this.fundList[7].budget=data.Transaction
 
-                if (res.data[0][0]['usedFund']!==null) {
-                    this.fundList[0].havePaid=usedFund.device
-                    this.fundList[1].havePaid=usedFund.Material
-                    this.fundList[2].havePaid=usedFund.processing 
-                    this.fundList[3].havePaid=usedFund.Collaboration 
-                    this.fundList[4].havePaid=usedFund.APPRAISAL
-                    this.fundList[5].havePaid=usedFund.entery 
-                    this.fundList[6].havePaid=usedFund.activities 
-                    this.fundList[7].havePaid=usedFund.Transaction
-                }
-                
+                let arr= res['data'][0].filter(e=>{
+                    return e.actualuse!=null
+                })
+                console.log(arr);
 
+                // let isUse = arr;
+                if (arr) {
+                    // console.log(111);
+                    arr.forEach(item=>{
+                    let JP = JSON.parse(item['actualuse']);
+                        this.fundList[0]['havePaid']+=Number(JP['device']);
+                        this.fundList[1]['havePaid']+=Number(JP['Material']);
+                        this.fundList[2]['havePaid']+=Number(JP['processing']);
+                        this.fundList[3]['havePaid']+=Number(JP['Collaboration']);
+                        this.fundList[4]['havePaid']+=Number(JP['APPRAISAL']);
+                        this.fundList[5]['havePaid']+=Number(JP['entery']);
+                        this.fundList[6]['havePaid']+=Number(JP['activities']);
+                        this.fundList[7]['havePaid']+=Number(JP['Transaction']);
+                    })
+                }
 
                 this.allFund=res.data[0][0]['money']
             },err=>{
@@ -232,6 +240,7 @@ export default {
             let fund2=arr2.reduce((prev,cur,index,arr) => {
                 return prev + cur*1;
             },0); 
+            // return console.log(fund,fund2);
             if (fund+fund2>this.allFund) return this.$message.error('申请金额已大于预算')
             this.submitDataDig=true
         },

src/views/fundManage/newMarkerfundDetails.vue

@@ -128,7 +128,7 @@
     import getFundNo from '@/components/tool/getProjectNo';
     import BeUpload from "../../components/tool/beUpload.vue";
     // import getExcel from "@/components/tool/getExcel";
-    import getExcel from '@/components/tool/downloadExcel'
+    import {getExcel2} from '@/components/tool/downloadExcel'
 export default {
     components: {
         BeUpload,
@@ -176,17 +176,19 @@ export default {
             this.ajax
             .get(this.$store.state.api+'/selectActivityFundDetail',param)
             .then(res=>{
-                console.log(res.data[1]);
+                // console.log(res.data[1]);
                 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'])
+
 
                 let arr= res['data'][1].filter(e=>{
                     return e.actualuse!=null
                 })
-                console.log(arr);
+                // console.log(arr);
 
                 let isUse = arr;
                 if (arr) {
@@ -237,16 +239,16 @@ export default {
                 this.fundList[6].thisApply=applyfund.activities 
                 this.fundList[7].thisApply=applyfund.Transaction
 
-                // if (data['actualuse']!=null) {
-                //     this.fundList[0].actualuse=actualuse.device
-                //     this.fundList[1].actualuse=actualuse.Material
-                //     this.fundList[2].actualuse=actualuse.processing
-                //     this.fundList[3].actualuse=actualuse.Collaboration
-                //     this.fundList[4].actualuse=actualuse.APPRAISAL
-                //     this.fundList[5].actualuse=actualuse.entery
-                //     this.fundList[6].actualuse=actualuse.activities
-                //     this.fundList[7].actualuse=actualuse.Transaction
-                // }
+                if (data['actualuse']!=null) {
+                    this.fundList[0].actualuse=actualuse.device
+                    this.fundList[1].actualuse=actualuse.Material
+                    this.fundList[2].actualuse=actualuse.processing
+                    this.fundList[3].actualuse=actualuse.Collaboration
+                    this.fundList[4].actualuse=actualuse.APPRAISAL
+                    this.fundList[5].actualuse=actualuse.entery
+                    this.fundList[6].actualuse=actualuse.activities
+                    this.fundList[7].actualuse=actualuse.Transaction
+                }
                 
 
                 this.intro=data.intro
@@ -265,7 +267,7 @@ export default {
             this.downLoadExcelDig=true
         },
         downLoadExcel(){   //生成表单
-            getExcel(this.fundList,this.intro)
+            getExcel2(this.fundList,this.intro)
             this.downLoadExcelDig=false
         },
         submitData(){

src/views/fundManage/newNomMarkerFundApply.vue

@@ -121,7 +121,7 @@
     import getFundNo from '@/components/tool/getProjectNo';
     import BeUpload from "../../components/tool/beUpload.vue";
     // import getExcel from "@/components/tool/getExcel";
-    import getExcel from '@/components/tool/downloadExcel'
+    import {getExcel} from '@/components/tool/downloadExcel'
 export default {
     components: {
         BeUpload,
@@ -132,25 +132,25 @@ export default {
             projectName:'',      //所选名称
             downLoadExcelDig:false,//下载Excel对话框
             submitDataDig:false,//提交对话框
-            allFund:'',
+            allFund:'',//总经费
             fundList:[
-                {fundName:'小型仪器设备费',budget:'',havePaid:'0',thisApply:'',remark:'项目开展所需的小型专用仪器设备、工具、配件购置或租赁费用。'},
-                {fundName:'材料费',budget:'',havePaid:'0',thisApply:'',remark:'项目开展需消耗的各种原材料、辅助材料等低值易耗品的采购费用。'},
-                {fundName:'测试化验加工费',budget:'',havePaid:'0',thisApply:'',remark:'项目开展过程中支付给外单位的检验、测试、化验、计算、分析及加工费等费用。'},
-                {fundName:'项目协作费',budget:'',havePaid:'0',thisApply:'',remark:'按合同规定支付给协作单位的费用'},
-                {fundName:'项目成功鉴定费',budget:'',havePaid:'0',thisApply:'',remark:'学术会务费、评审费、鉴定费、成果集制作费等费用。'},
-                {fundName:'参展参赛费',budget:'',havePaid:'0',thisApply:'',remark:'参加创客展会、竞赛等所需的报名费、展位费、布展费、宣传推广费及差旅费等费用。'},
-                {fundName:'创客交流活动费',budget:'',havePaid:'0',thisApply:'',remark:'创客交流活动中支付给校外专家的指导费、咨询费、授课费等费用。'},
-                {fundName:'知识产权事务费',budget:'',havePaid:'0',thisApply:'',remark:'论文版面费、专利及其他知识产权事务等费用。'},
+                {fundName:'小型仪器设备费',budget:'',havePaid:0,thisApply:'',remark:'项目开展所需的小型专用仪器设备、工具、配件购置或租赁费用。'},
+                {fundName:'材料费',budget:'',havePaid:0,thisApply:'',remark:'项目开展需消耗的各种原材料、辅助材料等低值易耗品的采购费用。'},
+                {fundName:'测试化验加工费',budget:'',havePaid:0,thisApply:'',remark:'项目开展过程中支付给外单位的检验、测试、化验、计算、分析及加工费等费用。'},
+                {fundName:'项目协作费',budget:'',havePaid:0,thisApply:'',remark:'按合同规定支付给协作单位的费用'},
+                {fundName:'项目成功鉴定费',budget:'',havePaid:0,thisApply:'',remark:'学术会务费、评审费、鉴定费、成果集制作费等费用。'},
+                {fundName:'参展参赛费',budget:'',havePaid:0,thisApply:'',remark:'参加创客展会、竞赛等所需的报名费、展位费、布展费、宣传推广费及差旅费等费用。'},
+                {fundName:'创客交流活动费',budget:'',havePaid:0,thisApply:'',remark:'创客交流活动中支付给校外专家的指导费、咨询费、授课费等费用。'},
+                {fundName:'知识产权事务费',budget:'',havePaid:0,thisApply:'',remark:'论文版面费、专利及其他知识产权事务等费用。'},
             ],
             intro:'',   //事由
         }
     },
     methods:{
-        getData(){         //获取活动经费的项目名称
+        getData(){         //获取活动经费的项目名称 
             let param={
                 uid:this.$store.state.userInfo.userid,
-                type:1              //查询的活动表。type为活动表中个人创客活动创客的分类字段
+                type:1
             }
             this.ajax
                 .get(this.$store.state.api+'/SelectMakerFundSelects',param)
@@ -177,13 +177,14 @@ export default {
             //知识产权事务费：Transaction   TransactionRemarks
             let param={
                 uid:this.$store.state.userInfo.userid,
-                fid:this.projectName,
+                aid:this.projectName,
             }
             this.ajax
             .get(this.$store.state.api+'/selectMarkerFundData',param)
             .then(res=>{
-                // console.log(res.data);
+                console.log(res.data);
                 let data=JSON.parse(res.data[0][0]['fund']);
+                // let usedFund=JSON.parse(res.data[0][0]['usedFund']);
                 // console.log(data);
                 this.fundList[0].budget=data.device
                 this.fundList[1].budget=data.Material
@@ -193,8 +194,29 @@ export default {
                 this.fundList[5].budget=data.entery 
                 this.fundList[6].budget=data.activities 
                 this.fundList[7].budget=data.Transaction
-                this.allFund=res.data[0][0]['money']
 
+                let arr= res['data'][0].filter(e=>{
+                    return e.actualuse!=null
+                })
+                console.log(arr);
+
+                // let isUse = arr;
+                if (arr) {
+                    // console.log(111);
+                    arr.forEach(item=>{
+                    let JP = JSON.parse(item['actualuse']);
+                        this.fundList[0]['havePaid']+=Number(JP['device']);
+                        this.fundList[1]['havePaid']+=Number(JP['Material']);
+                        this.fundList[2]['havePaid']+=Number(JP['processing']);
+                        this.fundList[3]['havePaid']+=Number(JP['Collaboration']);
+                        this.fundList[4]['havePaid']+=Number(JP['APPRAISAL']);
+                        this.fundList[5]['havePaid']+=Number(JP['entery']);
+                        this.fundList[6]['havePaid']+=Number(JP['activities']);
+                        this.fundList[7]['havePaid']+=Number(JP['Transaction']);
+                    })
+                }
+
+                this.allFund=res.data[0][0]['money']
             },err=>{
                 console.log(err);
             })
@@ -218,7 +240,7 @@ export default {
             let fund2=arr2.reduce((prev,cur,index,arr) => {
                 return prev + cur*1;
             },0); 
-            console.log(fund+fund2);
+            // return console.log(fund,fund2);
             if (fund+fund2>this.allFund) return this.$message.error('申请金额已大于预算')
             this.submitDataDig=true
         },
@@ -247,6 +269,7 @@ export default {
                     if(res.data==1){
                         this.$message.success('提交成功')
                         this.submitDataDig=false
+                        this.$router.push('/makerfund')
                     }else{
                         this.$message.error('提交失败')
                     }