老生缴费

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoBasic_PayFeeController.cs

@@ -63,6 +63,13 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         {
              return View();
         }
+
+        [HttpGet]
+        public ActionResult InvoiceForm(string keyValue)
+        {
+            var info = stuInfoFreshIBLL.GetStuEnrollFeeOrder(keyValue, false);
+            return Success(info);
+        }
         #endregion
 
         #region 获取数据

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs

@@ -190,7 +190,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [HttpGet]
         public ActionResult InvoiceForm(string keyValue)
         {
-            var info = stuInfoFreshIBLL.GetStuEnrollFeeOrder(keyValue);
+            var info = stuInfoFreshIBLL.GetStuEnrollFeeOrder(keyValue,true);
             return Success(info);
         }
         /// <summary>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_PayFee/InvoiceForm.cshtml

@@ -0,0 +1,18 @@
+@{
+    ViewBag.Title = "新生缴费管理";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<style>
+    #btnBox {
+        text-align: center;
+    }
+</style>
+<div class="lr-form-wrap" id="form">
+    <iframe src="" width="100%" frameborder="0">
+
+    </iframe>
+    <div id="btnBox">
+        <div id="cancelPayFee" class="btn btn-default">取消</div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuInfoBasic_PayFee/InvoiceForm.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_PayFee/InvoiceForm.js

@@ -0,0 +1,33 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2019-08-08 17:21
+ * 描  述：新生缴费管理
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            
+            //取消缴费
+            $('#cancelPayFee').click(function () {
+                learun.layerClose(window.name);
+            });
+        },
+        initData: function () {
+            if (!!keyValue) {
+                
+            }
+        }
+    };
+
+
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_PayFee/PayFeeIndex.js

@@ -59,10 +59,12 @@ var bootstrap = function ($, learun) {
             });
             //查看发票
             $('#lr_viewinvoice').on('click', function () {
-                var keyValue = $('#gridtable').jfGridValue('StuId');
+                var keyValue = $('#gridtable').jfGridValue('Id');
                 selectedRow = $('#gridtable').jfGridGet('rowdata');
                 if (learun.checkrow(keyValue)) {
-                    if (selectedRow.PayFeeStatus == "1") {
+                    console.log(selectedRow.InvoiceStatus);
+
+                    if (selectedRow.PayStatus == "1" && selectedRow.InvoiceStatus === true) {
                         //查询发票链接
                         learun.httpAsyncGet(
                             top.$.rootUrl + '/EducationalAdministration/StuInfoBasic_PayFee/InvoiceForm?keyValue=' + keyValue, function (res) {
@@ -76,12 +78,12 @@ var bootstrap = function ($, learun) {
                                         btn: null
                                     });
                                 } else {
-                                    learun.alert.warning("当前新生尚未开具发票，请缴费成功后耐心等待！");
+                                    learun.alert.warning("当前学生尚未开具发票，请缴费成功后耐心等待！");
                                     return;
                                 }
                             });
                     } else {
-                        learun.alert.warning("当前新生尚未缴费，请缴费成功后耐心等待！");
+                        learun.alert.warning("当前学生尚未缴费，请缴费成功后耐心等待！");
                         return;
                     }
                 }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/InvoiceForm.cshtml

@@ -8,7 +8,7 @@
     }
 </style>
 <div class="lr-form-wrap" id="form">
-    <iframe src="http://192.168.53.135:5000/colleges-proxy/industryMain.do?method=displayH5&ciphertext=974221333dcef7ab255aff8db3ff317ae6296433fdf3025dcd6749ce97da76bf416307484f9e04961459e34839ea8e83f88a4fdd0c9679e7987fae94150bda44e297c1f5526ee56634f38759dac9e13a49442ce6c0e32aee2b6812e47e72a2ad5becfd00ae5d890f8d1dcbfd77996b97ee557ccce082cf5f60fb5a709ff1807265d45b9b0d0b2cf4a5e0b9b4313d715e93bc6862b1dba1f6fcef4485aa134c9df9ec6518d6489c8ed37730c46d906c597a036119b2f998f986eed5c7deffd0f603761f70c95c41072a53135812f6262631964de0033a5f56472770cdd60834cec8d97215e358763a28195cb0840ac355bc6ae4e1d9ad2ca03222cb28914725d8dca0855b4935e44109a4edf9790e7cef2c2914eb4c6762f50c7795d827ee4e5833806bc1ad70ba71ad9d9817d6c85029" width="100%" frameborder="0">
+    <iframe src="" width="100%" frameborder="0">
 
     </iframe>
     <div id="btnBox">

Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj

