资金详情

src/views/fundManage/makerfundApply.vue

@@ -452,7 +452,7 @@ export default {
             dialogImageUrl:require('../../assets/img/zzpic426.jpg'),
             disabled: false,
             file:[],
-            selects:{
+            selects:{             //所选名称，类型id
                 projectName:'',
                 projectType:''
             },
@@ -540,8 +540,6 @@ export default {
                 reason:''          //理由
             },
 
-
-
             indirectFundBlock:[    //间接经费
                 {
                     indirectFundData:'',
@@ -619,7 +617,7 @@ export default {
                 xz:0,
                 qt:0,
             },
-            directDataReason:{
+            directDataReason:{     //直接经费理由
                 reason:'',
                 reason1:'',
                 reason2:'',
@@ -695,7 +693,7 @@ export default {
         }
     },
     methods:{
-        AllEquipment(){
+        AllEquipment(){                             //填写表单数据
            this.directFundBlock.forEach((e,i)=>{
                 switch(e.directFundData)
                 {
@@ -704,14 +702,12 @@ export default {
                         this.usedDirectData.facility+=e.usedFund*1;
                         this.directDataReason.reason=e.reason;
                         this.applicationDirectData.facility = e.apply*1
-                        // console.log(this.directData.facility);
                         break;
                     case 2:
                         this.directData.cl+=e.budget*1;
                         this.usedDirectData.cl+=e.usedFund*1;
                         this.directDataReason.reason1=e.reason;
                         this.applicationDirectData.cl = e.apply*1
-                        // console.log(this.directData.cl);
                         break;
                     case 3:
                         this.directData.jg=e.budget*1;
@@ -797,7 +793,7 @@ export default {
             this.AllFund.expended = this.Expenditure['expended']+this.IndirectFunding['expended'];
             //本次申请
             this.AllFund.application = this.Expenditure['application']+this.IndirectFunding['application']
-            //育儿
+            //余额
             this.AllFund.surplus = this.AllFund['budget']-this.AllFund['expended']-this.AllFund['application'];
 
             //项目名称
@@ -923,7 +919,7 @@ export default {
                 return per*1+cur.budget*1
             },0)
             let indirSum =this.indirectFundBlock.reduce((per,cur)=>{
-                return per*1+cur.budget*1
+                return per*1+cur.budget*1 
             },0)
             let allSum=dirSum+indirSum+this.residue.budget*1
 
@@ -933,20 +929,30 @@ export default {
             let usedIndirSum =this.indirectFundBlock.reduce((per,cur)=>{
                 return per*1+cur.usedFund*1
             },0)
-            let usedAllSum=usedDirSum+usedIndirSum+this.residue.usedFund*1
 
+            let usedApplyDirSum = this.directFundBlock.reduce((per,cur)=>{
+                return per*1+cur.apply*1
+            },0)
+            let usedApplyIndirSum =this.indirectFundBlock.reduce((per,cur)=>{
+                return per*1+cur.apply*1
+            },0)
+            // return console.log(usedApplyDirSum,usedApplyIndirSum);
+            let usedAllSum=usedDirSum+usedIndirSum+usedApplyDirSum+usedApplyIndirSum;
+            // return console.log(usedAllSum);
 
+            console.log(this.AllFund);
             let param={
-                uid:this.$store.state.userInfo.userid,
-                cid:this.selects.projectName,
-                type:this.selects.projectType,
-                dir:JSON.stringify(this.directFundBlock),
-                indir:JSON.stringify(this.indirectFundBlock),
-                elseFund:JSON.stringify(this.residue),
-                file:JSON.stringify(this.file),
-                AllSum:allSum,
-                usedSum:usedAllSum
+                uid:this.$store.state.userInfo.userid,            //用户id
+                cid:this.selects.projectName,                    //项目id
+                type:this.selects.projectType,                     //项目类型
+                dir:JSON.stringify(this.directFundBlock),           //所有直接经费
+                indir:JSON.stringify(this.indirectFundBlock),      //所有间接经费
+                elseFund:JSON.stringify(this.residue),              //
+                file:JSON.stringify(this.file),                     //文件
+                AllSum:allSum,                                      //所有钱总和
+                usedSum:usedAllSum                                  //已花费金额
             }
+            // return console.log(param);
             this.ajax
                 .post(this.$store.state.api+'/insertMakerFund',param)
                 .then(res=>{
@@ -981,7 +987,6 @@ export default {
                 })
         },
         addDirectFund(){           //添加直接经费
-
             //判断如果已经写满
             if(this.directFundBlock.length==this.newDirectFundBlock.directFundSelects.length)return this.$message.warning("已无法继续添加")
             let oldArr={};