diff --git a/app/oa/view/approve/add_caigou.html b/app/oa/view/approve/add_caigou.html index 23ed7bf..d4f589e 100644 --- a/app/oa/view/approve/add_caigou.html +++ b/app/oa/view/approve/add_caigou.html @@ -9,7 +9,7 @@ {eq name="$id" value="0"} - +
物品名称*物品名称* 期望交互日期* @@ -46,7 +46,7 @@ {else/} - +
物品名称*物品名称* 期望交互日期* diff --git a/app/oa/view/approve/add_chuchai.html b/app/oa/view/approve/add_chuchai.html index 8f4f15c..891ba0d 100644 --- a/app/oa/view/approve/add_chuchai.html +++ b/app/oa/view/approve/add_chuchai.html @@ -9,37 +9,12 @@ {eq name="$id" value="0"} - + @@ -97,37 +47,12 @@ {else/}
开始时间*开始时间* - + 结束时间* @@ -47,32 +22,7 @@ - +
- + @@ -219,6 +119,32 @@ 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(); + } + } + } + } + }, + }); + }); + if (typeof (flowStep) == "function") { flowStep(); } diff --git a/app/oa/view/approve/add_gongwen.html b/app/oa/view/approve/add_gongwen.html index c88168a..c5c9a6d 100644 --- a/app/oa/view/approve/add_gongwen.html +++ b/app/oa/view/approve/add_gongwen.html @@ -9,7 +9,7 @@ {eq name="$id" value="0"}
开始时间*开始时间* - + 结束时间* @@ -135,32 +60,7 @@ - +
- +
文件名称*文件名称* 紧急程度* @@ -44,7 +44,7 @@ {else/} - + @@ -105,68 +55,18 @@ @@ -206,6 +106,32 @@ const moduleInit = ['tool','employeepicker']; format: 'yyyy-MM-dd', showBottom: false }); + + //选择具体时间 + 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(); + } + } + } + } + } + }); + }); } {/block} diff --git a/app/oa/view/approve/add_huodong.html b/app/oa/view/approve/add_huodong.html index 64935af..3239cc3 100644 --- a/app/oa/view/approve/add_huodong.html +++ b/app/oa/view/approve/add_huodong.html @@ -9,7 +9,7 @@ {eq name="$id" value="0"}
文件名称*文件名称* 紧急程度* diff --git a/app/oa/view/approve/add_huiyishi.html b/app/oa/view/approve/add_huiyishi.html index 7ff7478..ec32675 100644 --- a/app/oa/view/approve/add_huiyishi.html +++ b/app/oa/view/approve/add_huiyishi.html @@ -20,68 +20,18 @@ 开始时间* - + - + 结束时间* - + - +
开始时间* - + - + 结束时间* - + - +
- + @@ -23,68 +23,18 @@ @@ -105,7 +55,7 @@ {else/}
活动名称*活动名称* 活动预算*
开始时间* - + - + 结束时间* - + - +
- + @@ -119,68 +69,18 @@ @@ -245,6 +145,32 @@ const moduleInit = ['tool','employeepicker']; format: 'yyyy-MM-dd', showBottom: false }); + + //选择具体时间 + 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(); + } + } + } + } + } + }); + }); } {/block} diff --git a/app/oa/view/approve/add_jiaban.html b/app/oa/view/approve/add_jiaban.html index f12fbd5..b43a51e 100644 --- a/app/oa/view/approve/add_jiaban.html +++ b/app/oa/view/approve/add_jiaban.html @@ -9,60 +9,12 @@ {eq name="$id" value="0"}
活动名称*活动名称* 活动预算*
开始时间* - + - + 结束时间* - + - +
- + @@ -135,60 +39,12 @@ {else/}
开始时间*开始时间* - + 结束时间* @@ -70,55 +22,7 @@ - +
- + @@ -319,15 +127,40 @@ const moduleInit = ['tool','employeepicker']; }); }); - form.on('select(time_b)', function(data){ - var hours = leaveTime(); - if(hours == 0){ - $('#duration').html('-'); - } - else{ - $('#duration').html('共'+hours+'小时'); - } - $('[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){ + $('#duration').html('-'); + } + else{ + $('#duration').html('共'+hours+'小时'); + } + $('[name="duration"]').val(hours); + } + }); }); } diff --git a/app/oa/view/approve/add_jiangli.html b/app/oa/view/approve/add_jiangli.html index 527b616..1ab3451 100644 --- a/app/oa/view/approve/add_jiangli.html +++ b/app/oa/view/approve/add_jiangli.html @@ -9,7 +9,7 @@ {eq name="$id" value="0"}
开始时间*开始时间* - + 结束时间* @@ -196,55 +52,7 @@ - +
- +
奖励金额*奖励金额* 奖励日期* @@ -40,7 +40,7 @@ {else/} - +
奖励金额*奖励金额* 奖励日期* diff --git a/app/oa/view/approve/add_jiekuan.html b/app/oa/view/approve/add_jiekuan.html index caaeac5..1a15dd7 100644 --- a/app/oa/view/approve/add_jiekuan.html +++ b/app/oa/view/approve/add_jiekuan.html @@ -9,7 +9,7 @@ {eq name="$id" value="0"} - +
借款金额*借款金额* 借款类型* @@ -51,7 +51,7 @@ {else/} - + @@ -126,26 +88,7 @@ @@ -317,20 +241,45 @@ const moduleInit = ['tool','employeepicker']; }); }); - form.on('select(time_b)', function(data){ - var hours = leaveTime(); - if(hours == 0){ - $('#hours,#days').html('-'); - } - else{ - $('#hours').html('共'+hours/10+'小时'); - var days = 0; - if(hours>=75){ - days = parseInt(hours/75); + //选择具体时间 + 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); } - $('#days').html('共'+days+'天，'+(hours%75)/10+'小时'); - } - $('[name="duration"]').val(hours/10); + }); }); } diff --git a/app/oa/view/approve/add_ruzhi.html b/app/oa/view/approve/add_ruzhi.html index 20f8989..6952a4a 100644 --- a/app/oa/view/approve/add_ruzhi.html +++ b/app/oa/view/approve/add_ruzhi.html @@ -9,7 +9,7 @@ {eq name="$id" value="0"}
借款金额*借款金额* 费用类型* diff --git a/app/oa/view/approve/add_qingjia.html b/app/oa/view/approve/add_qingjia.html index 3686d88..bcf63d1 100644 --- a/app/oa/view/approve/add_qingjia.html +++ b/app/oa/view/approve/add_qingjia.html @@ -31,26 +31,7 @@ - + 结束时间* @@ -58,26 +39,7 @@ - +
- + 结束时间* @@ -153,26 +96,7 @@ - +
- +
员工姓名*员工姓名* 入职日期* @@ -55,7 +55,7 @@ {else/} - +
员工姓名*员工姓名* 入职日期* diff --git a/app/oa/view/approve/add_style.html b/app/oa/view/approve/add_style.html index 08e6d45..83d8e81 100644 --- a/app/oa/view/approve/add_style.html +++ b/app/oa/view/approve/add_style.html @@ -5,4 +5,19 @@ .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_tongyong.html b/app/oa/view/approve/add_tongyong.html index b83bd3c..674ac8f 100644 --- a/app/oa/view/approve/add_tongyong.html +++ b/app/oa/view/approve/add_tongyong.html @@ -9,7 +9,7 @@ {eq name="$id" value="0"} - +
审批内容*审批内容* 紧急程度* diff --git a/app/oa/view/approve/add_waichu.html b/app/oa/view/approve/add_waichu.html index 23c2fc8..7992dea 100644 --- a/app/oa/view/approve/add_waichu.html +++ b/app/oa/view/approve/add_waichu.html @@ -9,7 +9,7 @@ {eq name="$id" value="0"} - + @@ -18,26 +18,7 @@ @@ -91,7 +53,7 @@ {else/}
外出地点*外出地点*
- + 结束时间* @@ -45,26 +26,7 @@ - +
- + @@ -100,26 +62,7 @@ @@ -291,21 +215,46 @@ const moduleInit = ['tool','employeepicker']; }); }); - form.on('select(time_b)', function(data){ - var hours = leaveTime(); - if(hours == 0){ - $('#hours,#days').html('-'); - } - else{ - $('#hours').html('共'+hours/10+'小时'); - var days = 0; - if(hours>=75){ - days = parseInt(hours/75); + //选择具体时间 + 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); } - $('#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 310b15e..f7e49c7 100644 --- a/app/oa/view/approve/add_yongche.html +++ b/app/oa/view/approve/add_yongche.html @@ -14,55 +14,7 @@ @@ -153,55 +57,7 @@ @@ -316,7 +124,7 @@ function leaveTime() { //计算出小时数 var hours=diff/(3600*1000); console.log(hours); - return hours; + return hours.toFixed(1); } const moduleInit = ['tool','employeepicker']; @@ -343,18 +151,41 @@ const moduleInit = ['tool','employeepicker']; }); }); - form.on('select(time_b)', function(data){ - var hours = leaveTime(); - if(hours == 0){ - $('#duration').html('-'); - } - else{ - $('#duration').html('共'+hours+'小时'); - } - $('[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){ + $('#duration').html('-'); + } + else{ + $('#duration').html('共'+hours+'小时'); + } + $('[name="duration"]').val(hours); + } + }); + }); } {/block} diff --git a/app/oa/view/approve/add_yongzhang.html b/app/oa/view/approve/add_yongzhang.html index c640435..65af37d 100644 --- a/app/oa/view/approve/add_yongzhang.html +++ b/app/oa/view/approve/add_yongzhang.html @@ -9,7 +9,7 @@ {eq name="$id" value="0"}
外出地点*外出地点*
- + 结束时间* @@ -127,26 +70,7 @@ - +
- + 结束时间* @@ -70,55 +22,7 @@ - +
- + 结束时间* @@ -209,55 +65,7 @@ - +
- + @@ -63,7 +63,7 @@ {else/}
用印日期*用印日期*
- + diff --git a/app/oa/view/approve/add_zhaopin.html b/app/oa/view/approve/add_zhaopin.html index f929872..28a0b3e 100644 --- a/app/oa/view/approve/add_zhaopin.html +++ b/app/oa/view/approve/add_zhaopin.html @@ -9,7 +9,7 @@ {eq name="$id" value="0"}
用印日期*用印日期*
- +
招聘部门*招聘部门* - +
招聘部门*招聘部门*