diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WageSchedule/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WageSchedule/Index.js index c4ef2f1e3..7933400fb 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WageSchedule/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WageSchedule/Index.js @@ -168,9 +168,14 @@ var bootstrap = function ($, learun) { $('#gridtable').jfGrid({ url: top.$.rootUrl + '/EducationalAdministration/WageSchedule/GetPageList', headData: [ + { + label: "审核状态", name: "F_EnabledMark", width: 70, align: "center", + formatter: function (cellvalue) { + return cellvalue == "1" ? "已审核" : "未审核"; + } + }, { label: '年', name: 'IssueYear', width: 70, align: "left" }, { label: '月', name: 'IssueMonth', width: 70, align: "left" }, - { label: '序号', name: 'No', width: 70, align: "left" }, { label: '姓名', name: 'EmpName', width: 70, align: "left" }, { label: '身份证号', name: 'WageCardNo', width: 130, align: "left" }, { label: '岗位工资', name: 'PostWage', width: 70, align: "left", statistics: true }, @@ -210,12 +215,7 @@ var bootstrap = function ($, learun) { //{ label: '薪级', name: 'PayGrade', width: 50, align: "left" }, //{ label: '创建用户', name: 'CreateUser', width: 70, align: "left" }, //{ label: '创建时间', name: 'CreateTime', width: 130, align: "left" }, - { - label: "审核状态", name: "F_EnabledMark", width: 70, align: "center", - formatter: function (cellvalue) { - return cellvalue == "1" ? "已审核" : "未审核"; - } - }, + ], mainId: 'Id', isPage: true, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WageSchedule/IndexMy.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WageSchedule/IndexMy.js index 11a7c0ea9..2e73b5983 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WageSchedule/IndexMy.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WageSchedule/IndexMy.js @@ -39,7 +39,6 @@ var bootstrap = function ($, learun) { headData: [ { label: '年', name: 'IssueYear', width: 70, align: "left" }, { label: '月', name: 'IssueMonth', width: 70, align: "left" }, - { label: '序号', name: 'No', width: 70, align: "left" }, { label: '姓名', name: 'EmpName', width: 70, align: "left" }, { label: '身份证号', name: 'WageCardNo', width: 130, align: "left" }, { label: '岗位工资', name: 'PostWage', width: 70, align: "left", statistics: true },