From eff54993612d815dea922d8249d651efd9383342 Mon Sep 17 00:00:00 2001
From: zhichao lei <442149704@qq.com>
Date: Mon, 7 Sep 2020 18:25:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=A1=E7=8A=B6=E6=80=81=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LogisticsManagement/Views/ADR_Record/Index.js  | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

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 f39527928..1b0798622 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	
@@ -135,15 +135,23 @@ var bootstrap = function ($, learun) {
                                 }
                             });
                         } },
-                    { label: "考勤时间", name: "ADTime", width: 100, align: "left" },
-                    { label: "打卡时间", name: "ClockTime", width: 100, align: "left" },
+                    { 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) {
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,
                                 code: 'ADStatus',
                                 callback: function (_data) {
-                                    callback(_data.text);
+                                    //callback(_data.text);
+                                    if (_data.text) {
+                                        if (_data.text == "正常") {
+                                            callback('<span class=\"label label-success\">'+_data.text+'</span>');
+                                        } else {
+                                            callback('<span class=\"label label-warning\">'+_data.text+'</span>');
+                                        }
+                                    }
+                                    
                                 }
                             });
                         } },