新生信息管理

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

@@ -1189,21 +1189,21 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
                 BoyNum = data.Count(y => y.GenderNo == "1"),
                 GirlNum = data.Count(y => y.GenderNo == "0"),
             };
-            var zhounei = data.Where(a => a.ProvinceNo.Contains("5121"));
+            var zhounei = data.Where(a => a.ProvinceNo.Contains("42"));
             var item1 = new
             {
-                ProvinceNo = "州内",
+                ProvinceNo = "省内",
                 TotalNum = zhounei.Count(),
                 RegisterNum = zhounei.Count(y => y.RegisterStatus == "1"),
                 BoyNum = zhounei.Count(y => y.GenderNo == "1"),
                 GirlNum = zhounei.Count(y => y.GenderNo == "0"),
 
             };
-            var zhouwai = data.Where(a => !a.ProvinceNo.Contains("5121"));
+            var zhouwai = data.Where(a => !a.ProvinceNo.Contains("42"));
             var item2 = new
             {
 
-                ProvinceNo = "州外",
+                ProvinceNo = "省外",
                 TotalNum = zhouwai.Count(),
                 RegisterNum = zhouwai.Count(y => y.RegisterStatus == "1"),
                 BoyNum = zhouwai.Count(y => y.GenderNo == "1"),

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

@@ -207,7 +207,7 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: '高考总分', name: 'HighAmountScore', width: 100, align: "left" },
+                    { label: '中考总分', name: 'HighAmountScore', width: 100, align: "left" },
                     { label: '第几志愿', name: 'WillNo', width: 80, align: "left" },
                     {
                         label: '录取专业', name: 'MajorNo', width: 100, align: "left",

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

@@ -165,7 +165,7 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: '高考总分', name: 'HighAmountScore', width: 100, align: "left" },
+                    { label: '中考总分', name: 'HighAmountScore', width: 100, align: "left" },
                     { label: '第几志愿', name: 'WillNo', width: 80, align: "left" },
                     {
                         label: '录取专业', name: 'RecruitMajorNo', width: 100, align: "left",

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

@@ -181,7 +181,7 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: '高考总分', name: 'HighAmountScore', width: 100, align: "left" },
+                    { label: '中考总分', name: 'HighAmountScore', width: 100, align: "left" },
                     { label: '第几志愿', name: 'WillNo', width: 80, align: "left" },
                     {
                         label: '录取专业', name: 'RecruitMajorNo', width: 100, align: "left",

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

@@ -77,7 +77,7 @@
         <div id="HighTestSortNo"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoFresh">
-        <div class="lr-form-item-title">高考总分 <font face="宋体">*</font> </div>
+        <div class="lr-form-item-title">中考总分 <font face="宋体">*</font> </div>
         <input id="HighAmountScore" type="text" class="form-control" isvalid="yes" checkexpession="PositiveFloatintZero" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoFresh">

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

@@ -100,7 +100,7 @@
         <div id="HighTestSortNo" class="disabled" readonly="readonly"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoFresh">
-        <div class="lr-form-item-title">高考总分 <font face="宋体">*</font> </div>
+        <div class="lr-form-item-title">中考总分 <font face="宋体">*</font> </div>
         <input id="HighAmountScore" type="text" class="form-control disabled" isvalid="yes" checkexpession="PositiveFloatintZero" readonly="readonly" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoFresh">

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

@@ -97,7 +97,7 @@
         <div id="HighTestSortNo" readonly="readonly"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoFresh">
-        <div class="lr-form-item-title">高考总分 <font face="宋体">*</font> </div>
+        <div class="lr-form-item-title">中考总分 <font face="宋体">*</font> </div>
         <input id="HighAmountScore" type="text" class="form-control" isvalid="yes" checkexpession="PositiveFloatintZero" readonly="readonly" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoFresh">

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

@@ -301,7 +301,7 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: '高考总分', name: 'HighAmountScore', width: 100, align: "left" },
+                    { label: '中考总分', name: 'HighAmountScore', width: 100, align: "left" },
                     { label: '第几志愿', name: 'WillNo', width: 80, align: "left" },
                     {
                         label: '录取专业', name: 'RecruitMajorNo', width: 100, align: "left",

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

@@ -290,7 +290,7 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: '高考总分', name: 'HighAmountScore', width: 100, align: "left" },
+                    { label: '中考总分', name: 'HighAmountScore', width: 100, align: "left" },
                     { label: '第几志愿', name: 'WillNo', width: 80, align: "left" },
                     {
                         label: '录取专业', name: 'RecruitMajorNo', width: 100, align: "left",

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

@@ -141,7 +141,7 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: '高考总分', name: 'HighAmountScore', width: 100, align: "left" },
+                    { label: '中考总分', name: 'HighAmountScore', width: 100, align: "left" },
                     { label: '第几志愿', name: 'WillNo', width: 80, align: "left" },
                     {
                         label: '录取专业', name: 'MajorNo', width: 100, align: "left",

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

@@ -345,7 +345,7 @@ var bootstrap = function ($, learun) {
                     //        });
                     //    }
                     //},
-                    //{ label: '高考总分', name: 'HighAmountScore', width: 100, align: "left" },
+                    //{ label: '中考总分', name: 'HighAmountScore', width: 100, align: "left" },
                     //{ label: '第几志愿', name: 'WillNo', width: 80, align: "left" },
                     //{
                     //    label: '录取专业', name: 'RecruitMajorNo', width: 100, align: "left",

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

@@ -228,7 +228,7 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: '高考总分', name: 'HighAmountScore', width: 100, align: "left" },
+                    { label: '中考总分', name: 'HighAmountScore', width: 100, align: "left" },
                     { label: '第几志愿', name: 'WillNo', width: 80, align: "left" },
                     {
                         label: '录取专业', name: 'RecruitMajorNo', width: 100, align: "left",

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

@@ -43,13 +43,13 @@ var bootstrap = function ($, learun) {
                             if (value == "总计") {
                                 callback("总计");
                             }
-                            if (value == "州内") {
-                                callback("州内");
+                            if (value == "省内") {
+                                callback("省内");
                             }
-                            if (value == "州外") {
-                                callback("州外");
+                            if (value == "省外") {
+                                callback("省外");
                             }
-                            if (value != "州内" && value != "州外" && value != "总计") {
+                            if (value != "省内" && value != "省外" && value != "总计") {
 
                                 learun.clientdata.getAsync('custmerData',
                                     {

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

@@ -227,7 +227,7 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: '高考总分', name: 'HighAmountScore', width: 100, align: "left" },
+                    { label: '中考总分', name: 'HighAmountScore', width: 100, align: "left" },
                     { label: '第几志愿', name: 'WillNo', width: 80, align: "left" },
                     {
                         label: '录取专业', name: 'RecruitMajorNo', width: 100, align: "left",