zy-asrs.git - Gitblit

parent: bbdb6ba1 | 补丁 | 提交 | show whitespace

luxiaotao1123

2021-08-27 88e2b533238ef92c9a68fe5f37f4d7b70c915da0

4个文件已修改

	src/main/java/com/zy/ints/controller/WaitMatinController.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/resources/mapper/WaitMatinMapper.xml	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/static/js/waitMatin/waitMatin.js	464 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/views/waitMatin/waitMatin.html	403 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

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

@@ -36,13 +36,13 @@
    public R headPage(@RequestParam(defaultValue = "1")Integer curr,
                      @RequestParam(defaultValue = "10")Integer limit,
                      @RequestParam Map<String, Object> param){
        if (!Cools.isEmpty(param.get("modi_time"))){
            String val = String.valueOf(param.get("modi_time"));
        if (!Cools.isEmpty(param.get("appe_time"))){
            String val = String.valueOf(param.get("appe_time"));
            if (val.contains(RANGE_TIME_LINK)) {
                String[] dates = val.split(RANGE_TIME_LINK);
                param.put("startTime", DateUtils.convert(dates[0]));
                param.put("endTime", DateUtils.convert(dates[1]));
                param.remove("modi_time");
                param.remove("appe_time");
            }
        }
        return R.ok(waitMatinService.getHeadPage(toPage(curr, limit, param, WaitMatin.class)));

 src/main/resources/mapper/WaitMatinMapper.xml

@@ -31,8 +31,8 @@
        <if test="bill_no!=null and bill_no!='' ">
            and bill_no like '%' + #{bill_no} + '%'
        </if>
        <if test="mat_no!=null and mat_no!='' ">
            and a.mat_no like '%' + #{mat_no} + '%'
        <if test="bill_type!=null and bill_type!='' ">
            and bill_type like '%' + #{bill_type} + '%'
        </if>
        <if test="mat_name!=null and mat_name!='' ">
            and a.mat_name like '%' + #{mat_name} + '%'
@@ -44,7 +44,7 @@
            and a.unit like '%' + #{unit} + '%'
        </if>
        <if test="startTime!=null and endTime!=null">
            and a.modi_time between #{startTime} and #{endTime}
            and appe_time between #{startTime} and #{endTime}
        </if>
    </sql>


 src/main/webapp/static/js/waitMatin/waitMatin.js

@@ -1,48 +1,29 @@
var pageCurr;
layui.config({
    base: baseUrl + "/static/layui/lay/modules/"
}).use(['table','laydate', 'form', 'admin'], function(){
    var table = layui.table;
}).use(['layer', 'form', 'table', 'util', 'admin', 'xmSelect', 'laydate'], function () {
    var $ = layui.jquery;
    var layer = layui.layer;
    var layDate = layui.laydate;
    var form = layui.form;
    var table = layui.table;
    var util = layui.util;
    var admin = layui.admin;
    var xmSelect = layui.xmSelect;
    var layDate = layui.laydate;

    // 数据渲染
    tableIns = table.render({
    // 渲染表格
    var insTb = table.render({
        elem: '#waitMatin',
        url: baseUrl+'/waitMatin/head/page/auth',
        headers: {token: localStorage.getItem('token')},
        url: baseUrl+'/waitMatin/list/auth',
        page: true,
        limit: 16,
        limits: [16, 30, 50, 100, 200, 500],
        toolbar: '#toolbar',
        cellMinWidth: 50,
        cellMinWidth: 100,
        cols: [[
            {type: 'checkbox'}
            ,{field: 'billNo', align: 'center',title: '单据编号'}
            ,{field: 'seqNo', align: 'center',title: '序号'}
            ,{field: 'billType$', align: 'center',title: '单据类型'}
            ,{field: 'matNo', align: 'center',title: '物料编码'}
            ,{field: 'matName', align: 'center',title: '物料名称'}
            ,{field: 'qty', align: 'center',title: '数量'}
            ,{field: 'specs', align: 'center',title: '规格'}
            ,{field: 'unit', align: 'center',title: '单位'}
            ,{field: 'size', align: 'center',title: '尺寸', hide: true}
            ,{field: 'color', align: 'center',title: '颜色', hide: true}
            ,{field: 'weight', align: 'center',title: '单重', hide: true}
            ,{field: 'memo', align: 'center',title: '备注', hide: true}
            ,{field: 'inQty', align: 'center',title: '已入库量'}
            ,{field: 'linkErp$', align: 'center',title: 'ERP连线'}
            ,{field: 'ioStatus$', align: 'center',title: '完成状态'}
            ,{field: 'ioTime$', align: 'center',title: '完成时间', hide: true}
            ,{field: 'modiUser$', align: 'center',title: '修改人员',event: 'modiUser', style: 'cursor:pointer', hide: true}
            ,{field: 'modiTime$', align: 'center',title: '修改时间', hide: true}
            ,{field: 'appeUser$', align: 'center',title: '建档人员',event: 'appeUser', style: 'cursor:pointer', hide: true}
            ,{field: 'appeTime$', align: 'center',title: '建档时间', hide: true}

            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:150}
            {type: 'numbers'},
            {field: 'billNo', title: '单据编号', sort: true},
            {field: 'billType$', align: 'center', title: '类型',  minWidth: 140, width: 140},
            {align: 'center', title: '明细', toolbar: '#tbLook', minWidth: 140, width: 140},
            {field: 'appeTime$', title: '创建时间', minWidth: 180, width: 180},
            {align: 'center', title: '操作', toolbar: '#operate', minWidth: 130, width: 130}
        ]],
        request: {
            pageName: 'curr',
@@ -63,153 +44,330 @@
            if (res.code === 403) {
                top.location.href = baseUrl+"/";
            }
            pageCurr=curr;
            limit();
        }
    });

    // 监听排序事件
    table.on('sort(waitMatin)', 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}
        });
    // 搜索
    form.on('submit(eCourseTbSearch)', function (data) {
        insTb.reload({where: data.field, page: {curr: 1}});
    });

    // 监听头工具栏事件
    table.on('toolbar(waitMatin)', function (obj) {
        var checkStatus = table.checkStatus(obj.config.id).data;
        switch(obj.event) {
            case 'addData':
    // 添加
    $("#eCourseAddBtn").click(function () {
                showEditModel();
                break;
            case 'deleteData':
               if (checkStatus.length === 0) {
                   layer.msg('请选择要删除的数据', {icon: 2});
                   return;
               }
               var ids = checkStatus.map(function (d) {
                   return d.seqNo;
               });
               del(ids);
               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);

    // 工具条点击事件
    table.on('tool(waitMatin)', function (obj) {
        var data = obj.data;
        var layEvent = obj.event;
        if (layEvent === 'edit') {
            showEditModel(data);
        } else if (layEvent === 'del') {
            doDel(data.billNo);
        } else if (layEvent === 'look') {
            var $a = $(obj.tr).find('a[lay-event="look"]');
            var offset = $a.offset();
            var top = offset.top;
            var left = offset.left;
            layer.open({
                type: 1,
                title: false,
                area: '630px',
                offset: [top + 'px', (left - 530 + $a.outerWidth()) + 'px'],
                shade: .01,
                shadeClose: true,
                fixed: false,
                content: '<table id="lookSSXMTable" lay-filter="lookSSXMTable"></table>',
                success: function (layero) {
                    table.render({
                        elem: '#lookSSXMTable',
                        headers: {token: localStorage.getItem('token')},
                        url: baseUrl+'/waitMatin/list/auth',
                        where: {
                            bill_no: data.billNo
                        },
                        page: true,
                        cellMinWidth: 100,
                        cols: [[
                            {type: 'numbers'},
                            {field: 'matNo', title: '物料编码'},
                            {field: 'matName', title: '物料名称', width: 160},
                            {field: 'qty', title: '数量'},
                            {
                                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');
                        },
                        size: ''
                    });
                        }
                    });
                    var exportData = {};
                    $.each($('#search-box [name]').serializeArray(), function() {
                        exportData[this.name] = this.value;
        }
                    });
                    var param = {
                        'waitMatin': exportData,
                        'fields': fields
                    };

    // 显示表单弹窗
    function showEditModel(expTpe) {
        admin.open({
            type: 1,
            title: (expTpe ? '修改' : '添加') + '单据',
            content: $('#editDialog').html(),
            area: '700px',
            success: function (layero, dIndex) {
                $(layero).children('.layui-layer-content').css('overflow', 'visible');
                var url = expTpe ? '../../json/ok.json' : '../../json/ok.json';
                var isExpAdd = !expTpe;
                // 回显数据
                form.val('editForm', expTpe);
                // 表单提交事件
                form.on('submit(waitMatinEditSubmit)', function (data) {
                    // 组装数据
                    if (xxDataList.length <= 0) {
                        layer.tips('请添加单据明细', '#matAddBtnComment', {tips: [1, '#ff4c4c']});
                        return false;
                    }
                    var param = [];
                    var nList = admin.util.deepClone(xxDataList);
                    for (var xi = 0; xi < nList.length; xi++) {
                        if (nList[xi].qty > 0) {
                            param.push({
                                billNo: data.field.billNo,
                                billType: data.field.billType,
                                matNo: nList[xi].matNo,
                                matName: nList[xi].matName,
                                qty: nList[xi].qty,
                            })
                        }
                    }
                    if (param.length === 0) {
                        layer.msg('单据明细数量不合法', {icon: 2});
                        return false;
                    }
                    if (isExpAdd) {
                        layer.load(2);
                    $.ajax({
                        url: baseUrl+"/waitMatin/export/auth",
                            url: baseUrl+"/waitMatin/add/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();
                                layer.closeAll('loading');
                            if (res.code === 200) {
                                table.exportFile(titles,res.data,'xls');
                                    layer.close(dIndex);
                                    insTb.reload({page: {curr: 1}});
                                    layer.msg(res.msg, {icon: 1});
                                } else if (res.code === 403){
                                    top.location.href = baseUrl+"/";
                                }else {
                                    layer.msg(res.msg, {icon: 2});
                                }
                            }
                        })
                    }
                    return false;
                });
                // 明细表格
                var xxDataList = [];
                var tbOptions = {
                    elem: '#formSSXMTable',
                    data: xxDataList,
                    page: true,
                    height: '350px;',
                    cellMinWidth: 100,
                    cols: [[
                        {type: 'numbers'},
                        {field: 'matNo', title: '物料编码'},
                        {field: 'matName', title: '物料名称', width: 160},
                        {field: 'qty', title: '修改数量', style: 'color: blue;font-weight: bold', edit: true, minWidth: 100, width: 100},
                        {align: 'center', title: '操作', toolbar: '#formSSXMTableBar', minWidth: 80, width: 80}
                    ]],
                    done: function () {
                        $(layero).find('.layui-table-view').css('margin', '0');
                    },
                    size: ''
                };
                if (!isExpAdd) {
                    tbOptions.data = undefined;
                    tbOptions.url = '../../json/e-course-tb2.json?experimentTypeId=' + expTpe.experimentTypeId;
                }
                var insTbSSXM = table.render(tbOptions);
                // 工具条点击事件
                table.on('tool(formSSXMTable)', function (obj) {
                    var data = obj.data;
                    var layEvent = obj.event;
                    if (layEvent === 'edit') {
                        showEditModel2(data);
                    } else if (layEvent === 'del') {
                        layer.confirm('确定要删除吗？', {
                            shade: .1,
                            skin: 'layui-layer-admin'
                        }, function (i) {
                            layer.close(i);
                            for (var j = 0; j < xxDataList.length; j++) {
                                if (xxDataList[j].matNo === data.matNo) {
                                    xxDataList.splice(j, 1);
                                }
                            }
                            insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
                        });
                    }
                });
                // 数量修改
                table.on('edit(formSSXMTable)', function (obj) {
                    let count = Number(obj.value);
                    if (isNaN(count)) {
                        layer.msg("请输入数字");
                    } else {
                        if (count > 0) {
                            for (var i=0;i<xxDataList.length;i++){
                                if (xxDataList[i]["matNo"] === obj.data.matNo){
                                    xxDataList[i]["qty"] = count;
                                    break;
                                }
                            }
                        } else {
                            layer.msg("数量必须大于零");
                        }
                    }
                    insTbSSXM.reload({data: xxDataList});
                });
                //
                $('#matAddBtnComment').click(function () {
                    showEditModel2();
                });

                // 显示添加明细表单弹窗
                function showEditModel2(exp) {
                    admin.open({
                        type: 1,
                        offset: '150px',
                        area: '480px',
                        title: (exp ? '修改' : '添加') + '明细',
                        content: $('#matEditDialog').html(),
                        success: function (layero, dIndex) {
                            $(layero).children('.layui-layer-content').css('overflow', 'visible');
                            var url = exp ? '../../json/ok.json' : '../../json/ok.json';
                            // 回显数据
                            form.val('matEditForm', exp);
                            // 表单提交事件
                            form.on('submit(matEditSubmit)', function (data) {
                                var existMats = [];
                                xxDataList.forEach(function(elem) {
                                    existMats.push(elem.matNo);
                                });
                                var selectList = matXmSelect.getValue();
                                for (var i = 0; i<selectList.length; i++) {
                                    var item = selectList[i];
                                    if (existMats.indexOf(item.value) === -1) {
                                        // 查询物料详情
                                        $.ajax({
                                            url: baseUrl+"/matCode/"+item.value+"/auth",
                                            headers: {'token': localStorage.getItem('token')},
                                            method: 'GET',
                                            async: false,
                                            success: function (res) {
                                                if (res.code === 200){
                                                    var mat = res.data;
                                                    xxDataList.push({
                                                        matNo: mat.matNo,
                                                        matName: mat.matName,
                                                        qty: 0.0
                                                    });
                                                    insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg, {icon: 2})
                            }
                        }
                    });
                });
                break;
                                        })
        }
    });

    // 监听行工具事件
    table.on('tool(waitMatin)', function(obj){
        var data = obj.data;
        switch (obj.event) {
            case 'edit':
                showEditModel(data);
                break;
            case "del":
                var ids = [data.seqNo];
                del(ids);
                break;
        }
                                layer.close(dIndex);
                                return false;
    });

    /* 弹窗 - 新增、修改 */
    function showEditModel(mData) {
        admin.open({
            type: 1,
            area: '600px',
            title: (mData ? '修改' : '添加') + '订单状态',
            content: $('#editDialog').html(),
            success: function (layero, dIndex) {
                layDateRender();
                form.val('detail', mData);
                form.on('submit(editSubmit)', function (data) {
                    var loadIndex = layer.load(2);
                            // 渲染物料选择
                            var matXmSelect = xmSelect.render({
                                el: '#mat',
                                style: {
                                    width: '340px',
                                },
                                autoRow: true,
                                toolbar: { show: true },
                                filterable: true,
                                remoteSearch: true,
                                remoteMethod: function(val, cb, show){
                    $.ajax({
                        url: baseUrl+"/waitMatin/"+(mData?'update':'add')+"/auth",
                                        url: baseUrl+"/mat/all/get/kv",
                        headers: {'token': localStorage.getItem('token')},
                        data: data.field,
                                        data: {
                                            condition: val
                                        },
                        method: 'POST',
                        success: function (res) {
                            layer.close(loadIndex);
                            if (res.code === 200){
                                layer.close(dIndex);
                                layer.msg(res.msg, {icon: 1});
                                tableReload();
                            } else if (res.code === 403){
                                top.location.href = baseUrl+"/";
                                                cb(res.data)
                            }else {
                                                cb([]);
                                layer.msg(res.msg, {icon: 2});
                            }
                        }
                    })
                    return false;
                });
                                }
                            })
                            // 弹窗不出现滚动条
                $(layero).children('.layui-layer-content').css('overflow', 'visible');
                layui.form.render('select');
            }
        });
    }

    /* 删除 */
    function del(ids) {
        layer.confirm('确定要删除选中数据吗？', {
            skin: 'layui-layer-admin',
            shade: .1
            }
        });
    }

    // 删除单据
    function doDel(billNo) {
        layer.confirm('确定要删除吗？', {
            shade: .1,
            skin: 'layui-layer-admin'
        }, function (i) {
            layer.close(i);
            var loadIndex = layer.load(2);
            layer.load(2);

            $.ajax({
                url: baseUrl+"/waitMatin/delete/auth",
                headers: {'token': localStorage.getItem('token')},
                data: {ids: ids},
                data: {
                    billNo: billNo
                },
                // contentType:'application/json;charset=UTF-8',
                method: 'POST',
                success: function (res) {
                    layer.close(loadIndex);
                    layer.closeAll('loading');
                    if (res.code === 200){
                        insTb.reload({page: {curr: 1}});
                        layer.msg(res.msg, {icon: 1});
                        tableReload();
                    } else if (res.code === 403){
                        top.location.href = baseUrl+"/";
                    } else {
@@ -220,55 +378,9 @@
        });
    }

    // 搜索
    form.on('submit(search)', function (data) {
        pageCurr = 1;
        tableReload(false);
    });

    // 重置
    form.on('submit(reset)', function (data) {
        pageCurr = 1;
        clearFormVal($('#search-box'));
        tableReload(false);
    });

    // 时间选择器
    function layDateRender() {
            layDate.render({
        elem: '#ioTime\\$',
        type: 'datetime'
        });
        layDate.render({
        elem: '#modiTime\\$',
        type: 'datetime'
        });
        layDate.render({
        elem: '#appeTime\\$',
        type: 'datetime'
        });
        layDate.render({
            elem: '.layui-laydate-range'
            ,type: 'datetime'
            ,range: true
        });
    }
    layDateRender();

});

// 关闭动作
$(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;
    });
    tableIns.reload({
        where: searchData,
        page: {curr: pageCurr}
     });
}

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

@@ -25,9 +25,25 @@
            <div class="layui-form toolbar">
                <div class="layui-form-item">
                    <div class="layui-inline">
                        <label class="layui-form-label w-auto">单据编号：</label>
                        <div class="layui-input-inline mr0">
                            <input name="bill_no" class="layui-input" type="text" placeholder="输入单据编号"/>
                        </div>
                    </div>
                    <div class="layui-inline">
                        <div class="layui-input-inline mr0">
                            <select name="bill_type" placeholder="请选择单据类型">
                                <option value="" style="display: none"></option>
                                <option value="1">采购入库</option>
                                <option value="2">生产入库</option>
                                <option value="3">调拨入库</option>
                                <option value="4">销售退回入库</option>
                                <option value="5">其他入库</option>
                            </select>
                        </div>
                    </div>
                    <div class="layui-inline" style="width: 300px">
                        <div class="layui-input-inline">
                            <input class="layui-input layui-laydate-range" name="appe_time" type="text" placeholder="起始时间 - 终止时间" autocomplete="off" style="width: 300px">
                        </div>
                    </div>
                    <div class="layui-inline">
@@ -122,390 +138,7 @@
<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>
    layui.config({
        base: baseUrl + "/static/layui/lay/modules/"
    }).use(['layer', 'form', 'table', 'util', 'admin', 'xmSelect'], function () {
        var $ = layui.jquery;
        var layer = layui.layer;
        var form = layui.form;
        var table = layui.table;
        var util = layui.util;
        var admin = layui.admin;
        var xmSelect = layui.xmSelect;

        // 渲染表格
        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: '类型',  minWidth: 140, width: 140},
                // {align: 'center', title: '星期', templet: '#eCourseTbWeek', minWidth: 350, width: 350},
                {align: 'center', title: '明细', toolbar: '#tbLook', minWidth: 140, width: 140},
                {field: 'appeTime$', title: '创建时间', minWidth: 180, width: 180},
                {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, curr, count) {
                if (res.code === 403) {
                    top.location.href = baseUrl+"/";
                }
            }
        });

        // 搜索
        form.on('submit(eCourseTbSearch)', function (data) {
            insTb.reload({where: data.field, page: {curr: 1}});
        });

        // 添加
        $("#eCourseAddBtn").click(function () {
            showEditModel();
        });

        // 工具条点击事件
        table.on('tool(waitMatin)', function (obj) {
            var data = obj.data;
            var layEvent = obj.event;
            if (layEvent === 'edit') {
                showEditModel(data);
            } else if (layEvent === 'del') {
                doDel(data.billNo);
            } else if (layEvent === 'look') {
                var $a = $(obj.tr).find('a[lay-event="look"]');
                var offset = $a.offset();
                var top = offset.top;
                var left = offset.left;
                layer.open({
                    type: 1,
                    title: false,
                    area: '630px',
                    offset: [top + 'px', (left - 530 + $a.outerWidth()) + 'px'],
                    shade: .01,
                    shadeClose: true,
                    fixed: false,
                    content: '<table id="lookSSXMTable" lay-filter="lookSSXMTable"></table>',
                    success: function (layero) {
                        table.render({
                            elem: '#lookSSXMTable',
                            headers: {token: localStorage.getItem('token')},
                            url: baseUrl+'/waitMatin/list/auth',
                            where: {
                                bill_no: data.billNo
                            },
                            page: true,
                            cellMinWidth: 100,
                            cols: [[
                                {type: 'numbers'},
                                {field: 'matNo', title: '物料编码'},
                                {field: 'matName', title: '物料名称', width: 160},
                                {field: 'qty', title: '数量'},
                                {
                                    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');
                            },
                            size: ''
                        });
                    }
                });
            }
        });

        // 显示表单弹窗
        function showEditModel(expTpe) {
            admin.open({
                type: 1,
                title: (expTpe ? '修改' : '添加') + '单据',
                content: $('#editDialog').html(),
                area: '700px',
                success: function (layero, dIndex) {
                    $(layero).children('.layui-layer-content').css('overflow', 'visible');
                    var url = expTpe ? '../../json/ok.json' : '../../json/ok.json';
                    var isExpAdd = !expTpe;
                    // 回显数据
                    form.val('editForm', expTpe);
                    // 表单提交事件
                    form.on('submit(waitMatinEditSubmit)', function (data) {
                        // 组装数据
                        if (xxDataList.length <= 0) {
                            layer.tips('请添加单据明细', '#matAddBtnComment', {tips: [1, '#ff4c4c']});
                            return false;
                        }
                        var param = [];
                        var nList = admin.util.deepClone(xxDataList);
                        for (var xi = 0; xi < nList.length; xi++) {
                            if (nList[xi].qty > 0) {
                                param.push({
                                    billNo: data.field.billNo,
                                    billType: data.field.billType,
                                    matNo: nList[xi].matNo,
                                    matName: nList[xi].matName,
                                    qty: nList[xi].qty,
                                })
                            }
                        }
                        if (param.length === 0) {
                            layer.msg('单据明细数量不合法', {icon: 2});
                            return false;
                        }
                        if (isExpAdd) {
                            layer.load(2);
                            $.ajax({
                                url: baseUrl+"/waitMatin/add/auth",
                                headers: {'token': localStorage.getItem('token')},
                                data: JSON.stringify(param),
                                contentType:'application/json;charset=UTF-8',
                                method: 'POST',
                                success: function (res) {
                                    layer.closeAll('loading');
                                    if (res.code === 200){
                                        layer.close(dIndex);
                                        insTb.reload({page: {curr: 1}});
                                        layer.msg(res.msg, {icon: 1});
                                    } else if (res.code === 403){
                                        top.location.href = baseUrl+"/";
                                    }else {
                                        layer.msg(res.msg, {icon: 2});
                                    }
                                }
                            })
                        }
                        return false;
                    });
                    // 明细表格
                    var xxDataList = [];
                    var tbOptions = {
                        elem: '#formSSXMTable',
                        data: xxDataList,
                        page: true,
                        height: '350px;',
                        cellMinWidth: 100,
                        cols: [[
                            {type: 'numbers'},
                            {field: 'matNo', title: '物料编码'},
                            {field: 'matName', title: '物料名称', width: 160},
                            {field: 'qty', title: '修改数量', style: 'color: blue;font-weight: bold', edit: true, minWidth: 100, width: 100},
                            {align: 'center', title: '操作', toolbar: '#formSSXMTableBar', minWidth: 80, width: 80}
                        ]],
                        done: function () {
                            $(layero).find('.layui-table-view').css('margin', '0');
                        },
                        size: ''
                    };
                    if (!isExpAdd) {
                        tbOptions.data = undefined;
                        tbOptions.url = '../../json/e-course-tb2.json?experimentTypeId=' + expTpe.experimentTypeId;
                    }
                    var insTbSSXM = table.render(tbOptions);
                    // 工具条点击事件
                    table.on('tool(formSSXMTable)', function (obj) {
                        var data = obj.data;
                        var layEvent = obj.event;
                        if (layEvent === 'edit') {
                            showEditModel2(data);
                        } else if (layEvent === 'del') {
                            layer.confirm('确定要删除吗？', {
                                shade: .1,
                                skin: 'layui-layer-admin'
                            }, function (i) {
                                layer.close(i);
                                for (var j = 0; j < xxDataList.length; j++) {
                                    if (xxDataList[j].matNo === data.matNo) {
                                        xxDataList.splice(j, 1);
                                    }
                                }
                                insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
                            });
                        }
                    });
                    // 数量修改
                    table.on('edit(formSSXMTable)', function (obj) {
                        let count = Number(obj.value);
                        if (isNaN(count)) {
                            layer.msg("请输入数字");
                        } else {
                            if (count > 0) {
                                for (var i=0;i<xxDataList.length;i++){
                                    if (xxDataList[i]["matNo"] === obj.data.matNo){
                                        xxDataList[i]["qty"] = count;
                                        break;
                                    }
                                }
                            } else {
                                layer.msg("数量必须大于零");
                            }
                        }
                        insTbSSXM.reload({data: xxDataList});
                    });
                    //
                    $('#matAddBtnComment').click(function () {
                        showEditModel2();
                    });

                    // 显示添加明细表单弹窗
                    function showEditModel2(exp) {
                        admin.open({
                            type: 1,
                            offset: '150px',
                            area: '480px',
                            title: (exp ? '修改' : '添加') + '明细',
                            content: $('#matEditDialog').html(),
                            success: function (layero, dIndex) {
                                $(layero).children('.layui-layer-content').css('overflow', 'visible');
                                var url = exp ? '../../json/ok.json' : '../../json/ok.json';
                                // 回显数据
                                form.val('matEditForm', exp);
                                // 表单提交事件
                                form.on('submit(matEditSubmit)', function (data) {
                                    var existMats = [];
                                    xxDataList.forEach(function(elem) {
                                        existMats.push(elem.matNo);
                                    });
                                    var selectList = matXmSelect.getValue();
                                    for (var i = 0; i<selectList.length; i++) {
                                        var item = selectList[i];
                                        if (existMats.indexOf(item.value) === -1) {
                                            // 查询物料详情
                                            $.ajax({
                                                url: baseUrl+"/matCode/"+item.value+"/auth",
                                                headers: {'token': localStorage.getItem('token')},
                                                method: 'GET',
                                                async: false,
                                                success: function (res) {
                                                    if (res.code === 200){
                                                        var mat = res.data;
                                                        xxDataList.push({
                                                            matNo: mat.matNo,
                                                            matName: mat.matName,
                                                            qty: 0.0
                                                        });
                                                        insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
                                                    } else if (res.code === 403){
                                                        top.location.href = baseUrl+"/";
                                                    }else {
                                                        layer.msg(res.msg, {icon: 2})
                                                    }
                                                }
                                            })
                                        }
                                    }
                                    layer.close(dIndex);
                                    return false;
                                });
                                // 渲染物料选择
                                var matXmSelect = xmSelect.render({
                                    el: '#mat',
                                    style: {
                                        width: '340px',
                                    },
                                    autoRow: true,
                                    toolbar: { show: true },
                                    filterable: true,
                                    remoteSearch: true,
                                    remoteMethod: function(val, cb, show){
                                        $.ajax({
                                            url: baseUrl+"/mat/all/get/kv",
                                            headers: {'token': localStorage.getItem('token')},
                                            data: {
                                                condition: val
                                            },
                                            method: 'POST',
                                            success: function (res) {
                                                if (res.code === 200){
                                                    cb(res.data)
                                                } else {
                                                    cb([]);
                                                    layer.msg(res.msg, {icon: 2});
                                                }
                                            }
                                        });
                                    }
                                })
                                // 弹窗不出现滚动条
                                $(layero).children('.layui-layer-content').css('overflow', 'visible');
                                layui.form.render('select');
                            }
                        });
                    }

                }
            });
        }

        // 删除单据
        function doDel(billNo) {
            layer.confirm('确定要删除吗？', {
                shade: .1,
                skin: 'layui-layer-admin'
            }, function (i) {
                layer.close(i);
                layer.load(2);

                $.ajax({
                    url: baseUrl+"/waitMatin/delete/auth",
                    headers: {'token': localStorage.getItem('token')},
                    data: {
                        billNo: billNo
                    },
                    // contentType:'application/json;charset=UTF-8',
                    method: 'POST',
                    success: function (res) {
                        layer.closeAll('loading');
                        if (res.code === 200){
                            insTb.reload({page: {curr: 1}});
                            layer.msg(res.msg, {icon: 1});
                        } else if (res.code === 403){
                            top.location.href = baseUrl+"/";
                        }else {
                            layer.msg(res.msg, {icon: 2});
                        }
                    }
                })
            });
        }

    });
</script>
<script type="text/javascript" src="../../static/js/waitMatin/waitMatin.js" charset="utf-8"></script>
</body>
</html>

			@@ -36,13 +36,13 @@
			public R headPage(@RequestParam(defaultValue = "1")Integer curr,
			@RequestParam(defaultValue = "10")Integer limit,
			@RequestParam Map<String, Object> param){
			if (!Cools.isEmpty(param.get("modi_time"))){
			String val = String.valueOf(param.get("modi_time"));
			if (!Cools.isEmpty(param.get("appe_time"))){
			String val = String.valueOf(param.get("appe_time"));
			if (val.contains(RANGE_TIME_LINK)) {
			String[] dates = val.split(RANGE_TIME_LINK);
			param.put("startTime", DateUtils.convert(dates[0]));
			param.put("endTime", DateUtils.convert(dates[1]));
			param.remove("modi_time");
			param.remove("appe_time");
			}
			}
			return R.ok(waitMatinService.getHeadPage(toPage(curr, limit, param, WaitMatin.class)));

			@@ -31,8 +31,8 @@
			<if test="bill_no!=null and bill_no!='' ">
			and bill_no like '%' + #{bill_no} + '%'
			</if>
			<if test="mat_no!=null and mat_no!='' ">
			and a.mat_no like '%' + #{mat_no} + '%'
			<if test="bill_type!=null and bill_type!='' ">
			and bill_type like '%' + #{bill_type} + '%'
			</if>
			<if test="mat_name!=null and mat_name!='' ">
			and a.mat_name like '%' + #{mat_name} + '%'
			@@ -44,7 +44,7 @@
			and a.unit like '%' + #{unit} + '%'
			</if>
			<if test="startTime!=null and endTime!=null">
			and a.modi_time between #{startTime} and #{endTime}
			and appe_time between #{startTime} and #{endTime}
			</if>
			</sql>

			@@ -1,48 +1,29 @@
			var pageCurr;
			layui.config({
			base: baseUrl + "/static/layui/lay/modules/"
			}).use(['table','laydate', 'form', 'admin'], function(){
			var table = layui.table;
			}).use(['layer', 'form', 'table', 'util', 'admin', 'xmSelect', 'laydate'], function () {
			var $ = layui.jquery;
			var layer = layui.layer;
			var layDate = layui.laydate;
			var form = layui.form;
			var table = layui.table;
			var util = layui.util;
			var admin = layui.admin;
			var xmSelect = layui.xmSelect;
			var layDate = layui.laydate;

			// 数据渲染
			tableIns = table.render({
			// 渲染表格
			var insTb = table.render({
			elem: '#waitMatin',
			url: baseUrl+'/waitMatin/head/page/auth',
			headers: {token: localStorage.getItem('token')},
			url: baseUrl+'/waitMatin/list/auth',
			page: true,
			limit: 16,
			limits: [16, 30, 50, 100, 200, 500],
			toolbar: '#toolbar',
			cellMinWidth: 50,
			cellMinWidth: 100,
			cols: [[
			{type: 'checkbox'}
			,{field: 'billNo', align: 'center',title: '单据编号'}
			,{field: 'seqNo', align: 'center',title: '序号'}
			,{field: 'billType$', align: 'center',title: '单据类型'}
			,{field: 'matNo', align: 'center',title: '物料编码'}
			,{field: 'matName', align: 'center',title: '物料名称'}
			,{field: 'qty', align: 'center',title: '数量'}
			,{field: 'specs', align: 'center',title: '规格'}
			,{field: 'unit', align: 'center',title: '单位'}
			,{field: 'size', align: 'center',title: '尺寸', hide: true}
			,{field: 'color', align: 'center',title: '颜色', hide: true}
			,{field: 'weight', align: 'center',title: '单重', hide: true}
			,{field: 'memo', align: 'center',title: '备注', hide: true}
			,{field: 'inQty', align: 'center',title: '已入库量'}
			,{field: 'linkErp$', align: 'center',title: 'ERP连线'}
			,{field: 'ioStatus$', align: 'center',title: '完成状态'}
			,{field: 'ioTime$', align: 'center',title: '完成时间', hide: true}
			,{field: 'modiUser$', align: 'center',title: '修改人员',event: 'modiUser', style: 'cursor:pointer', hide: true}
			,{field: 'modiTime$', align: 'center',title: '修改时间', hide: true}
			,{field: 'appeUser$', align: 'center',title: '建档人员',event: 'appeUser', style: 'cursor:pointer', hide: true}
			,{field: 'appeTime$', align: 'center',title: '建档时间', hide: true}

			,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:150}
			{type: 'numbers'},
			{field: 'billNo', title: '单据编号', sort: true},
			{field: 'billType$', align: 'center', title: '类型', minWidth: 140, width: 140},
			{align: 'center', title: '明细', toolbar: '#tbLook', minWidth: 140, width: 140},
			{field: 'appeTime$', title: '创建时间', minWidth: 180, width: 180},
			{align: 'center', title: '操作', toolbar: '#operate', minWidth: 130, width: 130}
			]],
			request: {
			pageName: 'curr',
			@@ -63,153 +44,330 @@
			if (res.code === 403) {
			top.location.href = baseUrl+"/";
			}
			pageCurr=curr;
			limit();
			}
			});

			// 监听排序事件
			table.on('sort(waitMatin)', 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}
			});
			// 搜索
			form.on('submit(eCourseTbSearch)', function (data) {
			insTb.reload({where: data.field, page: {curr: 1}});
			});

			// 监听头工具栏事件
			table.on('toolbar(waitMatin)', function (obj) {
			var checkStatus = table.checkStatus(obj.config.id).data;
			switch(obj.event) {
			case 'addData':
			// 添加
			$("#eCourseAddBtn").click(function () {
			showEditModel();
			break;
			case 'deleteData':
			if (checkStatus.length === 0) {
			layer.msg('请选择要删除的数据', {icon: 2});
			return;
			}
			var ids = checkStatus.map(function (d) {
			return d.seqNo;
			});
			del(ids);
			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);

			// 工具条点击事件
			table.on('tool(waitMatin)', function (obj) {
			var data = obj.data;
			var layEvent = obj.event;
			if (layEvent === 'edit') {
			showEditModel(data);
			} else if (layEvent === 'del') {
			doDel(data.billNo);
			} else if (layEvent === 'look') {
			var $a = $(obj.tr).find('a[lay-event="look"]');
			var offset = $a.offset();
			var top = offset.top;
			var left = offset.left;
			layer.open({
			type: 1,
			title: false,
			area: '630px',
			offset: [top + 'px', (left - 530 + $a.outerWidth()) + 'px'],
			shade: .01,
			shadeClose: true,
			fixed: false,
			content: '<table id="lookSSXMTable" lay-filter="lookSSXMTable"></table>',
			success: function (layero) {
			table.render({
			elem: '#lookSSXMTable',
			headers: {token: localStorage.getItem('token')},
			url: baseUrl+'/waitMatin/list/auth',
			where: {
			bill_no: data.billNo
			},
			page: true,
			cellMinWidth: 100,
			cols: [[
			{type: 'numbers'},
			{field: 'matNo', title: '物料编码'},
			{field: 'matName', title: '物料名称', width: 160},
			{field: 'qty', title: '数量'},
			{
			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');
			},
			size: ''
			});
			}
			});
			var exportData = {};
			$.each($('#search-box [name]').serializeArray(), function() {
			exportData[this.name] = this.value;
			}
			});
			var param = {
			'waitMatin': exportData,
			'fields': fields
			};

			// 显示表单弹窗
			function showEditModel(expTpe) {
			admin.open({
			type: 1,
			title: (expTpe ? '修改' : '添加') + '单据',
			content: $('#editDialog').html(),
			area: '700px',
			success: function (layero, dIndex) {
			$(layero).children('.layui-layer-content').css('overflow', 'visible');
			var url = expTpe ? '../../json/ok.json' : '../../json/ok.json';
			var isExpAdd = !expTpe;
			// 回显数据
			form.val('editForm', expTpe);
			// 表单提交事件
			form.on('submit(waitMatinEditSubmit)', function (data) {
			// 组装数据
			if (xxDataList.length <= 0) {
			layer.tips('请添加单据明细', '#matAddBtnComment', {tips: [1, '#ff4c4c']});
			return false;
			}
			var param = [];
			var nList = admin.util.deepClone(xxDataList);
			for (var xi = 0; xi < nList.length; xi++) {
			if (nList[xi].qty > 0) {
			param.push({
			billNo: data.field.billNo,
			billType: data.field.billType,
			matNo: nList[xi].matNo,
			matName: nList[xi].matName,
			qty: nList[xi].qty,
			})
			}
			}
			if (param.length === 0) {
			layer.msg('单据明细数量不合法', {icon: 2});
			return false;
			}
			if (isExpAdd) {
			layer.load(2);
			$.ajax({
			url: baseUrl+"/waitMatin/export/auth",
			url: baseUrl+"/waitMatin/add/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();
			layer.closeAll('loading');
			if (res.code === 200) {
			table.exportFile(titles,res.data,'xls');
			layer.close(dIndex);
			insTb.reload({page: {curr: 1}});
			layer.msg(res.msg, {icon: 1});
			} else if (res.code === 403){
			top.location.href = baseUrl+"/";
			}else {
			layer.msg(res.msg, {icon: 2});
			}
			}
			})
			}
			return false;
			});
			// 明细表格
			var xxDataList = [];
			var tbOptions = {
			elem: '#formSSXMTable',
			data: xxDataList,
			page: true,
			height: '350px;',
			cellMinWidth: 100,
			cols: [[
			{type: 'numbers'},
			{field: 'matNo', title: '物料编码'},
			{field: 'matName', title: '物料名称', width: 160},
			{field: 'qty', title: '修改数量', style: 'color: blue;font-weight: bold', edit: true, minWidth: 100, width: 100},
			{align: 'center', title: '操作', toolbar: '#formSSXMTableBar', minWidth: 80, width: 80}
			]],
			done: function () {
			$(layero).find('.layui-table-view').css('margin', '0');
			},
			size: ''
			};
			if (!isExpAdd) {
			tbOptions.data = undefined;
			tbOptions.url = '../../json/e-course-tb2.json?experimentTypeId=' + expTpe.experimentTypeId;
			}
			var insTbSSXM = table.render(tbOptions);
			// 工具条点击事件
			table.on('tool(formSSXMTable)', function (obj) {
			var data = obj.data;
			var layEvent = obj.event;
			if (layEvent === 'edit') {
			showEditModel2(data);
			} else if (layEvent === 'del') {
			layer.confirm('确定要删除吗？', {
			shade: .1,
			skin: 'layui-layer-admin'
			}, function (i) {
			layer.close(i);
			for (var j = 0; j < xxDataList.length; j++) {
			if (xxDataList[j].matNo === data.matNo) {
			xxDataList.splice(j, 1);
			}
			}
			insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
			});
			}
			});
			// 数量修改
			table.on('edit(formSSXMTable)', function (obj) {
			let count = Number(obj.value);
			if (isNaN(count)) {
			layer.msg("请输入数字");
			} else {
			if (count > 0) {
			for (var i=0;i<xxDataList.length;i++){
			if (xxDataList[i]["matNo"] === obj.data.matNo){
			xxDataList[i]["qty"] = count;
			break;
			}
			}
			} else {
			layer.msg("数量必须大于零");
			}
			}
			insTbSSXM.reload({data: xxDataList});
			});
			//
			$('#matAddBtnComment').click(function () {
			showEditModel2();
			});

			// 显示添加明细表单弹窗
			function showEditModel2(exp) {
			admin.open({
			type: 1,
			offset: '150px',
			area: '480px',
			title: (exp ? '修改' : '添加') + '明细',
			content: $('#matEditDialog').html(),
			success: function (layero, dIndex) {
			$(layero).children('.layui-layer-content').css('overflow', 'visible');
			var url = exp ? '../../json/ok.json' : '../../json/ok.json';
			// 回显数据
			form.val('matEditForm', exp);
			// 表单提交事件
			form.on('submit(matEditSubmit)', function (data) {
			var existMats = [];
			xxDataList.forEach(function(elem) {
			existMats.push(elem.matNo);
			});
			var selectList = matXmSelect.getValue();
			for (var i = 0; i<selectList.length; i++) {
			var item = selectList[i];
			if (existMats.indexOf(item.value) === -1) {
			// 查询物料详情
			$.ajax({
			url: baseUrl+"/matCode/"+item.value+"/auth",
			headers: {'token': localStorage.getItem('token')},
			method: 'GET',
			async: false,
			success: function (res) {
			if (res.code === 200){
			var mat = res.data;
			xxDataList.push({
			matNo: mat.matNo,
			matName: mat.matName,
			qty: 0.0
			});
			insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
			} else if (res.code === 403) {
			top.location.href = baseUrl+"/";
			} else {
			layer.msg(res.msg, {icon: 2})
			}
			}
			});
			});
			break;
			})
			}
			});

			// 监听行工具事件
			table.on('tool(waitMatin)', function(obj){
			var data = obj.data;
			switch (obj.event) {
			case 'edit':
			showEditModel(data);
			break;
			case "del":
			var ids = [data.seqNo];
			del(ids);
			break;
			}
			layer.close(dIndex);
			return false;
			});

			/* 弹窗 - 新增、修改 */
			function showEditModel(mData) {
			admin.open({
			type: 1,
			area: '600px',
			title: (mData ? '修改' : '添加') + '订单状态',
			content: $('#editDialog').html(),
			success: function (layero, dIndex) {
			layDateRender();
			form.val('detail', mData);
			form.on('submit(editSubmit)', function (data) {
			var loadIndex = layer.load(2);
			// 渲染物料选择
			var matXmSelect = xmSelect.render({
			el: '#mat',
			style: {
			width: '340px',
			},
			autoRow: true,
			toolbar: { show: true },
			filterable: true,
			remoteSearch: true,
			remoteMethod: function(val, cb, show){
			$.ajax({
			url: baseUrl+"/waitMatin/"+(mData?'update':'add')+"/auth",
			url: baseUrl+"/mat/all/get/kv",
			headers: {'token': localStorage.getItem('token')},
			data: data.field,
			data: {
			condition: val
			},
			method: 'POST',
			success: function (res) {
			layer.close(loadIndex);
			if (res.code === 200){
			layer.close(dIndex);
			layer.msg(res.msg, {icon: 1});
			tableReload();
			} else if (res.code === 403){
			top.location.href = baseUrl+"/";
			cb(res.data)
			}else {
			cb([]);
			layer.msg(res.msg, {icon: 2});
			}
			}
			})
			return false;
			});
			}
			})
			// 弹窗不出现滚动条
			$(layero).children('.layui-layer-content').css('overflow', 'visible');
			layui.form.render('select');
			}
			});
			}

			/* 删除 */
			function del(ids) {
			layer.confirm('确定要删除选中数据吗？', {
			skin: 'layui-layer-admin',
			shade: .1
			}
			});
			}

			// 删除单据
			function doDel(billNo) {
			layer.confirm('确定要删除吗？', {
			shade: .1,
			skin: 'layui-layer-admin'
			}, function (i) {
			layer.close(i);
			var loadIndex = layer.load(2);
			layer.load(2);

			$.ajax({
			url: baseUrl+"/waitMatin/delete/auth",
			headers: {'token': localStorage.getItem('token')},
			data: {ids: ids},
			data: {
			billNo: billNo
			},
			// contentType:'application/json;charset=UTF-8',
			method: 'POST',
			success: function (res) {
			layer.close(loadIndex);
			layer.closeAll('loading');
			if (res.code === 200){
			insTb.reload({page: {curr: 1}});
			layer.msg(res.msg, {icon: 1});
			tableReload();
			} else if (res.code === 403){
			top.location.href = baseUrl+"/";
			} else {
			@@ -220,55 +378,9 @@
			});
			}

			// 搜索
			form.on('submit(search)', function (data) {
			pageCurr = 1;
			tableReload(false);
			});

			// 重置
			form.on('submit(reset)', function (data) {
			pageCurr = 1;
			clearFormVal($('#search-box'));
			tableReload(false);
			});

			// 时间选择器
			function layDateRender() {
			layDate.render({
			elem: '#ioTime\\$',
			type: 'datetime'
			});
			layDate.render({
			elem: '#modiTime\\$',
			type: 'datetime'
			});
			layDate.render({
			elem: '#appeTime\\$',
			type: 'datetime'
			});
			layDate.render({
			elem: '.layui-laydate-range'
			,type: 'datetime'
			,range: true
			});
			}
			layDateRender();

			});

			// 关闭动作
			$(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;
			});
			tableIns.reload({
			where: searchData,
			page: {curr: pageCurr}
			});
			}

			@@ -25,9 +25,25 @@
			<div class="layui-form toolbar">
			<div class="layui-form-item">
			<div class="layui-inline">
			<label class="layui-form-label w-auto">单据编号：</label>
			<div class="layui-input-inline mr0">
			<input name="bill_no" class="layui-input" type="text" placeholder="输入单据编号"/>
			</div>
			</div>
			<div class="layui-inline">
			<div class="layui-input-inline mr0">
			<select name="bill_type" placeholder="请选择单据类型">
			<option value="" style="display: none"></option>
			<option value="1">采购入库</option>
			<option value="2">生产入库</option>
			<option value="3">调拨入库</option>
			<option value="4">销售退回入库</option>
			<option value="5">其他入库</option>
			</select>
			</div>
			</div>
			<div class="layui-inline" style="width: 300px">
			<div class="layui-input-inline">
			<input class="layui-input layui-laydate-range" name="appe_time" type="text" placeholder="起始时间 - 终止时间" autocomplete="off" style="width: 300px">
			</div>
			</div>
			<div class="layui-inline">
			@@ -122,390 +138,7 @@
			<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>
			layui.config({
			base: baseUrl + "/static/layui/lay/modules/"
			}).use(['layer', 'form', 'table', 'util', 'admin', 'xmSelect'], function () {
			var $ = layui.jquery;
			var layer = layui.layer;
			var form = layui.form;
			var table = layui.table;
			var util = layui.util;
			var admin = layui.admin;
			var xmSelect = layui.xmSelect;

			// 渲染表格
			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: '类型', minWidth: 140, width: 140},
			// {align: 'center', title: '星期', templet: '#eCourseTbWeek', minWidth: 350, width: 350},
			{align: 'center', title: '明细', toolbar: '#tbLook', minWidth: 140, width: 140},
			{field: 'appeTime$', title: '创建时间', minWidth: 180, width: 180},
			{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, curr, count) {
			if (res.code === 403) {
			top.location.href = baseUrl+"/";
			}
			}
			});

			// 搜索
			form.on('submit(eCourseTbSearch)', function (data) {
			insTb.reload({where: data.field, page: {curr: 1}});
			});

			// 添加
			$("#eCourseAddBtn").click(function () {
			showEditModel();
			});

			// 工具条点击事件
			table.on('tool(waitMatin)', function (obj) {
			var data = obj.data;
			var layEvent = obj.event;
			if (layEvent === 'edit') {
			showEditModel(data);
			} else if (layEvent === 'del') {
			doDel(data.billNo);
			} else if (layEvent === 'look') {
			var $a = $(obj.tr).find('a[lay-event="look"]');
			var offset = $a.offset();
			var top = offset.top;
			var left = offset.left;
			layer.open({
			type: 1,
			title: false,
			area: '630px',
			offset: [top + 'px', (left - 530 + $a.outerWidth()) + 'px'],
			shade: .01,
			shadeClose: true,
			fixed: false,
			content: '<table id="lookSSXMTable" lay-filter="lookSSXMTable"></table>',
			success: function (layero) {
			table.render({
			elem: '#lookSSXMTable',
			headers: {token: localStorage.getItem('token')},
			url: baseUrl+'/waitMatin/list/auth',
			where: {
			bill_no: data.billNo
			},
			page: true,
			cellMinWidth: 100,
			cols: [[
			{type: 'numbers'},
			{field: 'matNo', title: '物料编码'},
			{field: 'matName', title: '物料名称', width: 160},
			{field: 'qty', title: '数量'},
			{
			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');
			},
			size: ''
			});
			}
			});
			}
			});

			// 显示表单弹窗
			function showEditModel(expTpe) {
			admin.open({
			type: 1,
			title: (expTpe ? '修改' : '添加') + '单据',
			content: $('#editDialog').html(),
			area: '700px',
			success: function (layero, dIndex) {
			$(layero).children('.layui-layer-content').css('overflow', 'visible');
			var url = expTpe ? '../../json/ok.json' : '../../json/ok.json';
			var isExpAdd = !expTpe;
			// 回显数据
			form.val('editForm', expTpe);
			// 表单提交事件
			form.on('submit(waitMatinEditSubmit)', function (data) {
			// 组装数据
			if (xxDataList.length <= 0) {
			layer.tips('请添加单据明细', '#matAddBtnComment', {tips: [1, '#ff4c4c']});
			return false;
			}
			var param = [];
			var nList = admin.util.deepClone(xxDataList);
			for (var xi = 0; xi < nList.length; xi++) {
			if (nList[xi].qty > 0) {
			param.push({
			billNo: data.field.billNo,
			billType: data.field.billType,
			matNo: nList[xi].matNo,
			matName: nList[xi].matName,
			qty: nList[xi].qty,
			})
			}
			}
			if (param.length === 0) {
			layer.msg('单据明细数量不合法', {icon: 2});
			return false;
			}
			if (isExpAdd) {
			layer.load(2);
			$.ajax({
			url: baseUrl+"/waitMatin/add/auth",
			headers: {'token': localStorage.getItem('token')},
			data: JSON.stringify(param),
			contentType:'application/json;charset=UTF-8',
			method: 'POST',
			success: function (res) {
			layer.closeAll('loading');
			if (res.code === 200){
			layer.close(dIndex);
			insTb.reload({page: {curr: 1}});
			layer.msg(res.msg, {icon: 1});
			} else if (res.code === 403){
			top.location.href = baseUrl+"/";
			}else {
			layer.msg(res.msg, {icon: 2});
			}
			}
			})
			}
			return false;
			});
			// 明细表格
			var xxDataList = [];
			var tbOptions = {
			elem: '#formSSXMTable',
			data: xxDataList,
			page: true,
			height: '350px;',
			cellMinWidth: 100,
			cols: [[
			{type: 'numbers'},
			{field: 'matNo', title: '物料编码'},
			{field: 'matName', title: '物料名称', width: 160},
			{field: 'qty', title: '修改数量', style: 'color: blue;font-weight: bold', edit: true, minWidth: 100, width: 100},
			{align: 'center', title: '操作', toolbar: '#formSSXMTableBar', minWidth: 80, width: 80}
			]],
			done: function () {
			$(layero).find('.layui-table-view').css('margin', '0');
			},
			size: ''
			};
			if (!isExpAdd) {
			tbOptions.data = undefined;
			tbOptions.url = '../../json/e-course-tb2.json?experimentTypeId=' + expTpe.experimentTypeId;
			}
			var insTbSSXM = table.render(tbOptions);
			// 工具条点击事件
			table.on('tool(formSSXMTable)', function (obj) {
			var data = obj.data;
			var layEvent = obj.event;
			if (layEvent === 'edit') {
			showEditModel2(data);
			} else if (layEvent === 'del') {
			layer.confirm('确定要删除吗？', {
			shade: .1,
			skin: 'layui-layer-admin'
			}, function (i) {
			layer.close(i);
			for (var j = 0; j < xxDataList.length; j++) {
			if (xxDataList[j].matNo === data.matNo) {
			xxDataList.splice(j, 1);
			}
			}
			insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
			});
			}
			});
			// 数量修改
			table.on('edit(formSSXMTable)', function (obj) {
			let count = Number(obj.value);
			if (isNaN(count)) {
			layer.msg("请输入数字");
			} else {
			if (count > 0) {
			for (var i=0;i<xxDataList.length;i++){
			if (xxDataList[i]["matNo"] === obj.data.matNo){
			xxDataList[i]["qty"] = count;
			break;
			}
			}
			} else {
			layer.msg("数量必须大于零");
			}
			}
			insTbSSXM.reload({data: xxDataList});
			});
			//
			$('#matAddBtnComment').click(function () {
			showEditModel2();
			});

			// 显示添加明细表单弹窗
			function showEditModel2(exp) {
			admin.open({
			type: 1,
			offset: '150px',
			area: '480px',
			title: (exp ? '修改' : '添加') + '明细',
			content: $('#matEditDialog').html(),
			success: function (layero, dIndex) {
			$(layero).children('.layui-layer-content').css('overflow', 'visible');
			var url = exp ? '../../json/ok.json' : '../../json/ok.json';
			// 回显数据
			form.val('matEditForm', exp);
			// 表单提交事件
			form.on('submit(matEditSubmit)', function (data) {
			var existMats = [];
			xxDataList.forEach(function(elem) {
			existMats.push(elem.matNo);
			});
			var selectList = matXmSelect.getValue();
			for (var i = 0; i<selectList.length; i++) {
			var item = selectList[i];
			if (existMats.indexOf(item.value) === -1) {
			// 查询物料详情
			$.ajax({
			url: baseUrl+"/matCode/"+item.value+"/auth",
			headers: {'token': localStorage.getItem('token')},
			method: 'GET',
			async: false,
			success: function (res) {
			if (res.code === 200){
			var mat = res.data;
			xxDataList.push({
			matNo: mat.matNo,
			matName: mat.matName,
			qty: 0.0
			});
			insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
			} else if (res.code === 403){
			top.location.href = baseUrl+"/";
			}else {
			layer.msg(res.msg, {icon: 2})
			}
			}
			})
			}
			}
			layer.close(dIndex);
			return false;
			});
			// 渲染物料选择
			var matXmSelect = xmSelect.render({
			el: '#mat',
			style: {
			width: '340px',
			},
			autoRow: true,
			toolbar: { show: true },
			filterable: true,
			remoteSearch: true,
			remoteMethod: function(val, cb, show){
			$.ajax({
			url: baseUrl+"/mat/all/get/kv",
			headers: {'token': localStorage.getItem('token')},
			data: {
			condition: val
			},
			method: 'POST',
			success: function (res) {
			if (res.code === 200){
			cb(res.data)
			} else {
			cb([]);
			layer.msg(res.msg, {icon: 2});
			}
			}
			});
			}
			})
			// 弹窗不出现滚动条
			$(layero).children('.layui-layer-content').css('overflow', 'visible');
			layui.form.render('select');
			}
			});
			}

			}
			});
			}

			// 删除单据
			function doDel(billNo) {
			layer.confirm('确定要删除吗？', {
			shade: .1,
			skin: 'layui-layer-admin'
			}, function (i) {
			layer.close(i);
			layer.load(2);

			$.ajax({
			url: baseUrl+"/waitMatin/delete/auth",
			headers: {'token': localStorage.getItem('token')},
			data: {
			billNo: billNo
			},
			// contentType:'application/json;charset=UTF-8',
			method: 'POST',
			success: function (res) {
			layer.closeAll('loading');
			if (res.code === 200){
			insTb.reload({page: {curr: 1}});
			layer.msg(res.msg, {icon: 1});
			} else if (res.code === 403){
			top.location.href = baseUrl+"/";
			}else {
			layer.msg(res.msg, {icon: 2});
			}
			}
			})
			});
			}

			});
			</script>
			<script type="text/javascript" src="../../static/js/waitMatin/waitMatin.js" charset="utf-8"></script>
			</body>
			</html>