diff --git a/app/common.php b/app/common.php index fb26c9f..782db89 100644 --- a/app/common.php +++ b/app/common.php @@ -644,8 +644,11 @@ function time_trans($time, $format = 'd') /** * 计算按天数 */ -function countDays($a, $b = 0) +function countDays($a=0, $b = 0) { + if ($a == 0) { + $a = date("Y-m-d"); + } if ($b == 0) { $b = date("Y-m-d"); } diff --git a/app/install/data/gouguoa.sql b/app/install/data/gouguoa.sql index 4759d4f..5134685 100644 --- a/app/install/data/gouguoa.sql +++ b/app/install/data/gouguoa.sql @@ -1197,7 +1197,9 @@ CREATE TABLE `oa_approve` ( `remark1` varchar(500) NOT NULL DEFAULT '' COMMENT '备注1', `detail_time` int(11) NOT NULL DEFAULT 0 COMMENT '时间日期', `start_time` int(11) NOT NULL DEFAULT 0 COMMENT '开始时间', + `start_time_span` int(1) NOT NULL DEFAULT 0 COMMENT '开始时间时段:1上午,2下午', `end_time` int(11) NOT NULL DEFAULT 0 COMMENT '结束时间', + `end_time_span` int(1) NOT NULL DEFAULT 0 COMMENT '结束时间时段:1上午,2下午', `duration` decimal(10, 1) NOT NULL DEFAULT 0.0 COMMENT '时长', `admin_id` int(10) NOT NULL COMMENT '创建人ID', `department_id` int(10) NOT NULL COMMENT '创建人部门ID', diff --git a/app/oa/controller/Approve.php b/app/oa/controller/Approve.php index 2c60f09..3f256d7 100644 --- a/app/oa/controller/Approve.php +++ b/app/oa/controller/Approve.php @@ -239,16 +239,12 @@ class Approve extends BaseController if (isset($param['end_time'])) { $param['end_time'] = strtotime($param['end_time']); if ($param['end_time'] < $param['start_time']) { - return to_assign(1, "时间选择有误"); + return to_assign(1, "结束时间不能小于开始时间"); } } - if (isset($param['start_time_a'])) { - $param['start_time'] = strtotime($param['start_time_a'] . '' . $param['start_time_b']); - } - if (isset($param['end_time_a'])) { - $param['end_time'] = strtotime($param['end_time_a'] . '' . $param['end_time_b']); - if ($param['end_time'] <= $param['start_time']) { - return to_assign(1, "结束时间需要大于开始时间"); + if (isset($param['duration'])) { + if ($param['duration'] <=0) { + return to_assign(1, "时间区间选择错误"); } } $flow_list = Db::name('Flow')->where('id',$param['flow_id'])->value('flow_list'); @@ -435,12 +431,15 @@ class Approve extends BaseController $detail = Db::name('Approve')->where('id',$param['id'])->find(); $check_record = []; if($detail['start_time']>0){ - $detail['start_time'] = date('Y-m-d H:i',$detail['start_time']); + $detail['start_time_hour'] = date('Y-m-d H:i:s',$detail['start_time']); + $detail['start_time'] = date('Y-m-d',$detail['start_time']); } if($detail['end_time']>0){ - $detail['end_time'] = date('Y-m-d H:i',$detail['end_time']); + $detail['end_time_hour'] = date('Y-m-d H:i:s',$detail['end_time']); + $detail['end_time'] = date('Y-m-d',$detail['end_time']); } if($detail['detail_time']>0){ + $detail['detail_time_hour'] = date('Y-m-d H:i:s',$detail['detail_time']); $detail['detail_time'] = date('Y-m-d',$detail['detail_time']); } diff --git a/app/oa/view/approve/add_chuchai.html b/app/oa/view/approve/add_chuchai.html index 3dbf11a..767fec2 100644 --- a/app/oa/view/approve/add_chuchai.html +++ b/app/oa/view/approve/add_chuchai.html @@ -4,21 +4,36 @@ {/block} {block name="body"} -
+

出差审批

{eq name="$id" value="0"} - + + + + + @@ -41,16 +56,31 @@ {else/}
开始时间*开始时间* - +
+ +
+
+ + +
结束时间* - - +
+ +
+
+ + +
出差天数-
出差地点*
- + + + + + @@ -84,30 +114,82 @@ {block name="script"} {/block} diff --git a/app/oa/view/approve/add_huiyishi.html b/app/oa/view/approve/add_huiyishi.html index 06e00ec..5a43b4f 100644 --- a/app/oa/view/approve/add_huiyishi.html +++ b/app/oa/view/approve/add_huiyishi.html @@ -24,7 +24,6 @@ @@ -53,7 +52,6 @@ diff --git a/app/oa/view/approve/add_huodong.html b/app/oa/view/approve/add_huodong.html index 4fd8b6f..ce2d40e 100644 --- a/app/oa/view/approve/add_huodong.html +++ b/app/oa/view/approve/add_huodong.html @@ -27,7 +27,6 @@ @@ -67,7 +66,6 @@ diff --git a/app/oa/view/approve/add_jiaban.html b/app/oa/view/approve/add_jiaban.html index ee9cc35..6633157 100644 --- a/app/oa/view/approve/add_jiaban.html +++ b/app/oa/view/approve/add_jiaban.html @@ -4,24 +4,35 @@ {/block} {block name="body"} - +

加班申请审批

{eq name="$id" value="0"}
开始时间*开始时间* - +
+ +
+
+ + +
结束时间* - - +
+ +
+
+ + +
出差天数共 {$detail.duration|default='-'} 天
出差地点* 结束时间* -
结束时间* -
结束时间* -
结束时间* -
- + - - + + @@ -33,19 +44,30 @@ {else/}
开始时间*开始时间* - +
+ +
+
+ + +
结束时间* - - +
+ +
+
+ + +
加班时长-加班天数共 - 天
加班事由*
- + - - + + @@ -63,55 +85,82 @@ {block name="script"} {/block} diff --git a/app/oa/view/approve/add_qingjia.html b/app/oa/view/approve/add_qingjia.html index b22f14d..9bea31d 100644 --- a/app/oa/view/approve/add_qingjia.html +++ b/app/oa/view/approve/add_qingjia.html @@ -4,7 +4,7 @@ {/block} {block name="body"} - +

请假申请

{eq name="$id" value="0"}
开始时间*开始时间* - +
+ +
+
+ + +
结束时间* - - +
+ +
+
+ + +
加班时长共{$detail.duration}工时加班天数共 {$detail.duration|default='-'} 天
请假事由*
@@ -28,18 +28,28 @@ - - - + @@ -78,18 +88,28 @@ - - - + @@ -120,63 +140,23 @@ {block name="script"} {/block} diff --git a/app/oa/view/approve/add_waichu.html b/app/oa/view/approve/add_waichu.html index b5d7dc4..a621dd6 100644 --- a/app/oa/view/approve/add_waichu.html +++ b/app/oa/view/approve/add_waichu.html @@ -4,7 +4,7 @@ {/block} {block name="body"} - +

外出审批

{eq name="$id" value="0"}
开始时间* - +
+ +
+
+ + +
结束时间* - +
+ +
+
+ + +
请假工时 请假天数--
请假事由*
开始时间* - +
+ +
+
+ + +
结束时间* - +
+ +
+
+ + +
请假工时 请假天数共{$detail.days}天,{$detail.hours}小时共 {$detail.duration|default='-'} 天
请假事由*
@@ -15,18 +15,28 @@ - - - + @@ -52,19 +62,28 @@ - - - + @@ -95,63 +114,23 @@ {block name="script"} {/block} diff --git a/app/oa/view/approve/add_yongche.html b/app/oa/view/approve/add_yongche.html index 4bb0d69..ff120c7 100644 --- a/app/oa/view/approve/add_yongche.html +++ b/app/oa/view/approve/add_yongche.html @@ -4,24 +4,35 @@ {/block} {block name="body"} - +

用车审批

{eq name="$id" value="0"}
开始时间* - +
+ +
+
+ + +
结束时间* - +
+ +
+
+ + +
外出时长 外出天数--
外出事由*
开始时间* - +
+ +
+
+ + +
结束时间* - - +
+ +
+
+ + +
外出时长 外出天数共{$detail.days}天,{$detail.hours}小时共 {$detail.duration|default='-'} 天
外出事由*
- - + + @@ -48,17 +59,28 @@ - - + + @@ -89,53 +111,82 @@ {block name="script"} {/block} diff --git a/app/oa/view/approve/view_chuchai.html b/app/oa/view/approve/view_chuchai.html index 5f82407..b30b6f5 100644 --- a/app/oa/view/approve/view_chuchai.html +++ b/app/oa/view/approve/view_chuchai.html @@ -9,11 +9,13 @@
开始时间* - +
+ +
+
+ + +
结束时间* - - +
+ +
+
+ + +
用车时长-用车天数-
用车目的地*
开始时间* - +
+ +
+
+ + +
结束时间* - - +
+ +
+
+ + +
用车时长共{$detail.duration}小时用车天数共 {$detail.duration|default='-'} 天
用车目的地*
- + - + + + diff --git a/app/oa/view/approve/view_huiyishi.html b/app/oa/view/approve/view_huiyishi.html index 296a9fa..6c288c3 100644 --- a/app/oa/view/approve/view_huiyishi.html +++ b/app/oa/view/approve/view_huiyishi.html @@ -17,7 +17,7 @@ - + diff --git a/app/oa/view/approve/view_huodong.html b/app/oa/view/approve/view_huodong.html index 91d3e96..174fd71 100644 --- a/app/oa/view/approve/view_huodong.html +++ b/app/oa/view/approve/view_huodong.html @@ -13,7 +13,7 @@ - + diff --git a/app/oa/view/approve/view_jiaban.html b/app/oa/view/approve/view_jiaban.html index 28ba234..e40fbc9 100644 --- a/app/oa/view/approve/view_jiaban.html +++ b/app/oa/view/approve/view_jiaban.html @@ -9,9 +9,9 @@
出差地点{$detail.address}{$detail.address}
出差日期{$detail.start_time} 至 {$detail.end_time}{$detail.start_time} 的{$detail.start_time_span==1?'上午':'下午'} 至 {$detail.end_time} 的{$detail.end_time_span==1?'上午':'下午'}出差天数共{$detail.duration}天
出差事由
预定时间{$detail.start_time} 至 {$detail.end_time}{$detail.start_time_hour} 至 {$detail.end_time_hour}
备注活动预算 {$detail.amount} 活动日期{$detail.start_time} 至 {$detail.end_time}{$detail.start_time_hour} 至 {$detail.end_time_hour}
活动说明
- - - + + + diff --git a/app/oa/view/approve/view_qingjia.html b/app/oa/view/approve/view_qingjia.html index 86c063f..0aaca2f 100644 --- a/app/oa/view/approve/view_qingjia.html +++ b/app/oa/view/approve/view_qingjia.html @@ -21,22 +21,18 @@ {eq name="$detail.detail_type" value="9"}其他{/eq} - - - - - + - + - + {notempty name="$detail.file_ids"} - - - - - - + - + diff --git a/app/oa/view/approve/view_yongche.html b/app/oa/view/approve/view_yongche.html index aa97db0..2b2a0ba 100644 --- a/app/oa/view/approve/view_yongche.html +++ b/app/oa/view/approve/view_yongche.html @@ -9,12 +9,12 @@
加班时间{$detail.start_time} 至 {$detail.end_time}加班时长共{$detail.duration}工时{$detail.start_time} 的{$detail.start_time_span==1?'上午':'下午'} 至 {$detail.end_time} 的{$detail.end_time_span==1?'上午':'下午'}请假天数共{$detail.duration}天
加班事由 请假日期{$detail.start_time} 至 {$detail.end_time}
请假工时共{$detail.duration}工时{$detail.start_time} 的{$detail.start_time_span==1?'上午':'下午'} 至 {$detail.end_time} 的{$detail.end_time_span==1?'上午':'下午'} 请假天数共{$detail.days}天,{$detail.hours}小时共{$detail.duration}天
请假事由{$detail.content}{$detail.content}
相关附件 +
{volist name="$detail.fileArray" id="vo"}
{:file_card($vo,'view')}
diff --git a/app/oa/view/approve/view_waichu.html b/app/oa/view/approve/view_waichu.html index 30d4b43..486b561 100644 --- a/app/oa/view/approve/view_waichu.html +++ b/app/oa/view/approve/view_waichu.html @@ -13,13 +13,9 @@
外出日期{$detail.start_time} 至 {$detail.end_time}
外出时长共{$detail.duration}工时{$detail.start_time} 的{$detail.start_time_span==1?'上午':'下午'} 至 {$detail.end_time} 的{$detail.end_time_span==1?'上午':'下午'} 外出天数共{$detail.days}天,{$detail.hours}小时共{$detail.duration}天
外出事由
- - - + + + - +
用车时间{$detail.start_time} 至 {$detail.end_time}用车时长共{$detail.duration}小时{$detail.start_time} 的{$detail.start_time_span==1?'上午':'下午'} 至 {$detail.end_time} 的{$detail.end_time_span==1?'上午':'下午'}用车天数共{$detail.duration}天
用车目的地目的地 {$detail.address} 车辆