From 7e0147a21386ae4ed8bbfcf71df7452161499e3a Mon Sep 17 00:00:00 2001 From: hdm Date: Wed, 10 Aug 2022 10:45:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=A8=A1=E5=9D=97=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E5=B0=B1=E7=AE=97=E5=85=BC=E5=AE=B9=E8=8B=B9=E6=9E=9C?= =?UTF-8?q?=E7=9A=84safari=E6=B5=8F=E8=A7=88=E5=99=A8=EF=BC=8C=E6=8A=8A?= =?UTF-8?q?=E5=9F=BA=E7=A1=80=E7=9A=84=E5=AE=A1=E6=89=B9=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=86=99=E5=85=A5coonfig=E9=85=8D=E7=BD=AE=E4=B8=AD=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/home/controller/Cate.php | 11 +++- app/home/controller/Flow.php | 7 +++ app/home/view/cate/flow_type.html | 23 +------- app/home/view/cate/flow_type_add.html | 22 ++----- app/home/view/flow/add.html | 22 ++----- app/home/view/flow/index.html | 22 +------ app/oa/controller/Approve.php | 1 + app/oa/view/approve/add_chuchai.html | 26 +++----- app/oa/view/approve/add_jiaban.html | 62 ++++++++----------- app/oa/view/approve/add_qingjia.html | 73 ++++++++--------------- app/oa/view/approve/add_waichu.html | 85 +++++++++++++-------------- app/oa/view/approve/add_yongche.html | 62 ++++++++----------- app/oa/view/approve/index.html | 48 ++------------- config/approve.php | 59 +++++++++++++++++++ 14 files changed, 216 insertions(+), 307 deletions(-) create mode 100644 config/approve.php diff --git a/app/home/controller/Cate.php b/app/home/controller/Cate.php index e91d224..8140f9e 100644 --- a/app/home/controller/Cate.php +++ b/app/home/controller/Cate.php @@ -29,7 +29,15 @@ class Cate extends BaseController public function flow_type() { if (request()->isAjax()) { - $cate = Db::name('FlowType')->order('id asc')->select(); + $cate = Db::name('FlowType')->order('id asc')->select()->toArray(); + $type = get_config('approve.type'); + foreach ($cate as $key => &$value){ + foreach ($type as $k => $val){ + if($value['type'] == $val['id']){ + $value['type_name'] = $val['title']; + } + } + } return to_assign(0, '', $cate); } else { return view(); @@ -76,6 +84,7 @@ class Cate extends BaseController View::assign('detail', $detail); } View::assign('id', $id); + View::assign('type', get_config('approve.type')); return view(); } } diff --git a/app/home/controller/Flow.php b/app/home/controller/Flow.php index 0e8a677..46d361b 100644 --- a/app/home/controller/Flow.php +++ b/app/home/controller/Flow.php @@ -20,6 +20,7 @@ class Flow extends BaseController public function index() { if (request()->isAjax()) { + $type = get_config('approve.type'); $list = Db::name('Flow') ->field('f.*,a.name as username,t.title as flow_cate') ->alias('f') @@ -32,6 +33,11 @@ class Flow extends BaseController if($value['department']==''){ $value['department'] = '全公司'; } + foreach ($type as $k => $val){ + if($value['type'] == $val['id']){ + $value['type_name'] = $val['title']; + } + } } return to_assign(0, '', $list); } else { @@ -133,6 +139,7 @@ class Flow extends BaseController View::assign('detail', $detail); } View::assign('id', $id); + View::assign('type', get_config('approve.type')); return view(); } } diff --git a/app/home/view/cate/flow_type.html b/app/home/view/cate/flow_type.html index a6069be..eea71af 100644 --- a/app/home/view/cate/flow_type.html +++ b/app/home/view/cate/flow_type.html @@ -33,28 +33,7 @@ var html=' '+d.icon; return html; }} - ,{field:'type', title: '所属分类',width:100,align:'center',templet: function(d){ - var html=''; - if(d.type==1){ - html = '假勤'; - } - else if(d.type==2){ - html = '行政'; - }else if(d.type==3){ - html = '财务'; - }else if(d.type==4){ - html = '人事'; - }else if(d.type==5){ - html = '其他'; - }else if(d.type==6){ - html = '报销'; - }else if(d.type==7){ - html = '发票'; - }else if(d.type==8){ - html = '合同'; - } - return html; - }} + ,{field:'type_name', title: '所属分类',width:100,align:'center'} ,{field:'status', title: '状态',width:80,align:'center',templet: function(d){ var html1='正常'; var html2='禁用'; diff --git a/app/home/view/cate/flow_type_add.html b/app/home/view/cate/flow_type_add.html index c9be497..8df1f41 100644 --- a/app/home/view/cate/flow_type_add.html +++ b/app/home/view/cate/flow_type_add.html @@ -10,14 +10,9 @@ 名称* @@ -49,14 +44,9 @@ 名称* diff --git a/app/home/view/flow/add.html b/app/home/view/flow/add.html index 973d2eb..da8af29 100644 --- a/app/home/view/flow/add.html +++ b/app/home/view/flow/add.html @@ -24,14 +24,9 @@ 审批类型* @@ -154,14 +149,9 @@ 审批类型* diff --git a/app/home/view/flow/index.html b/app/home/view/flow/index.html index fa9e74f..8e3c328 100644 --- a/app/home/view/flow/index.html +++ b/app/home/view/flow/index.html @@ -39,27 +39,7 @@ } return html; }} - ,{field:'name',title: '应用模块',width:80, align:'center',templet:function(d){ - var html = '其他'; - if(d.type==1){ - html = '假勤'; - }else if(d.type==2){ - html = '行政'; - }else if(d.type==3){ - html = '财务'; - }else if(d.type==4){ - html = '人事'; - }else if(d.type==5){ - html = '其他'; - }else if(d.type==6){ - html = '报销'; - }else if(d.type==7){ - html = '发票'; - }else if(d.type==8){ - html = '合同'; - } - return html; - }} + ,{field:'type_name',title: '应用模块',width:80, align:'center'} ,{field:'flow_cate',title: '审批类型',width:100, align:'center'} ,{field:'department',title: '适用部门'} ,{field:'username',title: '最后修改人',width:90,align:'center'} diff --git a/app/oa/controller/Approve.php b/app/oa/controller/Approve.php index 2c37af7..d1980c4 100644 --- a/app/oa/controller/Approve.php +++ b/app/oa/controller/Approve.php @@ -55,6 +55,7 @@ class Approve extends BaseController } else { $list = Db::name('FlowType')->where(['status'=>1])->select()->toArray(); View::assign('list', $list); + View::assign('type', get_config('approve.type')); return view(); } } diff --git a/app/oa/view/approve/add_chuchai.html b/app/oa/view/approve/add_chuchai.html index c87be19..8f4f15c 100644 --- a/app/oa/view/approve/add_chuchai.html +++ b/app/oa/view/approve/add_chuchai.html @@ -11,7 +11,7 @@ 开始时间* - + + @@ -99,7 +99,7 @@ 开始时间* - + + @@ -212,19 +212,11 @@ const moduleInit = ['tool','employeepicker']; employeepicker = layui.employeepicker, laydate = layui.laydate; //日期时间范围 - 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-time').each(function () { + laydate.render({ + elem: this, + trigger: 'click' + }); }); if (typeof (flowStep) == "function") { diff --git a/app/oa/view/approve/add_jiaban.html b/app/oa/view/approve/add_jiaban.html index eb81e00..f12fbd5 100644 --- a/app/oa/view/approve/add_jiaban.html +++ b/app/oa/view/approve/add_jiaban.html @@ -11,7 +11,7 @@ 开始时间* - + + @@ -137,7 +137,7 @@ 开始时间* - + + @@ -279,8 +279,10 @@ function leaveTime() { return 0; } - var start = new Date(data_1+' '+data_1_1); - var end = new Date(data_2+' '+data_2_1); + 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();//时间差的毫秒数 if(diff<0){ return 0; @@ -298,41 +300,23 @@ const moduleInit = ['tool','employeepicker']; if (typeof (flowStep) == "function") { flowStep(); - } + } //日期时间范围 - laydate.render({ - elem: '#start_time_a', - type: 'date', - format: 'yyyy-MM-dd', - showBottom: false, - done:function(){ - var hours = leaveTime(); - if(hours == 0){ - $('#duration').html('-'); + lay('.select-time').each(function () { + laydate.render({ + elem: this, + trigger: 'click', + done:function(){ + var hours = leaveTime(); + if(hours == 0){ + $('#duration').html('-'); + } + else{ + $('#duration').html('共'+hours+'小时'); + } + $('[name="duration"]').val(hours); } - else{ - $('#duration').html('共'+hours+'小时'); - } - $('[name="duration"]').val(hours); - } - }); - - //日期时间范围 - laydate.render({ - elem: '#end_time_a', - type: 'date', - format: 'yyyy-MM-dd', - showBottom: false, - done:function(){ - var hours = leaveTime(); - if(hours == 0){ - $('#duration').html('-'); - } - else{ - $('#duration').html('共'+hours+'小时'); - } - $('[name="duration"]').val(hours); - } + }); }); form.on('select(time_b)', function(data){ diff --git a/app/oa/view/approve/add_qingjia.html b/app/oa/view/approve/add_qingjia.html index 021602e..3686d88 100644 --- a/app/oa/view/approve/add_qingjia.html +++ b/app/oa/view/approve/add_qingjia.html @@ -28,7 +28,7 @@ 开始时间* - + + @@ -123,7 +123,7 @@ 开始时间* - + + @@ -231,8 +231,10 @@ function leaveTime() { return 0; } - var start = new Date(data_1+' '+data_1_1); - var end = new Date(data_2+' '+data_2_1); + 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(); @@ -292,52 +294,27 @@ const moduleInit = ['tool','employeepicker']; if (typeof (flowStep) == "function") { flowStep(); } - //日期时间范围 - laydate.render({ - elem: '#start_time_a', - type: 'date', - format: 'yyyy-MM-dd', - showBottom: false, - 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); + lay('.select-time').each(function () { + laydate.render({ + elem: this, + trigger: 'click', + done:function(){ + var hours = leaveTime(); + if(hours == 0){ + $('#hours,#days').html('-'); } - $('#days').html('共'+days+'天，'+(hours%75)/10+'小时'); - } - $('[name="duration"]').val(hours/10); - } - }); - - - //日期时间范围 - laydate.render({ - elem: '#end_time_a', - type: 'date', - format: 'yyyy-MM-dd', - showBottom: false, - 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); + else{ + $('#hours').html('共'+hours/10+'小时'); + var days = 0; + if(hours>=75){ + days = parseInt(hours/75); + } + $('#days').html('共'+days+'天，'+(hours%75)/10+'小时'); } - $('#days').html('共'+days+'天，'+(hours%75)/10+'小时'); + $('[name="duration"]').val(hours/10); } - $('[name="duration"]').val(hours/10); - } + }); }); form.on('select(time_b)', function(data){ diff --git a/app/oa/view/approve/add_waichu.html b/app/oa/view/approve/add_waichu.html index 6a6dd83..23c2fc8 100644 --- a/app/oa/view/approve/add_waichu.html +++ b/app/oa/view/approve/add_waichu.html @@ -15,7 +15,7 @@ 开始时间* - + + @@ -97,7 +97,7 @@ 开始时间* - + + @@ -205,9 +205,11 @@ function leaveTime() { return 0; } - var start = new Date(data_1+' '+data_1_1); - var end = new Date(data_2+' '+data_2_1); - var startHour = start.getHours(); //16 + 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(); @@ -267,49 +269,42 @@ const moduleInit = ['tool','employeepicker']; flowStep(); } //日期时间范围 - laydate.render({ - elem: '#start_time_a', - type: 'date', - format: 'yyyy-MM-dd', - showBottom: false, - 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); + lay('.select-time').each(function () { + laydate.render({ + elem: this, + trigger: 'click', + done:function(){ + var hours = leaveTime(); + if(hours == 0){ + $('#hours,#days').html('-'); } - $('#days').html('共'+days+'天，'+(hours%75)/10+'小时'); + 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/10); - } + }); }); - //日期时间范围 - laydate.render({ - elem: '#end_time_a', - type: 'date', - format: 'yyyy-MM-dd', - showBottom: false, - 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); + 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); + } + $('#days').html('共'+days+'天，'+(hours%75)/10+'小时'); + } + $('[name="duration"]').val(hours/10); }); } diff --git a/app/oa/view/approve/add_yongche.html b/app/oa/view/approve/add_yongche.html index 64afa4c..310b15e 100644 --- a/app/oa/view/approve/add_yongche.html +++ b/app/oa/view/approve/add_yongche.html @@ -11,7 +11,7 @@ 开始时间* - + + @@ -150,7 +150,7 @@ 开始时间* - + + @@ -305,8 +305,10 @@ function leaveTime() { return 0; } - var start = new Date(data_1+' '+data_1_1); - var end = new Date(data_2+' '+data_2_1); + 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();//时间差的毫秒数 if(diff<0){ return 0; @@ -322,41 +324,23 @@ const moduleInit = ['tool','employeepicker']; var form = layui.form,tool=layui.tool, employeepicker = layui.employeepicker,laydate = layui.laydate; if (typeof (flowStep) == "function") { flowStep(); - } + } //日期时间范围 - laydate.render({ - elem: '#start_time_a', - type: 'date', - format: 'yyyy-MM-dd', - showBottom: false, - done:function(){ - var hours = leaveTime(); - if(hours == 0){ - $('#duration').html('-'); + lay('.select-time').each(function () { + laydate.render({ + elem: this, + trigger: 'click', + done:function(){ + var hours = leaveTime(); + if(hours == 0){ + $('#duration').html('-'); + } + else{ + $('#duration').html('共'+hours+'小时'); + } + $('[name="duration"]').val(hours); } - else{ - $('#duration').html('共'+hours+'小时'); - } - $('[name="duration"]').val(hours); - } - }); - - //日期时间范围 - laydate.render({ - elem: '#end_time_a', - type: 'date', - format: 'yyyy-MM-dd', - showBottom: false, - done:function(){ - var hours = leaveTime(); - if(hours == 0){ - $('#duration').html('-'); - } - else{ - $('#duration').html('共'+hours+'小时'); - } - $('[name="duration"]').val(hours); - } + }); }); form.on('select(time_b)', function(data){ diff --git a/app/oa/view/approve/index.html b/app/oa/view/approve/index.html index 9edfe6c..7f68cee 100644 --- a/app/oa/view/approve/index.html +++ b/app/oa/view/approve/index.html @@ -17,57 +17,19 @@
-

