备用金报账校验逻辑修改

src/main/resources/mapper/StaBudgetapprovalDao.xml

@@ -1161,8 +1161,27 @@
     <select id="getZbzje" resultType="com.liang.entity.StaBudgetapproval">
         SELECT
             (SELECT XMZYS * 10000 FROM prj_AnnualBudgetDetail WHERE FJ = '' AND NYS = #{nys}) AS XMZYS,
+            (SELECT BYJ * 10000 FROM prj_AnnualBudgetDetail WHERE FJ = '' AND NYS = #{nys}) AS BYJ,
             (SELECT XMZ * 10000 FROM prj_AnnualBudgetDetail WHERE ID = #{fylb} AND NYS = #{nys}) AS KMZYS,
-            (SELECT SUM(BZJE) FROM sta_BudgetApproval WHERE NYS = #{nys} and SPZT = '审批结束' ) AS ZBZJE,
+            (select
+                SUM(sr.bzje)
+            from
+                sta_Reimbursement sr
+                    left join  sta_BudgetApproval sb on sr.fysq = sb.id
+            where
+                sb.NYS = #{nys}
+              and sb.SPZT != '作废'
+                    and sr.spzt != '作废') AS ZBZJE,
+            (select
+                 SUM(sr.bzje)
+             from
+                 sta_Reimbursement sr
+                     left join  sta_BudgetApproval sb on sr.fysq = sb.id
+             where
+                 sb.NYS = #{nys}
+               and sb.SPZT != '作废'
+                and sb.SFBYJ = 1
+                and sr.spzt != '作废' ) AS BYJBZZE,
             (select
                  SUM(sr.bzje)
              from

src/main/resources/mapper/StaReimbursementDao.xml

@@ -33,7 +33,7 @@
 
     <!--id查询单个-->
     <select id="queryById" resultMap="StaReimbursementMap">
-        select r.*, b.FYLB, g.FYMC as FYLBMC, b.SQJE
+        select r.*, b.FYLB, g.FYMC as FYLBMC, b.SQJE,b.SFBYJ
         from sta_Reimbursement r
                  left join sta_BudgetApproval b on b.ID = r.FYSQ
                  left join prj_AnnualBudgetDetail g on g.ID = b.FYLB

src/main/resources/templates/payapply/update.html

@@ -412,23 +412,18 @@
                 Message.warning('本次付款金额，不能大于付款计划金额！',2000);
                 return ;
             }
-            console.log(selectedText[1].replace(/\s+/g, ''))
-            console.log(selectedText[2].replace(/\s+/g, ''))
-            console.log(bcfkje+parseFloat(selectedText[2].replace(/\s+/g, ''))-oldbcfkje)
-/*            if (bcfkje+parseFloat(selectedText[2].replace(/\s+/g, ''))-oldbcfkje>selectedText[1].replace(/\s+/g, '')){
+            if (bcfkje+parseFloat(selectedText[2].replace(/\s+/g, ''))-oldbcfkje>selectedText[1].replace(/\s+/g, '')){
                 Message.warning('该付款计划下已申请付款金额加上本次付款金额，大于付款计划金额！',2000);
                 return ;
-            }*/
+            }
             $.ajax({
                 url: AjaxUtil.ctx + 'staBudgetapproval/getKmze/?id='+fysq,
                 type: "post",
                 async: false,
                 dataType: "json",
                 success: function (result) {
-                    console.log(result);
                     if (result.code == 0){
                         var kmze = result.data;
-                        console.log(data);
                         if (kmze.length > 0){
                             var kmzes = kmze[0];
                             fkje = kmzes.yfze;
@@ -450,7 +445,7 @@
             console.log(fkje-oldbcfkje+bcfkje)
             console.log((fkje-oldbcfkje+bcfkje) > bzje)
             if ( (fkje-oldbcfkje+bcfkje) > bzje){
-                Message.warning('该报账下付款申请已申请总金额已超出报账金额!',2000);
+                alert('该项目费用类别为'+fymc+' 下的付款申请总金额已超出总报账金额，已申请的付款金额为:'+(fkje-oldbcfkje)+'万元，报账金额为：'+bzje+'万元');
                 return ;
             }
             //合同文件

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

@@ -163,18 +163,22 @@
         var sqje = $("#sqje").val();
         var xmmc = [[${budgetapproval.xmmc}]];
         var fylb = [[${budgetapproval.fylb}]];
+        var sfbyj = [[${budgetapproval.sfbyj}]];
         xmmc = xmmc.replace(/[\/\\]/g, '_');
         var htId ;
 
         var xmzys;//项目总预算
+        var byj;//项目备用金
         var zbzje;//项目总报账额
         var kmzys;//科目项目组预算
+        var byjbzze;//备用金报账总额
         var kmybzje;//科目已报账金额
         var bzId = -1;
 
         setTimeout(function() {
             // 在这里可以进行您的加载操作
             layer.msg('加载完成！', { icon: 1 });
+            getbzje();
             var fylbmc = document.getElementById('fylbmc').value;
             var clDiv = document.getElementById('cl'); // 获取 div
             if ( fylbmc == '（1）外委研究支出费' || fylbmc == '（3）外协测试试验与加工费'){
@@ -599,40 +603,64 @@
                 }
             });
         });
-        AjaxUtil.post({
-            url: AjaxUtil.ctx + 'staReimbursement/getZbjje/'+fysq+'/'+fylb,
-            success:function (data){
-                xmzys = data.data.xmzys;
-                zbzje = data.data.zbzje;
-                kmzys =data.data.kmzys;
-                kmybzje =data.data.kmybzje;
+        function getbzje() {
+            AjaxUtil.post({
+                url: AjaxUtil.ctx + 'staReimbursement/getZbjje/' + fysq + '/' + fylb,
+                success: function (data) {
+                    xmzys = data.data.xmzys;
+                    byj = data.data.byj;
+                    zbzje = data.data.zbzje;
+                    kmzys = data.data.kmzys;
+                    byjbzze = data.data.byjbzze;
+                    kmybzje = data.data.kmybzje;
 
-            }
-        })
+                }
+            })
+        }
 
         // 监听确认按钮
         form.on('submit(saveBtn)', function (data) {
+            getbzje()//初始化已报账金额
             var sqje = parseFloat($("#sqje").val());
             var bzje = parseFloat($("#bzje").val());
-            console.log(kmzys)
-            console.log(kmybzje)
-            //校验报账金额是否大于科目项目组预算
-            if (kmzys == null  && kmzys ==''){
-                alert('该报账此费用类别没有项目组预算，请在年度预算中修改项目组预算!!')
-                return false;
-            }else if (bzje > kmzys){
-                alert('报账金额大于该科目项目组预算，请查看年度预算中该科目项目组预算后重新填写!!!')
-                return false;
-            }else if (bzje + kmybzje >kmzys){
-                alert('该科目已申请报账加上当前报账金额，已超过该科目项目组预算!!')
-                return false;
-            }
-            // 获取该项目的总报账金额
-            if (xmzys !== null && zbzje !== null) {
-                if (zbzje + bzje > xmzys) {
-                    alert("该项目已申请报账加上当前报账金额,已超过该项目总预算!!")
+            //判断是否是备用金
+            if (sfbyj){
+                //1.判断当前项目是否有备用金
+                if(byj == null || byj == ''){
+                    alert('该项目没有备用金，如需继续报账，请在年度预算中修改该项目备用金!!');
                     return false;
                 }
+                //2.判断当前报账金额是否大于项目备用金
+                if (bzje>byj){
+                    alert('报账金额已超过年度备用金金额，年度备用金金额为:'+byj+'元');
+                    return false;
+                }
+                //3.判断当前项目备用金已创建的报账金额是否超额
+                if (byjbzze + bzje>byj){
+                    alert('该项目下备用金已申请报账金额加上当前报账金额，已超过年度备用金金额。该项目下备用金已申请报账金额为:'+byjbzze+'元,年度备用金金额为:'+byj+'元');
+                    return false;
+                }
+            }else {
+                //校验报账金额是否大于科目项目组预算
+                if (kmzys == null || kmzys == '') {
+                    alert('该费用类别没有项目组预算，请在年度预算中修改该费用类别预算!!')
+                    return false;
+                }
+                if (bzje > kmzys) {
+                    alert('报账金额大于该费用类别预算，该费用类别预算为:'+kmzys+'元')
+                    return false;
+                }
+                if (bzje + kmybzje > kmzys) {
+                    alert('该费用类别下已申请报账金额加上当前报账金额，已超过该费用类别预算。该费用类别下已申请的报账总金额为:'+kmybzje+'元,该费用类别预算为:'+kmzys+'元')
+                    return false;
+                }
+                // 获取该项目的总报账金额
+                if (xmzys !== null && zbzje !== null) {
+                    if (zbzje + bzje > xmzys) {
+                        alert("该项目下已申请报账金额加上当前报账金额,已超过该项目总预算。该项目下已申请的报账总金额为:"+zbzje+'元,项目总预算为:'+xmzys+'元')
+                        return false;
+                    }
+                }
             }
             // if (bzje!==null && bzje > sqje * 1.2) {
             //     alert("报账金额不能超过申请金额的120%！");

src/main/resources/templates/reimburse/update.html

@@ -144,24 +144,28 @@
             upload = layui.upload;
         var fysq = $("#fysq").val();
         var fylb = [[${reimbursement.fylb}]]
+        var sfbyj = [[${reimbursement.sfbyj}]];
 
         var xmzys;//项目总预算
+        var byj;//项目备用金
         var zbzje;//项目总报账额
         var kmzys;//科目项目组预算
+        var byjbzze;//备用金报账总额
         var kmybzje;//科目已报账金额
 
-
-        AjaxUtil.post({
-            url: AjaxUtil.ctx + 'staReimbursement/getZbjje/'+fysq+'/'+fylb,
-            success:function (data){
-                console.log(data.data)
-                xmzys = data.data.xmzys;
-                zbzje = data.data.zbzje;
-                kmzys =data.data.kmzys;
-                kmybzje =data.data.kmybzje;
-
-            }
-        })
+        function getbzje() {
+            AjaxUtil.post({
+                url: AjaxUtil.ctx + 'staReimbursement/getZbjje/' + fysq + '/' + fylb,
+                success: function (data) {
+                    xmzys = data.data.xmzys;
+                    byj = data.data.byj;
+                    zbzje = data.data.zbzje;
+                    kmzys = data.data.kmzys;
+                    byjbzze = data.data.byjbzze;
+                    kmybzje = data.data.kmybzje;
+                }
+            })
+        }
 
         // //下拉框回显
         // function set_select(id, value) {
@@ -176,6 +180,7 @@
 
 
         setTimeout(function() {
+            getbzje()
             // 在这里可以进行您的加载操作
             layer.msg('加载完成！', { icon: 1 });
             var fylbmc = document.getElementById('fylbmc').value;
@@ -543,32 +548,47 @@
 
         // 监听确认按钮
         form.on('submit(saveBtn)', function (data) {
+            getbzje()
             var sqje = parseFloat($("#sqje").val());
             var bzje = parseFloat($("#bzje").val());
             var oldbzje = [[${reimbursement.bzje}]]
-            console.log('xmzys='+xmzys)
-            console.log('zbzje='+zbzje)
-            console.log('kmzys='+kmzys)
-            console.log('kmybzje='+kmybzje)
-            console.log('oldbzje='+oldbzje)
-            console.log('bzje='+bzje)
-            if (kmzys == null  && kmzys ==''){
-                alert('该报账此费用类别没有项目组预算，请在年度预算中修改项目组预算!!')
-                return false;
-            }else if (bzje > kmzys){
-                alert('报账金额大于该科目项目组预算，请查看年度预算中该科目项目组预算后重新填写!!!')
-                return false;
-            }else if (bzje + kmybzje -oldbzje >kmzys){
-                alert('该科目已申请报账加上当前报账金额，已超过该科目项目组预算!!')
-                return false;
-            }
-            // 获取该项目的总报账金额
-            if (xmzys !== null && zbzje !== null) {
-                if (zbzje + bzje - oldbzje > xmzys) {
-                    alert("该项目已申请报账加上当前报账金额,已超过该项目总预算!!")
-                    return false;
-                }
-            }
+           if (sfbyj){
+               //1.判断当前项目是否有备用金
+               if(byj == null || byj == ''){
+                   alert('该项目没有备用金，如需继续报账，请在年度预算中修改该项目备用金!!');
+                   return false;
+               }
+               //2.判断当前报账金额是否大于项目备用金
+               if (bzje>byj){
+                   alert('报账金额已超过年度备用金金额，年度备用金金额为:'+byj+'元');
+                   return false;
+               }
+               //3.判断当前项目备用金已创建的报账金额是否超额
+               if (byjbzze + bzje - oldbzje>byj){
+                   alert('该项目下备用金已申请报账金额加上当前报账金额，已超过年度备用金金额。该项目下备用金已申请报账金额为:'+(byjbzze-oldbzje)+'元,年度备用金金额为:'+byj+'元');
+                   return false;
+               }
+           }else {
+               if (kmzys == null && kmzys == '') {
+                   alert('该报账此费用类别没有项目组预算，请在年度预算中修改项目组预算!!')
+                   return false;
+               }
+               if (bzje > kmzys) {
+                   alert('报账金额大于该费用类别预算，该费用类别预算为:'+kmzys+'元')
+                   return false;
+               }
+               if (bzje + kmybzje - oldbzje > kmzys) {
+                   alert('该费用类别下已申请报账金额加上当前报账金额，已超过该费用类别预算。该费用类别下已申请的报账总金额为:'+(kmybzje-oldbzje)+'元,该费用类别预算为:'+kmzys+'元')
+                   return false;
+               }
+               // 获取该项目的总报账金额
+               if (xmzys !== null && zbzje !== null) {
+                   if (zbzje + bzje - oldbzje > xmzys) {
+                       alert("该项目下已申请报账金额加上当前报账金额,已超过该项目总预算。该项目下已申请的报账总金额为:"+(zbzje-oldbzje)+'元,项目总预算为:'+xmzys+'元')
+                       return false;
+                   }
+               }
+           }
             // if (bzje!==null && bzje > sqje * 1.2) {
             //     alert("报账金额不能超过申请金额的120%！");
             //     return false; // 阻止表单提交

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

@@ -829,7 +829,7 @@
                     {field: 'ysje', title: '预算(万元)', width: '19%'},
                     {field: 'ysqje', title: '已申请(元)', width: '19%'},
                     {field: 'ybzje', title: '已报账(元)',width: '19%'},
-                    {field: 'bzzje',title: '报账中费用(元)',width: '18.5%'}
+                    {field: 'bzzje',title: '报账中费用(元)',width: '18%'}
                 ]
             ]
         });
@@ -842,7 +842,7 @@
                     {field: 'ysje', title: '预算(万元)', width: '19%'},
                     {field: 'ysqje', title: '可申请(元)', width: '19%'},
                     {field: 'ybzje', title: '可报账(元)',width: '19%'},
-                    {field: 'bzzje',title: '',width: '18.5%'}
+                    {field: 'bzzje',title: '',width: '18%'}
                 ]
             ]
         });

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

@@ -413,12 +413,12 @@
                        "ysqje": [[${kmFyInfo.sqje}]],
                        "ybzje": [[${kmFyInfo.bzje}]]
                    },
-                   {
-                       "km": "项目年度经费",
-                       "ysje": [[${xmFyInfo.ysje}]],
-                       "ysqje": [[${kmFyInfo.ysje}]] * 10000 - [[${kmFyInfo.sqje}]],
-                       "ybzje": [[${kmFyInfo.ysje}]] * 10000 - [[${kmFyInfo.bzje}]]
-                   },
+                   // {
+                   //     "km": "项目年度经费",
+                   //     "ysje": [[${xmFyInfo.ysje}]],
+                   //     "ysqje": [[${kmFyInfo.ysje}]] * 10000 - [[${kmFyInfo.sqje}]],
+                   //     "ybzje": [[${kmFyInfo.ysje}]] * 10000 - [[${kmFyInfo.bzje}]]
+                   // },
                    {
                        "km":"项目备用金",
                        "ysje":  [[${kmFyInfo.bzje2}]],
@@ -441,10 +441,10 @@
                    data: dataTj,
                    cols: [
                        [
-                           {field: 'km', title: '科目名称', width: '30%'},
+                           {field: 'km', title: '科目名称', width: '28%'},
                            {field: 'ysje', title: '预算(万元)', width: '24%', align:'right'},
                            {field: 'ysqje', title: '已申请(元)', width: '24%',align:'right'},
-                           {field: 'ybzje', title: '已报账(元)',width: '25%', align:'right'},
+                           {field: 'ybzje', title: '已报账(元)',width: '24%', align:'right'},
                        ]
                    ]
                });
@@ -453,7 +453,7 @@
                    data: dataTj2,
                    cols: [
                        [
-                           {field: 'km', title: '科目名称', width: '30%',align:'left'},
+                           {field: 'km', title: '科目名称', width: '28%',align:'left'},
                            {field: 'ysje', title: '预算(万元)', width: '24%', align:'right'},
                            {field: 'ysqje', title: '可申请(元)', width: '24%', align:'right'},
                            {field: 'ybzje', title: '可报账(元)',width: '24%', align:'right'}