Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs

luxiaotao1123

2020-06-27 4e60273930b31cc25f7c2a4ab1b7d5a8088a378b

Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs

 src/main/java/com/zy/common/web/AuthController.java

@@ -146,7 +146,7 @@

                    // 是否拥有查看权限
                    if (getUserId() != 9527) {
                        Resource view = resourceService.selectOne(new EntityWrapper<Resource>().eq("resource_id", resource.getId()).like("code", "view"));
                        Resource view = resourceService.selectOne(new EntityWrapper<Resource>().eq("resource_id", resource.getId()).like("code", "#view"));
                        if (!Cools.isEmpty(view)){
                            RoleResource param = new RoleResource();
                            param.setResourceId(view.getId());

 src/main/resources/application.yml

@@ -15,7 +15,7 @@
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
    url: jdbc:sqlserver://127.0.0.1:1433;databasename=dlasrs
    username: sa
    password: sa@123
    password: Qwe!@#123
  mvc:
    static-path-pattern: /**
  redis:

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

@@ -20,7 +20,7 @@
        cellMinWidth: 50,
        cols: [[
            {type: 'checkbox'}
            ,{field: 'wrkNo', align: 'center',title: '工作号',sort: true}
            ,{field: 'wrkNo', align: 'center',title: '工作号',sort: true, width: 85}
            ,{field: 'ioTime$', align: 'center',title: '工作时间',sort: true, width: 160}
            ,{field: 'wrkSts$', align: 'center',title: '工作状态'}
            ,{field: 'ioType$', align: 'center',title: '入出库类型'}
@@ -64,7 +64,7 @@
            //         return html;
            //     }}

            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:200}
            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:160}
        ]],
        request: {
            pageName: 'curr',

 src/main/webapp/views/matCode/matCode.html

@@ -79,16 +79,15 @@
</div>
<script type="text/html" id="toolbar">
    <div class="layui-btn-container">
        <button class="layui-btn layui-btn-normal" id="btn-export" lay-event="exportData" style="float: inherit">导出</button>
        <button class="layui-btn " id="btn-into" lay-event="intoData">导入</button>
        <button class="layui-btn layui-btn-danger" id="btn-print-batch" lay-event="btnPrintBatch">批量打印</button>
        <button class="layui-btn layui-btn-normal layui-btn-sm" id="btn-export" lay-event="exportData" style="float: inherit">导出</button>
        <button class="layui-btn layui-btn-sm" id="btn-into" lay-event="intoData">导入</button>
        <button class="layui-btn layui-btn-danger layui-btn-sm" id="btn-print-batch" lay-event="btnPrintBatch">批量打印</button>
    </div>
</script>

<script type="text/html" id="operate">
    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">详情</a>
    <button class="layui-btn layui-btn-danger layui-btn-xs btn-print" lay-event="btnPrint">打印</button>
<!--    <a class="layui-btn layui-btn-xs btn-edit" lay-event="edit">编辑</a>-->
</script>

<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>

 src/main/webapp/views/stoMan/stoQue.html

@@ -46,7 +46,7 @@
</div>
<script type="text/html" id="toolbar">
    <div class="layui-btn-container">
        <button class="layui-btn layui-btn-normal layui-btn-lg" id="refresh-sto" lay-event="refreshSto" style="margin-left: 10px">更新库存</button>
        <button class="layui-btn layui-btn-normal layui-btn-sm" id="refresh-sto" lay-event="refreshSto" style="margin-left: 10px">更新库存</button>
        <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">导出</button>
    </div>
</script>
@@ -54,7 +54,7 @@
<table class="layui-hide" id="stoQue" lay-filter="stoQue"></table>

<script type="text/html" id="operate">
    <a class="layui-btn layui-btn-sm loc-detl" lay-event="locDetl" style="font-size: 15px">查看明细</a>
    <a class="layui-btn layui-btn-xs loc-detl" lay-event="locDetl">查看明细</a>
</script>

<!--明细表-->

 src/main/webapp/views/wrkMast/wrkMast.html

@@ -106,8 +106,8 @@
</div>
<script type="text/html" id="toolbar">
    <div class="layui-btn-container">
        <button class="layui-btn layui-btn-normal" id="btn-pri-add" lay-event="priAdd"><i class="layui-icon">&#xe624;</i>增加优先级</button>
        <button class="layui-btn layui-btn-normal" id="btn-pri-red" lay-event="priRed"><i class="layui-icon">&#xe67e;</i>降低优先级</button>
        <button class="layui-btn layui-btn-normal layui-btn-sm" id="btn-pri-add" lay-event="priAdd"><i class="layui-icon">&#xe624;</i>增加优先级</button>
        <button class="layui-btn layui-btn-normal layui-btn-sm" id="btn-pri-red" lay-event="priRed"><i class="layui-icon">&#xe67e;</i>降低优先级</button>
        <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">导出</button>
    </div>
</script>
@@ -122,9 +122,9 @@
</div>

<script type="text/html" id="operate">
    <a class="layui-btn layui-btn-sm btn-detlShow" lay-event="detlShow">明细</a>
    <a class="layui-btn layui-btn-danger layui-btn-sm btn-complete" lay-event="complete">完成</a>
    <a class="layui-btn layui-btn-primary layui-btn-sm btn-cancel" lay-event="cancel">取消</a>
    <a class="layui-btn layui-btn-xs btn-detlShow" lay-event="detlShow">明细</a>
    <a class="layui-btn layui-btn-danger layui-btn-xs btn-complete" lay-event="complete">完成</a>
    <a class="layui-btn layui-btn-primary layui-btn-xs btn-cancel" lay-event="cancel">取消</a>
</script>

<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>