wupengfei 2 years ago
parent
commit
f34b177f1c

+ 4 - 0
application/car/controller/CarInfo.php

@@ -32,6 +32,10 @@ class CarInfo extends Controller
         $sel_where = [];
         if($name = input('name')) $sel_where[] = ['u.name','like','%'.$name.'%'];
         if($status = input('status')) $sel_where[] = ['u.status','=',$status];
+        $time = explode(' - ',input('create_at'));
+        if(input('create_at')){
+            $sel_where[] = ['a.create_at','between time',$time];
+        }
         $query = $this->_query($this->table)
             ->field('a.*,u.name,u.headimg')
             ->where($sel_where)

+ 6 - 35
application/car/view/car_info/index_search.html

@@ -21,50 +21,21 @@
                 </select>
             </div>
         </div>
+        <div class="layui-form-item layui-inline">
+            <label class="layui-form-label">申请时间</label>
+            <div class="layui-input-inline">
+                <input name="create_at" value="{$Think.get.create_at|default=''}" placeholder="请选择申请时间" class="layui-input">
+            </div>
+        </div>
 
 
         <div class="layui-form-item layui-inline">
             <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
        <!--     <button type="button" data-export-list class="layui-btn layui-btn-primary" id="download"><i class="layui-icon layui-icon-export"></i> 导 出</button>-->
         </div>
-        <div class="layui-form-item layui-inline" style="margin-left: 5px;">
-            <div  data-title="导出" class='layui-btn layui-btn-sm layui-btn-primary' id="download">导出</div>
-        </div>
     </form>
     <script>
         form.render();
         laydate.render({range: true, elem: '[name="create_at"]'})
-        layui.use('upload', function(){
-            var upload = layui.upload;
-            //执行实例
-            var uploadInst = upload.render({
-                elem: '#import' //绑定元素
-                ,url: '/user/member/import'
-                ,accept: 'file' //普通文件,
-                ,data:{
-                    subject_id:function(){
-                        return $('#subject').val();
-                    }
-                }
-                ,before: function(obj){ //obj参数包含的信息,跟 choose回调完全一致,可参见上文。
-                }
-                ,done: function(res){
-                    if(res.code == 0){
-                        layer.msg(res.info);
-                    }else{
-                        layer.msg('导入成功');
-                        setTimeout(function(){
-                            location.reload();
-                        },2000);
-                    }
-                }
-                ,error: function(){
-                    layer.msg('上传失败');
-                }
-            });
-        });
-        $('#download').click(function () {
-            window.location.href = "{:url('export')}?phone={$Think.get.phone|default=''}&name={$Think.get.name|default=''}&create_at={$Think.get.create_at|default=''}&account_type={$Think.get.create_at|default='0'}" + $(this).parents('form').serialize();
-        });
     </script>
 </fieldset>

+ 1 - 36
application/leave/view/leave_info/index_search.html

@@ -41,7 +41,7 @@
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">申请时间</label>
             <div class="layui-input-inline">
-                <input name="create_at" value="{$Think.get.create_at|default=''}" placeholder="请选申请时间" class="layui-input">
+                <input name="create_at" value="{$Think.get.create_at|default=''}" placeholder="请选申请时间" class="layui-input">
             </div>
         </div>
 
@@ -51,44 +51,9 @@
             <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
        <!--     <button type="button" data-export-list class="layui-btn layui-btn-primary" id="download"><i class="layui-icon layui-icon-export"></i> 导 出</button>-->
         </div>
-        <div class="layui-form-item layui-inline" style="margin-left: 5px;">
-            <div  data-title="导出" class='layui-btn layui-btn-sm layui-btn-primary' id="download">导出</div>
-        </div>
     </form>
     <script>
         form.render();
         laydate.render({range: true, elem: '[name="create_at"]'})
-        layui.use('upload', function(){
-            var upload = layui.upload;
-            //执行实例
-            var uploadInst = upload.render({
-                elem: '#import' //绑定元素
-                ,url: '/user/member/import'
-                ,accept: 'file' //普通文件,
-                ,data:{
-                    subject_id:function(){
-                        return $('#subject').val();
-                    }
-                }
-                ,before: function(obj){ //obj参数包含的信息,跟 choose回调完全一致,可参见上文。
-                }
-                ,done: function(res){
-                    if(res.code == 0){
-                        layer.msg(res.info);
-                    }else{
-                        layer.msg('导入成功');
-                        setTimeout(function(){
-                            location.reload();
-                        },2000);
-                    }
-                }
-                ,error: function(){
-                    layer.msg('上传失败');
-                }
-            });
-        });
-        $('#download').click(function () {
-            window.location.href = "{:url('export')}?phone={$Think.get.phone|default=''}&name={$Think.get.name|default=''}&create_at={$Think.get.create_at|default=''}&account_type={$Think.get.create_at|default='0'}" + $(this).parents('form').serialize();
-        });
     </script>
 </fieldset>