智云MES-UI前端
parent: 34e55eb9 | 补丁 | 提交 | ignore whitespace
wtt
2024-09-05 71710fa23194118c8472e503e9136f33477ecb19 
销售出库打印修改，采购订单查询bug修复
1个文件已添加
2个文件已修改
345 ■■■■■ 已修改文件
WebTM/Vlog/webapi20240905.txt 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/采购管理/采购订单/Cg_POOrderBillQuery.html 291 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/销售出库/Kf_SellOutBillList.html 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 WebTM/Vlog/webapi20240905.txt


New file


@@ -0,0 +1,23 @@


2024/9/5 10:23:53 æ‰“印sql:exec h_p_Kf_SellOutBillList_PrintSellOutBill 13787793




2024/9/5 10:23:53 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;




2024/9/5 10:23:53 ReportDataSet:1




2024/9/5 10:25:44 æ‰“印sql:select * from h_v_IF_SellOutBillList_EditInit where hmainid = 13787793




2024/9/5 10:25:44 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;




2024/9/5 10:25:44 ReportDataSet:1




2024/9/5 10:28:34 æ‰“印sql:select * from h_v_IF_SellOutBillList_EditInit where hmainid = 13787793




2024/9/5 10:28:34 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;




2024/9/5 10:28:34 ReportDataSet:1




2024/9/5 10:28:47 æ‰“印sql:select * from h_v_IF_SellOutBillList_EditInit where hmainid = 13787793




2024/9/5 10:28:47 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;




2024/9/5 10:28:47 ReportDataSet:1




 WebTM/views/²É¹º¹ÜÀí/²É¹º¶©µ¥/Cg_POOrderBillQuery.html


@@ -18,7 +18,14 @@


    <script src="../../../layuiadmin/HideButton.js"></script>


    <script src="../../../layuiadmin/soulTable.slim.js"></script>


    <script src="../../../layuiadmin/PageTitle.js"></script>


    <style type="text/css">


        .layui-table-click {


            background: #ceedfa;


            color: black


        }


    </style>


</head>




<body>


    <div class="layui-fluid">


        <div class="layui-col-md12">


@@ -54,10 +61,10 @@


                                <div class="layui-inline">


                                    <label class="layui-form-label">单据号</label>


                                    <div class="layui-input-block">


                                        <input type="text" class="layui-input ForFilteringSchemes" name="HBillno2" id="HBillno2" style="width:190px;">


                                        <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo" style="width:190px;">


                                    </div>


                                </div>


                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">重新同步</button>


                                


                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">


                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>


                                </button>


@@ -68,12 +75,6 @@


                                </div>


                                <div class="layui-colla-content">


                                    <div class="layui-row" style="margin-top:5px">


                                        <div class="layui-inline">


                                            <label class="layui-form-label">单据号</label>


                                            <div class="layui-input-block">


                                                <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo" style="width:190px;">


                                            </div>


                                        </div>


                                        <div class="layui-inline">


                                            <label class="layui-form-label">业务员</label>


                                            <div class="layui-input-block">


@@ -86,6 +87,13 @@


                                                <input type="text" class="layui-input ForFilteringSchemes" name="HSupName" id="HSupName" style="width:190px;">


                                            </div>


                                        </div>


                                        <div class="layui-inline">


                                            <label class="layui-form-label">单据号</label>


                                            <div class="layui-input-block">


                                                <input type="text" class="layui-input ForFilteringSchemes" name="HBillno2" id="HBillno2" style="width:190px;">


                                            </div>


                                        </div>


                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">重新同步</button>


                                    </div>


                                    <div class="layui-inline">


                                        <div class="layui-row" style="margin-top:5px">


@@ -236,7 +244,6 @@


            var sWhere = "";


            var option = [];


            var optionSub = [];


            var Name = "Cg_POOrderBillWidth";


            var HModName = "Cg_POOrderBillQuery";


            var HModNameSub = "Cg_POOrderBillQuerySub";


            var HBillType = "1102";


@@ -244,11 +251,11 @@


            var HModuleType = "1102";


            //通过单据类型，从数据库动态获取单据模块命名,引用js文件 PageTitle.js


            var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);


            //#endregion 


            //#endregion




            ////不需要显示的字段 å¯æ‰©å±•


            var titleData = [];


            //#endregion 


            //#endregion




            //#region ã€è¿‡æ»¤æ–¹æ¡ˆã€‘




