#资金修改

src/components/tool/downloadExcel.js

@@ -239,15 +239,15 @@ function getExcel2(val,intro,tit,ty){
         //自动计算的单元格
         //直接经费
             //小型仪器设备费余额
-            worksheet.getCell("G7").value = {formula:"C7-D7-E7",result:worksheet.getCell("C7")-worksheet.getCell("D7")-worksheet.getCell("E7")}
+            worksheet.getCell("G7").value = {formula:"C7-D7-F7",result:worksheet.getCell("C7")-worksheet.getCell("D7")-worksheet.getCell("F7")}
             //材料费余额
-            worksheet.getCell("G8").value = {formula:"C8-D8-E8",result:worksheet.getCell("C8")-worksheet.getCell("D8")-worksheet.getCell("E8")}
+            worksheet.getCell("G8").value = {formula:"C8-D8-F8",result:worksheet.getCell("C8")-worksheet.getCell("D8")-worksheet.getCell("F8")}
             //测试化验加工费余额
-            worksheet.getCell("G9").value = {formula:"C9-D9-E9",result:worksheet.getCell("C9")-worksheet.getCell("D9")-worksheet.getCell("E9")}
+            worksheet.getCell("G9").value = {formula:"C9-D9-F9",result:worksheet.getCell("C9")-worksheet.getCell("D9")-worksheet.getCell("F9")}
             //项目协作费余额
-            worksheet.getCell("G10").value = {formula:"C10-D10-E10",result:worksheet.getCell("C10")-worksheet.getCell("D10")-worksheet.getCell("E10")}
+            worksheet.getCell("G10").value = {formula:"C10-D10-F10",result:worksheet.getCell("C10")-worksheet.getCell("D10")-worksheet.getCell("F10")}
             //其他支出余额
-            worksheet.getCell("G11").value = {formula:"C11-D11-E11",result:worksheet.getCell("C11")-worksheet.getCell("D11")-worksheet.getCell("E11")}
+            worksheet.getCell("G11").value = {formula:"C11-D11-F11",result:worksheet.getCell("C11")-worksheet.getCell("D11")-worksheet.getCell("F11")}
             //总预算
             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}
             //已支付
@@ -260,15 +260,15 @@ function getExcel2(val,intro,tit,ty){
             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("G13").value = {formula:"C13-D13-F13",result:worksheet.getCell("C13")-worksheet.getCell("D13")-worksheet.getCell("F13")}
             //参展参赛费余额
-            worksheet.getCell("G14").value = {formula:"C14-D14-E14",result:worksheet.getCell("C14")-worksheet.getCell("D14")-worksheet.getCell("E14")}
+            worksheet.getCell("G14").value = {formula:"C14-D14-F14",result:worksheet.getCell("C14")-worksheet.getCell("D14")-worksheet.getCell("F14")}
             //创客交流活动费余额
-            worksheet.getCell("G15").value = {formula:"C15-D15-E15",result:worksheet.getCell("C15")-worksheet.getCell("D15")-worksheet.getCell("E15")}
+            worksheet.getCell("G15").value = {formula:"C15-D15-F15",result:worksheet.getCell("C15")-worksheet.getCell("D15")-worksheet.getCell("F15")}
             //知识产权事务费余额
-            worksheet.getCell("G16").value = {formula:"C16-D16-E16",result:worksheet.getCell("C16")-worksheet.getCell("D16")-worksheet.getCell("E16")}
+            worksheet.getCell("G16").value = {formula:"C16-D16-F16",result:worksheet.getCell("C16")-worksheet.getCell("D16")-worksheet.getCell("F16")}
             //其他支出余额
-            worksheet.getCell("G17").value = {formula:"C17-D17-E17",result:worksheet.getCell("C17")-worksheet.getCell("D17")-worksheet.getCell("E17")}
+            worksheet.getCell("G17").value = {formula:"C17-D17-F17",result:worksheet.getCell("C17")-worksheet.getCell("D17")-worksheet.getCell("F17")}
             //总预算
             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}
             //已支付

src/views/fundManage/newMarkerfundApply.vue

@@ -201,17 +201,18 @@ export default {
 
 
 
-                let arr= res['data'][1].filter(e=>{
-                    return e.actualuse!=null
-                })
+
 
                 res['data'][1].filter(e=>{
-                   if (e.actualuse!=null) {
+                   if (e.actualuse==null) {
                         e.actualuse=e.applyfund
                    }
                 })
                 // console.log(arr);
 
+                let arr= res['data'][1].filter(e=>{
+                    return e.actualuse!=null
+                })
                 // let isUse = arr;
                 if (arr) {
                     // console.log(111);

src/views/fundManage/newNomMarkerFundApply.vue

@@ -198,15 +198,18 @@ export default {
                 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
-                })
-                // console.log(arr);
+
+
+
+
                 res['data'][1].filter(e=>{
-                   if (e.actualuse!=null) {
+                   if (e.actualuse==null) {
                         e.actualuse=e.applyfund
                    }
                 })
+                let arr= res['data'][0].filter(e=>{
+                    return e.actualuse!=null
+                })
 
                 // let isUse = arr;
                 if (arr) {