Преглед на файлове

打卡管理-结算月格式转换问题修复,页面点击时间控件增加区域

ZhangWenQiang преди 5 години
родител
ревизия
8ac6119e4a

+ 2 - 0
happy-job-base-system/src/main/webapp/webpage/modules/wspunch/wsSettlementMonthList.js

@@ -4,6 +4,8 @@ $(document).ready(function() {
 
     laydate.render({
         elem: '#startMonthTime1'
+        ,eventElem: '#startMonthTime2'
+        ,trigger: 'click'
         ,type: 'month'
         ,value: getPreviousFirstMonday()
         ,btns: ['confirm']

+ 1 - 1
happy-job-base-system/src/main/webapp/webpage/modules/wspunch/wsSettlementMonthList.jsp

@@ -36,7 +36,7 @@
 							<div class='input-group date' id='startMonthTime' >
 								<input type='text' id='startMonthTime1' name="endDate" class="form-control input-sm layui-input"  placeholder="结算月搜索" readonly/>
 								<span class="input-group-addon">
-			                       <span class="glyphicon glyphicon-calendar"></span>
+			                       <span id="startMonthTime2" class="glyphicon glyphicon-calendar"></span>
 			                   </span>
 							</div>
 						</div>

+ 4 - 0
happy-job-base-system/src/main/webapp/webpage/modules/wspunch/wsSettlementWeekList.js

@@ -4,6 +4,8 @@ $(document).ready(function() {
 
     laydate.render({
         elem: '#startWeekTime1'
+        ,eventElem: '#startWeekTime2'
+        ,trigger: 'click'
         ,showBottom: false
         ,value: getPreviousFirstMonday()
         ,done: function(value, date, endDate){
@@ -15,6 +17,8 @@ $(document).ready(function() {
 
     laydate.render({
         elem: '#endWeekTime1'
+        ,eventElem: '#endWeekTime2'
+        ,trigger: 'click'
         ,showBottom: false
         ,value: getPreviousLastMonday()
         ,done: function(value, date, endDate){

+ 2 - 2
happy-job-base-system/src/main/webapp/webpage/modules/wspunch/wsSettlementWeekList.jsp

@@ -37,7 +37,7 @@
 								<div class='input-group date' id='startWeekTime' style="left: -5px;" >
 									<input type='text' id='startWeekTime1'  name="startDate" class="form-control input-sm"  placeholder="周结算开始时间" value="" readonly/>
 									<span class="input-group-addon">
-					                       <span class="glyphicon glyphicon-calendar"></span>
+					                       <span id='startWeekTime2' class="glyphicon glyphicon-calendar"></span>
 					                   </span>
 								</div>
 							</div>
@@ -48,7 +48,7 @@
 								<div class='input-group date' id='endWeekTime' style="left: -10px;" >
 									<input type='text'  id='endWeekTime1' name="endDate" class="form-control input-sm" placeholder="周结算结束时间" readonly/>
 									<span class="input-group-addon">
-					                       <span class="glyphicon glyphicon-calendar"></span>
+					                       <span id='endWeekTime2' class="glyphicon glyphicon-calendar"></span>
 					                   </span>
 								</div>
 							</div>

+ 3 - 2
happy-job-module-hpjob/src/main/java/com/jeeplus/modules/wspunch/service/WsSettlementService.java

@@ -426,6 +426,7 @@ public class WsSettlementService extends CrudService<WsSettlementMapper, WsCompa
     private LocalDate localDateFormat(LocalDate date, int day, int scale) {
         LocalDate localDate = date;
         String format = "";
+        String dayStr = day < 10 ? "0" + day : "" + day;
         switch (scale) {
             case 1:
                 //月第一天
@@ -433,12 +434,12 @@ public class WsSettlementService extends CrudService<WsSettlementMapper, WsCompa
                 //上月最后一天
                 LocalDate lastMonthDay = firstDay.minusDays(1);
                 format = dateFormat(localDate2Date(lastMonthDay));
-                format = format.substring(0, 8) + day;
+                format = format.substring(0, 8) + dayStr;
                 localDate = LocalDate.parse(format);
                 break;
             case 2:
                 format = dateFormat(localDate2Date(localDate));
-                format = format.substring(0, 8) + day;
+                format = format.substring(0, 8) + dayStr;
                 localDate = LocalDate.parse(format);
                 break;
             default: