#

luxiaotao1123

2020-06-17 e2c10c0672005557d716cba615495a7bf2a9e567

#

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

@@ -90,8 +90,10 @@
                                @RequestParam Integer type){
        if (type == 1) {
            workService.completeWrkMast(workNo, getUserId());
            return R.ok("工作档已完成");
        } else if (type == 2) {
            workService.cancelWrkMast(workNo, getUserId());
            return R.ok("工作档已取消");
        }
        return R.ok();
    }

 src/main/webapp/static/js/wrkMast/wrkMast.js

@@ -305,7 +305,7 @@
                layer.confirm('确认完成该笔工作档？', {title: '工作号：'+data.wrkNo}, function(){
                    http.post(baseUrl+"/hand/control/wrkMast", {workNo: data.wrkNo, type:1}, function (res) {
                        $(".layui-laypage-btn")[0].click();
                        layer.msg(res.msg);
                        layer.msg(data.wrkNo + res.msg);
                    })
                    layer.closeAll();

@@ -316,7 +316,7 @@
                layer.confirm('确认取消该笔工作档？', {title: '工作号：'+data.wrkNo}, function(){
                    http.post(baseUrl+"/hand/control/wrkMast", {workNo: data.wrkNo, type:2}, function (res) {
                        $(".layui-laypage-btn")[0].click();
                        layer.msg(res.msg);
                        layer.msg(data.wrkNo + res.msg);
                    })
                    layer.closeAll();
                });

 src/main/webapp/views/report/viewStayTime.html

@@ -27,7 +27,7 @@
    </div>

    <!-- 待添加 -->
    <div id="data-search-btn" class="layui-btn-container layui-form-item">
    <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>