Inicio Explorar Axuda
Iniciar sesión
chengwenliang
/
erp
2
0
Fork 0
Ficheiros Incidencias 0 Pull Requests 0 Wiki
Explorar o código

提交数据

lvhao hai 16 horas
pai
6ba2b43645
achega
d943c53d64
Modificáronse 2 ficheiros con 13 adicións e 5 borrados
Dividir vista Mostrar estatísticas de Diff
  1. 6 3
      core/CoreApp/controllers/Workshopshow.php
  2. 7 2
      template/erp/workshopshow_zcwjgshow.html

+ 6 - 3
core/CoreApp/controllers/Workshopshow.php
Ver ficheiro 

@@ -373,7 +373,8 @@ class Workshopshow extends Start_Controller
 
             $page = $this->input->post('page',true);
 
 		    $perpage = $this->input->post('perpage',true);
 
 
-            $month_one = date("Y-m-d", strtotime("-1 month"));
 
+            $timetkk = $this->input->post('timetkk',true);
 
+            $timetjj = $this->input->post('timetjj',true);
 
 
             if(empty($page))
 
 		    {
 
@@ -385,7 +386,8 @@ class Workshopshow extends Start_Controller
 
                 $start = ($page - 1)*$perpage;
 
             }
 
 
-            $this->db->where("time >",strtotime($month_one));
 
+            $this->db->where("time >= ",strtotime($timetkk));
 
+            $this->db->where("time < ",strtotime($timetkk));
 
             $this->db->not_like('rk', '|11|','before');
 
             $this->db->where("ycrk_type",0);
 
             $this->db->order_by('id','desc');
 
@@ -395,7 +397,8 @@ class Workshopshow extends Start_Controller
 
             $info_list = $info_list->result_array();
 
 
            
-            $this->db->where("time >",strtotime($month_one));
 
+            $this->db->where("time >= ",strtotime($timetkk));
 
+            $this->db->where("time < ",strtotime($timetkk));
 
             $this->db->not_like('rk', '|11|','before');
 
             $this->db->where("ycrk_type",0);
 
             $total = $this->db->count_all_results('systemtransfer');

+ 7 - 2
template/erp/workshopshow_zcwjgshow.html
Ver ficheiro 

@@ -2,8 +2,13 @@
 
 <body>
 
 <div class="warp">
 
 <div class="fixed">
 
-<ul class="search" style="display: none;">
 
-<li><span>确 定</span></li>
 
+<ul class="search" >
 
+
 
+<li>
 
+    <input id="timetk"  value="{date('Y-m-d', strtotime('-1 month'))} 00:00" name="timetkk" type="text" onclick="laydate({istime: true,format:'YYYY-MM-DD hh:mm'})">
 
+        至&nbsp;&nbsp;&nbsp;&nbsp; 
+    <input id="timetj" value="{date('Y-m-d H:i',time())}" name="timetjj" type="text" onclick="laydate({istime: true,format:'YYYY-MM-DD hh:mm'})"></li>
 
+    <li><span>确 定</span></li>
 
 </ul>