From 44a84ed90e5b824de133f0ae44b120b4cd36bd07 Mon Sep 17 00:00:00 2001
From: liangkun <liangkun7173@hotmail.com>
Date: Tue, 8 Nov 2022 16:03:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BC=B4=E8=B4=B9=E8=B4=B9?=
 =?UTF-8?q?=E7=94=A8=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/StuInfoBasic_PayFee/PayFeeForm.js   | 22 +++++++++++++------
 .../Views/StuInfoFresh/PayFeeForm.js          | 11 +++++++---
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_PayFee/PayFeeForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_PayFee/PayFeeForm.js
index e5bae24d6..98692b5a9 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_PayFee/PayFeeForm.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_PayFee/PayFeeForm.js	
@@ -19,6 +19,9 @@ var bootstrap = function ($, learun) {
         bind: function () {
             //获取缴费二维码
             $('#confirmPayFee').click(function () {
+                if (parseFloat($('#PayMoney').html()) === 0) {
+                    return learun.alert.warning("所交费用不能为0！");
+                }
                 if (parseFloat($('#PayMoney').html()) > PayFeeTotal) {
                     return learun.alert.warning("所交费用超出应交费用！");
                 }
@@ -43,14 +46,14 @@ var bootstrap = function ($, learun) {
             $('#queryPayFee').click(function () {
                 location.reload();
             });
-
+             
             //计算实交金额
             $('table').on('change',
                 '.paydetail',
                 function () {
                     var num = 0;
                     num = parseFloat(num);
-                    $(".paydetail").each(function (i, item) {
+                    $(".paydetail").each(function (i, item) { 
                         var val = 0;
                         if (!!$(this).val()) {
                             val = parseFloat($(this).val()).toFixed(2);
@@ -99,10 +102,14 @@ var bootstrap = function ($, learun) {
                     html += "<tr><td class=\"tableLeft\">姓名</td> <td>" + StuInfoFresh.StuName + "</td></tr>";
                     html += "<tr><td class=\"tableLeft\">班级</td><td>" + className + "</td></tr>";
                     html += "<tr><td class=\"tableLeft\">系别</td><td>" + deptName + "</td></tr>";
+
                     html += '<tr style="border-top: 10px solid blue;"><td class=\"tableLeft\">缴费项目</td><td class=\"tableLeft\">收费标准</td><td class=\"tableLeft\">本次实缴</td></tr>';
                     $.each(data['FinaChargesStandardList'], function (i, item) {
-                        html += '<tr><td class=\"tableLeft\">' + item.ChargeItemName + '</td><td>' + item.Standard + '元</td><td><input id="' + item.ChargeItemCode + '"  data-amount="' + item.Standard + '" data-name="' + item.ChargeItemName + '" type="number" class="form-control paydetail" value="' + item.SJAmount+'" /></td></tr>';
+                        html += '<tr><td class=\"tableLeft\">' + item.ChargeItemName + '</td><td>' + item.Standard + '元</td><td>' +
+                            '<input  id="' + item.ChargeItemCode + '"   onkeyup="if(this.value > ' + item.Standard + '){this.value=' + item.Standard + '}"  onafterpaste="if(this.value > ' + item.Standard + '){this.value=' + item.Standard +'}" ' +
+                            ' max="' + item.Standard + '"  min="0"   data-amount="' + item.Standard + '" data-name="' + item.ChargeItemName + '" type="number" class="form-control paydetail" value="' + item.SJAmount + '" /></td></tr>';
                     });
+
                     html += '<tr><td class=\"tableLeft\">应缴合计</td><td>' + data['PayFeeTotal'] + '元</td><td><span id="PayMoney">' + PayFeeTotal+'</span></td></tr>';
                     html += '<tr><td class=\"tableLeft\">&nbsp;</td><td colspan="2">&nbsp;</td></tr>';
                     html += '<tr><td class=\"tableLeft\">已缴金额</td><td colspan="2">' + YJAmount + '</td></tr>';
@@ -114,10 +121,10 @@ var bootstrap = function ($, learun) {
             var list = [];
             var detail = "";
             var ifisnull = false;
-            $('.paydetail').each(function (i, item) {
+            $('.paydetail').each(function (i, item) { 
                 var value = 0;
                 if (!!$(this).val()) {
-                    value = parseFloat($(this).val());
+                    value = parseFloat($(this).val()); 
                 } else {
                     ifisnull = true;
                 }
@@ -128,7 +135,7 @@ var bootstrap = function ($, learun) {
                     ChargeItemID: $(this).attr('id'),
                     YJAmount: $(this).attr('data-amount'),
                     SJAmount: value
-                };
+                }; 
                 list.push(entity);
             });
             if (ifisnull) {
@@ -138,7 +145,8 @@ var bootstrap = function ($, learun) {
             $('.paydetail').each(function(i, item) {
                 $(this).attr('disabled', 'disabled');
             });
-            detail = detail.substring(0, detail.length - 1);
+            detail = detail.substring(0, detail.length - 1); 
+
             var param = {};
             //param.LoanMoney = $('#LoanMoney').val();
             param.PayFeeDetail = detail;
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeForm.js
index 520e7021a..5d3678d6e 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeForm.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeForm.js	
@@ -19,6 +19,9 @@ var bootstrap = function ($, learun) {
         bind: function () {
             //获取缴费二维码
             $('#confirmPayFee').click(function () {
+                if (parseFloat($('#PayMoney').html()) === 0) {
+                    return learun.alert.warning("所交费用不能为0！");
+                }
                 if (parseFloat($('#PayMoney').html()) > PayFeeTotal) {
                     return learun.alert.warning("所交费用超出应交费用！");
                 }
@@ -42,8 +45,8 @@ var bootstrap = function ($, learun) {
             });
             $('#queryPayFee').click(function () {
                 location.reload();
-            });
-
+            }); 
+         
             //计算实交金额
             $('table').on('change',
                 '.paydetail',
@@ -100,7 +103,9 @@ var bootstrap = function ($, learun) {
                     html += "<tr><td class=\"tableLeft\">系别</td><td>" + deptName + "</td></tr>";
                     html += '<tr style="border-top: 10px solid blue;"><td class=\"tableLeft\">缴费项目</td><td class=\"tableLeft\">收费标准</td><td class=\"tableLeft\">本次实缴</td></tr>';
                     $.each(data['FinaChargesStandardList'], function (i, item) {
-                        html += '<tr><td class=\"tableLeft\">' + item.ChargeItemName + '</td><td>' + item.Standard + '元</td><td><input id="' + item.ChargeItemCode + '"  data-amount="' + item.Standard + '" data-name="' + item.ChargeItemName + '" type="number" class="form-control paydetail" value="' + item.SJAmount + '" /></td></tr>';
+                        html += '<tr><td class=\"tableLeft\">' + item.ChargeItemName + '</td><td>' + item.Standard + '元</td><td>' +
+                            '<input  id="' + item.ChargeItemCode + '"   onkeyup="if(this.value > ' + item.Standard + '){this.value=' + item.Standard + '}"  onafterpaste="if(this.value > ' + item.Standard + '){this.value=' + item.Standard + '}" ' +
+                            ' max="' + item.Standard + '"  min="0"   data-amount="' + item.Standard + '" data-name="' + item.ChargeItemName + '" type="number" class="form-control paydetail" value="' + item.SJAmount + '" /></td></tr>';
                     });
                     html += '<tr><td class=\"tableLeft\">应缴合计</td><td>' + data['PayFeeTotal'] + '元</td><td><span id="PayMoney">' + PayFeeTotal+'</span></td></tr>';
                     html += '<tr><td class=\"tableLeft\">&nbsp;</td><td colspan="2">&nbsp;</td></tr>';