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

yusijie

2023-12-01 56b15c48939c9be8ed4fb1315d0cdbde963d3ea6

 WebTM/views/³µ¼ä¹ÜÀí/±¨±í·ÖÎö/sc_ICOMReport.html

@@ -150,6 +150,8 @@
            var option = [];
            var HModName = "sc_ICOMReport";

            var titleData = ["HCusID"];//不需要显示的字段 å¯æ‰©å±•

            var detailBar = 0;       //用于汇总报表查看明细报表，当为0时显示明细汇总报表对应明细报表。
            //#endregion

@@ -263,7 +265,7 @@
                            //在列表左边添加勾选框
                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '合计'  });
                            for (var i = 0; i < data.length; i++) {
                                if ($.inArray(data[i].name, "") > -1) {
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else if (data[i].name == '成品合计件数' || data[i].name == '入库合计米数') {
@@ -359,6 +361,9 @@
                    com = " and (" + ColName + " " + com + ")";
                }
                sWhere += com;

                //根据用户过滤用户关联客户的记录
                sWhere += getSWhereByHUser();

                get_Display(sWhere);
                //调用接口后清空sWhere缓存
@@ -484,7 +489,7 @@
                        if (data1.data.length != 0) {

                            var dataCol = [];//数据库查询出的列数据
                            var titleData = [];//不需要显示的字段 å¯æ‰©å±•
                            //var titleData = [];//不需要显示的字段 å¯æ‰©å±•

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

@@ -573,7 +578,32 @@
                })
            }

          
            //#region æ ¹æ®ç”¨æˆ·èŽ·å–用户关联客户的过滤条件
            function getSWhereByHUser() {
                var res = "";
                $.ajax({
                    type: "GET",
                    async: false,
                    url: GetWEBURL() + "/Xs_SeOrderBill/getCusIDListByUser", //方法所在页面和方法名
                    data: { "CurUserID": sessionStorage["Czybm"], "CurUserName": sessionStorage["HUserName"] },
                    success: function (result) {
                        if (result.count == 1) {
                            res = result.data;
                        } else {
                            res = result.data;
                            layer.alert(result.code + result.Message, { icon: 5 });
                        }
                    }, error: function (err) {
                        res = " and 1 = 0";
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });

                //res = res.replace("HCusID", "HSupID");

                return res;
            }
            //#endregion

            //#endregion
        });