@@ -269,7 +276,7 @@




            //#region ç‚¹å‡»äº‹ä»¶åŒ…括on form事件等




           






            //头工具栏事件


            table.on('toolbar(mainTable)', function (obj) {


@@ -364,7 +371,7 @@


                };


            });


            //表格点击事件


            






            //重新同步按钮


            form.on('submit(btnResCnz)', function (data) {


@@ -404,44 +411,6 @@


            //查询按钮


            form.on('submit(btnSearch)', function (data) {


                get_FastQuery(table, option,2);


            });




            //表头信息部门弹窗


            form.on('submit(Department)', function () {


                //页面层-自定义


                layer.open({


                    type: 2,


                    skin: 'layui-layer-rim', //加上边框


                    title: '供应商列表',


                    closeBtn: 1,


                    shift: 2,


                    area: ['80%', '80%'],


                    maxmin: true,


                    content: ['../../PublicPage/SupplierInformation.html', 'yes'],


                    btn: ['确定', '取消']


                    , btn1: function (index, layero) {




                        //按钮【按钮一】的回调


                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面


                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"


                        if (checkStatus.data.length === 0) {


                            return layer.msg('请选择数据');


                        }


                        $("#HSupName").val(checkStatus.data[0].HName);


                        $("#HSupID").val(checkStatus.data[0].HItemID);


                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的


                    }


                    , btn2: function (index, layero) {


                        //按钮【按钮二】的回调


                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­


                    },


                    end: function () {




                    },


                    success: function (layero, index) {




                    }


                });


            });




            //日期间隔下拉列表监听


@@ -485,7 +454,7 @@


                set_InitGrid();


                //直接执行列表筛选 åŠ è½½æ•°æ®åˆ°ç½‘æ ¼


                get_FastQuery(table, option,1)


                




                //查询当前登录用户有没有在当前模块设置默认过滤方案


                get_DefaultModule();


            }


@@ -523,7 +492,7 @@


                        , { field: '物料名称', title: '物料名称', width: 130 }


                        , { field: '数量', title: '订单数量', width: 100, totalRow: true }


                        , { field: '打印条码数量', title: '打印条码数量', width: 120, totalRow: true  }


                        /* å®‰ç‘žæ–°å¢žå­—段 begin */                   


                        /* å®‰ç‘žæ–°å¢žå­—段 begin */


                        , { field: '可打印条码数量', title: '可打印条码数量', width: 120, totalRow: true}


                        /* å®‰ç‘žæ–°å¢žå­—段 end */


                        , { field: '关联数量', title: '已发货数量', width: 120, totalRow: true}


@@ -596,12 +565,12 @@


                        , { field: '作废日期', title: '作废日期', width: 120, templet: "<div>{{d.作废日期 ==null ?'':layui.util.toDateString(d.作废日期, 'yyyy-MM-dd HH:mm:ss')}}</div>" }




                ]]


               




                    , done: function (res, curr, count) {


                        soulTable.render(this);


                    }


                };


                




                optionSub = {


                    elem: '#mainTableSub'


                    , toolbar: '#toolbarDemoSub'


@@ -642,7 +611,7 @@


                                }


                            }


                            //在列表左边添加勾选框


                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '合计'});


                            col.push({ type: 'radio', fixed: 'left', totalRowText: '合计'});


                            for (var i = 0; i < data.length; i++) {


                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {


                                if ($.inArray(data[i].name, titleData) > -1) {


@@ -681,7 +650,7 @@


                            //刷新表格数据


                            DisPlay_HideColumn();




                            




                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {


                                ColFilter();


                            }


@@ -725,7 +694,7 @@


                                }


                            }


                            //在列表左边添加勾选框


                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '合计' });


                            col.push({ type: 'radio', fixed: 'left', totalRowText: '合计' });


                            for (var i = 0; i < data.length; i++) {


                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {


                                if ($.inArray(data[i].name, titleData) > -1) {


@@ -830,7 +799,7 @@


                    var InterID = data[0].hmainid.toString();


                    //逻辑删除方法


                    layer.confirm("确认要删除吗，删除后不能恢复", { title: "删除确认" }, function (index) {


                        




                        if (data[0].状态 == "创建") {


                            $.ajax({


                                type: "GET",


@@ -850,42 +819,21 @@


                                    } else {


                                        layer.alert(result.code + result.Message, { icon: 5 });


                                    }


                                  




                                }, error: function () {


                                    




                                    layer.alert("接口请求失败!", { icon: 5 });


                                }


                            });


                        } else {


                            layer.msg('该条数据不是创建状态,无法删除！');


                          




                        }


                       




                    })


                }


                else {


                    layer.msg('请选择一行数据删除！');


                }


            }




            //预览


            function get_ViewReport() {


                var checkStatus = table.checkStatus('mainTable')


                    , data = checkStatus.data;


                if (checkStatus.data.length === 1) {


                    layer.open({


                        type: 2


                        , area: ['50%', '50%']


                        , title: '打印模版选择'


                        , shade: 0.6 //遮罩透明度


                        , maxmin: false //允许全屏最小化


                        , anim: 0 //0-6的动画形式，-1不开启


                        , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HMouldProdInBill', 'yes']


                        , resize: false


                    })


                }


                else {


                    layer.msg('请选择一行数据打印！');


                }


            }




