1.0.5

admin

2021-08-30 91726f605850e37f58ba3446c8765e00add359e6

1.0.5

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

@@ -99,7 +99,7 @@
                                    return util.toDateString(d.createTime);
                                },  width: 180
                            },
                            {field: 'outqty', title: '已出库量'},
                            {field: 'inQty', title: '已入库量'},
                            {field: 'color', title: '颜色'},
                            {field: 'specs', title: '规格'}
                        ]],
@@ -130,6 +130,8 @@

    // 显示表单弹窗
    function showEditModel(expTpe) {
        var mlist=null
        var inQtys=[]
        admin.open({
            type: 1,
            title: (expTpe ? '修改' : '添加') + '单据',
@@ -153,7 +155,13 @@
                    var param = [];
                    var nList = admin.util.deepClone(xxDataList);
                    for (var xi = 0; xi < nList.length; xi++) {
                        if (nList[xi].qty > 0) {
                        // console.log('已入库：'+nList[xi].inQty)
                        // console.log('旧数量：'+inQtys[xi])
                        // console.log('数量：'+nList[xi].qty)
                        if (nList[xi].inQty > 0 && inQtys[xi]!=nList[xi].qty) {
                            layer.msg("已入库无法修改", {icon: 2})
                            return false;
                        } else  if (nList[xi].qty > 0) {
                            param.push({
                                billNo: data.field.billNo,
                                billType: data.field.billType,
@@ -165,7 +173,11 @@
                                memo: nList[xi].memo,
                                unit: nList[xi].unit,
                                qty: nList[xi].qty,
                                inQty: nList[xi].inQty,
                            })
                        }else if (nList[xi].qty == 0){
                            layer.msg('明细修改数量不合法', {icon: 2});
                            return false;
                        }
                    }
                    if (param.length === 0) {
@@ -210,12 +222,18 @@
                        {field: 'specs', title: '规格', width: 160},
                        {field: 'color', title: '颜色', width: 160},
                        {field: 'size', title: '尺寸', width: 160},
                        {field: 'qty', title: '修改数量', style: 'color: blue;font-weight: bold', edit: true, minWidth: 100, width: 100},
                        {field: 'inQty', title: '已入库量',  minWidth: 100, width: 100},
                        {field: 'unit', title: '单位', width: 160},
                        {field: 'memo', title: '备注' , edit: true, 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 (res) {
                        mlist= res.data
                        for (let i = 0; i < mlist.length; i++) {
                            var waitIn=mlist[i]
                            inQtys.push(waitIn.qty)
                        }
                        $(layero).find('.layui-table-view').css('margin', '0');
                    },
                    size: ''

 src/main/webapp/static/js/waitMatout/waitMatout.js

@@ -61,7 +61,7 @@
    table.on('tool(waitMatout)', function (obj) {
        var data = obj.data;
        var layEvent = obj.event;
        console.log(obj)
        var checkStatus = table.checkStatus(obj.config);
        if (layEvent === 'edit') {
            showEditModel(data);
        } else if (layEvent === 'del') {
@@ -133,23 +133,9 @@
    // 显示表单弹窗
    function showEditModel(expTpe) {

        //matOut ajax
        // var DataList = [];
        // $.ajax({
        //     url: baseUrl+"/waitMatout/list/auth2?billNo=" + expTpe.billNo,
        //     headers: {'token': localStorage.getItem('token')},
        //     contentType:'application/json;charset=UTF-8',
        //     method: 'POST',
        //     success: function (res) {
        //         console.log(res)
        //         var list=res.data.records;
        //         for (let i = 0; i < list.length; i++) {
        //             DataList.push(list[i]);
        //         }
        //     }
        // })
        // console.log(DataList)

        var mlist=null
        var oldQtys=[]
        admin.open({
            type: 1,
            title: (expTpe ? '修改' : '添加') + '单据',
@@ -165,7 +151,6 @@
                }
                // 表单提交事件
                form.on('submit(waitMatoutEditSubmit)', function (data) {
                    console.log(data)
                    // 组装数据
                    if (xxDataList.length <= 0) {
                        layer.tips('请添加单据明细', '#matAddBtnComment', {tips: [1, '#ff4c4c']});
@@ -173,10 +158,13 @@
                    }
                    var param = [];
                    var nList = admin.util.deepClone(xxDataList);
                    console.log(nList)
                    for (var xi = 0; xi < nList.length; xi++) {
                        if (nList[xi].outQty > 0 ) {

                        // console.log('已出库：'+nList[xi].outQty)
                        // console.log('旧数量：'+oldQtys[xi])
                        // console.log('数量：'+nList[xi].qty)
                        if (nList[xi].outQty > 0 && oldQtys[xi]!=nList[xi].qty) {
                            layer.msg("已出库无法修改", {icon: 2})
                            return false;
                        } else if (nList[xi].qty > 0) {
                            param.push({
                                billNo: data.field.billNo,
@@ -191,6 +179,9 @@
                                outQty: nList[xi].outQty,
                                qty: nList[xi].qty,
                            })
                        }else if (nList[xi].qty == 0){
                            layer.msg('明细修改数量不合法', {icon: 2});
                            return false;
                        }
                    }
                    if (param.length === 0) {
@@ -242,7 +233,11 @@
                        {align: 'center', title: '操作', toolbar: '#formSSXMTableBar', minWidth: 80, width: 80}
                    ]],
                    done: function (res) {
                        var list= res.data
                        mlist= res.data
                        for (let i = 0; i < mlist.length; i++) {
                            var waitOut=mlist[i]
                            oldQtys.push(waitOut.qty)
                        }
                        $(layero).find('.layui-table-view').css('margin', '0');
                    },
                    size: ''
@@ -290,7 +285,6 @@
                });
                // 数量修改
                table.on('edit(formSSXMTable)', function (obj) {
                    debugger;
                    if (obj.field=='memo'){
                        let vle = obj.value;
                        for (var i=0;i<xxDataList.length;i++) {
@@ -355,7 +349,6 @@
                                            success: function (res) {
                                                if (res.code === 200){
                                                    var mat = res.data;
                                                    console.log(mat)
                                                    xxDataList.push({
                                                        matNo: mat.matNo,
                                                        matName: mat.matName,