Merge branch '西昌分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 西昌分支

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

@@ -40,25 +40,25 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [HttpGet]
         public ActionResult Index()
         {
-             return View();
+            return View();
         }
 
         [HttpGet]
         public ActionResult PayFeeIndex()
         {
-             return View();
+            return View();
         }
 
         [HttpGet]
         public ActionResult PayFeeIndexForStu()
         {
-             return View("PayFeeIndex");
+            return View("PayFeeIndex");
         }
 
         [HttpGet]
         public ActionResult PayFeeForm()
         {
-             return View();
+            return View();
         }
         /// <summary>
         /// 表单页
@@ -67,19 +67,30 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [HttpGet]
         public ActionResult Form()
         {
-             return View();
+            return View();
         }
 
         [HttpGet]
-        public ActionResult InvoiceForm(string keyValue)
+        public ActionResult InvoiceForm()
         {
-            var info = stuInfoFreshIBLL.GetStuEnrollFeeOrder(keyValue, false);
-            return Success(info);
+            return View();
         }
         #endregion
 
         #region 获取数据
 
+        /// <summary>
+        /// 获取表单数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetInvoiceRecord(string keyValue)
+        {
+            var list = stuInfoFreshIBLL.GetStuEnrollFeeOrder(keyValue, false);
+            return Success(list);
+        }
         /// <summary>
         /// 获取页面显示列表数据
         /// </summary>
