From 83f83bd7636a116fbe1329114084c54d496699f0 Mon Sep 17 00:00:00 2001
From: liangkun <liangkun7173@hotmail.com>
Date: Mon, 18 Jul 2022 18:21:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E8=AF=95=E5=BC=80=E5=8F=91=E8=A5=BF?=
 =?UTF-8?q?=E6=98=8C=E7=BC=B4=E8=B4=B9=E4=B8=8E=E5=8F=91=E7=A5=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/StuInfoFresh/PayFeeForm.js          | 13 ++++++++++-
 .../Views/StuInfoFresh/PayFeeIndex.js         | 22 +++++++++++++++++++
 .../Views/FinaChargeItem/ShowIndex.cshtml     | 22 ++++++++++++++-----
 .../css/receiveSendFeeManagement/charge.css   |  3 +++
 .../FinaChargeItem/FinaChargeItemEntity.cs    |  4 ++++
 .../FinaChargeItem/FinaChargeItemService.cs   | 13 +----------
 .../FinaChargesStandardEntity.cs              |  2 ++
 .../FinaChargesStandardService.cs             |  2 +-
 8 files changed, 62 insertions(+), 19 deletions(-)

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 d91fc46b2..3c1d87fcb 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	
@@ -62,6 +62,10 @@ var bootstrap = function ($, learun) {
         initData: function () {
             if (!!keyValue) {
                 $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/GetPayFeeDetail?keyValue=' + keyValue, function (data) {
+                    if (data['FinaChargesStandardList'].length == 0) {
+                        learun.alert.warning("检测到还未维护该专业收费标准！请先维护该专业收费标准。");
+                        return;
+                    }
                     var StuInfoFresh = data['StuInfoFreshData'];
                     var className = "";
                     learun.clientdata.getAsync('custmerData', {
@@ -89,7 +93,7 @@ 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.ChargeItemID + '"  data-amount="' + item.Standard + '" data-name="' + item.ChargeItemName + '" type="number" class="form-control paydetail" /></td></tr>';
+                        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" /></td></tr>';
                     });
                     html += '<tr><td class=\"tableLeft\">合计</td><td>' + data['PayFeeTotal'] + '元</td><td><span id="PayMoney"></span></td></tr>';
                     html += '<tr><td class=\"tableLeft\">贷款金额</td><td colspan="2"><input id="LoanMoney" type="number" class="form-control" value="' + StuInfoFresh.LoanMoney + '" /></td></tr>';
@@ -101,10 +105,13 @@ var bootstrap = function ($, learun) {
         getQRCode: function () {
             var list = [];
             var detail = "";
+            var ifisnull = false;
             $('.paydetail').each(function (i, item) {
                 var value = 0;
                 if (!!$(this).val()) {
                     value = parseFloat($(this).val());
+                } else {
+                    ifisnull = true;
                 }
                 detail += $(this).attr('id') + "!" + value + '&';
                 var entity = {
@@ -116,6 +123,10 @@ var bootstrap = function ($, learun) {
                 };
                 list.push(entity);
             });
+            if (ifisnull) {
+                learun.alert.warning("收费项目金额不能为空！请检查并填写。");
+                return;
+            }
             detail = detail.substring(0, detail.length - 1);
             var param = {};
             param.LoanMoney = $('#LoanMoney').val();
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js
index 2521c8593..56a27c546 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js	
@@ -58,6 +58,28 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
+            //查看发票
+            $('#lr_viewinvoice').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                selectedRow = $('#gridtable').jfGridGet('rowdata');
+                if (learun.checkrow(keyValue)) {
+                    if (selectedRow.billStatus === true) {
+                        learun.layerForm({
+                            id: 'form_payCode',
+                            title: '二维码缴费',
+                            url: top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/PayFeeForm?keyValue=' + keyValue,
+                            width: 800,
+                            height: 600,
+                            btn: null
+                        });
+                       
+                    } else {
+                        learun.alert.warning("当前新生尚未开具发票，请缴费成功后耐心等待！");
+                        return;
+                    }
+                   
+                }
+            });
             // 缴费
             $('#lr_payFee').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('ID');
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeItem/ShowIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeItem/ShowIndex.cshtml
index ef2397310..ddf9438ff 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeItem/ShowIndex.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeItem/ShowIndex.cshtml	
@@ -104,6 +104,7 @@
                             <div class="chargeSec1Box">
                                 <input type="hidden" name="ChargeItemID" value="@item.ChargeItemID" />
                                 <input type="hidden" name="KeyWordMark" value="@item.KeyWordMark" />
+                                <input type="hidden" name="ChargeItemCode" value="@item.ChargeItemCode" />
                                 <input type="hidden" name="priority" value="@item.priority" />
                                 <div class="chargeSec1Btn">
                                     <img src="~/Content/images/receiveSendFeeManagement/charge1-3.png" alt="" />
@@ -140,13 +141,14 @@
                             '<div class="chargeSec1Col5">' +
                             '<div class="chargeSec1Box">' +
                             '<input type="hidden" name="ChargeItemID" value="' + item.ChargeItemID + '" />' +
-                            '<input type="hidden" name="KeyWordMark" value="' + item.KeyWordMark + '" />' +
+                        '<input type="hidden" name="KeyWordMark" value="' + item.KeyWordMark + '" />' +
+                        '<input type="hidden" name="ChargeItemCode" value="' + item.ChargeItemCode + '" />' +
                             '<input type="hidden" name="priority" value="' + item.priority + '" />' +
                             '<div class="chargeSec1Btn">' +
                             '<img src="/Content/images/receiveSendFeeManagement/charge1-3.png" alt="" />' +
                             '<img src="/Content/images/receiveSendFeeManagement/charge1-2.png" alt="" />' +
                             '</div>' +
-                            '<div class="chargeSec1T">' + item.ChargeItemName + '</div>' +
+                        '<div class="chargeSec1T">' + item.ChargeItemName + '</div>' +
                             '<div class="chargeSec1Con">' +
                             '<div class="chargeSec1Txt">' + item.Remark + '</div>' +
                             '<div class="chargeSec1Time">' + createdate + '</div>' +
@@ -163,7 +165,7 @@
             });
         });
         //弹框内容
