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(''+_data.text+'');
+ } else {
+ callback(''+_data.text+'');
+ }
+ }
+
}
});
} },