From 474e784866712af99abe3e92710c1f2948a2c38e Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 11 十二月 2023 00:41:10 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/mapper/LocDetlMapper.java                |    9 
 src/main/java/com/zy/asrs/service/LocDetlService.java              |    5 
 src/main/java/com/zy/asrs/controller/LocDetlController.java        |   77 +++++++
 src/main/java/com/zy/asrs/entity/param/WrkDetlLogAllViewParam.java |   28 ++
 src/main/webapp/views/locDetlStatis/wrkDetlLogAllView.html         |   91 +++++++++
 src/main/resources/mapper/LocDetlMapper.xml                        |   82 ++++++++
 src/main/webapp/static/js/locDetlStatis/wrkDetlLogAllView.js       |  260 ++++++++++++++++++++++++++
 src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java     |   26 ++
 8 files changed, 578 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index b3b35d6..978c030 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -13,6 +13,7 @@
 import com.core.common.DateUtils;
 import com.core.common.R;
 import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.param.WrkDetlLogAllViewParam;
 import com.zy.asrs.entity.result.LocDetlAll;
 import com.zy.asrs.entity.result.LocDetlDTO;
 import com.zy.asrs.mapper.LocDetlMapper;
@@ -28,6 +29,7 @@
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.net.URLEncoder;
+import java.time.LocalDate;
 import java.util.*;
 
 @RestController
@@ -472,5 +474,80 @@
         return R.ok("褰撳墠搴撲綅鏄┖搴撲綅");
     }
 
+    @RequestMapping(value = "/asr/wrk/out/in/all/view/auth")
+    @ManagerAuth
+    public R outInAllView(@RequestParam(defaultValue = "1")Integer curr,
+                    @RequestParam(defaultValue = "10")Integer limit,
+                    @RequestParam Map<String, Object> param) {
+        excludeTrash(param);
+        if (!Cools.isEmpty(param.get("matnr"))){
+            Page<WrkDetlLogAllViewParam> wrkDetlLogAllViewParamPageM = locDetlService.selectAllWrkDetlLogAllViewParamByMatnr(toPage(curr, limit, param, WrkDetlLogAllViewParam.class));
+            return R.ok().add(wrkDetlLogAllViewParamPageM);
+        }else {
+            Page<WrkDetlLogAllViewParam> wrkDetlLogAllViewParamPage = locDetlService.selectAllWrkDetlLogAllViewParam(toPage(curr, limit, param, WrkDetlLogAllViewParam.class));
+            return R.ok().add(wrkDetlLogAllViewParamPage);
+        }
+    }
+
+    @RequestMapping(value = "/asr/wrk/out/in/all/count/view/auth")
+    @ManagerAuth
+    public R outInAllCountView(@RequestParam(defaultValue = "1")Integer curr,
+                          @RequestParam(defaultValue = "10")Integer limit,
+                          @RequestParam Map<String, Object> param) {
+        excludeTrash(param);
+        LocalDate localDate = LocalDate.now();
+        int year = localDate.getYear();
+        int month = localDate.getMonthValue();
+        int day = localDate.getDayOfMonth();
+        param.put("year",year);
+        param.put("month",month);
+        param.put("day",day);
+        param.put("kun","All");
+        param.put("upDown","鍑哄簱");
+        List<WrkDetlLogAllViewParam> excel = locDetlService.selectAllWrkDetlLogAllViewParamE(param);
+        Double a=0.0;
+        for (WrkDetlLogAllViewParam wrkDetlLogAllViewParam:excel
+             ) {
+            a=wrkDetlLogAllViewParam.getAnfme()+a;
+        }
+
+        param.put("upDown","鍏ュ簱");
+        List<WrkDetlLogAllViewParam> excel2 = locDetlService.selectAllWrkDetlLogAllViewParamE(param);
+        Double b=0.0;
+        for (WrkDetlLogAllViewParam wrkDetlLogAllViewParam:excel2
+        ) {
+            b=wrkDetlLogAllViewParam.getAnfme()+b;
+        }
+
+        Map<String, Object> map2 = new HashMap<>();
+        map2.put("a", a);
+        map2.put("b", b);
+
+        return R.ok(map2);
+    }
+
+    @RequestMapping(value = "/asr/wrk/out/in/all/view/export")
+//    @ManagerAuth
+    public void outInAllExport(HttpServletResponse response,
+                               @RequestParam Map<String, Object> param) throws IOException {
+        List<WrkDetlLogAllViewParam> excel = new ArrayList<>();
+        excludeTrash(param);
+        param.put("kun","All");
+        if (!Cools.isEmpty(param.get("matnr"))){
+            excel = locDetlService.selectAllWrkDetlLogAllViewParamByMatnrE(param);
+
+        }else {
+            excel = locDetlService.selectAllWrkDetlLogAllViewParamE(param);
+
+        }
+        response.setContentType("application/vnd.ms-excel");
+        response.setCharacterEncoding("utf-8");
+        String fileName = URLEncoder.encode("鍑哄叆搴撴槑缁嗗巻鍙�", "UTF-8");
+        response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
+        EasyExcel.write(response.getOutputStream(), WrkDetlLogAllViewParam.class)
+                .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
+                .sheet("琛�1")
+                .doWrite(excel);
+    }
 
 }
