政治面貌修改为字典

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/DropOutIndex.js

@@ -121,12 +121,11 @@ var bootstrap = function ($, learun) {
                     {
                         label: '民族', name: 'Nation', width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality',
+                            learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                keyId: 'nationalityno',
+                                code: 'BCdNationality',
                                 callback: function (_data) {
-                                    callback(_data['nationality']);
+                                    callback(_data.text);
                                 }
                             });
                         }
@@ -134,12 +133,11 @@ var bootstrap = function ($, learun) {
                     {
                         label: '政治面貌', name: 'PoliticsFace', width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace',
+                            learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                keyId: 'partyfaceno',
+                                code: 'BCdPartyFace',
                                 callback: function (_data) {
-                                    callback(_data['partyface']);
+                                    callback(_data.text);
                                 }
                             });
                         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/PaymentIndex.js

@@ -130,12 +130,11 @@ var bootstrap = function ($, learun) {
                     {
                         label: '政治面貌', name: 'PoliticsFace', width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace',
+                            learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                keyId: 'partyfaceno',
+                                code: 'BCdPartyFace',
                                 callback: function (_data) {
-                                    callback(_data['partyface']);
+                                    callback(_data.text);
                                 }
                             });
                         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/RegistrateForm.js

@@ -56,7 +56,7 @@ var bootstrap = function ($, learun) {
             $('#Country').lrselect({
                 value: 'ACODE', text: 'ANAME'
             });
-            $('#PoliticsFace').lrDataSourceSelect({ code: 'BCdPartyFace', value: 'partyfaceno', text: 'partyface' });
+            $("#PoliticsFace").lrDataItemSelect({ code: 'BCdPartyFace' });
             $("#OriginId").lrDataItemSelect({ code: 'ResidenceNo' });
             $("#DataSource").lrDataItemSelect({ code: 'AdmissionsDataSource' });
             $("#ExamineTypeId").lrDataItemSelect({ code: 'ExamineType' });
@@ -148,13 +148,11 @@ var bootstrap = function ($, learun) {
                         label: '政治面貌', name: 'PoliticalId', width: 100, align: 'left'
                         , edit: {
                             type: 'select',
-                            datatype: 'dataSource',
-                            code: 'BCdPartyFace',
-                            op: {
-                                value: 'partyfaceno',
-                                text: 'partyface',
-                                title: 'partyface'
-                            }
+                            init: function (data, $edit) {
+
+                            },
+                            datatype: 'dataItem',
+                            code: 'BCdPartyFace'
                         }
                     },
                     {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/RegistrateIndex.js

@@ -202,12 +202,11 @@ var bootstrap = function ($, learun) {
                     {
                         label: '政治面貌', name: 'PoliticsFace', width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace',
+                            learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                keyId: 'partyfaceno',
+                                code: 'BCdPartyFace',
                                 callback: function (_data) {
-                                    callback(_data['partyface']);
+                                    callback(_data.text);
                                 }
                             });
                         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/ReportIndex.js

@@ -132,12 +132,11 @@ var bootstrap = function ($, learun) {
                     {
                         label: '政治面貌', name: 'PoliticsFace', width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace',
+                            learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                keyId: 'partyfaceno',
+                                code: 'BCdPartyFace',
                                 callback: function (_data) {
-                                    callback(_data['partyface']);
+                                    callback(_data.text);
                                 }
                             });
                         }

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

@@ -122,11 +122,8 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
                     empInfo.NationalityNo = nationality.Rows[0][1].ToString();
                 }
                 //政治面貌
-                var partyFace = dataSourceIBLL.GetDataTable("BCdPartyFace", "t.PartyFaceNo='" + empInfo.PartyFaceNo + "'");
-                if (partyFace != null && partyFace.Rows.Count > 0)
-                {
-                    empInfo.PartyFaceNo = partyFace.Rows[0][1].ToString();
-                }
+                empInfo.PartyFaceNo = dataItemIBLL.GetDetailList("BCdPartyFace").FirstOrDefault(x => x.F_ItemValue == empInfo.PartyFaceNo)?.F_ItemName;
+                
                 //最高学历
                 var highestRecord = dataSourceIBLL.GetDataTable("BCdCultureDegree", "t.CultureDegreeNo='" + empInfo.HighestRecord + "'");
                 if (highestRecord != null && highestRecord.Rows.Count > 0)

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

@@ -14,6 +14,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
     {
         // GET: EducationalAdministration/EmpInfoEnternal
         DataSourceIBLL dataSourceIBLL = new DataSourceBLL();
+        DataItemIBLL dataItemIBLL = new DataItemBLL();
         UserIBLL userIBLL = new UserBLL();
         EmpInfoIBLL empInfoIBLL = new EmpInfoBLL();
         AnnexesFileIBLL annexesFileIBLL = new AnnexesFileBLL();
@@ -53,6 +54,21 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             }
         }
 