-        function layerHtml(headInfo, ChargeItemID, ChargeItemName, Remark, noClass, yesClass, priority) {
+        function layerHtml(headInfo, ChargeItemID, ChargeItemName, ChargeItemCode, Remark, noClass, yesClass, priority) {
             var html = '<form id="formBox">' +
                 '<div class="layerChage layerChage2">' +
                 '<div class="layerChageT">' + headInfo + '</div>' +
@@ -174,6 +176,10 @@
                 '<input type="text" name="ChargeItemName" value="' + ChargeItemName + '" />' +
                 '</div>' +
                 '<div class="chargeInput">' +
+                '<span>收费项目编码</span>' +
+                '<input type="text" name="ChargeItemCode" value="' + ChargeItemCode + '" />' +
+                '</div>' +
+                '<div class="chargeInput">' +
                 '<span>备注</span>' +
                 '<textarea name="Remark" cols="30" rows="10">' + Remark + '</textarea>' +
                 '</div>' +
@@ -204,7 +210,7 @@
             var noClass = 'checked="checked"';
             var yesClass = '';
 
-            var html = layerHtml("添加收费项目", "", "", "", noClass, yesClass, "0");
+            var html = layerHtml("添加收费项目", "", "", "","", noClass, yesClass, "0");
 
             layer.open({
                 type: 1,
@@ -220,6 +226,7 @@
             var KeyWordMark = chargeSec1Btn.siblings('input[name="KeyWordMark"]').val();
             var priority = chargeSec1Btn.siblings('input[name="priority"]').val();
             var ChargeItemName = chargeSec1Btn.siblings('.chargeSec1T').html();
+            var ChargeItemCode = chargeSec1Btn.siblings('input[name="ChargeItemCode"]').val();
             var Remark = chargeSec1Btn.siblings('.chargeSec1Con').find('.chargeSec1Txt').html();
 
             if (ChargeItemID == null || ChargeItemID == "") {
@@ -242,7 +249,7 @@
                     yesClass = 'checked="checked"';
                 }
 
-                var html = layerHtml("编辑收费项目", ChargeItemID, ChargeItemName, Remark, noClass, yesClass, priority);
+                var html = layerHtml("编辑收费项目", ChargeItemID, ChargeItemName, ChargeItemCode, Remark, noClass, yesClass, priority);
 
                 layer.open({
                     type: 1,
@@ -272,6 +279,7 @@
 
             var formObject = new Object();
             formObject.ChargeItemName = formSelector.find('input[name="ChargeItemName"]').val();
+            formObject.ChargeItemCode = formSelector.find('input[name="ChargeItemCode"]').val();
             formObject.Remark = formSelector.find('[name="Remark"]').val();
             formObject.KeyWordMark = formSelector.find('input[name="KeyWordMark"]:checked').val();
             formObject.priority = formSelector.find('input[name="priority"]').val();
@@ -280,6 +288,10 @@
                 layer.msg("收费项目名称不能为空！", function () { });
                 return;
             }
+            if (formObject.ChargeItemCode.trim() == null || formObject.ChargeItemCode.trim() == "") {
+                layer.msg("收费项目编码不能为空！", function () { });
+                return;
+            }
             if (formObject.priority.trim() == null || formObject.priority.trim() == "") {
                 layer.msg("优先级不能为空！", function () { });
                 return;
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/css/receiveSendFeeManagement/charge.css b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/css/receiveSendFeeManagement/charge.css
index 2ca5ed889..a0878f98b 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/css/receiveSendFeeManagement/charge.css	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/css/receiveSendFeeManagement/charge.css	
@@ -85,6 +85,9 @@
 .chargeSec1Row2 .chargeSec1T {
     border-bottom: 1px solid #47E1E4;
 }
+.chargeSec1Row2 .chargeSec1TC {
+    border-bottom: 1px solid #47E1E4;
+}
 
 .chargeSec1Row3 .chargeSec1T {
     border-bottom: 1px solid #FCB938;
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeItem/FinaChargeItemEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeItem/FinaChargeItemEntity.cs
index 2d8af7a49..6c90ebb23 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeItem/FinaChargeItemEntity.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeItem/FinaChargeItemEntity.cs	
@@ -59,6 +59,10 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
         /// </summary>
         [Column("CREATEUSERNAME")]
         public string CreateUserName { get; set; }
+
+        [Column("CHARGEITEMCODE")]
+        public string ChargeItemCode { get; set; }
+
         #endregion
 
         #region  扩展操作
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeItem/FinaChargeItemService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeItem/FinaChargeItemService.cs
index adc716133..fcb9ea4e6 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeItem/FinaChargeItemService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeItem/FinaChargeItemService.cs	
@@ -29,18 +29,7 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
             try
             {
                 var strSql = new StringBuilder();
-                strSql.Append("SELECT ");
-                strSql.Append(@"
-                t.ChargeItemID,
-                t.ChargeItemName,
-                t.Remark,
-                t.CurrentMark,
-                t.KeyWordMark,
-                t.priority,
-                t.CreateDate,
-                t.CreateUserId,
-                t.CreateUserName
-                ");
+                strSql.Append("SELECT * ");
                 strSql.Append("  FROM FinaChargeItem t ");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargesStandard/FinaChargesStandardEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargesStandard/FinaChargesStandardEntity.cs
index c803d8b01..bcdbc290b 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargesStandard/FinaChargesStandardEntity.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargesStandard/FinaChargesStandardEntity.cs	
@@ -93,6 +93,8 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
         /// </summary>
         [NotMapped]
         public string ChargeItemName { get; set; }
+        [NotMapped]
+        public string ChargeItemCode { get; set; }
         //专业名称
         [NotMapped]
         public string MajorName { get; set; }
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargesStandard/FinaChargesStandardService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargesStandard/FinaChargesStandardService.cs
index fc515bad8..93804a4fd 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargesStandard/FinaChargesStandardService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargesStandard/FinaChargesStandardService.cs	
@@ -200,7 +200,7 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
             try
             {
                 var strSql = new StringBuilder();
-                strSql.Append("select i.ChargeItemID,REPLACE(i.ChargeItemName,'','') as ChargeItemName,t.ChargeStandardID,t.Standard as Standard");
+                strSql.Append("select i.ChargeItemID,i.ChargeItemCode,REPLACE(i.ChargeItemName,'','') as ChargeItemName,t.ChargeStandardID,t.Standard as Standard");
                 strSql.Append(" from [dbo].[FinaChargesStandard] t inner join [dbo].[FinaChargeItem] i on t.ChargeItemID=i.ChargeItemID ");
                 strSql.Append(" and t.AcademicYearNo='" + academicYearNo + "' and t.Semester='" + semester + "' and t.Grade='" + grade + "' and t.MajorNo='" + majorNo + "' ");
                 return this.BaseRepository("CollegeMIS").FindList<FinaChargesStandardEntity>(strSql.ToString());