diff --git a/src/main/java/com/zy/asrs/entity/param/WrkDetlLogAllViewParam.java b/src/main/java/com/zy/asrs/entity/param/WrkDetlLogAllViewParam.java
new file mode 100644
index 0000000..5c600f5
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/WrkDetlLogAllViewParam.java
@@ -0,0 +1,28 @@
+package com.zy.asrs.entity.param;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+@Data
+public class WrkDetlLogAllViewParam {
+    @ExcelProperty("鏁伴噺")
+    private Double anfme;
+
+    @ExcelProperty("鐗╂枡缂栫爜")
+    private String matnr;
+
+    @ExcelProperty("骞�")
+    private Integer year;
+
+    @ExcelProperty("鏈�")
+    private Integer month;
+
+    @ExcelProperty("鏃�")
+    private Integer day;
+
+    @ExcelProperty("浠撳簱")
+    private String kun;
+
+    @ExcelProperty("鍏ュ嚭搴撶被鍨�")
+    private String upDown;
+}
diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index a31b8bb..c5d7a11 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.param.WrkDetlLogAllViewParam;
 import com.zy.asrs.entity.result.LocDetlAll;
 import com.zy.asrs.entity.result.LocDetlDTO;
 import com.zy.asrs.entity.result.StockVo;
@@ -103,4 +104,12 @@
 
     List<LocDetl> queryStock3(String matnr, String batch, int owner);
     List<LocDetlAll> selectOwnerAllAnfme();
+    List<WrkDetlLogAllViewParam> selectAllWrkDetlLogAllViewParamE(Map<String, Object> map);
+    List<WrkDetlLogAllViewParam> selectAllWrkDetlLogAllViewParam(Map<String, Object> map);
+    Integer selectAllWrkDetlLogAllViewParamCount(Map<String, Object> map);
+
+    List<WrkDetlLogAllViewParam> selectAllWrkDetlLogAllViewParamByMatnr(Map<String, Object> map);
+    List<WrkDetlLogAllViewParam> selectAllWrkDetlLogAllViewParamByMatnrE(Map<String, Object> map);
+    Integer selectAllWrkDetlLogAllViewParamByMatnrCount(Map<String, Object> map);
+
 }
diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index 4d16f63..60633c0 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.service.IService;
 import com.core.common.R;
 import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.param.WrkDetlLogAllViewParam;
 import com.zy.asrs.entity.result.LocDetlAll;
 import com.zy.asrs.entity.result.LocDetlDTO;
 import com.zy.asrs.entity.result.StockVo;