+        /// <summary>
+        /// 获取数据字典数据
+        /// </summary>
+        /// <param name="code">数据源编号</param>
+        /// <param name="strWhere">sql查询条件语句</param>
+        /// <param name="queryJson">数据源请求条件字串</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetDataItemMap(string code, string ver)
+        {
+            var data = dataItemIBLL.GetDetailList(code, null);
+
+            return JsonResult(data);
+        }
 
         public ActionResult UploadImg(HttpPostedFileBase Filedata)
         {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js

@@ -91,7 +91,7 @@ var bootstrap = function ($, learun) {
             $('#GenderNo').lrDataItemSelect({ code: 'usersexbit' });
             $('#IsHasLesson').lrDataItemSelect({ code: 'YesOrNoBit' });
             $('#NationalityNo').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' });
-            $('#PartyFaceNo').lrDataSourceSelect({ code: 'BCdPartyFace', value: 'partyfaceno', text: 'partyface' });
+            $('#PartyFaceNo').lrDataItemSelect({ code: 'BCdPartyFace' });
             $('#ProvinceNo').lrDataSourceSelect({
                 code: 'DIC_PROVINCE', value: 'pcode', text: 'pname',
                 select: function (item) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormAdd.cshtml

@@ -185,7 +185,7 @@
             //登录按钮点击
             form.on('submit(*)', function (data) {
 
-               
+
                 $.ajax({
                     url: "/EducationalAdministration/EmpInfo/SaveForm?keyValue=2b7d3b57-6614-4900-affe-9b26bd77bbb4",
                     data: { strEntity: JSON.stringify(data.field) },
@@ -299,13 +299,13 @@
                 },
             });
             $.ajax({
-                url: "/LR_SystemModule/DataSource/GetMap?code=" + "BCdPartyFace",
+                url: "/EducationalAdministration/EmpInfoEnternal/GetDataItemMap?code=" + "BCdPartyFace",
                 async: false,
                 success: function (msg) {
-                    var companys = $.parseJSON(msg).data.data;
+                    var companys = $.parseJSON(msg).data;
                     var str = '<option value="">请选择</option>';
                     $.each(companys, function (i, item) {
-                        str += '<option value="' + item.partyfaceno + '">' + item.partyface + '</option>'
+                        str += '<option value="' + item["F_ItemValue"] + '">' + item["F_ItemName"] + '</option>'
                     })
                     $("#PartyFaceNo").html(str);
                 },

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

@@ -156,15 +156,14 @@
                 },
                 partyFaceNo: function (value) {
                     var result;
-                    top.learun.clientdata.getAsync('custmerData', {
-                        sync: true,
-                        url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace',
+                    top.learun.clientdata.getAsync('dataItem', {
                         key: value,
-                        keyId: 'partyfaceno',
+                        code: 'BCdPartyFace',
                         callback: function (_data) {
-                            result = _data['partyface'];
+                            result = _data.text;
                         }
                     });
+                    
                     return result;
                 },
                 overseasChineseNo: function (value) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormView.js

@@ -36,7 +36,7 @@ var bootstrap = function ($, learun) {
             $('#F_DepartmentId').lrselect();
             $('#GenderNo').lrDataItemSelect({ code: 'usersexbit' });
             $('#NationalityNo').lrDataSourceSelect({ code: 'BCdNationality',value: 'nationalityno',text: 'nationality' });
-            $('#PartyFaceNo').lrDataSourceSelect({ code: 'BCdPartyFace',value: 'partyfaceno',text: 'partyface' });
+            $('#PartyFaceNo').lrDataItemSelect({ code: 'BCdPartyFace' });
             $('#ProvinceNo').lrDataSourceSelect({
                 code: 'DIC_PROVINCE', value: 'pcode', text: 'pname',
                 select: function (item) {

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

@@ -48,7 +48,7 @@ var bootstrap = function ($, learun) {
             });
             $('#RegionNo').lrselect();
             //政治面貌
-            $('#PartyFaceNo').lrDataSourceSelect({ code: 'BCdPartyFace', value: 'partyfaceno', text: 'partyface' });
+            $('#PartyFaceNo').lrDataItemSelect({ code: 'BCdPartyFace', allowSearch: true });
             //最高学历
             $('#HighestRecord').lrDataSourceSelect({ code: 'BCdCultureDegree', value: 'culturedegreeno', text: 'culturedegree' });
 
@@ -449,12 +449,11 @@ var bootstrap = function ($, learun) {
                     {
                         label: "政治面貌", name: "PartyFaceNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace',
+                            learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                keyId: 'partyfaceno',
+                                code: 'BCdPartyFace',
                                 callback: function (_data) {
-                                    callback(_data['partyface']);
+                                    callback(_data.text);
                                 }
                             });
                         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/IndexOfDC.js

@@ -348,12 +348,11 @@ var bootstrap = function ($, learun) {
                     {
                         label: "政治面貌", name: "PartyFaceNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace',
+                            learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                keyId: 'partyfaceno',
+                                code: 'BCdPartyFace',
                                 callback: function (_data) {
-                                    callback(_data['partyface']);
+                                    callback(_data.text);
                                 }
                             });
                         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfoEnternal/FormAdd.cshtml

@@ -326,13 +326,13 @@
                 },
             });
             $.ajax({
-                url: "/EducationalAdministration/EmpInfoEnternal/GetMap?code=" + "BCdPartyFace",
+                url: "/EducationalAdministration/EmpInfoEnternal/GetDataItemMap?code=" + "BCdPartyFace",
                 async: false,
                 success: function (msg) {
-                    var companys = $.parseJSON(msg).data.data;
+                    var msgObject = $.parseJSON(msg);
                     var str = '<option value="">请选择</option>';
-                    $.each(companys, function (i, item) {
-                        str += '<option value="' + item.partyfaceno + '">' + item.partyface + '</option>'
+                    $.each(msgObject.data, function (i, item) {
+                        str += '<option value="' + item["F_ItemValue"] + '">' + item["F_ItemName"] + '</option>'
                     })
                     $("#PartyFaceNo").html(str);
                 },

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SignUpAboutOnline/Form.js

@@ -19,7 +19,7 @@ var bootstrap = function ($, learun) {
             $('#NationalityNo').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' });
             $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
             $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
-            $('#PartyFaceNo').lrDataSourceSelect({ code: 'BCdPartyFace', value: 'partyfaceno', text: 'partyface' });
+            $('#PartyFaceNo').lrDataItemSelect({ code: 'BCdPartyFace' });
             $('#IsAccommodate').lrDataItemSelect({ code: 'YesOrNoInt' });
         },
         initData: function () {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SignUpAboutTrain/Form.js

@@ -16,8 +16,8 @@ var bootstrap = function ($, learun) {
         },
         bind: function () {
             $('#Sex').lrDataItemSelect({ code: 'usersex' });
-            $('#NationalityNo').lrDataSourceSelect({ code: 'BCdNationality',value: 'nationalityno',text: 'nationality' });
-            $('#PartyFaceNo').lrDataSourceSelect({ code: 'BCdPartyFace',value: 'partyfaceno',text: 'partyface' });
+            $('#NationalityNo').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' });
+            $('#PartyFaceNo').lrDataItemSelect({ code: 'BCdPartyFace' });
             $('#CultureDegree').lrDataSourceSelect({ code: 'BCdCultureDegree',value: 'culturedegreeno',text: 'culturedegree' });
             $('#ResidenceNo').lrDataItemSelect({ code: 'ResidenceNo' });
             $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo',value: 'majorno',text: 'majorname' });

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

@@ -99,12 +99,11 @@ var bootstrap = function ($, learun) {
                     {
                         label: "政治面貌", name: "PartyFaceNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace',
+                            learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                keyId: 'partyfaceno',
+                                code: 'BCdPartyFace',
                                 callback: function (_data) {
-                                    callback(_data['partyface']);
+                                    callback(_data.text);
                                 }
                             });
                         }

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

@@ -205,12 +205,11 @@ var bootstrap = function ($, learun) {
                     {
                         label: "政治面貌", name: "Political", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace',
+                            learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                keyId: 'partyfaceno',
+                                code: 'BCdPartyFace',
                                 callback: function (_data) {
-                                    callback(_data['partyface']);
+                                    callback(_data.text);
                                 }
                             });
                         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Form.js

@@ -23,7 +23,8 @@ var bootstrap = function ($, learun) {
             //民族
             $('#Nationals').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' });
             //政治面貌
-            $('#Political').lrDataSourceSelect({ code: 'BCdPartyFace', value: 'partyfaceno', text: 'partyface' });
+            //$('#Political').lrDataSourceSelect({ code: 'BCdPartyFace', value: 'partyfaceno', text: 'partyface' });
+            $('#Political').lrDataItemSelect({ code: 'BCdPartyFace' });
              $('#DeptNo').lrselect({
                 allowSearch: true,
                 value: "deptno",

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/FormView.js

@@ -23,7 +23,7 @@ var bootstrap = function ($, learun) {
             //民族
             $('#Nationals').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' });
             //政治面貌
-            $('#Political').lrDataSourceSelect({ code: 'BCdPartyFace', value: 'partyfaceno', text: 'partyface' });
+            $('#Political').lrDataItemSelect({ code: 'BCdPartyFace' });
             $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
             $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
             $('#FreshType').lrDataItemSelect({ code: 'timeType' });

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetArticles.js

@@ -210,12 +210,11 @@ var bootstrap = function ($, learun) {
                     {
                         label: "政治面貌", name: "Political", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace',
+                            learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                keyId: 'partyfaceno',
+                                code: 'BCdPartyFace',
                                 callback: function (_data) {
-                                    callback(_data['partyface']);
+                                    callback(_data.text);
                                 }
                             });
                         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetCloth.js

@@ -210,12 +210,11 @@ var bootstrap = function ($, learun) {
                     {
                         label: "政治面貌", name: "Political", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace',
+                            learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                keyId: 'partyfaceno',
+                                code: 'BCdPartyFace',
                                 callback: function (_data) {
-                                    callback(_data['partyface']);
+                                    callback(_data.text);
                                 }
                             });
                         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetClothSize.js

@@ -206,12 +206,11 @@ var bootstrap = function ($, learun) {
                     {
                         label: "政治面貌", name: "Political", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace',
+                            learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                keyId: 'partyfaceno',
+                                code: 'BCdPartyFace',
                                 callback: function (_data) {
-                                    callback(_data['partyface']);
+                                    callback(_data.text);
                                 }
                             });
                         }

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

@@ -372,12 +372,11 @@ var bootstrap = function ($, learun) {
                     {
                         label: "政治面貌", name: "Political", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace',
+                            learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                keyId: 'partyfaceno',
+                                code: 'BCdPartyFace',
                                 callback: function (_data) {
-                                    callback(_data['partyface']);
+                                    callback(_data.text);
                                 }
                             });
                         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPay.js

@@ -242,12 +242,11 @@ var bootstrap = function ($, learun) {
                     {
                         label: "政治面貌", name: "Political", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace',
+                            learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                keyId: 'partyfaceno',
+                                code: 'BCdPartyFace',
                                 callback: function (_data) {
-                                    callback(_data['partyface']);
+                                    callback(_data.text);
                                 }
                             });
                         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPhoto.js

@@ -202,12 +202,11 @@ var bootstrap = function ($, learun) {
                     {
                         label: "政治面貌", name: "Political", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace',
+                            learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                keyId: 'partyfaceno',
+                                code: 'BCdPartyFace',
                                 callback: function (_data) {
-                                    callback(_data['partyface']);
+                                    callback(_data.text);
                                 }
                             });
                         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Military.js

@@ -240,12 +240,11 @@ var bootstrap = function ($, learun) {
                     {
                         label: "政治面貌", name: "Political", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace',
+                            learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                keyId: 'partyfaceno',
+                                code: 'BCdPartyFace',
                                 callback: function (_data) {
-                                    callback(_data['partyface']);
+                                    callback(_data.text);
                                 }
                             });
                         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/PayAfter.js

@@ -328,12 +328,11 @@ var bootstrap = function ($, learun) {
                     {
                         label: "政治面貌", name: "Political", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace',
+                            learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                keyId: 'partyfaceno',
+                                code: 'BCdPartyFace',
                                 callback: function (_data) {
-                                    callback(_data['partyface']);
+                                    callback(_data.text);
                                 }
                             });
                         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Report.js

@@ -315,12 +315,11 @@ var bootstrap = function ($, learun) {
                     {
                         label: "政治面貌", name: "Political", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace',
+                            learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                keyId: 'partyfaceno',
+                                code: 'BCdPartyFace',
                                 callback: function (_data) {
-                                    callback(_data['partyface']);
+                                    callback(_data.text);
                                 }
                             });
                         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/StuTuition.js

@@ -0,0 +1,441 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2019-07-17 11:20
+ * 描  述：新生录取管理
+ */
+var refreshGirdData;
+var NowGrade;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            var data_grade = learun.httpGet(top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetYearListByMaxClass',
+                {});
+            NowGrade = data_grade.info;
+
+            page.initGird();
+            page.bind();
+            //page.refreshMoney();
+        },
+        bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+                //page.refreshMoney();
+            }, 380, 400);
+            $("#IsSubsidize1").lrDataItemSelect({ code: "jyYewOrNot" });
+            $('#Grade').lrselect({
+                url: top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetYearListByClass',
+                value: "year",
+                text: "year",
+            });
+            $('#Grade').lrselectSet(NowGrade);
+
+            $('#DeptNo').lrselect({
+                allowSearch: true,
+                value: "deptno",
+                text: "deptname",
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
+                select: function (item) {
+                    if (item) {
+                        $('#MajorNo').lrselectRefresh({
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                            param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" }
+                        });
+                    } else {
+                        $('#MajorNo').lrselectRefresh({
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                            param: { strWhere: "1=1 AND CheckMark=1" }
+                        });
+                    }
+
+                }
+            });
+            $('#MajorNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                value: "majorno",
+                text: "majorname",
+                param: { strWhere: "1=1 AND CheckMark=1" },
+                select: function (item) {
+                    if (item) {
+                        $('#ClassNo').lrselectRefresh({
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1" }
+                        });
+                    } else {
+                        $('#ClassNo').lrselectRefresh({
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: "1=1 AND CheckMark=1" }
+                        });
+                    }
+                }
+            });
+            $('#ClassNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                param: { strWhere: "1=1 AND CheckMark=1" },
+                value: "classno",
+                text: "classname"
+            });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 打印
+            $('#lr_print').on('click', function () {
+                $('#gridtable').jqprintTable();
+            });
+            $('#lr_view').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('StuId');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'form',
+                        title: '查看',
+                        url: top.$.rootUrl + '/EducationalAdministration/StuEnroll/FormView?keyValue=' + keyValue,
+                        width: 800,
+                        height: 600,
+                        btn: null
+                    });
+                }
+            });
+            //上传资料
+            $('#lr_uploadFile').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('StuId');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'form',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/EducationalAdministration/StuEnroll/SubsidizeUrl?keyValue=' + keyValue,
+                        width: 600,
+                        height: 200,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+
+            //确认免学费
+            $("#lr_help").on('click', function () {
+                var data = $('#gridtable').jfGridGet('rowdata');
+                if (data.length > 0) {
+                    var IsManualSubsidize = $('#gridtable').jfGridValue('IsManualSubsidize');
+                   
+                    if (IsManualSubsidize.indexOf('true') != -1) {
+                        learun.alert.warning('选中项目包含多次操作免学费的数据！');
+                        return;
+                    }
+                    learun.layerConfirm('是否确认免学费!',
+                        function (res) {
+                            if (res) {
+                                learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuEnroll/Help',
+                                    { stuId: JSON.stringify(data), status: true },
+                                    function (res) {
+                                        refreshGirdData();
+
+                                    });
+                            }
+
+
+                        });
+
+                }
+
+            });
+
+            //全部免学费
+            $("#lr_allhelp").on('click', function () {
+                learun.layerConfirm('是否全部免学费!',
+                    function (res) {
+                        if (res) {
+
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuEnroll/AllHelp',
+                                {},
+                                function (res) {
+                                    refreshGirdData();
+
+                                });
+                        }
+
+
+                    });
+
+
+            });
+
+
+            //确认不免学费
+            $("#lr_nohelp").on('click', function () {
+                var data = $('#gridtable').jfGridGet('rowdata');
+                if (data.length > 0) {
+                    learun.layerConfirm('是否确认不免学费!',
+                        function (res) {
+                            if (res) {
+                                learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuEnroll/Help',
+                                    { stuId: JSON.stringify(data), status: false },
+                                    function (res) {
+                                        refreshGirdData();
+                                    });
+                            }
+                        });
+                }
+
+            });
+
+            //确认资助
+            $('#lr_support').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('StuId');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认资助？', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuEnroll/Support', { keyValue: keyValue }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+
+
+            //学费变更
+            $("#lr_change").on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('StuId');
+                if (keyValue.indexOf(',') > 0) {
+                    learun.alert.warning("只能选中一条记录变更！");
+                    return;
+                }
+                var isSupportChange = $('#gridtable').jfGridValue('IsSupportChange');
+                //如果已变更，将不能重复变更
+                if (isSupportChange) {
+                    learun.alert.warning("选中记录中已变更，不可重复变更！");
+                    return;
+                } else {
+                    if (learun.checkrow(keyValue)) {
+                        learun.layerForm({
+                            id: 'form',
+                            title: '学费变更',
+                            url: top.$.rootUrl + '/EducationalAdministration/StuEnroll/HelpChange?keyValue=' + keyValue,
+                            width: 600,
+                            height: 400,
+                            callBack: function (id) {
+                                var res = false;
+                                // 验证数据
+                                res = top[id].validForm();
+                                // 保存数据
+                                if (res) {
+                                    res = top[id].save('', function () {
+                                        page.search();
+                                    });
+                                }
+                                return res;
+                            }
+                        });
+                    }
+
+                }
+            });
+
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetPageList',
+                headData: [
+                    { label: "姓名", name: "StuName", width: 100, align: "left" },
+                    {
+                        label: "班级", name: "ClassNo", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
+                                key: value,
+                                keyId: 'classno',
+                                callback: function (_data) {
+                                    callback(_data['classname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "录取方式", name: "Admissions", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'enrollType',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: "学生报名号", name: "RegistrationNo", width: 100, align: "left" },
+                    {
+                        label: "招生类别", name: "EnrollType", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'EnrollStudentType',
+                                callback: function (_data) {
+                                    if (_data.text == "计划外") {
+                                        callback('<span class=\"label label-success\" style=\"background:#DC143C\">计划外</span>')
+                                    } else {
+
+                                        callback(_data.text);
+                                    }
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "免学费", name: "IsSubsidize1", width: 100, align: "left", formatter: function (value, row) {
+                            if (row.IsSubsidize1) {
+                                return '<span class=\"label label-success\">是</span>';
+                            } else if (row.IsSubsidize1 == false) {
+                                return '<span class=\"label label-warning\">否</span>';
+                            } else {
+                                return "未处理";
+                            }
+                        }
+                    },
+                    {
+                        label: "是否上传资料", name: "SubsidizeUrl", width: 100, align: "left", formatter: function (value) {
+                            if (value) {
+                                return '<span class=\"label label-success\">已上传</span>';
+                            } else {
+                                return '<span class=\"label label-warning\">未上传</span>';
+                            }
+                        }
+                    },
+                    {
+                        label: "性别", name: "Gender", width: 100, align: "left", formatter: function (value) {
+                            return value == "1" ? "男" : "女";
+
+                        }
+                    },
+                    {
+                        label: "民族", name: "Nationals", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality',
+                                key: value,
+                                keyId: 'nationalityno',
+                                callback: function (_data) {
+                                    callback(_data['nationality']);
+                                }
+                            });
+                        }
+                    },
+                    { label: "出生年月", name: "Birthday", width: 100, align: "left", formatter: function (val) { return learun.formatDate(val, 'yyyy-MM-dd') } },
+                    { label: "身份证", name: "IDCard", width: 150, align: "left" },
+                    {
+                        label: "政治面貌", name: "Political", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'BCdPartyFace',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "届别", name: "FreshType", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'timeType',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "户别", name: "ResidenceType", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'HouseholdCategory',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "考生类别", name: "StuType", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'stuType',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: "户口地", name: "ResidenceAddress", width: 100, align: "left" },
+                    { label: "非京籍报考类", name: "NonNative", width: 100, align: "left" },
+                    { label: "学籍所在学校", name: "FromSchool", width: 100, align: "left" },
+                    { label: "家庭住址", name: "HomeAddress", width: 100, align: "left" },
+                    { label: "第一监护人", name: "FirstGuardian", width: 100, align: "left" },
+                    { label: "与被监护人关系", name: "FirstRelationship", width: 100, align: "left" },
+                    { label: "工作单位", name: "FirstUnits", width: 100, align: "left" },
+                    { label: "联系电话", name: "FirstMobile", width: 100, align: "left" },
+                    { label: "第二监护人", name: "SecondGuardian", width: 100, align: "left" },
+                    { label: "与被监护人关系", name: "SecondRelationship", width: 100, align: "left" },
+                    { label: "工作单位", name: "SecondUnits", width: 100, align: "left" },
+                    { label: "联系电话", name: "SecondMobile", width: 100, align: "left" },
+                    { label: "接收通知书地址", name: "Acceptance", width: 100, align: "left" },
+                    { label: "收件人", name: "Recipient", width: 100, align: "left" },
+                    { label: "邮政编码", name: "ZipCode", width: 100, align: "left" },
+                    { label: "既往病史", name: "MedicalHistory", width: 100, align: "left" },
+                    { label: "加分照顾对象", name: "AdditionalCare", width: 100, align: "left" },
+                    { label: "录取专业代码", name: "MajorNo", width: 100, align: "left" },
+                    { label: "录取专业名称", name: "MajorName", width: 100, align: "left" },
+
+                    { label: "是否住宿", name: "IsAccommodation", width: 100, align: "left" },
+                    { label: "准考证号", name: "ExamRegistration", width: 100, align: "left" },
+                ],
+                isMultiselect: true,
+                mainId: 'StuId',
+                isPage: true
+            });
+            page.search();
+        },
+        refreshMoney: function (queryJson) {
+            learun.httpAsyncGetWithParam(top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetMilitaryStatistics', { queryJson: queryJson,type:2 }, function (res) {
+                //console.log(res);
+                $("#allAmount").html(res.data.aa);
+                $("#isAmount").html(res.data.bb);
+            });
+            //$.post(
+            //    top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetHelpStatistics',
+            //    {
+            //        DeptNo: deptNo,
+            //        MajorNo: majorNo,
+            //        ClassNo: classNo
+            //    },
+            //    function (res) {
+            //        $("#allAmount").html(res.data.aa);
+            //        $("#isAmount").html(res.data.bb);
+            //    }, "json");
+        },
+        search: function (param) {
+            param = param || {};
+            param.SqlParameter = ' AND IsReport=1';
+
+            if (!param.Grade && param.Grade == undefined) {
+                param.Grade = NowGrade;
+            }
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+            page.refreshMoney(JSON.stringify(param));
+        }
+    };
+    refreshGirdData = function () {
+        page.search();
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.js

@@ -107,7 +107,7 @@ var bootstrap = function ($, learun) {
             $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' });
             $('#NationalityNo').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' });
             $('#GenderNo').lrDataItemSelect({ code: 'usersexbit' });
-            $('#PartyFaceNo').lrDataSourceSelect({ code: 'BCdPartyFace', value: 'partyfaceno', text: 'partyface' });
+            $('#PartyFaceNo').lrDataItemSelect({ code: 'BCdPartyFace' });
             $('#HealthStatusNo').lrDataSourceSelect({ code: 'BCdHealthStatus', value: 'healthstatusno', text: 'healthstatus' });
             $('#Photo').lrUploader();
             $('#FamilyOriginNo').lrDataSourceSelect({ code: 'BCdFamilyOrigin', value: 'familyoriginno', text: 'familyorigin' });

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormOfDC.js

@@ -106,7 +106,7 @@ var bootstrap = function ($, learun) {
             $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' });
             $('#NationalityNo').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' });
             $('#GenderNo').lrDataItemSelect({ code: 'usersexbit' });
-            $('#PartyFaceNo').lrDataSourceSelect({ code: 'BCdPartyFace', value: 'partyfaceno', text: 'partyface' });
+            $('#PartyFaceNo').lrDataItemSelect({ code: 'BCdPartyFace' });
             $('#HealthStatusNo').lrDataSourceSelect({ code: 'BCdHealthStatus', value: 'healthstatusno', text: 'healthstatus' });
             $('#Photo').lrUploader();
             $('#FamilyOriginNo').lrDataSourceSelect({ code: 'BCdFamilyOrigin', value: 'familyoriginno', text: 'familyorigin' });
@@ -187,13 +187,13 @@ var bootstrap = function ($, learun) {
             $('#OneIsGuardian').lrDataItemSelect({ code: 'YesOrNoInt' });
             $('#OneIdCardType').lrDataItemSelect({ code: 'IdCardType' });
             $('#OneNationalityNo').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' });
-            $('#OnePartyFaceNo').lrDataSourceSelect({ code: 'BCdPartyFace', value: 'partyfaceno', text: 'partyface' });
+            $('#OnePartyFaceNo').lrDataItemSelect({ code: 'BCdPartyFace' });
             $('#OneHealthStatus').lrDataSourceSelect({ code: 'BCdHealthStatus', value: 'healthstatusno', text: 'healthstatus' });
             $('#TwoMembership').lrDataItemSelect({ code: 'FamilyRelation' });
             $('#TwoIsGuardian').lrDataItemSelect({ code: 'YesOrNoInt' });
             $('#TwoIdCardType').lrDataItemSelect({ code: 'IdCardType' });
             $('#TwoNationalityNo').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' });
-            $('#TwoPartyFaceNo').lrDataSourceSelect({ code: 'BCdPartyFace', value: 'partyfaceno', text: 'partyface' });
+            $('#TwoPartyFaceNo').lrDataItemSelect({ code: 'BCdPartyFace' });
             $('#TwoHealthStatus').lrDataSourceSelect({ code: 'BCdHealthStatus', value: 'healthstatusno', text: 'healthstatus' });
 
 

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

@@ -179,13 +179,11 @@
                 },
                 partyFaceNo: function (value) {
                     var result;
-                    top.learun.clientdata.getAsync('custmerData', {
-                        sync: true,
-                        url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace',
+                    top.learun.clientdata.getAsync('dataItem', {
                         key: value,
-                        keyId: 'partyfaceno',
+                        code: 'BCdPartyFace',
                         callback: function (_data) {
-                            result = _data['partyface'];
+                            result = _data.text;
                         }
                     });
                     return result;

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormView.js

@@ -65,7 +65,7 @@ var bootstrap = function ($, learun) {
             $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' });
             $('#NationalityNo').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' });
             $('#GenderNo').lrDataItemSelect({ code: 'usersexbit' });
-            $('#PartyFaceNo').lrDataSourceSelect({ code: 'BCdPartyFace', value: 'partyfaceno', text: 'partyface' });
+            $('#PartyFaceNo').lrDataItemSelect({ code: 'BCdPartyFace' });
             $('#HealthStatusNo').lrDataSourceSelect({ code: 'BCdHealthStatus', value: 'healthstatusno', text: 'healthstatus' });
             $('#Photo').lrUploader();
             $('#FamilyOriginNo').lrDataSourceSelect({ code: 'BCdFamilyOrigin', value: 'familyoriginno', text: 'familyorigin' });

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

@@ -262,12 +262,11 @@ var bootstrap = function ($, learun) {
                     {
                         label: "政治面貌", name: "PartyFaceNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace',
+                            learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                keyId: 'partyfaceno',
+                                code: 'BCdPartyFace',
                                 callback: function (_data) {
-                                    callback(_data['partyface']);
+                                    callback(_data.text);
                                 }
                             });
                         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/IndexOfDC.js

@@ -389,12 +389,11 @@ var bootstrap = function ($, learun) {
                     {
                         label: "政治面貌", name: "PartyFaceNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace',
+                            learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                keyId: 'partyfaceno',
+                                code: 'BCdPartyFace',
                                 callback: function (_data) {
-                                    callback(_data['partyface']);
+                                    callback(_data.text);
                                 }
                             });
                         }
@@ -554,12 +553,11 @@ var bootstrap = function ($, learun) {
                     {
                         label: "成员1政治面貌", name: "OnePartyFaceNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace',
+                            learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                keyId: 'partyfaceno',
+                                code: 'BCdPartyFace',
                                 callback: function (_data) {
-                                    callback(_data['partyface']);
+                                    callback(_data.text);
                                 }
                             });
                         }
@@ -632,12 +630,11 @@ var bootstrap = function ($, learun) {
                     {
                         label: "成员2政治面貌", name: "TwoPartyFaceNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace',
+                            learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                keyId: 'partyfaceno',
+                                code: 'BCdPartyFace',
                                 callback: function (_data) {
-                                    callback(_data['partyface']);
+                                    callback(_data.text);
                                 }
                             });
                         }

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

@@ -167,12 +167,11 @@ var bootstrap = function ($, learun) {
                     {
                         label: '政治面貌', name: 'PartyFaceNo', width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace',
+                            learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                keyId: 'partyfaceno',
+                                code: 'BCdPartyFace',
                                 callback: function (_data) {
-                                    callback(_data['partyface']);
+                                    callback(_data.text);
                                 }
                             });
                         }

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

@@ -17,7 +17,7 @@ var bootstrap = function ($, learun) {
         bind: function () {
             $('#DepositBank').lrDataItemSelect({ code: 'DepositBank' }); 
             $("#GenderNo").lrDataItemSelect({ code: 'usersex' });
-            $('#PartyFaceNo').lrDataSourceSelect({ code: 'BCdPartyFace', value: 'partyfaceno', text: 'partyface' });
+            $("#PartyFaceNo").lrDataItemSelect({ code: 'BCdPartyFace' });
             $("#FamilyOriginNo").lrDataItemSelect({ code: 'ExamineeCategory' });
             $('#NationalityNo').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' });
             $("#TestStuSortNo").lrDataItemSelect({ code: 'ExamineeType' });

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

@@ -17,7 +17,7 @@ var bootstrap = function ($, learun) {
         bind: function () {
             $("#GenderNo").lrDataItemSelect({ code: 'usersex' });
             $("#IsAccommodate").lrDataItemSelect({ code: 'YesOrNoInt' });
-            $('#PartyFaceNo').lrDataSourceSelect({ code: 'BCdPartyFace', value: 'partyfaceno', text: 'partyface' });
+            $("#PartyFaceNo").lrDataItemSelect({ code: 'BCdPartyFace' });
             $("#FamilyOriginNo").lrDataItemSelect({ code: 'ExamineeCategory' });
             $('#NationalityNo').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' });
             $("#TestStuSortNo").lrDataItemSelect({ code: 'ExamineeType' });

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

@@ -17,7 +17,7 @@ var bootstrap = function ($, learun) {
         },
         bind: function () {
             $("#GenderNo").lrDataItemSelect({ code: 'usersex' });
-            $('#PartyFaceNo').lrDataSourceSelect({ code: 'BCdPartyFace', value: 'partyfaceno', text: 'partyface' });
+            $("#PartyFaceNo").lrDataItemSelect({ code: 'BCdPartyFace' });
             $("#FamilyOriginNo").lrDataItemSelect({ code: 'ExamineeCategory' });
             $('#NationalityNo').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' });
             $("#TestStuSortNo").lrDataItemSelect({ code: 'ExamineeType' });

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

@@ -16,7 +16,7 @@ var bootstrap = function ($, learun) {
         },
         bind: function () {
             $("#GenderNo").lrDataItemSelect({ code: 'usersex' });
-            $('#PartyFaceNo').lrDataSourceSelect({ code: 'BCdPartyFace', value: 'partyfaceno', text: 'partyface' });
+            $("#PartyFaceNo").lrDataItemSelect({ code: 'BCdPartyFace' });
             $("#FamilyOriginNo").lrDataItemSelect({ code: 'ExamineeCategory' });
             $('#NationalityNo').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' });
             $("#TestStuSortNo").lrDataItemSelect({ code: 'ExamineeType' });

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

@@ -268,12 +268,11 @@ var bootstrap = function ($, learun) {
                     {
                         label: '政治面貌', name: 'PartyFaceNo', width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace',
+                            learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                keyId: 'partyfaceno',
+                                code: 'BCdPartyFace',
                                 callback: function (_data) {
-                                    callback(_data['partyface']);
+                                    callback(_data.text);
                                 }
                             });
                         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Room.cshtml

@@ -277,13 +277,11 @@
                 filter_BCdPartyFace: function (value) {
 
                     var result;
-                    top.learun.clientdata.getAsync('custmerData', {
-                        sync: true,
-                        url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace',
+                    top.learun.clientdata.getAsync('dataItem', {
                         key: value,
-                        keyId: 'partyfaceno',
+                        code: 'BCdPartyFace',
                         callback: function (_data) {
-                            result = _data['partyface'];
+                            result=_data.text;
                         }
                     });
                     return result;

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/OnlineRegistrate/RegistrateForm.cshtml

@@ -242,7 +242,9 @@
                                                 <td class="col-md-3">
                                                     <span id="@item.Id"></span>
                                                     <script>
-                                                    $.ajax({
+
+                                                        GetDataItemStr("BCdPartyFace", "@item.PoliticalId","#@item.Id");
+                                                        @*$.ajax({
                                                         url: "/OnlineRegistrate/GetDataSourceMap?code=BCdPartyFace",
                                                         async: false,
                                                         success: function (msg) {
@@ -258,7 +260,7 @@
                                                                 layer.msg(msgObject.info);
                                                             }
                                                         },
-                                                    });
+                                                    });*@
                                                     </script>
                                                 </td>
                                                 <td class="col-md-3">@item.WorkUnit</td>
@@ -341,7 +343,7 @@
         GetDataItemStr("usersex", "@Model.SexId", "#SexId");
         GetDataSourceStr("BCdNationality", "nationalityno", "nationality", "@Model.Nation", "#Nation");
         GetDataItemStr("FamilyBirth", "@Model.AP_OnlineStudentInfoEntity.FamilyBirthId", "#FamilyBirthId");
-        GetDataSourceStr("BCdPartyFace", "partyfaceno", "partyface", "@Model.PoliticsFace", "#PoliticsFace");
+        GetDataItemStr("BCdPartyFace", "@Model.PoliticsFace", "#PoliticsFace");
         GetDataSourceStr("BCdCultureDegree", "culturedegreeno", "culturedegree", "@Model.AP_OnlineStudentInfoEntity.CultureId", "#CultureId");
         GetDataItemStr("MarriageType", "@Model.AP_OnlineStudentInfoEntity.MarriageId", "#MarriageId");
         GetDataItemStr("ResidenceNo", "@Model.OriginId", "#OriginId");

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/OnlineRegistrate/RegistrateFormEdit.cshtml

@@ -549,17 +549,17 @@
                                                                     <select id="@item.Id" name="PoliticalId" class="col-md-12" style="border: 0; background: transparent; height: 39px; width:165px; line-height:39px;" placeholder=""></select>
                                                                     <script>
                                                                         $.ajax({
-                                                                            url: "/OnlineRegistrate/GetDataSourceMap?code=" + "BCdPartyFace",
+                                                                            url: "/OnlineRegistrate/GetDataItemMap?code=" + "BCdPartyFace",
                                                                             async: false,
                                                                             success: function (msg) {
                                                                                 var msgObject = $.parseJSON(msg);
                                                                                 if (msgObject.code == 200) {
                                                                                     var str = '<option value="">请选择</option>';
                                                                                     $.each(msgObject.data, function (i, item) {
-                                                                                        if (item["partyfaceno"] == @item.PoliticalId) {
-                                                                                            str += '<option value="' + item["partyfaceno"] + '" selected="selected">' + item["partyface"] + '</option>'
+                                                                                        if (item["F_ItemValue"] == @item.PoliticalId) {
+                                                                                            str += '<option value="' + item["F_ItemValue"] + '" selected="selected">' + item["F_ItemName"] + '</option>'
                                                                                         } else {
-                                                                                            str += '<option value="' + item["partyfaceno"] + '">' + item["partyface"] + '</option>'
+                                                                                            str += '<option value="' + item["F_ItemValue"] + '">' + item["F_ItemName"] + '</option>'
                                                                                         }
                                                                                     })
                                                                                     $("#@item.Id").html(str);
@@ -847,7 +847,7 @@
             @*SetDataSourceSelect("DIC_AREA", "acode", "aname", "@Model.Country", "#Country");*@
             SetDataItemSelect("usersex", "@Model.SexId", "#SexId");
             SetDataSourceSelect("BCdCultureDegree", "culturedegreeno", "culturedegree", "@Model.AP_OnlineStudentInfoEntity.CultureId", "#CultureId");
-            SetDataSourceSelect("BCdPartyFace", "partyfaceno", "partyface", "@Model.PoliticsFace", "#PoliticsFace");
+            SetDataItemSelect("BCdPartyFace", "@Model.PoliticsFace", "#PoliticsFace");
             SetDataSourceSelect("BCdNationality", "nationalityno", "nationality", "@Model.Nation", "#Nation");
             SetDataItemSelect("MarriageType", "@Model.AP_OnlineStudentInfoEntity.MarriageId", "#MarriageId");
             SetDataItemSelect("FamilyBirth", "@Model.AP_OnlineStudentInfoEntity.FamilyBirthId", "#FamilyBirthId");
@@ -946,14 +946,14 @@
                 '</tr>';
 
             $.ajax({
-                url: "/OnlineRegistrate/GetDataSourceMap?code=" + "BCdPartyFace",
+                url: "/OnlineRegistrate/GetDataItemMap?code=" + "BCdPartyFace",
                 async: false,
                 success: function (msg) {
                     var msgObject = $.parseJSON(msg);
                     if (msgObject.code == 200) {
                         var str = '<option value="">请选择</option>';
                         $.each(msgObject.data, function (i, item) {
-                            str += '<option value="' + item["partyfaceno"] + '">' + item["partyface"] + '</option>'
+                            str += '<option value="' + item["F_ItemValue"] + '">' + item["F_ItemName"] + '</option>'
                         })
                         $('#tbodyFamily').append(html1 + str + html2);
                         renderForm('select','FamilySelectFilter');

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml

@@ -236,13 +236,11 @@
                                     },
                                     partyFaceNo: function (value) {
                                         var result;
-                                        top.learun.clientdata.getAsync('custmerData', {
-                                            sync: true,
-                                            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace',
+                                        top.learun.clientdata.getAsync('dataItem', {
                                             key: value,
-                                            keyId: 'partyfaceno',
+                                            code: 'BCdPartyFace',
                                             callback: function (_data) {
-                                                result = _data['partyface'];
+                                                result = _data.text;
                                             }
                                         });
                                         return result;
@@ -500,13 +498,11 @@
                                     },
                                     partyFaceNo: function (value) {
                                         var result;
-                                        top.learun.clientdata.getAsync('custmerData', {
-                                            sync: true,
-                                            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace',
+                                        top.learun.clientdata.getAsync('dataItem', {
                                             key: value,
-                                            keyId: 'partyfaceno',
+                                            code: 'BCdPartyFace',
                                             callback: function (_data) {
-                                                result = _data['partyface'];
+                                                result = _data.text;
                                             }
                                         });
                                         return result;

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexForDC.cshtml

@@ -236,13 +236,11 @@
                                     },
                                     partyFaceNo: function (value) {
                                         var result;
-                                        top.learun.clientdata.getAsync('custmerData', {
-                                            sync: true,
-                                            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace',
+                                        top.learun.clientdata.getAsync('dataItem', {
                                             key: value,
-                                            keyId: 'partyfaceno',
+                                            code: 'BCdPartyFace',
                                             callback: function (_data) {
-                                                result = _data['partyface'];
+                                                result = _data.text;
                                             }
                                         });
                                         return result;
@@ -508,13 +506,11 @@
                                     },
                                     partyFaceNo: function (value) {
                                         var result;
-                                        top.learun.clientdata.getAsync('custmerData', {
-                                            sync: true,
-                                            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace',
+                                        top.learun.clientdata.getAsync('dataItem', {
                                             key: value,
-                                            keyId: 'partyfaceno',
+                                            code: 'BCdPartyFace',
                                             callback: function (_data) {
-                                                result = _data['partyface'];
+                                                result = _data.text;
                                             }
                                         });
                                         return result;

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexInTeacher.cshtml

@@ -222,13 +222,11 @@
                                 },
                                 partyFaceNo: function (value) {
                                     var result;
-                                    top.learun.clientdata.getAsync('custmerData', {
-                                        sync: true,
-                                        url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace',
+                                    top.learun.clientdata.getAsync('dataItem', {
                                         key: value,
-                                        keyId: 'partyfaceno',
+                                        code: 'BCdPartyFace',
                                         callback: function (_data) {
-                                            result = _data['partyface'];
+                                            result = _data.text;
                                         }
                                     });
                                     return result;
@@ -549,13 +547,11 @@
                                 },
                                 partyFaceNo: function (value) {
                                     var result;
-                                    top.learun.clientdata.getAsync('custmerData', {
-                                        sync: true,
-                                        url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace',
+                                    top.learun.clientdata.getAsync('dataItem', {
                                         key: value,
-                                        keyId: 'partyfaceno',
+                                        code: 'BCdPartyFace',
                                         callback: function (_data) {
-                                            result = _data['partyface'];
+                                            result =_data.text;
                                         }
                                     });
                                     return result;

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Feixing/UserApiController.cs

@@ -298,16 +298,17 @@ namespace Learun.Application.WebApi.Modules.Feixing
                 }
                 if (req == "Political")
                 {
-                    var data = dataSourceIBLL.GetDataTable("BCdPartyFace", "");
+                    var data = dataItemIBLL.GetDetailList("BCdPartyFace", "");
                     DictDataModel dictDataModel = new DictDataModel();
-                    for (int i = 0; i < data.Rows.Count; i++)
+                    foreach (var t in data)
                     {
                         dictDataModel.Items.Add(new SysDictDetailApiViewModel
                         {
-                            ItemName = data.Rows[i]["partyface"].ToString(),
-                            ItemValue = data.Rows[i]["partyfaceno"].ToString()
+                            ItemName = t.F_ItemName,
+                            ItemValue = t.F_ItemValue
                         });
                     }
+                    
                     return Success("OK", dictDataModel);
                 }
                 if (req == "Nation")

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Excel/Import/ExcelImportBLL.cs

@@ -813,7 +813,7 @@ namespace Learun.Application.Excel
                         empinfoEntity.Birthday = Convert.ToDateTime(dr["出生日期"].ToString());
                         empinfoEntity.NationalityNo = dataSourceIBLL.GetKeyByValue("BCdNationality", "nationality", dr["民族"].ToString(), "nationalityno");
                         empinfoEntity.LocusOfResidence = dr["籍贯"].ToString();
-                        empinfoEntity.PartyFaceNo = dataSourceIBLL.GetKeyByValue("BCdPartyFace", "partyface", dr["政治面貌"].ToString(), "partyfaceno");
+                        empinfoEntity.PartyFaceNo = FindDataItemValue(dataItemIBLL.GetDetailList("BCdPartyFace"), dr["政治面貌"].ToString(), "政治面貌", false); 
                         empinfoEntity.JoinPartyTime = dr["入党（团）时间"].ToString();
                         empinfoEntity.mobile = dr["联系电话"].ToString();
                         empinfoEntity.EMail = dr["电子邮箱"].ToString();