#

luxiaotao1123

2021-08-24 74b4d4c5b3f085374eaa93b95ed97bea54309833

#

 src/main/java/com/zy/ints/controller/WaitMatinController.java

@@ -51,11 +51,6 @@








    // -------------------------------------------------------------------------------------------------

    @RequestMapping(value = "/waitMatin/{id}/auth")

 src/main/webapp/views/waitMatin/waitMatin.html

@@ -25,9 +25,9 @@
            <div class="layui-form toolbar">
                <div class="layui-form-item">
                    <div class="layui-inline">
                        <label class="layui-form-label w-auto">课程名称：</label>
                        <label class="layui-form-label w-auto">单据编号：</label>
                        <div class="layui-input-inline mr0">
                            <input name="experimentTypeName" class="layui-input" type="text" placeholder="输入课程名称"/>
                            <input name="experimentTypeName" class="layui-input" type="text" placeholder="输入单据编号"/>
                        </div>
                    </div>
                    <div class="layui-inline">
@@ -39,61 +39,34 @@
                    </div>
                </div>
            </div>
            <table id="eCourseTable" lay-filter="eCourseTable"></table>
            <table id="waitMatin" lay-filter="waitMatin"></table>
        </div>
    </div>
</div>


<!-- 搜索栏 -->
<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="bill_no" placeholder="单据编号" autocomplete="off">
        </div>
    </div>
    <!-- 日期范围 -->
    <div class="layui-inline" style="width: 300px">
        <div class="layui-input-inline">
            <input class="layui-input layui-laydate-range" id="modi_time" name="modi_time" type="text" placeholder="起始时间 - 终止时间" autocomplete="off" style="width: 300px">
        </div>
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="condition" placeholder="请输入" autocomplete="off">
        </div>
    </div>
    <!-- 待添加 -->
    <div id="data-search-btn" class="layui-btn-container layui-form-item">
        <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>

<!-- 表格 -->
<div class="layui-form">
    <table class="layui-hide" id="waitMatin" lay-filter="waitMatin"></table>
</div>
<script type="text/html" id="toolbar">
    <div class="layui-btn-container">
        <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">新增</button>
        <button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">删除</button>
        <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">导出</button>
    </div>
</script>

<!-- 表格操作列 -->
<script type="text/html" id="operate">
    <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">修改</a>
    <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">删除</a>
    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">修改</a>
    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
</script>
<!-- 表格操作列 -->
<script type="text/html" id="tbLook">
    <span class="layui-text">
        <a href="javascript:;" lay-event="look">
            <i class="layui-icon" style="font-size: 12px;">&#xe61a;</i> 查看单据明细
        </a>
    </span>
</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/waitMatin/waitMatin.js" charset="utf-8"></script>
<!--<script type="text/javascript" src="../../static/js/waitMatin/waitMatin.js" charset="utf-8"></script>-->
<script>
    layui.use(['layer', 'form', 'table', 'util', 'admin'], function () {
    var pageCurr;
    layui.config({
        base: baseUrl + "/static/layui/lay/modules/"
    }).use(['layer', 'form', 'table', 'util', 'admin'], function () {
        var $ = layui.jquery;
        var layer = layui.layer;
        var form = layui.form;
@@ -105,21 +78,43 @@
        var insTb = table.render({
            elem: '#waitMatin',
            url: baseUrl+'/waitMatin/head/page/auth',
            headers: {token: localStorage.getItem('token')},
            page: true,
            cellMinWidth: 100,
            cols: [[
                {type: 'numbers'},
                {field: 'billNo', title: '单据编号', sort: true},
                {field: 'billType$', align: 'center', title: '类型'},
                {field: 'billType$', align: 'center', title: '类型',  minWidth: 140, width: 140},
                // {align: 'center', title: '星期', templet: '#eCourseTbWeek', minWidth: 350, width: 350},
                {align: 'center', title: '明细', toolbar: '#eCourseTbLook', minWidth: 140, width: 140},
                {align: 'center', title: '明细', toolbar: '#tbLook', minWidth: 140, width: 140},
                {
                    field: 'createTime', title: '创建时间', sort: true, templet: function (d) {
                    field: 'appeTime$', title: '创建时间', sort: true, templet: function (d) {
                        return util.toDateString(d.createTime);
                    }, width: 180
                },
                {align: 'center', title: '操作', toolbar: '#eCourseTbBar', minWidth: 130, width: 130}
            ]]
                {align: 'center', title: '操作', toolbar: '#operate', minWidth: 130, width: 130}
            ]],
            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) {
                if (res.code === 403) {
                    top.location.href = baseUrl+"/";
                }
                pageCurr=curr;
            }
        });

        // 搜索
@@ -133,14 +128,14 @@
        });

        // 工具条点击事件
        table.on('tool(eCourseTable)', function (obj) {
        table.on('tool(waitMatin)', function (obj) {
            var data = obj.data;
            var layEvent = obj.event;
            if (layEvent == 'edit') {
            if (layEvent === 'edit') {
                showEditModel(data);
            } else if (layEvent == 'del') {
            } else if (layEvent === 'del') {
                doDel(data.experimentTypeId);
            } else if (layEvent == 'look') {
            } else if (layEvent === 'look') {
                var $a = $(obj.tr).find('a[lay-event="look"]');
                var offset = $a.offset();
                var top = offset.top;
@@ -148,7 +143,7 @@
                layer.open({
                    type: 1,
                    title: false,
                    area: '530px',
                    area: '630px',
                    offset: [top + 'px', (left - 530 + $a.outerWidth()) + 'px'],
                    shade: .01,
                    shadeClose: true,
@@ -157,18 +152,39 @@
                    success: function (layero) {
                        table.render({
                            elem: '#lookSSXMTable',
                            url: '../../json/e-course-tb2.json?experimentTypeId=' + data.experimentTypeId,
                            headers: {token: localStorage.getItem('token')},
                            url: baseUrl+'/waitMatin/list/auth',
                            where: {
                                bill_no: data.billNo
                            },
                            page: true,
                            cellMinWidth: 100,
                            cols: [[
                                {type: 'numbers'},
                                {field: 'experimentName', title: '项目名称', sort: true},
                                {field: 'matNo', title: '物料编码'},
                                {field: 'matName', title: '物料名称', width: 160},
                                {field: 'qty', title: '数量'},
                                {
                                    field: 'createTime', title: '创建时间', sort: true, templet: function (d) {
                                    field: 'createTime$', title: '创建时间', sort: true, templet: function (d) {
                                        return util.toDateString(d.createTime);
                                    }
                                    },  width: 180
                                }
                            ]],
                            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 () {
                                $(layero).find('.layui-table-view').css('margin', '0');
                            },
@@ -183,7 +199,7 @@
        function showEditModel(expTpe) {
            admin.open({
                type: 1,
                title: (expTpe ? '修改' : '添加') + '实验课程',
                title: (expTpe ? '修改' : '添加') + '单据',
                content: $('#eCourseEditDialog').html(),
                area: '700px',
                success: function (layero, dIndex) {