@@ -40,6 +41,10 @@
     Page<LocDetlAll> getStockStatisAll(Page<LocDetlAll> page);
     Page<LocDetlAll> getOwnerStatisAll(Page<LocDetlAll> page);
 
+    Page<WrkDetlLogAllViewParam> selectAllWrkDetlLogAllViewParam(Page<WrkDetlLogAllViewParam> page);
+    List<WrkDetlLogAllViewParam> selectAllWrkDetlLogAllViewParamE(Map<String, Object> map);
+    Page<WrkDetlLogAllViewParam> selectAllWrkDetlLogAllViewParamByMatnr(Page<WrkDetlLogAllViewParam> page);
+    List<WrkDetlLogAllViewParam> selectAllWrkDetlLogAllViewParamByMatnrE(Map<String, Object> map);
     Double sumAll();
 
     Double getSumAnfme(String matnr);
diff --git a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
index 7b1bbb0..1854311 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -5,6 +5,7 @@
 import com.core.common.Cools;
 import com.core.common.R;
 import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.param.WrkDetlLogAllViewParam;
 import com.zy.asrs.entity.result.LocDetlAll;
 import com.zy.asrs.entity.result.LocDetlDTO;
 import com.zy.asrs.entity.result.StockVo;
@@ -14,6 +15,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 @Service("locDetlService")
@@ -77,6 +79,30 @@
     }
 
     @Override
