diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/AllocationClass.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/AllocationClass.js index 6d617f58c..00c20c799 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/AllocationClass.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/AllocationClass.js @@ -186,7 +186,10 @@ var bootstrap = function ($, learun) { }); } }, - { label: "出生年月", name: "Birthday", width: 100, align: "left" }, + { + label: "出生年月", name: "Birthday", width: 100, align: "left" formatter: function (cellvalue) { + return learun.formatDate(cellvalue, 'yyyy-MM-dd'); + }}, { label: "班级", name: "ClassNo", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/AllocationDormitory.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/AllocationDormitory.js index d9a1d7e23..117ba1ae4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/AllocationDormitory.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/AllocationDormitory.js @@ -158,7 +158,10 @@ var bootstrap = function ($, learun) { }); } }, - { label: "出生年月", name: "Birthday", width: 100, align: "left", formatter: function (val) { return val.substring(0, 10); } }, + { + label: "出生年月", name: "Birthday", width: 100, align: "left", formatter: function (cellvalue) { + return learun.formatDate(cellvalue, 'yyyy-MM-dd'); + } }, { label: "班级", name: "ClassNo", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/CheckIn.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/CheckIn.js index 73db79a99..1c8e90918 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/CheckIn.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/CheckIn.js @@ -238,7 +238,10 @@ var bootstrap = function ($, learun) { }); } }, - { label: "出生年月", name: "Birthday", width: 100, align: "left", formatter: function (val) { return val.substring(0, 10); } }, + { + label: "出生年月", name: "Birthday", width: 100, align: "left", formatter: function (cellvalue) { + return learun.formatDate(cellvalue, 'yyyy-MM-dd'); + } }, { label: "身份证", name: "IDCard", width: 100, align: "left" }, { label: "届别", name: "FreshType", width: 100, align: "left", diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetArticles.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetArticles.js index e530de7c9..d19618edc 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetArticles.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetArticles.js @@ -204,7 +204,10 @@ var bootstrap = function ($, learun) { }); } }, - { label: "出生年月", name: "Birthday", width: 100, align: "left", formatter: function (val) { return val.substring(0, 10); } }, + { + label: "出生年月", name: "Birthday", width: 100, align: "left", formatter: function (cellvalue) { + return learun.formatDate(cellvalue, 'yyyy-MM-dd'); + } }, { label: "身份证", name: "IDCard", width: 100, align: "left" }, { label: "政治面貌", name: "Political", width: 100, align: "left", diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetCloth.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetCloth.js index bd99e3027..d33b5cd19 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetCloth.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetCloth.js @@ -204,7 +204,10 @@ var bootstrap = function ($, learun) { }); } }, - { label: "出生年月", name: "Birthday", width: 100, align: "left", formatter: function (val) { return val.substring(0, 10); } }, + { + label: "出生年月", name: "Birthday", width: 100, align: "left", formatter: function (cellvalue) { + return learun.formatDate(cellvalue, 'yyyy-MM-dd'); + } }, { label: "身份证", name: "IDCard", width: 100, align: "left" }, { label: "政治面貌", name: "Political", width: 100, align: "left", diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetClothSize.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetClothSize.js index db6e0315a..98b21575c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetClothSize.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetClothSize.js @@ -200,7 +200,10 @@ var bootstrap = function ($, learun) { }); } }, - { label: "出生年月", name: "Birthday", width: 100, align: "left", formatter: function (val) { return val.substring(0, 10); } }, + { + label: "出生年月", name: "Birthday", width: 100, align: "left", formatter: function (cellvalue) { + return learun.formatDate(cellvalue, 'yyyy-MM-dd'); + }}, { label: "身份证", name: "IDCard", width: 100, align: "left" }, { label: "政治面貌", name: "Political", width: 100, align: "left", diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Index.js index 27efacea1..97fb6a9f7 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Index.js @@ -366,7 +366,10 @@ var bootstrap = function ($, learun) { }); } }, - { label: "出生年月", name: "Birthday", width: 100, align: "left", formatter: function (val) { return val.substring(0, 10); } }, + { + label: "出生年月", name: "Birthday", width: 100, align: "left", formatter: function (cellvalue) { + return learun.formatDate(cellvalue, 'yyyy-MM-dd'); + } }, { label: "身份证", name: "IDCard", width: 100, align: "left" }, { label: "政治面貌", name: "Political", width: 100, align: "left", diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsHelp.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsHelp.js index 05e42e22c..cc589c95f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsHelp.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsHelp.js @@ -268,7 +268,10 @@ var bootstrap = function ($, learun) { }); } }, - { label: "出生年月", name: "Birthday", width: 100, align: "left", formatter: function (val) { return val.substring(0, 10); } }, + { + label: "出生年月", name: "Birthday", width: 100, align: "left", formatter: function (cellvalue) { + return learun.formatDate(cellvalue, 'yyyy-MM-dd'); + } }, { label: "身份证", name: "IDCard", width: 100, align: "left" }, { label: "政治面貌", name: "Political", width: 100, align: "left", diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPay.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPay.js index 9c8738ef0..f6baf63f3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPay.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPay.js @@ -236,7 +236,10 @@ var bootstrap = function ($, learun) { }); } }, - { label: "出生年月", name: "Birthday", width: 100, align: "left", formatter: function (val) { return val.substring(0, 10); } }, + { + label: "出生年月", name: "Birthday", width: 100, align: "left", formatter: function (cellvalue) { + return learun.formatDate(cellvalue, 'yyyy-MM-dd'); + } }, { label: "身份证", name: "IDCard", width: 100, align: "left" }, { label: "政治面貌", name: "Political", width: 100, align: "left", diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPhoto.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPhoto.js index 61242010b..ec96d4f6e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPhoto.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPhoto.js @@ -196,7 +196,10 @@ var bootstrap = function ($, learun) { }); } }, - { label: "出生年月", name: "Birthday", width: 100, align: "left", formatter: function (val) { return val.substring(0, 10); } }, + { + label: "出生年月", name: "Birthday", width: 100, align: "left", formatter: function (cellvalue) { + return learun.formatDate(cellvalue, 'yyyy-MM-dd'); + } }, { label: "身份证", name: "IDCard", width: 100, align: "left" }, { label: "政治面貌", name: "Political", width: 100, align: "left", diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Military.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Military.js index 8ea67ec42..02672d93a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Military.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Military.js @@ -234,7 +234,12 @@ var bootstrap = function ($, learun) { }); } }, - { label: "出生年月", name: "Birthday", width: 100, align: "left", formatter: function (val) { return val.substring(0, 10); } }, + { + label: "出生年月", name: "Birthday", width: 100, align: "left", + formatter: function (cellvalue) { + return learun.formatDate(cellvalue, 'yyyy-MM-dd'); + } + }, { label: "身份证", name: "IDCard", width: 100, align: "left" }, { label: "政治面貌", name: "Political", width: 100, align: "left", diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/NewAllocationBed.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/NewAllocationBed.js index b19d09698..dd9626587 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/NewAllocationBed.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/NewAllocationBed.js @@ -126,7 +126,10 @@ var bootstrap = function ($, learun) { }); } }, - { label: "出生年月", name: "Birthday", width: 100, align: "left", formatter: function (val) { return val.substring(0, 10); } }, + { + label: "出生年月", name: "Birthday", width: 100, align: "left", formatter: function (cellvalue) { + return learun.formatDate(cellvalue, 'yyyy-MM-dd'); + }}, { label: "班级", name: "ClassNo", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/PayAfter.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/PayAfter.js index 0318f04e3..bd571654c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/PayAfter.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/PayAfter.js @@ -322,7 +322,10 @@ var bootstrap = function ($, learun) { }); } }, - { label: "出生年月", name: "Birthday", width: 100, align: "left", formatter: function (val) { return val.substring(0, 10); } }, + { + label: "出生年月", name: "Birthday", width: 100, align: "left", formatter: function (cellvalue) { + return learun.formatDate(cellvalue, 'yyyy-MM-dd'); + } }, { label: "身份证", name: "IDCard", width: 100, align: "left" }, { label: "政治面貌", name: "Political", width: 100, align: "left", diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Report.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Report.js index cc7c1c62f..4c2ac70ae 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Report.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Report.js @@ -309,7 +309,10 @@ var bootstrap = function ($, learun) { }); } }, - { label: "出生年月", name: "Birthday", width: 100, align: "left", formatter: function (val) { return val.substring(0, 10); } }, + { + label: "出生年月", name: "Birthday", width: 100, align: "left", formatter: function (cellvalue) { + return learun.formatDate(cellvalue, 'yyyy-MM-dd'); + } }, { label: "身份证", name: "IDCard", width: 100, align: "left" }, { label: "政治面貌", name: "Political", width: 100, align: "left", diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/StuTuition.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/StuTuition.js index eebc7118c..bdd727516 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/StuTuition.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/StuTuition.js @@ -125,7 +125,7 @@ var bootstrap = function ($, learun) { var data = $('#gridtable').jfGridGet('rowdata'); if (data.length > 0) { var IsManualSubsidize = $('#gridtable').jfGridValue('IsManualSubsidize'); - + if (IsManualSubsidize.indexOf('true') != -1) { learun.alert.warning('选中项目包含多次操作免学费的数据!'); return; @@ -325,7 +325,11 @@ var bootstrap = function ($, learun) { }); } }, - { label: "出生年月", name: "Birthday", width: 100, align: "left", formatter: function (val) { return learun.formatDate(val, 'yyyy-MM-dd') } }, + { + label: "出生年月", name: "Birthday", width: 100, align: "left", formatter: function (cellvalue) { + return learun.formatDate(cellvalue, 'yyyy-MM-dd'); + } + }, { label: "身份证", name: "IDCard", width: 150, align: "left" }, { label: "政治面貌", name: "Political", width: 100, align: "left", @@ -405,7 +409,7 @@ var bootstrap = function ($, learun) { page.search(); }, refreshMoney: function (queryJson) { - learun.httpAsyncGetWithParam(top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetMilitaryStatistics', { queryJson: queryJson,type:2 }, function (res) { + 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);