#

luxiaotao1123

2022-06-01 d9843691332acafa39bba759b9fb9e0cfc9b9127

#

 src/main/java/com/zy/asrs/controller/WrkDetlLogController.java

@@ -33,6 +33,25 @@
        return R.ok(wrkDetlLogService.selectById(String.valueOf(id)));
    }

    /**
     * 根据工作主档查看明细时，工作号过滤明细
     */
    @RequestMapping(value = "/wrkDetlLogByMast/list/auth")
    @ManagerAuth
    public R list1(@RequestParam(defaultValue = "1")Integer curr,
                   @RequestParam(defaultValue = "10")Integer limit,
                   @RequestParam Integer wrk_no,
                   @RequestParam String ioTime){
        EntityWrapper<WrkDetlLog> wrapper = new EntityWrapper<>();
        if(!Cools.isEmpty(wrk_no) && wrk_no != 0){
            wrapper.eq("wrk_no",wrk_no);
        }
        if(!Cools.isEmpty(ioTime)){
            wrapper.eq("io_time", DateUtils.convert(ioTime, DateUtils.yyyyMMddHHmmsssss_F));
        }
        return R.ok(wrkDetlLogService.selectPage(new Page<>(curr, limit), wrapper));
    }

    @RequestMapping(value = "/wrkDetlLog/list/auth")
    @ManagerAuth
    public R list(@RequestParam(defaultValue = "1")Integer curr,

 src/main/webapp/views/wrkMastLog/wrkDetlLog.html

@@ -36,10 +36,7 @@
<script type="text/javascript">
    var pageCur;
    function getCol() {
        var cols = [
            {field: 'wrkNo', align: 'center',title: '工作号'}
            ,{field: 'ioTime$', align: 'center',title: '工作时间',width:160}
        ];
        let cols = [];
        cols.push.apply(cols, detlCols);
        cols.push({field: 'billNo', title:'单据编号', align: 'center', hide:true}
            ,{field: 'seqNo', title:'序号', align: 'center', width:80, hide:true});