审批新申请

-
假勤
+

审批新申请

+ {volist name="type" id="v" offset="0" length='5'} +
{$v.title}
{volist name="list" id="vo"} - {eq name="vo.type" value="1"} -
{$vo.title}
- {/eq} - {/volist} -
-
-
行政
-
-
- {volist name="list" id="vo"} - {eq name="vo.type" value="2"} -
{$vo.title}
- {/eq} - {/volist} -
-
-
财务
-
-
- {volist name="list" id="vo"} - {eq name="vo.type" value="3"} -
{$vo.title}
- {/eq} - {/volist} -
-
-
人事
-
-
- {volist name="list" id="vo"} - {eq name="vo.type" value="4"} -
{$vo.title}
- {/eq} - {/volist} -
-
-
其他
-
-
- {volist name="list" id="vo"} - {eq name="vo.type" value="5"} + {eq name="vo.type" value="$v.id"}
{$vo.title}
{/eq} {/volist}
+ {/volist}
diff --git a/config/approve.php b/config/approve.php new file mode 100644 index 0000000..ae80622 --- /dev/null +++ b/config/approve.php @@ -0,0 +1,59 @@ + [ + [ + 'id' => '1', + 'title'=> '假勤', + 'db_type'=>1, + 'db_name'=>'', + ], + [ + 'id' => '2', + 'title'=> '行政', + 'db_type'=>1, + 'db_name'=>'', + ], + [ + 'id' => '3', + 'title'=> '财务', + 'db_type'=>1, + 'db_name'=>'', + ], + [ + 'id' => '4', + 'title'=> '人事', + 'db_type'=>1, + 'db_name'=>'', + ], + [ + 'id' => '5', + 'title'=> '其他', + 'db_type'=>1, + 'db_name'=>'', + ], + [ + 'id' => '6', + 'title'=> '报销' , + 'db_type'=>2, + 'db_name'=>'', + ], + [ + 'id' => '7', + 'title'=> '发票', + 'db_type'=>3, + 'db_name'=>'', + ], + [ + 'id' => '8', + 'title'=> '合同', + 'db_type'=>4, + 'db_name'=>'', + ], + ], +];