#

luxiaotao1123

2021-08-27 889c68898bba81f90bae9923c01e40a5052cc843

#

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

@@ -48,6 +48,19 @@
        return R.ok(waitMatinService.getHeadPage(toPage(curr, limit, param, WaitMatin.class)));
    }

    @RequestMapping(value = "/waitMatin/detl/list/auth")
    @ManagerAuth
    public R detlPage(@RequestParam String billNo){
        if (Cools.isEmpty(billNo)){
            return R.parse(BaseRes.PARAM);
        }
        List<WaitMatin> waitMatins = waitMatinService.selectList(new EntityWrapper<WaitMatin>().eq("bill_no", billNo));
        if (Cools.isEmpty(waitMatins)) {
            return R.parse(BaseRes.EMPTY);
        }
        return R.ok().add(waitMatins);
    }


    /*************************************** xm-select ***********************************************/


 src/main/resources/mapper/WaitMatinMapper.xml

@@ -52,7 +52,7 @@
        select * from
        (
            select *,
            ROW_NUMBER() over (order by appe_time) as row
            ROW_NUMBER() over (order by appe_time desc) as row
            from (
                select distinct bill_no, bill_type, appe_time
                from ints_wait_matin
@@ -66,7 +66,7 @@
        select count(1) from
        (
            select *,
            ROW_NUMBER() over (order by appe_time) as row
            ROW_NUMBER() over (order by appe_time desc) as row
            from (
                select distinct bill_no, bill_type, appe_time
                from ints_wait_matin

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

@@ -190,6 +190,7 @@
                var xxDataList = [];
                var tbOptions = {
                    elem: '#formSSXMTable',
                    headers: {token: localStorage.getItem('token')},
                    data: xxDataList,
                    page: true,
                    height: '350px;',
@@ -201,14 +202,28 @@
                        {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 () {
                    done: function (res) {
                        $(layero).find('.layui-table-view').css('margin', '0');
                    },
                    size: ''
                };
                if (!isExpAdd) {
                    tbOptions.data = undefined;
                    tbOptions.url = '../../json/e-course-tb2.json?experimentTypeId=' + expTpe.experimentTypeId;
                    $.ajax({
                        url: baseUrl+"/waitMatin/detl/list/auth?billNo=" + expTpe.billNo,
                        headers: {'token': localStorage.getItem('token')},
                        method: 'GET',
                        async: false,
                        success: function (res) {
                            if (res.code === 200){
                                xxDataList = res.data;
                                tbOptions.data = xxDataList;
                            } else if (res.code === 403){
                                top.location.href = baseUrl+"/";
                            }else {
                                layer.msg(res.msg, {icon: 2})
                            }
                        }
                    })
                }
                var insTbSSXM = table.render(tbOptions);
                // 工具条点击事件
@@ -226,6 +241,7 @@
                            for (var j = 0; j < xxDataList.length; j++) {
                                if (xxDataList[j].matNo === data.matNo) {
                                    xxDataList.splice(j, 1);
                                    break;
                                }
                            }
                            insTbSSXM.reload({data: xxDataList, page: {curr: 1}});