自动化立体仓库 - WMS系统
#
luxiaotao1123
2021-08-27 bbdb6ba172824a42583d90ab6128dca54372e566
#
2个文件已修改
19 ■■■■■ 已修改文件
src/main/resources/mapper/WaitMatinMapper.xml 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/waitMatin/waitMatin.html 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/WaitMatinMapper.xml
@@ -28,8 +28,8 @@
    </resultMap>
    <sql id="condition">
        <if test="loc_no!=null and loc_no!='' ">
            and a.loc_no like '%' + #{loc_no} + '%'
        <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} + '%'
@@ -56,6 +56,7 @@
            from (
                select distinct bill_no, bill_type, appe_time
                from ints_wait_matin
                where 1=1
                <include refid="condition"></include>
            ) r
        ) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
@@ -69,6 +70,7 @@
            from (
                select distinct bill_no, bill_type, appe_time
                from ints_wait_matin
                where 1=1
                <include refid="condition"></include>
            ) r
        ) t
src/main/webapp/views/waitMatin/waitMatin.html
@@ -27,7 +27,7 @@
                    <div class="layui-inline">
                        <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="bill_no" class="layui-input" type="text" placeholder="输入单据编号"/>
                        </div>
                    </div>
                    <div class="layui-inline">
@@ -124,7 +124,6 @@
<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>
    var pageCurr;
    layui.config({
        base: baseUrl + "/static/layui/lay/modules/"
    }).use(['layer', 'form', 'table', 'util', 'admin', 'xmSelect'], function () {
@@ -149,11 +148,7 @@
                {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: '创建时间', sort: true, templet: function (d) {
                        return util.toDateString(d.createTime);
                    }, width: 180
                },
                {field: 'appeTime$', title: '创建时间', minWidth: 180, width: 180},
                {align: 'center', title: '操作', toolbar: '#operate', minWidth: 130, width: 130}
            ]],
            request: {
@@ -171,11 +166,10 @@
            response: {
                statusCode: 200
            },
            done: function (res) {
            done: function (res, curr, count) {
                if (res.code === 403) {
                    top.location.href = baseUrl+"/";
                }
                pageCurr=curr;
            }
        });
@@ -259,7 +253,6 @@
        // 显示表单弹窗
        function showEditModel(expTpe) {
            console.log(expTpe)
            admin.open({
                type: 1,
                title: (expTpe ? '修改' : '添加') + '单据',