@@ -110,8 +121,9 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [AjaxOnly]
         public ActionResult GetFormData(string keyValue)
         {
-            var StuInfoBasic_PayFeeData = stuInfoBasic_PayFeeIBLL.GetStuInfoBasic_PayFeeEntity( keyValue );
-            var jsonData = new {
+            var StuInfoBasic_PayFeeData = stuInfoBasic_PayFeeIBLL.GetStuInfoBasic_PayFeeEntity(keyValue);
+            var jsonData = new
+            {
                 StuInfoBasic_PayFee = StuInfoBasic_PayFeeData,
             };
             return Success(jsonData);
@@ -291,7 +303,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         public ActionResult SaveForm(string strEntity)
         {
             StuInfoBasic_PayFeeEntity entity = strEntity.ToObject<StuInfoBasic_PayFeeEntity>();
-            stuInfoBasic_PayFeeIBLL.SaveEntity("",entity);
+            stuInfoBasic_PayFeeIBLL.SaveEntity("", entity);
             return Success("初始化成功！");
         }
         #endregion

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

@@ -194,10 +194,11 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         }
 
         [HttpGet]
-        public ActionResult InvoiceForm(string keyValue)
+        public ActionResult InvoiceForm()
         {
-            var info = stuInfoFreshIBLL.GetStuEnrollFeeOrder(keyValue,true);
-            return Success(info);
+            //var list = stuInfoFreshIBLL.GetStuEnrollFeeOrder(keyValue,true);
+            //return Success(list);
+            return View();
         }
         /// <summary>
         /// 助学贷款表单页
@@ -309,7 +310,17 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         {
             stuInfoFreshIBLL.SynchronousList();
         }
-
+        /// <summary>
+        /// 获取列表数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetInvoiceRecord(string keyValue)
+        {
+            var list = stuInfoFreshIBLL.GetStuEnrollFeeOrder(keyValue, true);
+            return Success(list);
+        }
         /// <summary>
         /// 获取列表数据
         /// <summary>

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

@@ -7,12 +7,9 @@
         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 class="lr-form-tabs" id="lr_form_tabs">
+    <ul class="nav nav-tabs" id="tabul"></ul>
+</div>
+<div class="tab-content lr-tab-content" id="lr_tab_content">
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuInfoBasic_PayFee/InvoiceForm.js")

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

@@ -5,7 +5,7 @@
  * 描  述：新生缴费管理
  */
 var acceptClick;
-var keyValue = request('keyValue');
+var keyValue = '0003FFA0-23B8-4345-A020-E0DCBD2535EB';// request('keyValue');
 var bootstrap = function ($, learun) {
     "use strict";
     var page = {
@@ -15,7 +15,9 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
-            
+            $('#lr_form_tabs').lrFormTab();
+            $('#lr_form_tabs ul li').eq(0).trigger('click');
+
             //取消缴费
             $('#cancelPayFee').click(function () {
                 learun.layerClose(window.name);
@@ -23,7 +25,24 @@ var bootstrap = function ($, learun) {
         },
         initData: function () {
             if (!!keyValue) {
-                
+                learun.httpAsyncGet(
+                    top.$.rootUrl + '/EducationalAdministration/StuInfoBasic_PayFee/GetInvoiceRecord?keyValue=' + keyValue, function (res) {
+                        if (!!res.data) {
+                            var ulHtml = "";
+                            var contentHtml = "";
+                            for (var i = 0; i < res.data.length; i++) {
+                                ulHtml += '<li><a data-value="tab' + (i + 1) + '">票据' + (i + 1) + '</a></li>';
+                                contentHtml += '<div class="lr-form-wrap tab-pane tabClass" id="tab' + (i + 1) + '" >';
+                                contentHtml += '<iframe width="100%" scrolling="no" height="100%" frameborder="0" src="' + res.data[i].billUrl + '"></iframe>';
+                                contentHtml += '</div>';
+                            }
+                            $('#tabul').html(ulHtml);
+                            $('#lr_tab_content').html(contentHtml);
+                        } else {
+                            learun.alert.warning("当前新生尚未开具发票，请缴费成功后耐心等待！");
+                            return;
+                        }
+                    });
             }
         }
     };

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

@@ -62,21 +62,29 @@ var bootstrap = function ($, learun) {
                 var keyValue = $('#gridtable').jfGridValue('Id');
                 selectedRow = $('#gridtable').jfGridGet('rowdata');
                 if (learun.checkrow(keyValue)) {
-                    console.log(selectedRow.InvoiceStatus);
+                    //console.log(selectedRow.InvoiceStatus);
 
                     if (selectedRow.PayStatus == "1" && selectedRow.InvoiceStatus === true) {
                         //查询发票链接
                         learun.httpAsyncGet(
-                            top.$.rootUrl + '/EducationalAdministration/StuInfoBasic_PayFee/InvoiceForm?keyValue=' + keyValue, function (res) {
-                                if (!!res.data && !!res.data.billUrl) {
+                            top.$.rootUrl + '/EducationalAdministration/StuInfoBasic_PayFee/GetInvoiceRecord?keyValue=' + keyValue, function (res) {
+                                if (!!res.data && res.data.length > 0) {
                                     learun.layerForm({
                                         id: 'form_invoice',
                                         title: '查看发票',
-                                        url: res.data.billUrl,
+                                        url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic_PayFee/InvoiceForm?keyValue=' + keyValue,
                                         width: 1000,
                                         height: 600,
                                         btn: null
                                     });
+                                    //learun.layerForm({
+                                    //    id: 'form_invoice',
+                                    //    title: '查看发票',
+                                    //    url: res.data.billUrl,
+                                    //    width: 1000,
+                                    //    height: 600,
+                                    //    btn: null
+                                    //});
                                 } else {
                                     learun.alert.warning("当前学生尚未开具发票，请缴费成功后耐心等待！");
                                     return;
@@ -166,7 +174,7 @@ var bootstrap = function ($, learun) {
                 ],
                 mainId: 'Id',
                 isPage: true,
-                sidx:'DeptNo'
+                sidx: 'DeptNo'
 
             });
             page.search();

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

@@ -7,12 +7,19 @@
         text-align: center;
     }
 </style>
-<div class="lr-form-wrap" id="form">
+@*<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>*@
+<div class="lr-form-tabs" id="lr_form_tabs">
+    <ul class="nav nav-tabs" id="tabul">
+    </ul>
 </div>
-@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuInfoFresh/InvoiceForm.js")
+<div class="tab-content lr-tab-content" id="lr_tab_content">
+</div>
+
+    @Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuInfoFresh/InvoiceForm.js")

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

@@ -15,7 +15,8 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
-            
+            $('#lr_form_tabs').lrFormTab();
+            $('#lr_form_tabs ul li').eq(0).trigger('click');
             //取消缴费
             $('#cancelPayFee').click(function () {
                 learun.layerClose(window.name);
@@ -23,7 +24,24 @@ var bootstrap = function ($, learun) {
         },
         initData: function () {
             if (!!keyValue) {
-                
+                learun.httpAsyncGet(
+                    top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/GetInvoiceRecord?keyValue=' + keyValue, function (res) {
+                        if (!!res.data) {
+                            var ulHtml = "";
+                            var contentHtml = "";
+                            for (var i = 0; i < res.data.length; i++) {
+                                ulHtml += '<li><a data-value="tab' + (i + 1) + '">票据' + (i + 1) + '</a></li>';
+                                contentHtml += '<div class="lr-form-wrap tab-pane tabClass" id="tab' + (i + 1) + '" >';
+                                contentHtml += '<iframe width="100%" scrolling="no" height="100%" frameborder="0" src="' + res.data[i].billUrl + '"></iframe>';
+                                contentHtml += '</div>';
+                            }
+                            $('#tabul').html(ulHtml);
+                            $('#lr_tab_content').html(contentHtml);
+                        } else {
+                            learun.alert.warning("当前新生尚未开具发票，请缴费成功后耐心等待！");
+                            return;
+                        }
+                    });
             }
         }
     };

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

@@ -66,16 +66,24 @@ var bootstrap = function ($, learun) {
                     if (selectedRow.PayFeeStatus == "1") {
                         //查询发票链接
                         learun.httpAsyncGet(
-                            top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/InvoiceForm?keyValue=' + keyValue, function (res) {
-                                if (!!res.data && !!res.data.billUrl) {
+                            top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/GetInvoiceRecord?keyValue=' + keyValue, function (res) {
+                                if (!!res.data && res.data.length > 0) {
                                     learun.layerForm({
                                         id: 'form_invoice',
                                         title: '查看发票',
-                                        url: res.data.billUrl,
+                                        url: top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/InvoiceForm?keyValue=' + keyValue,
                                         width: 1000,
                                         height: 600,
                                         btn: null
                                     });
+                                    //learun.layerForm({
+                                    //    id: 'form_invoice',
+                                    //    title: '查看发票',
+                                    //    url: res.data.billUrl,
+                                    //    width: 1000,
+                                    //    height: 600,
+                                    //    btn: null
+                                    //});
                                 } else {
                                     learun.alert.warning("当前新生尚未开具发票，请缴费成功后耐心等待！");
                                     return;

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/StuEnrollInvoiceRecordMap.cs

@@ -0,0 +1,22 @@
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using System.Data.Entity.ModelConfiguration;
+
+namespace Learun.Application.Mapping
+{
+    public class StuEnrollInvoiceRecordMap : EntityTypeConfiguration<StuEnrollInvoiceRecordEntity>
+    {
+        public StuEnrollInvoiceRecordMap()
+        {
+            #region  表、主键
+            //表
+            this.ToTable("STUENROLLINVOICERECORD");
+            //主键
+            this.HasKey(t => t.Id);
+            #endregion
+
+            #region  配置关系
+            #endregion
+        }
+    }
+}
+

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj

@@ -67,6 +67,7 @@
     <Compile Include="AssetManagementSystem\Ass_PurchaseItemApplyMap.cs" />
     <Compile Include="AssetManagementSystem\Ass_ScrapItemMap.cs" />
     <Compile Include="AssetManagementSystem\Ass_ScrapMap.cs" />
+    <Compile Include="EducationalAdministration\StuEnrollInvoiceRecordMap.cs" />
     <Compile Include="EducationalAdministration\ArrangeExamTermItemNewMap.cs" />
     <Compile Include="EducationalAdministration\ArrangeExamTermNewMap.cs" />
     <Compile Include="EducationalAdministration\ArrangeLessonSyncMap.cs" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnrollInvoiceRecord/StuEnrollInvoiceRecordEntity.cs

@@ -0,0 +1,44 @@
+using Learun.Util;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 新生缴费单
+    /// </summary>
+    public class StuEnrollInvoiceRecordEntity
+    {
+        #region  实体成员
+        public string Id { get; set; }
+        public int? YearNo { get; set; }
+        public string StuNo { get; set; }
+        public string billNo { get; set; }
+        public string random { get; set; }
+        public bool? billStatus { get; set; }
+        public string billUrl { get; set; }
+
+        #endregion
+
+        #region  扩展操作
+        /// <summary>
+        /// 新增调用
+        /// </summary>
+        public void Create()
+        {
+            this.Id = Guid.NewGuid().ToString();
+        }
+        /// <summary>
+        /// 编辑调用
+        /// </summary>
+        /// <param name="keyValue"></param>
+        public void Modify(string keyValue)
+        {
+            this.Id = keyValue;
+        }
+        #endregion
+        #region  扩展字段
+        #endregion
+    }
+}
+

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

@@ -1013,7 +1013,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
-        public StuEnrollFeeOrderEntity GetStuEnrollFeeOrder(string keyValue, bool IsNewOrOld)
+        public IEnumerable<StuEnrollInvoiceRecordEntity> GetStuEnrollFeeOrder(string keyValue, bool IsNewOrOld)
         {
             try
             {

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

@@ -255,7 +255,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
 
         #endregion
 
-        StuEnrollFeeOrderEntity GetStuEnrollFeeOrder(string keyValue, bool IsNewOrOld);
+        IEnumerable<StuEnrollInvoiceRecordEntity> GetStuEnrollFeeOrder(string keyValue, bool IsNewOrOld);
         void SaveStudentCompare(string identityCardNo, int photoCheckStatus, string identPhoto, string scenePhoto);
     }
 }

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

@@ -2089,7 +2089,13 @@ where bb.StuNo not in (select b.StuNo from StuInfoBasic b where b.StuNo=bb.StuNo
 
         #endregion
 
-        public StuEnrollFeeOrderEntity GetStuEnrollFeeOrder(string keyValue, bool IsNewOrOld)
+        /// <summary>
+        /// 查询学生票据
+        /// </summary>
+        /// <param name="keyValue"></param>
+        /// <param name="IsNewOrOld"></param>
+        /// <returns></returns>
+        public IEnumerable<StuEnrollInvoiceRecordEntity> GetStuEnrollFeeOrder(string keyValue, bool IsNewOrOld)
         {
             try
             {
@@ -2097,7 +2103,7 @@ where bb.StuNo not in (select b.StuNo from StuInfoBasic b where b.StuNo=bb.StuNo
                 {
                     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);
+                    var model = BaseRepository("CollegeMIS").FindList<StuEnrollInvoiceRecordEntity>(a => a.StuNo == stufreshinfo.StuNo && !string.IsNullOrEmpty(a.billUrl) && a.YearNo == year);
                     if (model != null)
                     {
                         return model;
@@ -2110,7 +2116,7 @@ where bb.StuNo not in (select b.StuNo from StuInfoBasic b where b.StuNo=bb.StuNo
                 else
                 {
                     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);
+                    var model = BaseRepository("CollegeMIS").FindList<StuEnrollInvoiceRecordEntity>(a => a.StuNo == StuInfoBasic_PayFee.StuNo && !string.IsNullOrEmpty(a.billUrl) && a.YearNo == StuInfoBasic_PayFee.PayYear);
                     if (model != null)
                     {
                         return model;

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj

@@ -218,6 +218,7 @@
     <Compile Include="EducationalAdministration\StuEnrollAmountRecord\StuEnrollAmountRecordEntity.cs" />
     <Compile Include="EducationalAdministration\StuEnrollAmountRecord\StuEnrollAmountRecordIBLL.cs" />
     <Compile Include="EducationalAdministration\StuEnrollAmountRecord\StuEnrollAmountRecordService.cs" />
+    <Compile Include="EducationalAdministration\StuEnrollInvoiceRecord\StuEnrollInvoiceRecordEntity.cs" />
     <Compile Include="EducationalAdministration\StuEnrollFeeOrderDetail\StuEnrollFeeOrderDetailEntity.cs" />
     <Compile Include="EducationalAdministration\StuEnrollFeeOrder\StuEnrollFeeOrderEntity.cs" />
     <Compile Include="EducationalAdministration\StuEnrollScore\StuEnrollScoreBLL.cs" />