From 745b004b3e1f53bd7396e7715a1d53f9c54041a7 Mon Sep 17 00:00:00 2001
From: liangkun <liangkun7173@hotmail.com>
Date: Fri, 17 Jun 2022 15:32:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=80=BC=E7=8F=AD=E5=AE=89=E6=8E=92=E8=A1=A5?=
 =?UTF-8?q?=E5=85=85=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PersonnelManagement/DutySchedule/DutySchedule.js     | 9 +++++++--
 .../PersonnelManagement/Views/DutySchedule/Index.js      | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

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($('<p class="lr-ellipsis"><span>时间：</span></p>').dataFormatter({
-                value: _item.Date,
+            _$item.append($('<p class="lr-ellipsis"><span>开始时间：</span></p>').dataFormatter({
+                value: _item.StartTime,
+                type: 'datetime',
+                dateformat: 'yyyy-MM-dd'
+            }));
+            _$item.append($('<p class="lr-ellipsis"><span>结束时间：</span></p>').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" },