@@ -1097,6 +1097,7 @@
     <Content Include="Areas\EducationalAdministration\Views\StuInfoBasic\IndexOfDC.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoBasic\IndexInClass.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoBasic\MyClass.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuInfoBasic_PayFee\InvoiceForm.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoBasic_PayFee\PayFeeForm.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoBasic_PayFee\PayFeeIndex.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoBasic\Print.css" />
@@ -7898,6 +7899,7 @@
     <Content Include="Areas\EducationalAdministration\Views\StuInfoFresh\InvoiceForm.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoBasic_PayFee\PayFeeIndex.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoBasic_PayFee\PayFeeForm.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuInfoBasic_PayFee\InvoiceForm.cshtml" />
     <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshBLL.cs

@@ -1013,11 +1013,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
-        public StuEnrollFeeOrderEntity GetStuEnrollFeeOrder(string keyValue)
+        public StuEnrollFeeOrderEntity GetStuEnrollFeeOrder(string keyValue, bool IsNewOrOld)
         {
             try
             {
-                return stuInfoFreshService.GetStuEnrollFeeOrder(keyValue);
+                return stuInfoFreshService.GetStuEnrollFeeOrder(keyValue, IsNewOrOld);
             }
             catch (Exception ex)
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshIBLL.cs

@@ -255,6 +255,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
 
         #endregion
 
-        StuEnrollFeeOrderEntity GetStuEnrollFeeOrder(string keyValue);
+        StuEnrollFeeOrderEntity GetStuEnrollFeeOrder(string keyValue, bool IsNewOrOld);
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs

@@ -2089,21 +2089,38 @@ where bb.StuNo not in (select b.StuNo from StuInfoBasic b where b.StuNo=bb.StuNo
 
         #endregion
 
-        public StuEnrollFeeOrderEntity GetStuEnrollFeeOrder(string keyValue)
+        public StuEnrollFeeOrderEntity GetStuEnrollFeeOrder(string keyValue,bool IsNewOrOld)
         {
             try
             {
-                int dateyear = DateTime.Now.Year;
-                var stufreshinfo = BaseRepository("CollegeMIS").FindEntity<StuInfoFreshEntity>(m=>m.ID==keyValue);
-                var model = BaseRepository("CollegeMIS").FindEntity<StuEnrollFeeOrderEntity>(a => a.StuNo == stufreshinfo.StuNo&&a.Status==1&&a.billStatus==true&&!string.IsNullOrEmpty(a.billUrl)&&a.YearNo== dateyear);
-                if (model != null)
+                if (IsNewOrOld)
                 {
-                    return model;
+                    var stufreshinfo = BaseRepository("CollegeMIS").FindEntity<StuInfoFreshEntity>(m => m.ID == keyValue);
+                    int year =Convert.ToInt32("20" + stufreshinfo.Grade.ToString());
+                    var model = BaseRepository("CollegeMIS").FindEntity<StuEnrollFeeOrderEntity>(a => a.StuNo == stufreshinfo.StuNo && a.Status == 1 && a.billStatus == true && !string.IsNullOrEmpty(a.billUrl) && a.YearNo == year);
+                    if (model != null)
+                    {
+                        return model;
+                    }
+                    else
+                    {
+                        return null;
+                    }
                 }
                 else
                 {
-                    return null;
+                    var StuInfoBasic_PayFee =BaseRepository("CollegeMIS").FindEntity<StuInfoBasic_PayFeeEntity>(m => m.Id == keyValue);
+                    var model = BaseRepository("CollegeMIS").FindEntity<StuEnrollFeeOrderEntity>(a => a.StuNo == StuInfoBasic_PayFee.StuNo && a.Status == 1 && a.billStatus == true && !string.IsNullOrEmpty(a.billUrl) && a.YearNo == StuInfoBasic_PayFee.PayYear);
+                    if (model != null)
+                    {
+                        return model;
+                    }
+                    else
+                    {
+                        return null;
+                    }
                 }
+               
             }
             catch (Exception ex)
             {