@@ -952,7 +900,7 @@


                }


            }


            //#endregion


           




            //#region å‘起审批


            function set_startCheckBill() {


                var checkStatus = table.checkStatus('mainTable')


@@ -1157,8 +1105,8 @@


                                    var index = layer.getFrameIndex(window.name);


                                    //关闭当前frame


                                    layer.close(index);


                                    //修改为功后刷新界面


                                    $("#btnSearch").trigger('click');


                                    //修改为功后刷新子表界面


                                    $("tr.layui-table-click").trigger("click");


                                });




                            } else {


@@ -1211,117 +1159,6 @@


            }


            //#endregion






            //获取列宽


            function getColumnsWidth() {


                var result = [];


                var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;


                //获取列宽


                $.ajax({


                    url: GetWEBURL() + '/Cg_POOrderBill/list',


                    async: false,


                    type: "Get",


                    dataType: "json",


                    data: { "colNum": colNum, "Name": Name },


                    success: function (data1) {


                        if (data1.code == 1) {


                            result = data1.data;


                        }


                        else if (data1.code == -1) {




                        }


                        else {


                            layer.alert(data1.Message, { icon: 5 });


                        }


                    }, error: function (e) {


                        layer.alert(e.Message, { icon: 5 });


                    }


                });




                return result;


            }


            //保存列宽


            function set_SaveGridColWidth() {


                var arr = [];


                // åˆ—æ•°


                var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;


                for (var i = 0; i <= colNum; i++) {


                    var colName = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).text();


                    var colWidth = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).width();


                    if (colName != "" && colName != null) {


                        arr.push(colWidth == -1 ? 200 : colWidth);


                    }


                }


                arr.unshift(40); //首位追加


                $.ajax({


                    url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidth',


                    async: false,


                    type: "POST",


                    dataType: "json",


                    data: { "myMap": JSON.stringify(arr), "Name": Name },


                    success: function (data1) {


                        if (data1.count == 1) {


                            layer.alert(data1.Message, { icon: 1 });


                        } else {


                            layer.alert(data1.Message, { icon: 5 });


                        }


                    }, error: function (e) {


                        layer.alert(e.Message, { icon: 5 });


                    }


                });


                //设置赋值列宽


                var colWidth = getColumnsWidth();


                if (colWidth == "" || colWidth == []) {




                }


                else {


                    $.each(columns, function (x, m) {


                        m["width"] = colWidth[x];


                    });


                }


                get_FastQuery(table, option);


            }


            //默认列宽


            function set_DefaultGridColWidth() {


                var arr = [];


                // åˆ—æ•°


                var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;


                for (var i = 0; i <= colNum; i++) {


                    var colName = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).text();


                    if (colName != "" && colName != null) {


                        arr.push(300);   //默认宽度200


                    }


                }


                arr.unshift(40); //首位追加


                $.ajax({


                    url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidth',


                    async: false,


                    type: "POST",


                    dataType: "json",


                    data: { "myMap": JSON.stringify(arr), "Name": Name },


                    success: function (data1) {


                        if (data1.count == 1) {


                            layer.alert(data1.Message, { icon: 1 });




                        } else {


                            layer.alert(data1.Message, { icon: 5 });


                        }


                    }, error: function (e) {


                        layer.alert(e.Message, { icon: 5 });


                    }


                });


                //设置赋值列宽


                var colWidth = getColumnsWidth();


                if (colWidth == "" || colWidth == []) {




                }


                else {


                    $.each(columns, function (x, m) {


                        m["width"] = colWidth[x];


                    });


                }


                get_FastQuery(table, option);


            }






            //快速过滤


