优化

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

@@ -82,7 +82,12 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     { label: "分数", name: "Fraction", width: 100, align: "left" },
-                    { label: "日期", name: "Data", width: 130, align: "left" },
+                    {
+                        label: "日期", name: "Data", width: 130, align: "left",
+                        formatter: function (cellvalue) {
+                            return learun.formatDate(cellvalue, 'yyyy-MM-dd');
+                        }
+                    },
                     { label: "备注", name: "Remark", width: 100, align: "left" },
                 ],
                 mainId: 'ID',

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

@@ -82,7 +82,12 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     { label: "分数", name: "Fraction", width: 100, align: "left" },
-                    { label: "时间", name: "Data", width: 130, align: "left" },
+                    {
+                        label: "时间", name: "Data", width: 130, align: "left",
+                        formatter: function (cellvalue) {
+                            return learun.formatDate(cellvalue, 'yyyy-MM-dd');
+                        }
+                    },
                     { label: "备注", name: "Remark", width: 100, align: "left" },
                 ],
                 mainId: 'ID',

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

@@ -82,7 +82,12 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     { label: "分数", name: "Fraction", width: 100, align: "left" },
-                    { label: "日期", name: "Data", width: 130, align: "left" },
+                    {
+                        label: "日期", name: "Data", width: 130, align: "left",
+                        formatter: function (cellvalue) {
+                            return learun.formatDate(cellvalue, 'yyyy-MM-dd');
+                        }
+                    },
                     { label: "备注", name: "Remark", width: 100, align: "left" },
                 ],
                 mainId: 'ID',

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/ClassIndex.js

@@ -100,7 +100,7 @@ var bootstrap = function ($, learun) {
                     { label: "学年", name: "AcademicYearNo", width: 200, align: "left" },
                     { label: "学期", name: "Semester", width: 200, align: "left" },
                     {
-                        label: "系别", name: "DeptNo", width: 200, align: "left",
+                        label: "系部", name: "DeptNo", width: 200, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/DeptIndex.js

@@ -50,7 +50,7 @@ var bootstrap = function ($, learun) {
                     { label: "学年", name: "AcademicYearNo", width: 400, align: "left" },
                     { label: "学期", name: "Semester", width: 400, align: "left" },
                     {
-                        label: "系别", name: "DeptNo", width: 400, align: "left",
+                        label: "系部", name: "DeptNo", width: 400, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',

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

@@ -51,7 +51,7 @@ var bootstrap = function ($, learun) {
             });
             // 新增
             $('#lr_add').on('click', function () {
-               learun.layerForm({
+                learun.layerForm({
                     id: 'form',
                     title: '新增',
                     url: top.$.rootUrl + '/EducationalAdministration/StuEncourgement/Form',
@@ -82,9 +82,9 @@ var bootstrap = function ($, learun) {
             $('#lr_delete').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('ID');
                 if (learun.checkrow(keyValue)) {
-                   learun.layerConfirm('是否确认删除该项！', function (res) {
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
                         if (res) {
-                            learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/StuEncourgement/DeleteForm', { keyValue: keyValue}, function () {
+                            learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/StuEncourgement/DeleteForm', { keyValue: keyValue }, function () {
                                 refreshGirdData();
                             });
                         }
@@ -97,14 +97,19 @@ var bootstrap = function ($, learun) {
             $('#gridtable').lrAuthorizeJfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/StuEncourgement/GetPageList',
                 headData: [
-                    { label: "学号", name: "StuNo", width: 200, align: "left"},
-                    { label: "姓名", name: "StuName", width: 200, align: "left"},
-                    { label: "奖励名称", name: "EncourgeName", width: 200, align: "left"},
-                    { label: "奖励原因", name: "Reason", width: 200, align: "left"},
-                    { label: "奖励金额", name: "Fee", width: 200, align: "left"},
-                    { label: "奖励日期", name: "EncourgeDate", width: 200, align: "left"},
+                    { label: "学号", name: "StuNo", width: 200, align: "left" },
+                    { label: "姓名", name: "StuName", width: 200, align: "left" },
+                    { label: "奖励名称", name: "EncourgeName", width: 200, align: "left" },
+                    { label: "奖励原因", name: "Reason", width: 200, align: "left" },
+                    { label: "奖励金额", name: "Fee", width: 200, align: "left" },
+                    {
+                        label: "奖励日期", name: "EncourgeDate", width: 200, align: "left",
+                        formatter: function (cellvalue) {
+                            return learun.formatDate(cellvalue, 'yyyy-MM-dd');
+                        }
+                    },
                 ],
-                mainId:'ID',
+                mainId: 'ID',
                 isPage: true
             });
             page.search();
@@ -113,7 +118,7 @@ var bootstrap = function ($, learun) {
             param = param || {};
             param.StartTime = startTime;
             param.EndTime = endTime;
-            $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };
     refreshGirdData = function () {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEncourgement/MajorIndex.js

@@ -55,7 +55,7 @@ var bootstrap = function ($, learun) {
                     { label: "学年", name: "AcademicYearNo", width: 300, align: "left" },
                     { label: "学期", name: "Semester", width: 300, align: "left" },
                     {
-                        label: "系别", name: "DeptNo", width: 300, align: "left",
+                        label: "系部", name: "DeptNo", width: 300, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',

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

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

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/ClassIndex.js

@@ -100,7 +100,7 @@ var bootstrap = function ($, learun) {
                     { label: "学年", name: "AcademicYearNo", width: 200, align: "left" },
                     { label: "学期", name: "Semester", width: 200, align: "left" },
                     {
-                        label: "系别", name: "DeptNo", width: 200, align: "left",
+                        label: "系部", name: "DeptNo", width: 200, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/DeptIndex.js

@@ -50,7 +50,7 @@ var bootstrap = function ($, learun) {
                     { label: "学年", name: "AcademicYearNo", width: 400, align: "left" },
                     { label: "学期", name: "Semester", width: 400, align: "left" },
                     {
-                        label: "系别", name: "DeptNo", width: 400, align: "left",
+                        label: "系部", name: "DeptNo", width: 400, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',

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

@@ -46,7 +46,7 @@ var bootstrap = function ($, learun) {
                 page.search(queryJson);
             }, 200, 400);
             $('#PunishNo').lrDataItemSelect({ code: 'Punishment' });
-            
+
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -150,7 +150,12 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     { label: "处分原因", name: "PunishReason", width: 300, align: "left" },
-                    { label: "处分日期", name: "PunishDate", width: 200, align: "left" },
+                    {
+                        label: "处分日期", name: "PunishDate", width: 200, align: "left",
+                        formatter: function (cellvalue) {
+                            return learun.formatDate(cellvalue, 'yyyy-MM-dd');
+                        }
+                    },
                     { label: "处分文号", name: "FileNo", width: 200, align: "left" },
                     {
                         label: "是否解除处分", name: "IsCancelPunish", width: 100, align: "left", formatter: function (cellvalue) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/MajorIndex.js

@@ -55,7 +55,7 @@ var bootstrap = function ($, learun) {
                     { label: "学年", name: "AcademicYearNo", width: 300, align: "left" },
                     { label: "学期", name: "Semester", width: 300, align: "left" },
                     {
-                        label: "系别", name: "DeptNo", width: 300, align: "left",
+                        label: "系部", name: "DeptNo", width: 300, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',