考勤统计fix

o2web/source/x_component_Attendance/$MyDetail/listItem.json

@@ -5,7 +5,7 @@
     "contentStyles" : "normalTdNode",
     "item" : "function( d ){ return d.empName.split('@')[0] }",
     "name" : "empName",
-    "width" : "15%"
+    "width" : "9%"
   },
   {
     "title" : "日期",
@@ -14,7 +14,7 @@
     "defaultSort" : "desc",
     "item" : "recordDateString",
     "name" : "recordDateString",
-    "width" : "15%"
+    "width" : "9%"
   },
 
   {
@@ -23,7 +23,7 @@
     "contentStyles" : "normalTdNode",
     "item" : "function( data ){ if(data.isHoliday){return '节假日'}else if(data.isWeekend){return '周末'}else if(data.isWorkday){return '调休工作日'}else{return '工作日'}  }",
     "name" : "description",
-    "width" : "15%"
+    "width" : "9%"
   },
 
   {
@@ -32,7 +32,23 @@
     "contentStyles" : "normalTdNode",
     "item" : "onDutyTime",
     "name" : "onDutyTime",
-    "width" : "10%"
+    "width" : "9%"
+  },
+  {
+    "title" : "午休开始时间",
+    "headStyles" : "normalThNode",
+    "contentStyles" : "normalTdNode",
+    "item" : "morningOffDutyTime",
+    "name" : "morningOffDutyTime",
+    "width" : "9%"
+  },
+  {
+    "title" : "午休结束时间",
+    "headStyles" : "normalThNode",
+    "contentStyles" : "normalTdNode",
+    "item" : "afternoonOnDutyTime",
+    "name" : "afternoonOnDutyTime",
+    "width" : "9%"
   },
   {
     "title" : "下班打卡时间",
@@ -40,7 +56,7 @@
     "contentStyles" : "normalTdNode",
     "item" : "offDutyTime",
     "name" : "offDutyTime",
-    "width" : "10%"
+    "width" : "9%"
   },
   {
     "title": "考勤状态",
@@ -48,7 +64,7 @@
     "contentStyles": "normalTdNode",
     "item": "function( d ){  var status=''; if(d.isGetSelfHolidays){ status = '请假或外出报备' }else if(d.isLate){ status = '迟到' }else if(d.isLeaveEarlier){ status = '早退' }else if(d.isAbsent){ status = '缺勤' }else if(d.isAbnormalDuty){ status = '异常打卡' }else if(d.isLackOfTime){ status = '工时不足' }else{ status = '正常' }; return status; }",
     "name" : "status",
-    "width" : "10%"
+    "width" : "9%"
   } ,
   {
     "title": "申诉状态",
@@ -56,7 +72,7 @@
     "contentStyles": "normalTdNode",
     "item": "function( d ){  if(d.appealStatus==1){ return '申诉中' }else if(d.appealStatus==-1){ return '申诉未通过' }else if(d.appealStatus==9){ return '申诉通过' }else{ return '' } }",
     "name" : "appealStatus",
-    "width" : "10%"
+    "width" : "9%"
   },
   {
     "title": "申诉审核人",
@@ -64,7 +80,7 @@
     "contentStyles": "normalTdNode",
     "item": "function( d ){  return d.appealProcessor ? d.appealProcessor.split('@')[0] : '' }",
     "name" : "appealStatus",
-    "width" : "10%"
+    "width" : "9%"
   },
   {
     "title" : "申诉",
@@ -72,7 +88,7 @@
     "contentStyles" : "normalTdNode",
     "item" : "actions",
     "name" : "actions",
-    "width" : "10%",
+    "width" : "9%",
     "sub" : [{
       "title" : "发起申诉",
       "action" : "appeal",

o2web/source/x_component_Attendance/$PeopleDetail/listItem.json

@@ -5,7 +5,7 @@
     "contentStyles" : "normalTdNode",
     "item" : "function( d ){ return d.empName.split('@')[0] }",
     "name" : "empName",
-    "width" : "15%"
+    "width" : "11%"
   },
   {
     "title" : "日期",
@@ -14,7 +14,7 @@
     "defaultSort" : "desc",
     "item" : "recordDateString",
     "name" : "recordDateString",
-    "width" : "15%"
+    "width" : "11%"
   },
 
   {
@@ -23,7 +23,7 @@
     "contentStyles" : "normalTdNode",
     "item" : "function( data ){ if(data.isHoliday){return '节假日'}else if(data.isWeekend){return '周末'}else if(data.isWorkday){return '调休工作日'}else{return '工作日'}  }",
     "name" : "description",
-    "width" : "15%"
+    "width" : "11%"
   },
 
   {
@@ -32,7 +32,23 @@
     "contentStyles" : "normalTdNode",
     "item" : "onDutyTime",
     "name" : "onDutyTime",
-    "width" : "15%"
+    "width" : "11%"
+  },
+  {
+    "title" : "午休开始时间",
+    "headStyles" : "normalThNode",
+    "contentStyles" : "normalTdNode",
+    "item" : "morningOffDutyTime",
+    "name" : "morningOffDutyTime",
+    "width" : "11%"
+  },
+  {
+    "title" : "午休结束时间",
+    "headStyles" : "normalThNode",
+    "contentStyles" : "normalTdNode",
+    "item" : "afternoonOnDutyTime",
+    "name" : "afternoonOnDutyTime",
+    "width" : "11%"
   },
   {
     "title" : "下班打卡时间",
@@ -40,7 +56,7 @@
     "contentStyles" : "normalTdNode",
     "item" : "offDutyTime",
     "name" : "offDutyTime",
-    "width" : "15%"
+    "width" : "11%"
   },
   {
     "title": "考勤状态",
@@ -48,7 +64,7 @@
     "contentStyles": "normalTdNode",
     "item": "function( d ){  var status=''; if(d.isGetSelfHolidays){ status = '请假或外出报备' }else if(d.isLate){ status = '迟到' }else if(d.isLeaveEarlier){ status = '早退' }else if(d.isAbsent){ status = '缺勤' }else if(d.isAbnormalDuty){ status = '异常打卡' }else if(d.isLackOfTime){ status = '工时不足' }else{ status = '正常' }; return status; }",
     "name" : "status",
-    "width" : "10%"
+    "width" : "11%"
   },
   {
     "title": "申诉状态",
@@ -56,7 +72,7 @@
     "contentStyles": "normalTdNode",
     "item": "function( d ){  if(d.appealStatus==1){ return '申诉中' }else if(d.appealStatus==-1){ return '申诉未通过' }else if(d.appealStatus==9){ return '申诉通过' }else{ return '' } }",
     "name" : "appealStatus",
-    "width" : "10%"
+    "width" : "11%"
   }
 //  {
 //    "access" : "admin",

o2web/source/x_component_Attendance/$TopUnitDetail/listItem.json

@@ -5,7 +5,7 @@
     "contentStyles" : "normalTdNode",
     "item" : "function( d ){ return d.empName.split('@')[0] }",
     "name" : "empName",
-    "width" : "15%"
+    "width" : "11%"
   },
   {
     "title" : "日期",
@@ -14,7 +14,7 @@
     "defaultSort" : "desc",
     "item" : "recordDateString",
     "name" : "recordDateString",
-    "width" : "15%"
+    "width" : "11%"
   },
 
   {
@@ -23,7 +23,7 @@
     "contentStyles" : "normalTdNode",
     "item" : "function( data ){ if(data.isHoliday){return '节假日'}else if(data.isWeekend){return '周末'}else if(data.isWorkday){return '调休工作日'}else{return '工作日'}  }",
     "name" : "description",
-    "width" : "15%"
+    "width" : "11%"
   },
 
   {
@@ -32,7 +32,23 @@
     "contentStyles" : "normalTdNode",
     "item" : "onDutyTime",
     "name" : "onDutyTime",
-    "width" : "15%"
+    "width" : "11%"
+  },
+  {
+    "title" : "午休开始时间",
+    "headStyles" : "normalThNode",
+    "contentStyles" : "normalTdNode",
+    "item" : "morningOffDutyTime",
+    "name" : "morningOffDutyTime",
+    "width" : "11%"
+  },
+  {
+    "title" : "午休结束时间",
+    "headStyles" : "normalThNode",
+    "contentStyles" : "normalTdNode",
+    "item" : "afternoonOnDutyTime",
+    "name" : "afternoonOnDutyTime",
+    "width" : "11%"
   },
   {
     "title" : "下班打卡时间",
@@ -40,7 +56,7 @@
     "contentStyles" : "normalTdNode",
     "item" : "offDutyTime",
     "name" : "offDutyTime",
-    "width" : "15%"
+    "width" : "11%"
   },
   {
     "title": "考勤状态",
@@ -48,7 +64,7 @@
     "contentStyles": "normalTdNode",
     "item": "function( d ){  var status=''; if(d.isGetSelfHolidays){ status = '请假或外出报备' }else if(d.isLate){ status = '迟到' }else if(d.isLeaveEarlier){ status = '早退' }else if(d.isAbsent){ status = '缺勤' }else if(d.isAbnormalDuty){ status = '异常打卡' }else if(d.isLackOfTime){ status = '工时不足' }else{ status = '正常' }; return status; }",
     "name" : "status",
-    "width" : "10%"
+    "width" : "11%"
   },
   {
     "title": "申诉状态",
@@ -56,7 +72,7 @@
     "contentStyles": "normalTdNode",
     "item": "function( d ){  if(d.appealStatus==1){ return '申诉中' }else if(d.appealStatus==-1){ return '申诉未通过' }else if(d.appealStatus==9){ return '申诉通过' }else{ return '' } }",
     "name" : "appealStatus",
-    "width" : "15%"
+    "width" : "11%"
   }
 //  {
 //    "access" : "admin",

o2web/source/x_component_Attendance/$UnitDetail/listItem.json

@@ -6,7 +6,7 @@
     "item" : "function( d ){ return d.empName.split('@')[0] }",
     "name" : "empName",
     "defaultSort" : "asc",
-    "width" : "15%"
+    "width" : "11%"
   },
   {
     "title" : "日期",
@@ -14,7 +14,7 @@
     "contentStyles" : "normalTdNode",
     "item" : "recordDateString",
     "name" : "recordDateString",
-    "width" : "15%"
+    "width" : "11%"
   },
 
   {
@@ -23,7 +23,7 @@
     "contentStyles" : "normalTdNode",
     "item" : "function( data ){ if(data.isHoliday){return '节假日'}else if(data.isWeekend){return '周末'}else if(data.isWorkday){return '调休工作日'}else{return '工作日'}  }",
     "name" : "description",
-    "width" : "15%"
+    "width" : "11%"
   },
 
   {
@@ -32,7 +32,23 @@
     "contentStyles" : "normalTdNode",
     "item" : "onDutyTime",
     "name" : "onDutyTime",
-    "width" : "15%"
+    "width" : "11%"
+  },
+  {
+    "title" : "午休开始时间",
+    "headStyles" : "normalThNode",
+    "contentStyles" : "normalTdNode",
+    "item" : "morningOffDutyTime",
+    "name" : "morningOffDutyTime",
+    "width" : "11%"
+  },
+  {
+    "title" : "午休结束时间",
+    "headStyles" : "normalThNode",
+    "contentStyles" : "normalTdNode",
+    "item" : "afternoonOnDutyTime",
+    "name" : "afternoonOnDutyTime",
+    "width" : "11%"
   },
   {
     "title" : "下班打卡时间",
@@ -40,7 +56,7 @@
     "contentStyles" : "normalTdNode",
     "item" : "offDutyTime",
     "name" : "offDutyTime",
-    "width" : "15%"
+    "width" : "11%"
   },
   {
     "title": "考勤状态",
@@ -48,7 +64,7 @@
     "contentStyles": "normalTdNode",
     "item": "function( d ){  var status=''; if(d.isGetSelfHolidays){ status = '请假或外出报备' }else if(d.isLate){ status = '迟到' }else if(d.isLeaveEarlier){ status = '早退' }else if(d.isAbsent){ status = '缺勤' }else if(d.isAbnormalDuty){ status = '异常打卡' }else if(d.isLackOfTime){ status = '工时不足' }else{ status = '正常' }; return status; }",
     "name" : "status",
-    "width" : "10%"
+    "width" : "11%"
   },
   {
     "title": "申诉状态",
@@ -56,7 +72,7 @@
     "contentStyles": "normalTdNode",
     "item": "function( d ){  if(d.appealStatus==1){ return '申诉中' }else if(d.appealStatus==-1){ return '申诉未通过' }else if(d.appealStatus==9){ return '申诉通过' }else{ return '' } }",
     "name" : "appealStatus",
-    "width" : "10%"
+    "width" : "11%"
   }
 //  {
 //    "access" : "admin",

