Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms

skyouc

昨天 7cf2e143941e1548cc468992ada42106a27805a1

 src/main/webapp/static/js/adjustOrder/adjustOrder.js

@@ -107,24 +107,22 @@
            var offset = $a.offset();
            var top = offset.top;
            var left = offset.left;
            layer.open({
            admin.open({
                type: 1,
                title: false,
                area: '1000px',
                offset: [top + 'px', (left - 700 + $a.outerWidth()) + 'px'],
                shade: .01,
                shadeClose: true,
                fixed: false,
                content: '<table id="lookSSXMTable" lay-filter="lookSSXMTable"></table>',
                success: function (layero) {
                title: '单据明细',
                height: '450px',
                content: $('#orderItem').html(),
                area: '78%',
                success: function (layero, dIndex) {
                    table.render({
                        elem: '#lookSSXMTable',
                        headers: {token: localStorage.getItem('token')},
                        url: baseUrl+'/checkOrderDetl/list/auth',
                        elem: '#itemTable',
                        headers: { token: localStorage.getItem('token') },
                        url: baseUrl + '/checkOrderDetl/list/auth',
                        where: {
                            order_id: data.id
                        },
                        page: true,
                        height: '450px;',
                        cellMinWidth: 100,
                        cols: [[
                            {type: 'numbers'},
@@ -134,14 +132,6 @@
                            {field: 'maktx', title: '商品名称', width: 160},
                            {field: 'batch', title: '批号'},
                            {field: 'diffQty', title: '差异数量', style: 'font-weight: bold'},
                            // {field: 'unit', title: '单位'},
                            // {
                            //     field: 'createTime$', title: '创建时间', sort: true, templet: function (d) {
                            //         return util.toDateString(d.createTime);
                            //     },  width: 180
                            // },
                            // {field: 'inQty', title: '已入库量'},
                            // {field: 'color', title: '颜色'},
                            {field: 'specs', title: '规格'},
                            {field: 'status$', title: '状态'}
                        ]],
@@ -160,10 +150,7 @@
                        response: {
                            statusCode: 200
                        },
                        done:  (res) => {
                            if(res.code == 403){
                                window.top.location.href = baseUrl+"/";
                            }
                        done: function () {
                            $(layero).find('.layui-table-view').css('margin', '0');
                        },
                        size: ''