+    public Page<WrkDetlLogAllViewParam> selectAllWrkDetlLogAllViewParam(Page<WrkDetlLogAllViewParam> page) {
+        page.setRecords(baseMapper.selectAllWrkDetlLogAllViewParam(page.getCondition()));
+        page.setTotal(baseMapper.selectAllWrkDetlLogAllViewParamCount(page.getCondition()));
+        return page;
+    }
+
+    @Override
+    public Page<WrkDetlLogAllViewParam> selectAllWrkDetlLogAllViewParamByMatnr(Page<WrkDetlLogAllViewParam> page) {
+        page.setRecords(baseMapper.selectAllWrkDetlLogAllViewParamByMatnr(page.getCondition()));
+        page.setTotal(baseMapper.selectAllWrkDetlLogAllViewParamByMatnrCount(page.getCondition()));
+        return page;
+    }
+
+    @Override
+    public List<WrkDetlLogAllViewParam> selectAllWrkDetlLogAllViewParamByMatnrE(Map<String, Object> map) {
+        return baseMapper.selectAllWrkDetlLogAllViewParamByMatnrE(map);
+    }
+
+    @Override
+    public List<WrkDetlLogAllViewParam> selectAllWrkDetlLogAllViewParamE(Map<String, Object> map) {
+        return baseMapper.selectAllWrkDetlLogAllViewParamE(map);
+    }
+
+    @Override
     public Page<LocDetlAll> getOwnerStatisAll(Page<LocDetlAll> page) {
         page.setRecords(baseMapper.getOwnerStatisAll(page.getCondition()));
         page.setTotal(baseMapper.getOwnerStatisAllCount(page.getCondition()));
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index eda904e..e86e860 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -726,5 +726,87 @@
         select SUM(anfme) as anfme,owner from asr_loc_detl_all GROUP BY owner ORDER BY anfme DESC
     </select>
 
+    <sql id="wrkDetlLogAllViewParamCondition">
+        <if test="matnr!=null and maktx!='' ">
+            and a.matnr = #{matnr}
+        </if>
+        <if test="year!=null and year!='' ">
+            and a.year = #{year}
+        </if>
+        <if test="month!=null and month!='' ">
+            and a.month = #{month}
+        </if>
+        <if test="day!=null and day!='' ">
+            and a.day=#{day}
+        </if>
+        <if test="kun !=null and kun!='' ">
+            and a.kun =  #{kun}
+        </if>
+        <if test="upDown !=null and upDown!='' ">
+            and a.up_down =  #{upDown}
+        </if>
+    </sql>
+
+    <select id="selectAllWrkDetlLogAllViewParam" parameterType="java.util.Map" resultType="com.zy.asrs.entity.param.WrkDetlLogAllViewParam">
+        select t.* from
+        (
+            SELECT ROW_NUMBER() over (order by SUM(a.anfme) desc) as row,SUM(a.anfme) as anfme,a.year,a.month,a.day,a.kun,a.up_down as upDown
+            from asr_wrk_out_in_all_view as a
+            where 1=1
+            <include refid="wrkDetlLogAllViewParamCondition"></include>
+            group by a.[year],a.[month],a.[day],a.kun,a.up_down
+        ) t
+        where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
+    </select>
+
+    <select id="selectAllWrkDetlLogAllViewParamE" parameterType="java.util.Map" resultType="com.zy.asrs.entity.param.WrkDetlLogAllViewParam">
+        SELECT ROW_NUMBER() over (order by SUM(a.anfme) desc) as row,SUM(a.anfme) as anfme,a.year,a.month,a.day,a.kun,a.up_down as upDown
+        from asr_wrk_out_in_all_view as a
+        where 1=1
+        <include refid="wrkDetlLogAllViewParamCondition"></include>
+        group by a.[year],a.[month],a.[day],a.kun,a.up_down
+    </select>
+
+    <select id="selectAllWrkDetlLogAllViewParamCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+        select count(1) from
+        (
+        SELECT ROW_NUMBER() over (order by SUM(a.anfme) desc) as row,SUM(a.anfme) as anfme,a.year,a.month,a.day,a.kun,a.up_down as upDown
+        from asr_wrk_out_in_all_view as a
+        where 1=1
+        <include refid="wrkDetlLogAllViewParamCondition"></include>
+        group by a.[year],a.[month],a.[day],a.kun,a.up_down
+        ) t
+    </select>
+
+    <select id="selectAllWrkDetlLogAllViewParamByMatnr" parameterType="java.util.Map" resultType="com.zy.asrs.entity.param.WrkDetlLogAllViewParam">
+        select t.* from
+        (
+        SELECT ROW_NUMBER() over (order by SUM(a.anfme) desc) as row,SUM(a.anfme) as anfme,a.matnr,a.year,a.month,a.day,a.kun,a.up_down as upDown
+        from asr_wrk_out_in_all_view as a
+        where 1=1
+        <include refid="wrkDetlLogAllViewParamCondition"></include>
+        group by a.matnr,a.[year],a.[month],a.[day],a.kun,a.up_down
+        ) t
+        where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
+    </select>
+
+    <select id="selectAllWrkDetlLogAllViewParamByMatnrE" parameterType="java.util.Map" resultType="com.zy.asrs.entity.param.WrkDetlLogAllViewParam">
+        SELECT ROW_NUMBER() over (order by SUM(a.anfme) desc) as row,SUM(a.anfme) as anfme,a.matnr,a.year,a.month,a.day,a.kun,a.up_down as upDown
+        from asr_wrk_out_in_all_view as a
+        where 1=1
+        <include refid="wrkDetlLogAllViewParamCondition"></include>
+        group by a.matnr,a.[year],a.[month],a.[day],a.kun,a.up_down
+    </select>
+
+    <select id="selectAllWrkDetlLogAllViewParamByMatnrCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+        select count(1) from
+        (
+        SELECT ROW_NUMBER() over (order by SUM(a.anfme) desc) as row,SUM(a.anfme) as anfme,a.matnr,a.year,a.month,a.day,a.kun,a.up_down as upDown
+        from asr_wrk_out_in_all_view as a
+        where 1=1
+        <include refid="wrkDetlLogAllViewParamCondition"></include>
+        group by a.matnr,a.[year],a.[month],a.[day],a.kun,a.up_down
+        ) t
+    </select>
 
 </mapper>
diff --git a/src/main/webapp/static/js/locDetlStatis/wrkDetlLogAllView.js b/src/main/webapp/static/js/locDetlStatis/wrkDetlLogAllView.js
new file mode 100644
index 0000000..f5b0cc2
--- /dev/null
+++ b/src/main/webapp/static/js/locDetlStatis/wrkDetlLogAllView.js
@@ -0,0 +1,260 @@
+var pageCurr;
+function getCol() {
+    var cols = [
+        {field: 'anfme', align: 'center',title: '鏁伴噺', style: 'font-weight: bold'},
+        {field: 'matnr', align: 'center',title: '鐗╂枡缂栫爜', style: 'font-weight: bold'},
+        {field: 'year', align: 'center',title: '骞�', style: 'font-weight: bold'},
+        {field: 'month', align: 'center',title: '鏈�', style: 'font-weight: bold'},
+        {field: 'day', align: 'center',title: '鏃�', style: 'font-weight: bold'},
+        {field: 'kun', align: 'center',title: '浠撳簱', style: 'font-weight: bold'},
+        {field: 'upDown', align: 'center',title: '鍏ュ嚭搴撶被鍨�', style: 'font-weight: bold'}
+    ];
+    // cols.push({field: 'anfme', align: 'center',title: '鏁伴噺', style: 'font-weight: bold'}
+    // )
+    return cols;
+}
+
+layui.use(['table','laydate', 'form'], function(){
+    var table = layui.table;
+    var $ = layui.jquery;
+    var layer = layui.layer;
+    var layDate = layui.laydate;
+    var form = layui.form;
+
+    // 鏁版嵁娓叉煋
+    tableIns = table.render({
+        elem: '#wrkDetlLogAllView',
+        headers: {token: localStorage.getItem('token')},
+        url: baseUrl+'/asr/wrk/out/in/all/view/auth',
+        page: true,
+        limit: 20,
+        limits: [20, 30, 50, 100, 200, 500],
+        even: true,
+        toolbar: '#toolbar',
+        cellMinWidth: 50,
+        cols: [getCol()],
+        request: {
+            pageName: 'curr',
+            pageSize: 'limit'
+        },
+        parseData: function (res) {
+            return {
+                'code': res.code,
+                'msg': res.msg,
+                'count': res.data.total,
+                'data': res.data.records
+            }
+        },
+        response: {
+            statusCode: 200
+        },
+        done: function(res, curr, count) {
+            if (res.code === 403) {
+                top.location.href = baseUrl+"/";
+            }
+            pageCurr=curr;
+            limit();
+            form.on('checkbox(tableCheckbox)', function (data) {
+                var _index = $(data.elem).attr('table-index')||0;
+                if(data.elem.checked){
+                    res.data[_index][data.value] = 'Y';
+                }else{
+                    res.data[_index][data.value] = 'N';
+                }
+            });
+            /**
+             * 鏄剧ず搴撳瓨鎬绘暟閲忎粖鏃ュ嚭搴�
+             */
+            $.ajax({
+                url: baseUrl+"/asr/wrk/out/in/all/count/view/auth",
+                headers: {'token': localStorage.getItem('token')},
+                contentType:'application/json;charset=UTF-8',
+                method: 'POST',
+                success: function (res) {
+                    $("#countNum2").text(res.data.a + '涓�');
+                    $("#countNum3").text(res.data.b + '涓�');
+                }
+            });
+
+        }
+    });
+
+    // 鐩戝惉鎺掑簭浜嬩欢
+    table.on('sort(wrkDetlLogAllView)', function (obj) {
+        var searchData = {};
+        $.each($('#search-box [name]').serializeArray(), function() {
+            searchData[this.name] = this.value;
+        });
+        searchData['orderByField'] = obj.field;
+        searchData['orderByType'] = obj.type;
+        tableIns.reload({
+            where: searchData,
+            page: {
+                curr: 1
+            },
+            done: function (res, curr, count) {
+                if (res.code === 403) {
+                    top.location.href = baseUrl+"/";
+                }
+                pageCurr=curr;
+                limit();
+            }
+        });
+    });
+
+    // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+    table.on('toolbar(wrkDetlLogAllView)', function (obj) {
+        var checkStatus = table.checkStatus(obj.config.id);
+        switch(obj.event) {
+            case 'exportAll':
+                layer.closeAll();
+                layer.load(1, {shade: [0.1,'#fff']});
+                location.href = baseUrl + "/asr/wrk/out/in/all/view/export";
+                layer.closeAll('loading');
+                break;
+            case 'exportData':
+                layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
+                    var titles=[];
+                    var fields=[];
+                    obj.config.cols[0].map(function (col) {
+                        if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
+                            titles.push(col.title);
+                            fields.push(col.field);
+                        }
+                    });
+                    var exportData = {};
+                    $.each($('#search-box [name]').serializeArray(), function() {
+                        exportData[this.name] = this.value;
+                    });
+                    var param = {
+                        'locDetl': exportData,
+                        'fields': fields
+                    };
+                    $.ajax({
+                        url: baseUrl+"/locDetl/export/auth",
+                        headers: {'token': localStorage.getItem('token')},
+                        data: JSON.stringify(param),
+                        dataType:'json',
+                        contentType:'application/json;charset=UTF-8',
+                        method: 'POST',
+                        success: function (res) {
+                            layer.closeAll();
+                            if (res.code === 200) {
+                                table.exportFile(titles,res.data,'xls');
+                            } else if (res.code === 403) {
+                                top.location.href = baseUrl+"/";
+                            } else {
+                                layer.msg(res.msg)
+                            }
+                        }
+                    });
+                });
+                break;
+        }
+    });
+
+    // 鐩戝惉琛屽伐鍏蜂簨浠�
+    table.on('tool(wrkDetlLogAllView)', function(obj){
+        var data = obj.data;
+        switch (obj.event) {
+            // 璇︽儏
+            case 'detail':
+                layer.open({
+                    type: 2,
+                    title: '璇︽儏',
+                    maxmin: true,
+                    area: [top.detailWidth, top.detailHeight],
+                    shadeClose: false,
+                    content: 'locDetl_detail.html',
+                    success: function(layero, index){
+                        setFormVal(layer.getChildFrame('#detail', index), data, true);
+                        top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
+                        layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
+                        layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+                        layero.find('iframe')[0].contentWindow.layui.form.render('select');
+                        layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
+                    }
+                });
+                break;
+
+        }
+    });
+
+
+    // 鎼滅储鏍忔悳绱簨浠�
+    form.on('submit(search)', function (data) {
+        pageCurr = 1;
+        tableReload(false);
+    });
+
+    // 鎼滅储鏍忛噸缃簨浠�
+    form.on('submit(reset)', function (data) {
+        pageCurr = 1;
+        clearFormVal($('#search-box'));
+        tableReload(false);
+    });
+
+    // 鏃堕棿閫夋嫨鍣�
+    layDate.render({
+        elem: '#modiTime\\$',
+        type: 'datetime'
+    });
+    layDate.render({
+        elem: '#appeTime\\$',
+        type: 'datetime'
+    });
+
+
+});
+
+// 鍏抽棴鍔ㄤ綔
+$(document).on('click','#data-detail-close', function () {
+    parent.layer.closeAll();
+});
+
+function tableReload(child) {
+    var searchData = {};
+    $.each($('#search-box [name]').serializeArray(), function() {
+        searchData[this.name] = this.value;
+    });
+    (child ? parent.tableIns : tableIns).reload({
+        where: searchData,
+        page: {
+            curr: pageCurr
+        },
+        done: function (res, curr, count) {
+            if (res.code === 403) {
+                top.location.href = baseUrl+"/";
+            }
+            pageCurr=curr;
+            if (res.data.length === 0 && count !== 0) {
+                tableIns.reload({
+                    where: searchData,
+                    page: {
+                        curr: pageCurr-1
+                    }
+                });
+                pageCurr -= 1;
+            }
+            limit(child);
+        }
+    });
+}
+
+function detailScreen(index) {
+    var detail = layer.getChildFrame('#data-detail', index);
+    var height = detail.height()+60;
+    if (height > ($(window).height()*0.9)) {
+        height = ($(window).height()*0.8);
+    }
+    layer.style(index, {
+//        top: (($(window).height()-height)/3)+"px",
+        height: height+'px'
+    });
+}
+
+$('body').keydown(function () {
+    if (event.keyCode === 13) {
+        $("#search").click();
+    }
+});
diff --git a/src/main/webapp/views/locDetlStatis/wrkDetlLogAllView.html b/src/main/webapp/views/locDetlStatis/wrkDetlLogAllView.html
new file mode 100644
index 0000000..543bc19
--- /dev/null
+++ b/src/main/webapp/views/locDetlStatis/wrkDetlLogAllView.html
@@ -0,0 +1,91 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title></title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+    <link rel="stylesheet" href="../../static/css/common.css" media="all">
+</head>
+<body>
+
+<!-- 鎼滅储鏍� -->
+<div id="search-box" class="layui-form layui-card-header">
+    <div class="layui-inline">
+        <div class="layui-input-inline">
+            <input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧缂栧彿" autocomplete="off">
+        </div>
+        <div class="layui-input-inline">
+            <input class="layui-input" type="text" name="year" placeholder="骞�" autocomplete="off">
+        </div>
+        <div class="layui-input-inline">
+            <input class="layui-input" type="text" name="month" placeholder="鏈�" autocomplete="off">
+        </div>
+        <div class="layui-input-inline">
+            <input class="layui-input" type="text" name="day" placeholder="鏃�" autocomplete="off">
+        </div>
+        <div class="layui-input-inline">
+            <select name="kun">
+                <!--                    <option style="display: none"></option>-->
+                <option value="All">All</option>
+                <option value="骞冲簱">骞冲簱</option>
+                <option value="绔嬪簱">绔嬪簱</option>
+            </select>
+        </div>
+        <div class="layui-input-inline">
+            <select name="upDown">
+                <!--                    <option style="display: none"></option>-->
+                <option value="">鍏ュ嚭搴撶被鍨�</option>
+                <option value="鍏ュ簱">鍏ュ簱</option>
+                <option value="鍑哄簱">鍑哄簱</option>
+            </select>
+        </div>
+    </div>
+    <!-- 寰呮坊鍔� -->
+    <div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
+        <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储
+        </button>
+        <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆
+        </button>
+    </div>
+    <div class="layui-inline">
+        <fieldset class="layui-elem-field">
+            <legend>浠婃棩鍑哄簱鏁伴噺</legend>
+            <div class="layui-field-box" id="countNum2">
+                璇风◢绛�
+            </div>
+        </fieldset>
+    </div>
+    <div class="layui-inline">
+        <fieldset class="layui-elem-field">
+            <legend>浠婃棩鍏ュ簱鏁伴噺</legend>
+            <div class="layui-field-box" id="countNum3">
+                璇风◢绛�
+            </div>
+        </fieldset>
+    </div>
+</div>
+
+<!-- 琛ㄦ牸 -->
+<div class="layui-form">
+    <table class="layui-hide" id="wrkDetlLogAllView" lay-filter="wrkDetlLogAllView"></table>
+</div>
+<script type="text/html" id="toolbar">
+    <div class="layui-btn-container layui-col-md1">
+        <button class="layui-btn" lay-event="exportAll" style="margin-top: -0px">瀵煎嚭All鏁版嵁</button>
+    </div>
+</script>
+
+
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/locDetlStatis/wrkDetlLogAllView.js" charset="utf-8"></script>
+
+</body>
+</html>
+

--
Gitblit v1.9.1