新建费用申请时申请金额预输入问题

src/main/java/com/liang/controller/StaBudgetapprovalController.java

@@ -641,13 +641,13 @@ public class StaBudgetapprovalController extends BaseController {
         String xmndjfysq = staBudgetapprovalService.getFyzz(maps).getXmndjfysq();
         Double byjje = staBudgetapprovalService.getByjzje(maps).getByj();
         Double sqe = staBudgetapprovalService.getSqe(maps).getSqje();
-//        kmFyInfo.setXmndjfysq(xmndjfysq);
+        kmFyInfo.setXmndjfysq(xmndjfysq);
 //        kmFyInfo.setSqje(xxzje);
         kmFyInfo.setByj(byjzje);
         kmFyInfo.setXmzys(kmXmzys);
         kmFyInfo.setByjbzze(byjbzze);
         kmFyInfo.setBzje2(byjje);
-//        kmFyInfo.setSqje(sqe);
+        kmFyInfo.setSqje(sqe);
         // 申请金额总额 结束
         if (kmFyInfo.getYsje() == null)
             kmFyInfo.setYsje(0.0);
@@ -702,12 +702,11 @@ public class StaBudgetapprovalController extends BaseController {
             String xmndjfysq = staBudgetapprovalService.getFyzz(maps).getXmndjfysq();
             Double byjje = staBudgetapprovalService.getByjzje(maps).getByj();
             Double sqe = staBudgetapprovalService.getSqe(maps).getSqje();
-//            kmFyInfo.setSqje(sqe);
-//            kmFyInfo.setXmndjfysq(xmndjfysq);
+            kmFyInfo.setSqje(sqe);
+            kmFyInfo.setXmndjfysq(xmndjfysq);
 //            kmFyInfo.setSqje(xxzje);
             kmFyInfo.setByj(byjzje);
             kmFyInfo.setByjbzze(byjbzze);
-//            kmFyInfo.setXmndjfysq(xmndjfysq);
             kmFyInfo.setBzje2(byjje);
 
             if (budgetapproval.getXmid() != null){
@@ -1917,7 +1916,7 @@ public class StaBudgetapprovalController extends BaseController {
             kmFyInfo.setByj(byjzje);
             kmFyInfo.setByjbzze(byjbzze);
             Double sqe = staBudgetapprovalService.getSqe(maps).getSqje();
-//            kmFyInfo.setSqje(sqe);
+            kmFyInfo.setSqje(sqe);
             // 申请金额总额 结束
         }
         //        获取科目费用小项xmzys
@@ -1925,7 +1924,6 @@ public class StaBudgetapprovalController extends BaseController {
         Map<String, Object> maps = new HashMap<>();
         maps.put("nys",nys);
         maps.put("fymc",fymc);
-        Double sqe = staBudgetapprovalService.getSqe(maps).getSqje();
         if (kmFyInfo == null) {
             kmFyInfo = new StaBudgetapproval();
             kmFyInfo.setSqje(0.0);

src/main/resources/templates/stabudgetapproval/add.html

@@ -722,6 +722,7 @@
         var nf   =$("#nf").val();
         var xmmc   =$("#xmmc").val();
         var ysqjeOne = -1;
+        var jyje;
         var ybzjeOne = -1;
         var erpbh = $("#erpbh").val();
         var xmlx  =$("#xmlx").val();
@@ -1054,17 +1055,20 @@
                                         success: function (result) {
                                             dataTj[0].ysqje = result.sqje;
                                             dataTj[0].ybzje = result.bzje;
-                                            dataTj[1].ysqje = dataTj[0].ysje * 10000 - result.xmndjfysq;
+                                            dataTj[1].ysqje = dataTj[0].ysje * 10000 - result.sqje;
                                             dataTj[1].ybzje = dataTj[0].ysje * 10000 - dataTj[0].ybzje;
                                             xgqysq0 = result.sqje;
                                             xgqybz0 = result.bzje;
-                                            xgqysq1 = dataTj[0].ysje * 10000 - result.xmndjfysq;
+                                            xgqysq1 = dataTj[0].ysje * 10000 - result.sqje;
                                             xgqybz1 = dataTj[0].ysje * 10000 - dataTj[0].ybzje;
                                             kmXmzys = result.xmzys;
-                                            if (null === result.xmndjfysq) {
+                                            if (null === result.sqje) {
                                                 ysqjeOne = parseFloat(0);
+                                                jyje = parseFloat(0);
                                             } else {
-                                                ysqjeOne = parseFloat(result.xmndjfysq);
+                                                ysqjeOne = parseFloat(result.sqje);
+                                                //用于校验的金额
+                                                jyje = parseFloat(result.sqje);
                                             }
                                             ybzjeOne = parseFloat(dataTj[0].ybzje);
                                             currTable_tj.reload();
@@ -1143,13 +1147,13 @@
                         Message.error("费用申请的总金额，不能超过年度总预算!", 2000);
                         return false;
                     }
-                    if ($("#fylbmc").val()==="（1）外委研究支出费"){
-                        if (sqje+ysqje>=ysje+1) {
-                            Message.error("外委研究支出费申请的费用总金额，不能超过预算金额!", 2000);
+                    if ($("#fylbmc").val()==="（1）外委研究支出费"|| $("#fylbmc").val()==="（3）外协测试试验与加工费"){
+                        if (sqje+jyje>=ysje+1) {
+                            Message.error("该科目申请的费用总金额，不能超过预算金额!", 2000);
                             return false;
                         }
-                        if (sqje+ysqjeOne>kmXmzys){
-                            Message.error("外委研究支出费申请的费用总金额，不能超过该科目任务书总预算金额!", 2000);
+                        if (sqje+jyje>kmXmzys){
+                            Message.error("该科目申请的费用总金额，不能超过该科目任务书总预算金额!", 2000);
                             return false;
                         }
 
@@ -1170,7 +1174,7 @@
                     console.log('kmXmzys:'+kmXmzys);
                     console.log('hah:'+sqje+ysqjeOne);
 
-                    if ((sqje+ysqjeOne) > kmXmzys*1.2){
+                    if ((sqje+jyje) > kmXmzys*1.2){
                         Message.error("该科目申请的费用总金额，不能超过该科目任务书总预算金额的120%!", 2000);
                         return false;
                     }
@@ -4156,13 +4160,13 @@
                 Message.error("费用申请的总金额，不能超过年度总预算!", 2000);
                 return false;
             }
-            if ($("#fylbmc").val()==="外委研究支出费") {
+            if ($("#fylbmc").val()==="（1）外委研究支出费" || $("#fylbmc").val()==="（3）外协测试试验与加工费") {
                 if (ysqje > ysje || sqje >ysje) {
-                    Message.error("外委研究支出费申请的费用总金额，不能超过预算金额%!", 2000);
+                    Message.error("该科目申请的费用总金额，不能超过预算金额!", 2000);
                     return false;
                 }
-                if (sqje+ysqjeOne>kmXmzys){
-                    Message.error("外委研究支出费申请的费用总金额，不能超过该科目任务书总预算金额!", 2000);
+                if (sqje+jyje>kmXmzys){
+                    Message.error("该科目申请的费用总金额，不能超过该科目任务书总预算金额!", 2000);
                     return false;
                 }
 
@@ -4170,7 +4174,7 @@
                 Message.error("该科目申请的费用总金额，不能超过预算金额的120%!，无法保存", 2000);
                 return false;
             }
-            if (sqje+ysqjeOne>kmXmzys*1.2){
+            if (sqje+jyje>kmXmzys*1.2){
                 Message.error("该科目申请的费用总金额，不能超过该科目任务书总预算金额的120%!", 2000);
                 return false;
             }

src/main/resources/templates/stabudgetapproval/view_apply.html

@@ -482,7 +482,7 @@
                 "km": "项目年度经费",
                 "ysje": [[${xmFyInfo.ysje}]],
                 // "ysqje": [[${xmFyInfo.sqje}]],
-                "ysqje": [[${kmFyInfo.ysje}]] * 10000 - [[${kmFyInfo.xmndjfysq}]],
+                "ysqje": [[${kmFyInfo.ysje}]] * 10000 - [[${kmFyInfo.sqje}]],
                 "ybzje": [[${kmFyInfo.ysje}]] * 10000 - [[${kmFyInfo.bzje}]]
             },
             {