diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/DutySchedule/DutySchedule.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/DutySchedule/DutySchedule.js index 473e045da..c28e295cb 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/DutySchedule/DutySchedule.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/DutySchedule/DutySchedule.js @@ -74,8 +74,13 @@ }, rowRender: function (_index, _item, _$item, $page) {// 渲染列表行数据 _$item.addClass('lr-list-item lr-list-item-multi'); - _$item.append($('
时间:
').dataFormatter({ - value: _item.Date, + _$item.append($('开始时间:
').dataFormatter({ + value: _item.StartTime, + type: 'datetime', + dateformat: 'yyyy-MM-dd' + })); + _$item.append($('结束时间:
').dataFormatter({ + value: _item.EndTime, type: 'datetime', dateformat: 'yyyy-MM-dd' })); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DutySchedule/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DutySchedule/Index.js index 97590ef35..39b3f0932 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DutySchedule/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DutySchedule/Index.js @@ -62,7 +62,7 @@ var bootstrap = function ($, learun) { }, // 初始化列表 initGird: function () { - $('#gridtable').lrAuthorizeJfGrid({ + $('#gridtable').jfGrid({ url: top.$.rootUrl + '/PersonnelManagement/DutySchedule/GetPageList', headData: [ { label: "值班开始时间", name: "StartTime", width: 200, align: "left" },