From 3bdfe604430d1986c5684badb92603f8809c4ade Mon Sep 17 00:00:00 2001 From: "HDM58\\hdm58" Date: Wed, 14 Jun 2023 18:18:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E9=80=89=E6=8B=A9=E6=93=8D=E4=BD=9C=E4=BC=98?= =?UTF-8?q?=E5=8C=96=EF=BC=8C=E5=B7=A5=E6=97=B6=E8=AE=A1=E7=AE=97=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/article/view/cate/cate.html | 2 +- app/oa/controller/Approve.php | 8 +- app/oa/view/approve/add_chuchai.html | 76 +++------ app/oa/view/approve/add_huiyishi.html | 66 ++------ app/oa/view/approve/add_huodong.html | 80 ++------- app/oa/view/approve/add_jiaban.html | 82 ++------- app/oa/view/approve/add_qingjia.html | 197 +++++++--------------- app/oa/view/approve/add_style.html | 15 -- app/oa/view/approve/add_waichu.html | 192 +++++++-------------- app/oa/view/approve/add_yongche.html | 90 +++------- public/static/assets/gougu/module/tool.js | 3 +- 11 files changed, 215 insertions(+), 596 deletions(-) diff --git a/app/article/view/cate/cate.html b/app/article/view/cate/cate.html index bbae2f4..9796790 100644 --- a/app/article/view/cate/cate.html +++ b/app/article/view/cate/cate.html @@ -35,7 +35,7 @@ ,cols: [[ {field:'id',width:80, title: 'ID号', align:'center'} ,{field: 'sort', title: '排序',align:'center', width:80} - ,{field:'title', edit:'text',width:240, title: '分类名称'} + ,{field:'title', width:240, title: '分类名称'} ,{field:'pid', title: '父级ID', width:80, align:'center'} ,{field:'desc', title: '描述', } ,{width:160,title: '操作', align:'center',templet: function(d){ diff --git a/app/oa/controller/Approve.php b/app/oa/controller/Approve.php index 0c5ee86..c8e9c87 100644 --- a/app/oa/controller/Approve.php +++ b/app/oa/controller/Approve.php @@ -399,8 +399,8 @@ class Approve extends BaseController $detail['end_time_b'] = date('H:i',$detail['end_time']); $detail['detail_time'] = date('Y-m-d',$detail['detail_time']); - $detail['days'] = floor($detail['duration']*10/75); - $detail['hours'] = (($detail['duration']*10)%75)/10; + $detail['days'] = floor($detail['duration']*10/80); + $detail['hours'] = (($detail['duration']*10)%80)/10; $type = $detail['type']; if($detail['file_ids'] !=''){ $fileArray = Db::name('File')->where('id','in',$detail['file_ids'])->select(); @@ -446,8 +446,8 @@ class Approve extends BaseController $detail['detail_time'] = date('Y-m-d',$detail['detail_time']); } - $detail['days'] = floor($detail['duration']*10/75); - $detail['hours'] = (($detail['duration']*10)%75)/10; + $detail['days'] = floor($detail['duration']*10/80); + $detail['hours'] = (($detail['duration']*10)%80)/10; $detail['create_user'] = Db::name('Admin')->where('id',$detail['admin_id'])->value('name'); $flows = Db::name('FlowStep')->where(['action_id'=>$detail['id'],'type'=>1,'sort'=>$detail['check_step_sort'],'delete_time'=>0])->find(); diff --git a/app/oa/view/approve/add_chuchai.html b/app/oa/view/approve/add_chuchai.html index be9be51..3dbf11a 100644 --- a/app/oa/view/approve/add_chuchai.html +++ b/app/oa/view/approve/add_chuchai.html @@ -9,35 +9,29 @@ {eq name="$id" value="0"} - + - - - + - -
开始时间*开始时间* - - - + 结束时间* - - - +
出差地点*
出差事由* +
附件
 +
@@ -47,35 +41,29 @@ {else/} - + - - - + - - - - - @@ -55,23 +49,17 @@ - - - @@ -92,46 +80,14 @@ const moduleInit = ['tool','employeepicker']; flowStep(); } //日期时间范围 - laydate.render({ - elem: '#start_time_a', - type: 'date', - format: 'yyyy-MM-dd', - showBottom: false - }); - - //日期时间范围 - laydate.render({ - elem: '#end_time_a', - type: 'date', - format: 'yyyy-MM-dd', - showBottom: false - }); - - //选择具体时间 - lay('.select-datetime').each(function () { + lay('.select-time').each(function () { laydate.render({ elem: this, trigger: 'click', - type: 'time', - format: 'HH:mm', - btns: ['clear', 'confirm'], - ready: function (date) { - var dom = $(".laydate-time-list").children("li"); - for (var i = 0; i < dom.length; i++) { - if (i == 2 || i == 5) { - $(dom[i]).remove(); - } else if(i==1||i==4) { - var li = $(dom[i]).children("ol").children("li") - for (var j = 0; j < li.length; j++) { - if ($(li[j]).text() != 00 && $(li[j]).text()!=30) { - $(li[j]).remove(); - } - } - } - } - } + fullPanel:true, + type:'datetime' }); - }); + }); } {/block} diff --git a/app/oa/view/approve/add_huodong.html b/app/oa/view/approve/add_huodong.html index 5234f59..4fd8b6f 100644 --- a/app/oa/view/approve/add_huodong.html +++ b/app/oa/view/approve/add_huodong.html @@ -10,42 +10,36 @@
开始时间*开始时间* - - - + 结束时间* - - - - + +
出差地点*
出差事由* +
附件
 +
{notempty name="$detail.file_ids"} @@ -102,44 +90,20 @@ const moduleInit = ['tool','employeepicker','oaTool']; tool=layui.tool, oaTool=layui.oaTool, laydate = layui.laydate; - - oaTool.addFile({ - btn: 'upFile', - box: 'fileList' - }); //日期时间范围 lay('.select-time').each(function () { laydate.render({ elem: this, - trigger: 'click' + trigger: 'click', + fullPanel:true, + type:'datetime' }); }); - //选择具体时间 - lay('.select-datetime').each(function () { - laydate.render({ - elem: this, - trigger: 'click', - type: 'time', - format: 'HH:mm', - btns: ['clear', 'confirm'], - ready: function (date) { - var dom = $(".laydate-time-list").children("li"); - for (var i = 0; i < dom.length; i++) { - if (i == 2 || i == 5) { - $(dom[i]).remove(); - } else if(i==1||i==4) { - var li = $(dom[i]).children("ol").children("li") - for (var j = 0; j < li.length; j++) { - if ($(li[j]).text() != 00 && $(li[j]).text()!=30) { - $(li[j]).remove(); - } - } - } - } - }, - }); - }); + oaTool.addFile({ + btn: 'upFile', + box: 'fileList' + }); if (typeof (flowStep) == "function") { flowStep(); diff --git a/app/oa/view/approve/add_huiyishi.html b/app/oa/view/approve/add_huiyishi.html index ec32675..06e00ec 100644 --- a/app/oa/view/approve/add_huiyishi.html +++ b/app/oa/view/approve/add_huiyishi.html @@ -20,23 +20,17 @@
开始时间* - - - + 结束时间* - - - +
备注 +
开始时间* - - - + 结束时间* - - - - + +
备注 +
- + - + - - - - -
活动名称* 活动预算*
活动说明* +
开始时间* - - - + 结束时间* - - - +
备注 +
附件
 +
@@ -56,9 +50,9 @@ - + - + @@ -69,29 +63,23 @@ - - - -
活动名称* 活动预算*
活动说明*
开始时间* - - - + 结束时间* - - - - + +
备注 +
附件
 +
{notempty name="$detail.file_ids"} @@ -127,46 +115,14 @@ const moduleInit = ['tool','employeepicker','oaTool']; flowStep(); } //日期时间范围 - laydate.render({ - elem: '#start_time_a', - type: 'date', - format: 'yyyy-MM-dd', - showBottom: false - }); - - //日期时间范围 - laydate.render({ - elem: '#end_time_a', - type: 'date', - format: 'yyyy-MM-dd', - showBottom: false - }); - - //选择具体时间 - lay('.select-datetime').each(function () { + lay('.select-time').each(function () { laydate.render({ elem: this, trigger: 'click', - type: 'time', - format: 'HH:mm', - btns: ['clear', 'confirm'], - ready: function (date) { - var dom = $(".laydate-time-list").children("li"); - for (var i = 0; i < dom.length; i++) { - if (i == 2 || i == 5) { - $(dom[i]).remove(); - } else if(i==1||i==4) { - var li = $(dom[i]).children("ol").children("li") - for (var j = 0; j < li.length; j++) { - if ($(li[j]).text() != 00 && $(li[j]).text()!=30) { - $(li[j]).remove(); - } - } - } - } - } + fullPanel:true, + type:'datetime' }); - }); + }); } {/block} diff --git a/app/oa/view/approve/add_jiaban.html b/app/oa/view/approve/add_jiaban.html index b43a51e..ee9cc35 100644 --- a/app/oa/view/approve/add_jiaban.html +++ b/app/oa/view/approve/add_jiaban.html @@ -9,29 +9,23 @@ {eq name="$id" value="0"} - + - - - + - @@ -39,20 +33,14 @@ {else/}
开始时间*开始时间* - - - + 结束时间* - - - +
加班时长--
加班事由* +
- + - - @@ -79,16 +67,11 @@ * 工时计算 */ function leaveTime() { - var data_1 = $('#start_time_a').val(); - var data_1_1 = $('#start_time_b').val(); - var data_2 = $('#end_time_a').val(); - var data_2_1 = $('#end_time_b').val(); - if(data_1=='' || data_1_1=='' || data_2=='' || data_2_1==''){ + var start_date = $('#start_time').val(); + var end_date = $('#end_time').val(); + if(start_date=='' || end_date==''){ return 0; - } - - var start_date = data_1+' '+data_1_1; - var end_date = data_2+' '+data_2_1; + } var start = new Date(start_date.replace(/-/g,'/')); var end = new Date(end_date.replace(/-/g,'/')); var diff=end.getTime() - start.getTime();//时间差的毫秒数 @@ -98,7 +81,7 @@ function leaveTime() { //计算出小时数 var hours=diff/(3600*1000); console.log(hours); - return hours; + return hours.toFixed(1); } @@ -114,6 +97,8 @@ const moduleInit = ['tool','employeepicker']; laydate.render({ elem: this, trigger: 'click', + fullPanel:true, + type:'datetime', done:function(){ var hours = leaveTime(); if(hours == 0){ @@ -127,41 +112,6 @@ const moduleInit = ['tool','employeepicker']; }); }); - //选择具体时间 - lay('.select-datetime').each(function () { - laydate.render({ - elem: this, - trigger: 'click', - type: 'time', - format: 'HH:mm', - btns: ['clear', 'confirm'], - ready: function (date) { - var dom = $(".laydate-time-list").children("li"); - for (var i = 0; i < dom.length; i++) { - if (i == 2 || i == 5) { - $(dom[i]).remove(); - } else if(i==1||i==4) { - var li = $(dom[i]).children("ol").children("li") - for (var j = 0; j < li.length; j++) { - if ($(li[j]).text() != 00 && $(li[j]).text()!=30) { - $(li[j]).remove(); - } - } - } - } - }, - done:function(){ - var hours = leaveTime(); - if(hours == 0){ - $('#duration').html('-'); - } - else{ - $('#duration').html('共'+hours+'小时'); - } - $('[name="duration"]').val(hours); - } - }); - }); } {/block} diff --git a/app/oa/view/approve/add_qingjia.html b/app/oa/view/approve/add_qingjia.html index 3e7a7b7..5b4fb0f 100644 --- a/app/oa/view/approve/add_qingjia.html +++ b/app/oa/view/approve/add_qingjia.html @@ -10,7 +10,7 @@
开始时间*开始时间* - - - + 结束时间* - - - - + +
- - - - + - + - -
请假类型* +
开始时间* - - - + 结束时间* - - - +
请假工时-- 请假天数--
请假事由* +
附件
 +
@@ -67,7 +61,7 @@ - - - - + - + - -
请假类型* +
开始时间* - - - + 结束时间* - - - - + +
请假工时共{$detail.duration}工时共{$detail.duration}工时 请假天数共{$detail.days}天,{$detail.hours}小时共{$detail.days}天,{$detail.hours}小时
请假事由* +
附件
 +
{notempty name="$detail.file_ids"} @@ -137,69 +125,49 @@ /** * 工时计算 */ -function leaveTime() { - var data_1 = $('#start_time_a').val(); - var data_1_1 = $('#start_time_b').val(); - var data_2 = $('#end_time_a').val(); - var data_2_1 = $('#end_time_b').val(); - if(data_1=='' || data_1_1=='' || data_2=='' || data_2_1==''){ - return 0; - } +const WORKDAY_HOURS = 8; +const START_HOUR = 9; +const END_HOUR = 18; +const START_BREAK_HOUR = 12; +const END_BREAK_HOUR = 13; +const WEEKEND_DAYS = [0, 6]; - var start_date = data_1+' '+data_1_1; - var end_date = data_2+' '+data_2_1; - var start = new Date(start_date.replace(/-/g,'/')); - var end = new Date(end_date.replace(/-/g,'/')); - var startHour = start.getHours(); //16 - var startMin = start.getMinutes(); - var endHour = end.getHours(); - var endMin = end.getMinutes(); - - var startDate = start.setHours(0, 0, 0); - var endDate = end.setHours(0, 0, 0); - if(endDate12) { - hour= hour-15; - } - } - } else { - for (var i = 0; i <= dayNum; i++) { - var DateTime = startDate + 60 * 60 * 24 * 1000*i - var date = new Date(DateTime); - var week = date.getDay(); - if (week != 0 && week != 6) { - if (DateTime == startDate) { - hour+= (18-startHour)*10-(startMin/6); - if (startHour <= 12) { - hour= hour-15; - } - } else if (DateTime > startDate && DateTime < endDate) { - hour += 75; - } else if (DateTime == endDate){ - hour+= (endHour-9)*10+endMin/6; - if (endHour > 12) { - hour= hour-15; - } - } - } - } - } - if(hour<0){ - hour=0; - } - return hour; +function isWeekend(day) { + return WEEKEND_DAYS.includes(day); } +function calculateWorkHours() { + var startDate = new Date($('#start_time').val()); + var endDate = new Date($('#end_time').val()); + + const start = startDate.getTime(); + const end = endDate.getTime(); + const startDay = startDate.getDay(); + const endDay = endDate.getDay(); + + let totalHours = 0; + + for (let time = start; time < end; time += 3600000 /* 1 hour in milliseconds */) { + const date = new Date(time); + const dayOfWeek = date.getDay(); + const hour = date.getHours(); + + if (!isWeekend(dayOfWeek)) { + if (dayOfWeek === startDay && hour < START_HOUR) { + continue; + } else if (dayOfWeek === endDay && hour >= END_HOUR) { + break; + } else if (hour >= START_HOUR && hour < END_HOUR) { + if (hour < START_BREAK_HOUR || hour >= END_BREAK_HOUR) { + totalHours += 1; + } + } + } + } + return totalHours; +} + + const moduleInit = ['tool','employeepicker','oaTool']; function gouguInit() { var form = layui.form, @@ -220,61 +188,22 @@ const moduleInit = ['tool','employeepicker','oaTool']; laydate.render({ elem: this, trigger: 'click', + fullPanel:true, + type:'datetime', done:function(){ - var hours = leaveTime(); + var hours = calculateWorkHours(); if(hours == 0){ $('#hours,#days').html('-'); } else{ - $('#hours').html('共'+hours/10+'小时'); + $('#hours').html('共'+hours+'小时'); var days = 0; - if(hours>=75){ - days = parseInt(hours/75); + if(hours>=8){ + days = parseInt(hours/8); } - $('#days').html('共'+days+'天，'+(hours%75)/10+'小时'); + $('#days').html('共'+days+'天，'+(hours%8)+'小时'); } - $('[name="duration"]').val(hours/10); - } - }); - }); - - //选择具体时间 - lay('.select-datetime').each(function () { - laydate.render({ - elem: this, - trigger: 'click', - type: 'time', - format: 'HH:mm', - btns: ['clear', 'confirm'], - ready: function (date) { - var dom = $(".laydate-time-list").children("li"); - for (var i = 0; i < dom.length; i++) { - if (i == 2 || i == 5) { - $(dom[i]).remove(); - } else if(i==1||i==4) { - var li = $(dom[i]).children("ol").children("li") - for (var j = 0; j < li.length; j++) { - if ($(li[j]).text() != 00 && $(li[j]).text()!=30) { - $(li[j]).remove(); - } - } - } - } - }, - done:function(){ - var hours = leaveTime(); - if(hours == 0){ - $('#hours,#days').html('-'); - } - else{ - $('#hours').html('共'+hours/10+'小时'); - var days = 0; - if(hours>=75){ - days = parseInt(hours/75); - } - $('#days').html('共'+days+'天，'+(hours%75)/10+'小时'); - } - $('[name="duration"]').val(hours/10); + $('[name="duration"]').val(hours); } }); }); diff --git a/app/oa/view/approve/add_style.html b/app/oa/view/approve/add_style.html index 83d8e81..08e6d45 100644 --- a/app/oa/view/approve/add_style.html +++ b/app/oa/view/approve/add_style.html @@ -5,19 +5,4 @@ .layui-form-item .layui-btn-danger{display:none; margin-top:-8px} .layui-form-item:hover .layui-btn-danger{display:inline-block;} .select-1,.select-2{display:none;} -/* 设置只展示时分，隐藏秒那一列 */ -.laydate-time-list { - padding-bottom: 0; - overflow: hidden; -} - -.laydate-time-list > li { - width: 50% !important; -} - -.laydate-time-list ol li { - width: 100% !important; - padding-left: 0 !important; - text-align: center !important; -} \ No newline at end of file diff --git a/app/oa/view/approve/add_waichu.html b/app/oa/view/approve/add_waichu.html index 88bebcc..69d92e6 100644 --- a/app/oa/view/approve/add_waichu.html +++ b/app/oa/view/approve/add_waichu.html @@ -10,40 +10,34 @@ - + - - - + - + - -
外出地点*
开始时间* - - - + 结束时间* - - - +
外出时长-- 外出天数--
外出事由* +
附件
 +
@@ -54,40 +48,34 @@ - + - - - + - + - - - - - + - + - - @@ -54,29 +48,23 @@ - - - + - + - - @@ -105,16 +93,11 @@ * 工时计算 */ function leaveTime() { - var data_1 = $('#start_time_a').val(); - var data_1_1 = $('#start_time_b').val(); - var data_2 = $('#end_time_a').val(); - var data_2_1 = $('#end_time_b').val(); - if(data_1=='' || data_1_1=='' || data_2=='' || data_2_1==''){ + var start_date = $('#start_time').val(); + var end_date = $('#end_time').val(); + if(start_date=='' || end_date==''){ return 0; - } - - var start_date = data_1+' '+data_1_1; - var end_date = data_2+' '+data_2_1; + } var start = new Date(start_date.replace(/-/g,'/')); var end = new Date(end_date.replace(/-/g,'/')); var diff=end.getTime() - start.getTime();//时间差的毫秒数 @@ -133,11 +116,14 @@ const moduleInit = ['tool','employeepicker']; if (typeof (flowStep) == "function") { flowStep(); } + //日期时间范围 lay('.select-time').each(function () { laydate.render({ elem: this, trigger: 'click', + fullPanel:true, + type:'datetime', done:function(){ var hours = leaveTime(); if(hours == 0){ @@ -150,42 +136,6 @@ const moduleInit = ['tool','employeepicker']; } }); }); - - //选择具体时间 - lay('.select-datetime').each(function () { - laydate.render({ - elem: this, - trigger: 'click', - type: 'time', - format: 'HH:mm', - btns: ['clear', 'confirm'], - ready: function (date) { - var dom = $(".laydate-time-list").children("li"); - for (var i = 0; i < dom.length; i++) { - if (i == 2 || i == 5) { - $(dom[i]).remove(); - } else if(i==1||i==4) { - var li = $(dom[i]).children("ol").children("li") - for (var j = 0; j < li.length; j++) { - if ($(li[j]).text() != 00 && $(li[j]).text()!=30) { - $(li[j]).remove(); - } - } - } - } - }, - done:function(){ - var hours = leaveTime(); - if(hours == 0){ - $('#duration').html('-'); - } - else{ - $('#duration').html('共'+hours+'小时'); - } - $('[name="duration"]').val(hours); - } - }); - }); } {/block} diff --git a/public/static/assets/gougu/module/tool.js b/public/static/assets/gougu/module/tool.js index 17d1bf3..1fca236 100644 --- a/public/static/assets/gougu/module/tool.js +++ b/public/static/assets/gougu/module/tool.js @@ -311,7 +311,8 @@ layui.define([], function (exports) { layui.laydate.render({ elem: that, show: true, - type: type + type: type, + fullPanel: true }); return false; });
外出地点*
开始时间* - - - + 结束时间* - - - - + +
外出时长共{$detail.duration}工时共{$detail.duration}工时 外出天数共{$detail.days}天,{$detail.hours}小时共{$detail.days}天,{$detail.hours}小时
外出事由* +
附件
 +
{notempty name="$detail.file_ids"} @@ -111,67 +99,46 @@ /** * 工时计算 */ -function leaveTime() { - var data_1 = $('#start_time_a').val(); - var data_1_1 = $('#start_time_b').val(); - var data_2 = $('#end_time_a').val(); - var data_2_1 = $('#end_time_b').val(); - if(data_1=='' || data_1_1=='' || data_2=='' || data_2_1==''){ - return 0; - } +const WORKDAY_HOURS = 8; +const START_HOUR = 9; +const END_HOUR = 18; +const START_BREAK_HOUR = 12; +const END_BREAK_HOUR = 13; +const WEEKEND_DAYS = [0, 6]; - var start_date = data_1+' '+data_1_1; - var end_date = data_2+' '+data_2_1; - var start = new Date(start_date.replace(/-/g,'/')); - var end = new Date(end_date.replace(/-/g,'/')); - var startHour = start.getHours(); - var startMin = start.getMinutes(); - var endHour = end.getHours(); - var endMin = end.getMinutes(); - - var startDate = start.setHours(0, 0, 0); - var endDate = end.setHours(0, 0, 0); - if(endDate12) { - hour= hour-15; - } - } - } else { - for (var i = 0; i <= dayNum; i++) { - var DateTime = startDate + 60 * 60 * 24 * 1000*i - var date = new Date(DateTime); - var week = date.getDay(); - if (week != 0 && week != 6) { - if (DateTime == startDate) { - hour+= (18-startHour)*10-(startMin/6); - if (startHour <= 12) { - hour= hour-15; - } - } else if (DateTime > startDate && DateTime < endDate) { - hour += 75; - } else if (DateTime == endDate){ - hour+= (endHour-9)*10+endMin/6; - if (endHour > 12) { - hour= hour-15; - } - } - } +function isWeekend(day) { + return WEEKEND_DAYS.includes(day); +} + +function calculateWorkHours() { + var startDate = new Date($('#start_time').val()); + var endDate = new Date($('#end_time').val()); + + const start = startDate.getTime(); + const end = endDate.getTime(); + const startDay = startDate.getDay(); + const endDay = endDate.getDay(); + + let totalHours = 0; + + for (let time = start; time < end; time += 3600000 /* 1 hour in milliseconds */) { + const date = new Date(time); + const dayOfWeek = date.getDay(); + const hour = date.getHours(); + + if (!isWeekend(dayOfWeek)) { + if (dayOfWeek === startDay && hour < START_HOUR) { + continue; + } else if (dayOfWeek === endDay && hour >= END_HOUR) { + break; + } else if (hour >= START_HOUR && hour < END_HOUR) { + if (hour < START_BREAK_HOUR || hour >= END_BREAK_HOUR) { + totalHours += 1; } + } } - if(hour<0){ - hour=0; - } - return hour; + } + return totalHours; } const moduleInit = ['tool','employeepicker','oaTool']; @@ -194,64 +161,25 @@ const moduleInit = ['tool','employeepicker','oaTool']; laydate.render({ elem: this, trigger: 'click', + fullPanel:true, + type:'datetime', done:function(){ - var hours = leaveTime(); + var hours = calculateWorkHours(); if(hours == 0){ $('#hours,#days').html('-'); } else{ - $('#hours').html('共'+hours/10+'小时'); + $('#hours').html('共'+hours+'小时'); var days = 0; - if(hours>75){ - days = parseInt(hours/75); + if(hours>=8){ + days = parseInt(hours/8); } - $('#days').html('共'+days+'天，'+(hours%75)/10+'小时'); + $('#days').html('共'+days+'天，'+(hours%8)+'小时'); } - $('[name="duration"]').val(hours/10); + $('[name="duration"]').val(hours); } }); }); - - //选择具体时间 - lay('.select-datetime').each(function () { - laydate.render({ - elem: this, - trigger: 'click', - type: 'time', - format: 'HH:mm', - btns: ['clear', 'confirm'], - ready: function (date) { - var dom = $(".laydate-time-list").children("li"); - for (var i = 0; i < dom.length; i++) { - if (i == 2 || i == 5) { - $(dom[i]).remove(); - } else if(i==1||i==4) { - var li = $(dom[i]).children("ol").children("li") - for (var j = 0; j < li.length; j++) { - if ($(li[j]).text() != 00 && $(li[j]).text()!=30) { - $(li[j]).remove(); - } - } - } - } - }, - done:function(){ - var hours = leaveTime(); - if(hours == 0){ - $('#hours,#days').html('-'); - } - else{ - $('#hours').html('共'+hours/10+'小时'); - var days = 0; - if(hours>=75){ - days = parseInt(hours/75); - } - $('#days').html('共'+days+'天，'+(hours%75)/10+'小时'); - } - $('[name="duration"]').val(hours/10); - } - }); - }); } {/block} diff --git a/app/oa/view/approve/add_yongche.html b/app/oa/view/approve/add_yongche.html index f7e49c7..4bb0d69 100644 --- a/app/oa/view/approve/add_yongche.html +++ b/app/oa/view/approve/add_yongche.html @@ -11,29 +11,23 @@
开始时间* - - - + 结束时间* - - - +
用车时长--
用车目的地* 车辆选择* +
用车事由* +
开始时间* - - - + 结束时间* - - - - + +
用车时长共{$detail.duration}小时共{$detail.duration}小时
用车目的地* 车辆选择* +
用车事由* +