我的考勤班次重构

checkwork/src/main/resources/template/js/checkWorkTime/loginUserCheckWorkTime.js

@@ -11,17 +11,21 @@ layui.config({
 
     // 获取当前登陆人的考勤班次
     checkWorkUtil.getCurrentUserCheckWorkTimeList(function (json) {
+        $.each(json.rows, function (i, item) {
+            item.typeName = skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("checkWorkTimeType", 'id', item.type, 'name');
+        });
+
         $("#showBox").html(getDataUseHandlebars($("#showTemplate").html(), json));
         $.each(json.rows, function (i, item) {
             var type = item.type;
             if(type == 1){
-                checkWorkUtil.resetSingleBreak(item.timeId);
+                checkWorkUtil.resetSingleBreak(item.id);
             } else if (type == 2){
-                checkWorkUtil.resetWeekend(item.timeId);
+                checkWorkUtil.resetWeekend(item.id);
             } else if (type == 3){
-                checkWorkUtil.resetSingleAndDoubleBreak(item.timeId);
+                checkWorkUtil.resetSingleAndDoubleBreak(item.id);
             } else if (type == 4){
-                checkWorkUtil.resetCustomizeDay(item.days, item.timeId);
+                checkWorkUtil.resetCustomizeDay(item.checkWorkTimeWeekList, item.id);
             }
         });
     });

checkwork/src/main/resources/template/tpl/checkWorkTime/loginUserCheckWorkTime.html

@@ -24,13 +24,13 @@
             <div class="layui-col-sm6 layui-col-md4">
                 <div class="layui-card">
                     <div class="layui-card-header">
-                        {{title}}
+                        {{name}}
                         <span class="layui-badge layui-bg-blue header-right-top">{{typeName}}</span>
                     </div>
                     <div class="layui-card-body layuiadmin-card-list">
                         <p>工作时间段：{{startTime}} ~ {{endTime}}</p>
                         <p>作息时间段：{{restStartTime}} ~ {{restEndTime}}</p>
-                        <p id="{{timeId}}">工作日：
+                        <p id="{{id}}">工作日：
                             <span class="layui-badge layui-bg-blue weekDay" value="1">一</span>
                             <span class="layui-badge layui-bg-blue weekDay" value="2">二</span>
                             <span class="layui-badge layui-bg-blue weekDay" value="3">三</span>

web/src/main/resources/template/assets/lib/layui/customer/sysCustomerUtil.js

@@ -112,9 +112,9 @@ var checkWorkUtil = {
             return;
         }
         $.each(days, function (i, item) {
-            var _this = $("span[value='" + item.day + "']");
+            var _this = $("span[value='" + item.weekNumber + "']");
             if (!isNull(id)) {
-                _this = $("#" + id).find("span[value='" + item.day + "']");
+                _this = $("#" + id).find("span[value='" + item.weekNumber + "']");
             }
             var clas = getArrIndexOfPointStr(checkWorkUtil.checkWorkTimeColor, _this.attr("class"));
             _this.removeClass(clas);