@@ -1658,7 +1495,7 @@


                        if (data1.data.length != 0) {




                            var dataCol = [];//数据库查询出的列数据


                            console.log(titleData)




                            dataCol = data1.data[0].HGridString.split(',');




                            for (var i = 0; i < optionSub.cols[0].length - 1; i++) {


@@ -1739,49 +1576,27 @@




            //#region è¡Œç‚¹å‡»äº‹ä»¶


            table.on('row(mainTable)', function (obj) {


                //选中行改变颜色


                //显示子表


                get_DisplaySub(obj.data);


                //选中行改变颜色


                check_row(obj);


            })


            table.on('row(mainTableSub)', function (obj) {


                var flag = !obj.tr.find(':checkbox:first').prop('checked');


                obj.tr.find(':checkbox').prop('checked', flag);


                if (flag) {


                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //设置复选框选中样式


                    $(obj.tr.selector).eq(2).attr({ "style": "background:#ceedfa;color:black" });//改变当前tr背景颜色和字体颜色


                } else {


                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//取消复选框选中样式


                    $(obj.tr.selector).eq(2).attr({ "style": "background:" });//取消当前tr颜色


                //判断是否已经被选中


                if (obj.tr.find('.layui-form-radioed').length == 0) {


                    //触发单选框选中事件


                    obj.tr.find('i[class="layui-anim layui-icon"]').trigger("click");


                }


                //mainTable ä¸ºè¡¨æ ¼ID   æ³¨æ„æ­¤å¤„如果ID不正确将导致你在监听复选框时获取不到你选择的数据，前面的只是添加或删除选中未选中样式以及设置背景色，字体颜色


                layui.each(table.cache.mainTableSub, function (i, l) {


                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {


                        l.LAY_CHECKED = flag;


                    }


                });






            })


            //子表单选


            table.on('row(mainTableSub)', function (obj) {


                //判断是否已经被选中


                if (obj.tr.find('.layui-form-radioed').length == 0) {


                    //触发单选框选中事件


                    obj.tr.find('i[class="layui-anim layui-icon"]').trigger("click");


                }


            })


            //#endregion




            //#region ç‚¹å‡»è¡Œé€‰ä¸­é«˜äº®


            function check_row(obj) {


                var flag = !obj.tr.find(':checkbox:first').prop('checked');


                obj.tr.find(':checkbox').prop('checked', flag);


                if (flag) {


                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //设置复选框选中样式


                    $(obj.tr.selector).first().attr({ "style": "background:#ceedfa;color:black" });//改变当前tr背景颜色和字体颜色


                } else {


                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//取消复选框选中样式


                    $(obj.tr.selector).first().attr({ "style": "background:" });//取消当前tr颜色


                }


                //mainTable ä¸ºè¡¨æ ¼ID   æ³¨æ„æ­¤å¤„如果ID不正确将导致你在监听复选框时获取不到你选择的数据，前面的只是添加或删除选中未选中样式以及设置背景色，字体颜色


                layui.each(table.cache.mainTable, function (i, l) {


                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {


                        l.LAY_CHECKED = flag;


                    }


                });


            }


            //#endregion




            //#region åˆå§‹æ—¥æœŸé—´éš” ä¸‹æ‹‰åˆ—表


            function setSelect_HInitTimeCycle() {


                var valueList = [0, 1, 2, 3, 4, 5, 6, 29];


@@ -1860,7 +1675,7 @@


                                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));


                                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));




                              




                                ////执行查询方法


                                //get_FastQuery();


                            } else {




 WebTM/views/ÁìÁÏ·¢»õ/ÏúÊÛ³ö¿â/Kf_SellOutBillList.html


@@ -200,6 +200,7 @@


                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_BarCodeNote" id="get_BarCodeNote"><i class="layui-icon layui-icon-refresh-3"></i>条码明细</button>


                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_LookDown" id="get_LookDown"><i class="layui-icon layui-icon-refresh-3"></i>下查</button>


                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-print" lay-event="btn-print"><i class="layui-icon layui-icon-form"></i>打印</button>


                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-print2" lay-event="btn-print2"><i class="layui-icon layui-icon-form"></i>打印(结算单)</button>


                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>导出</button>


                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>


                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>隐藏列设置</button>


@@ -354,6 +355,9 @@


                        break;


                    //打印


                    case 'btn-print': get_PrintReport();


                        break;


                    //打印结算单


                    case 'btn-print2': get_PrintReport2();


                        break;


                    //导出excel


                    case 'get_export':


@@ -1474,6 +1478,33 @@


                        , shade: 0.6 //遮罩透明度


                        , maxmin: false //允许全屏最小化


                        , anim: 0 //0-6的动画形式，-1不开启


                        , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=Kf_SellOutBillList', 'yes']


                        , resize: false


                    })


                }


                else {


                    layer.msg('请选择一行数据打印！');


                }


            }


            //#endregion




            //#region æ‰“印材料结算清单


            function get_PrintReport2() {


                var checkStatus = table.checkStatus('mainTable')


                    , data = checkStatus.data;


                if (checkStatus.data.length === 1) {


                    if (data[0].状态 != "已审核") {


                        layer.alert("打印失败!原因：单据状态不为'已审核'状态!!", { icon: 5 });


                        return;


                    }




                    layer.open({


                        type: 2


                        , area: ['50%', '50%']


                        , title: '打印模版选择'


                        , shade: 0.6 //遮罩透明度


                        , maxmin: false //允许全屏最小化


                        , anim: 0 //0-6的动画形式，-1不开启


                        , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=Kf_SellOutBillListByID', 'yes']


                        , resize: false


                    })