From a8e451b588fbaee2c8f464507c24add6918d748d Mon Sep 17 00:00:00 2001
From: liangkun <liangkun7173@hotmail.com>
Date: Wed, 9 Sep 2020 15:39:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=83=E5=8B=A4=E8=AE=B0=E5=BD=95=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Areas/LogisticsManagement/Views/ADR_Record/Index.cshtml | 2 +-
 .../Areas/LogisticsManagement/Views/ADR_Record/Index.js     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

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 @@
                         <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
                     </div>
                     <div class=" btn-group btn-group-sm" learun-authorize="yes">
-                        <a id="lr_add"   class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
+                        <a id="lr_add"   class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;补卡</a>
                         <a id="lr_edit"  class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
                         <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
                     </div>
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,