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

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

@@ -115,7 +115,6 @@ var bootstrap = function ($, learun) {
             var detail = "";
             var ifisnull = false;
             $('.paydetail').each(function (i, item) {
-                $(this).attr('disabled', 'disabled');
                 var value = 0;
                 if (!!$(this).val()) {
                     value = parseFloat($(this).val());
@@ -136,6 +135,9 @@ var bootstrap = function ($, learun) {
                 learun.alert.warning("收费项目金额不能为空！请检查并填写。");
                 return;
             }
+            $('.paydetail').each(function(i, item) {
+                $(this).attr('disabled', 'disabled');
+            });
             detail = detail.substring(0, detail.length - 1);
             var param = {};
             //param.LoanMoney = $('#LoanMoney').val();

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

@@ -91,7 +91,7 @@ var bootstrap = function ($, learun) {
                                 }
                             });
                     } else {
-                        learun.alert.warning("当前学生尚未缴费，请缴费成功后耐心等待！");
+                        learun.alert.warning("当前学生尚未开票，请缴费成功后耐心等待！");
                         return;
                     }
                 }

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

@@ -114,7 +114,6 @@ var bootstrap = function ($, learun) {
             var detail = "";
             var ifisnull = false;
             $('.paydetail').each(function (i, item) {
-                $(this).attr('disabled', 'disabled');
                 var value = 0;
                 if (!!$(this).val()) {
                     value = parseFloat($(this).val());
@@ -135,6 +134,9 @@ var bootstrap = function ($, learun) {
                 learun.alert.warning("收费项目金额不能为空！请检查并填写。");
                 return;
             }
+            $('.paydetail').each(function(i, item) {
+                $(this).attr('disabled', 'disabled');
+            });
             detail = detail.substring(0, detail.length - 1);
             var param = {};
             //param.LoanMoney = $('#LoanMoney').val();

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

@@ -90,7 +90,7 @@ var bootstrap = function ($, learun) {
                                 }
                             });
                     } else {
-                        learun.alert.warning("当前新生尚未缴费，请缴费成功后耐心等待！");
+                        learun.alert.warning("当前学生尚未开票，请缴费成功后耐心等待！");
                         return;
                     }
                 }
@@ -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) {

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>
 

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>

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> 

Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js

@@ -21,10 +21,10 @@ export default {
   //   "http://192.168.2.98:8088/"
   // ],
   "apiHost": [
-     "http://192.168.10.58:8012/"
+     "http://192.168.10.68:8002/"
 	// "http://123.57.209.16:31173/"
   ],
-  "webHost":"http://demo.bjquanjiang.com:8081/",
+  "webHost":"http://192.168.10.68:8001/",
   // 开发环境下自动填充登录账号密码，与接口地址一一对应，只在开发环境下显示
   "devAccount": [
 	  // 20201130230 21364200000400266 老师 420528196310072253 学生 420528200606205026      420528200507261428