From 848c625aca6cdae7135d7df934bbf570f58dfa20 Mon Sep 17 00:00:00 2001
From: liangkun <liangkun7173@hotmail.com>
Date: Sat, 3 Sep 2022 18:29:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E8=AF=95=20?=
 =?UTF-8?q?=E6=96=B0=E7=94=9F=E9=97=AE=E9=A2=98=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/StuInfoFresh/PayFeeIndex.js                       | 6 ++++++
 .../Learun.Application.Web/Views/UserCenter/Index.cshtml    | 2 +-
 .../Learun.Application.WebApi/XmlConfig/database.config     | 1 +
 .../StuInfoFresh/StuInfoFreshEntity.cs                      | 2 +-
 4 files changed, 9 insertions(+), 2 deletions(-)

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 d2e3bcadf..e668ea2ca 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	
@@ -312,6 +312,12 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
+                    {
+                        label: "开票状态", name: "IsInvoice", width: 80, align: "center",
+                        formatter: function (cellvalue) {
+                            return cellvalue === true ? "<span class=\"label label-success\">已开票</span>" : "<span class=\"label label-danger\">未开票</span>";
+                        }
+                    },
                     { label: '线上缴费时间', name: 'PayFeeDate', width: 130, align: "left" },
                     {
                         label: '办理贷款状态', name: 'StudentLoanBLStatus', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml
index 5e7b5a3eb..76cc01d0b 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml	
@@ -725,7 +725,7 @@
             {
                 <div class="lr-layout-tool-right">
                     <div class="btn-group btn-group-sm">
-                        <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
+                        @*<a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>*@
                     </div>
                 </div>
 
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/database.config b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/database.config
index dcdf1b76c..7662181b6 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/database.config	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/database.config	
@@ -28,4 +28,5 @@
   <add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_西昌;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
   <add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_西昌;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
   <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
+  <add name="YongyouDb" connectionString="Server=.;Password=1;User ID=sa; Initial Catalog=u8gx" providerName="System.Data.SqlClient" />
 </connectionStrings>
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshEntity.cs
index af2d3a7f8..c6eecc1d6 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshEntity.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshEntity.cs	
@@ -627,7 +627,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// 是否开票 
         /// </summary> 
         [Column("ISINVOICE")]
-        public int? IsInvoice { get; set; }
+        public bool? IsInvoice { get; set; }
         /// <summary> 
         /// 人脸核验结果 
         /// </summary>