o2web/source/x_component_Attendance/MyDetail.js

@@ -842,6 +842,12 @@ MWF.xApplication.Attendance.MyDetail.Appeal = new Class({
             "    <td styles='formTableValue' item='recordDateString'></td></tr>"
             +"<tr><td styles='formTableTitle' lable='onDutyTime'></td>"+
             "    <td styles='formTableValue' item='onDutyTime'></td>" +
+            ((this.data.signProxy=="2"||this.data.signProxy=="3")?
+            "    <td styles='formTableTitle' lable='morningOffDutyTime'></td>"+
+            "    <td styles='formTableValue' item='morningOffDutyTime'></td></tr>" +
+            "<tr><td styles='formTableTitle' lable='afternoonOnDutyTime'></td>"+
+            "    <td styles='formTableValue' item='afternoonOnDutyTime'></td>" : ""
+            ) +
             "    <td styles='formTableTitle' lable='offDutyTime'></td>"+
             "    <td styles='formTableValue' item='offDutyTime'></td></tr>" +
             ( ( this.isNew && identityList.identities.length > 1 ) ?
@@ -872,14 +878,16 @@ MWF.xApplication.Attendance.MyDetail.Appeal = new Class({
             "    <td styles='formTableValue' item='appealDescription' colspan='3'></td></tr>" +
             "</table>";
         this.createTableArea.set("html",html);
-
-
+        var lp = this.app.lp.schedule;
+        var signProxy = this.data.signProxy||1;
         this.document = new MForm( this.createTableArea, this.data, {
             style : "popup",
             isEdited : this.isEdited || this.isNew,
             itemTemplate : {
                 recordDateString : { text:"考勤日期",  type : "innertext"},
                 onDutyTime : { text:"上班打卡时间",  type : "innertext"},
+                morningOffDutyTime : { text:signProxy==1?"":lp.signProxy[signProxy].middayRestStartTime,  type : "innertext"},
+                afternoonOnDutyTime : { text:signProxy==1?"":lp.signProxy[signProxy].middayRestEndTime,  type : "innertext"},
                 offDutyTime : { text:"下班打卡时间",  type : "innertext"},
                 statusShow : {  text:"考勤状态", type : "innertext" },
                 appealStatusShow : { text:"审批状态",type : "innertext"},