diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Index.cshtml index 119b0ef15..4adafbfb4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Index.cshtml @@ -30,7 +30,7 @@
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Index.js index 2efc5f652..406cee7cd 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Index.js @@ -99,7 +99,7 @@ var bootstrap = function ($, learun) { url: top.$.rootUrl + '/LogisticsManagement/ADR_Record/GetPageList', headData: [ { - label: "员工名字", name: "UserNo", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { + label: "姓名", name: "UserNo", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { learun.clientdata.getAsync('custmerData', { url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser', key: value, @@ -110,7 +110,7 @@ var bootstrap = function ($, learun) { }); } }, - { label: "员工编号", name: "UserNo", width: 100, align: "left" }, + { label: "职工编号", name: "UserNo", width: 100, align: "left" }, { label: "部门", name: "Department", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { @@ -136,7 +136,6 @@ var bootstrap = function ($, learun) { }); } }, - { label: "考勤时间", name: "ADTime", width: 150, align: "left" }, { label: "打卡时间", name: "ClockTime", width: 150, align: "left" }, { label: "打卡结果", name: "ClockStatus", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { @@ -158,6 +157,7 @@ var bootstrap = function ($, learun) { } }, { label: "打卡地点", name: "ClockPlace", width: 100, align: "left" }, + { label: "考勤数据上传时间", name: "ADTime", width: 150, align: "left" } ], mainId: 'ID', isPage: true,