Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

杨乐

2022-01-13 9f7ad8647536939300596d8b0a36c15c35e408ca

Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξֿ߲â¹ÜÀí/Sc_MouldProdBackBillList.html

@@ -181,9 +181,9 @@
                        , { field: 'Hunitid', title: 'Hunitid', width: 200, hide: true }
                        //, { field: '计量单位代码', title: '计量单位代码', width: 125 }
                        //, { field: '计量单位', title: '计量单位', width: 125 }
                        , { field: 'HWHSonID', title: 'HWHSonID', width: 200, hide: true }
                        //, { field: '发料仓库代码', title: '发料仓库代码', width: 125 }
                        //, { field: '发料仓库', title: '发料仓库', width: 125 }
                        , { field: '收料仓库ID', title: '收料仓库ID', width: 200, hide: true }
                        , { field: '收料仓库代码', title: '收料仓库代码', width: 125 }
                        , { field: '收料仓库', title: '收料仓库', width: 125 }
                        , { field: 'HSPID', title: 'HSPID', width: 200, hide: true }
                        , { field: '仓位代码', title: '仓位代码', width: 125 }
                        , { field: '仓位', title: '仓位', width: 125 }

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Sc_MouldOtherInBillList.html

@@ -176,9 +176,9 @@
                        , { field: 'Hunitid', title: 'Hunitid', width: 200, hide: true }
                        //, { field: '计量单位代码', title: '计量单位代码', width: 125 }
                        //, { field: '计量单位', title: '计量单位', width: 125 }
                        , { field: 'HWHSonID', title: 'HWHSonID', width: 200, hide: true }
                        , { field: '发料仓库代码', title: '发料仓库代码', width: 125 }
                        , { field: '发料仓库', title: '发料仓库', width: 125 }
                        , { field: '收料仓库ID', title: '收料仓库ID', width: 200, hide: true }
                        , { field: '收料仓库代码', title: '收料仓库代码', width: 125 }
                        , { field: '收料仓库', title: '收料仓库', width: 125 }
                        , { field: 'HSPID', title: 'HSPID', width: 200, hide: true }
                        , { field: '仓位代码', title: '仓位代码', width: 125 }
                        , { field: '仓位', title: '仓位', width: 125 }

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú°ü×°µ¥/Sc_PackUnionBill.html

@@ -122,8 +122,10 @@
            var pageIndex = 1;//当前页码值

            //#region è¿›å…¥é¡µé¢æ—¢åŠ è½½
            //初始化表单插件
            set_InitFrom();
            //初始化界面
            set_ClearBill();
            set_ClearBill(sWhere);
            //#endregion


@@ -174,12 +176,17 @@
                get_FastQuery();
            });

            //初始化表单
            function set_InitFrom() {
                laydate.render({
                    elem: '#HDate'
                });
            }
            //初始化界面
            function set_ClearBill() {
            function set_ClearBill(sWhere) {
                resultTableHead = []; //清空表头列，防止重复渲染
                //初始查询
                get_Display(sWhere);

            }
            //加载网格
            function get_Display(sWhere) {
@@ -201,7 +208,7 @@
                });
            }
            //初始化表格
            function set_InitGrid() {
            function set_InitGrid(sWhere) {
                //填充表格头数组
                var data = resultTableHead;
                cols_arr[0] = [];
@@ -229,6 +236,7 @@
                table.render({
                    elem: '#mainTable',
                    url: GetWEBURL() + '/Sc_PackUnionBill/Get_PackUnionBillList',
                    toolbar: '#toolbarDemo',
                    title: '组托单列表',
                    cols: cols_arr,    //填充表格头数据,
                    id: 'mainTable', //表格id
@@ -246,6 +254,45 @@
                        layer.close(layer.index);    //返回数据关闭loading
                    }
                });
            }
            //删除
            function set_DeleteBill() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var InterID = data[0].hmainid.toString();
                    //逻辑删除方法
                    layer.confirm("确认要删除吗，删除后不能恢复", { title: "删除确认" }, function (index) {
                        var wait = layer.load();
                        $.ajax({
                            type: "GET",
                            url: GetWEBURL() + "/Sc_PackUnionBill/set_DeleteBill", //方法所在页面和方法名
                            data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
                            success: function (result) {
                                if (result.count == 1) {
                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                        // å¾—到frame索引
                                        var index = layer.getFrameIndex(window.name);
                                        //关闭当前frame
                                        layer.close(index);
                                        //修改为功后刷新界面
                                        window.location.reload();
                                    });

                                } else {
                                    layer.alert(result.code + result.Message, { icon: 5 });
                                }
                                layer.close(wait);
                            }, error: function () {
                                layer.close(wait);
                                layer.alert("接口请求失败!", { icon: 5 });
                            }
                        });
                    })
                }
                else {
                    layer.msg('请选择一行数据删除！');
                }
            }
            //快速过滤
            function get_FastQuery() {
@@ -284,8 +331,8 @@
                $("#HMaterNumber").val("");
                $("#HMaterName").val("");
                $("#HMakerMan").val("");
                sWhere = " ";
                get_FastQuery();
                sWhere = "";
                get_Display(sWhere);
            }
            //刷新
            function set_Refresh() {