1
duhe
2023-07-11 3f6f429d03171f51d52623f9b752f32c7ab35579
1
2个文件已修改
144 ■■■■■ 已修改文件
WebTM/Properties/PublishProfiles/JFTM.pubxml.user 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/项目管理/工程项目/PM_ProjectBill.html 142 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -4284,7 +4284,7 @@
      <publishTime>07/10/2023 16:01:26</publishTime>
    </File>
    <File Include="views/项目管理/工程项目/PM_ProjectBill.html">
      <publishTime>07/11/2023 08:04:08</publishTime>
      <publishTime>07/11/2023 08:41:10</publishTime>
    </File>
    <File Include="views/项目管理/工程项目/PM_ProjectBillList.html">
      <publishTime>07/09/2023 13:47:48</publishTime>
WebTM/views/ÏîÄ¿¹ÜÀí/¹¤³ÌÏîÄ¿/PM_ProjectBill.html
@@ -427,7 +427,7 @@
                , element = layui.element;
            //模块名
            var HModName = "Gy_ProjectBill";
            var HModName = "PM_ProjectBill";
            //表格渲染参数
            var option = {};            //项目阶段表渲染参数
            var option1 = {};           //项目成员表渲染参数
@@ -503,6 +503,11 @@
                get_InitGrid1();
                RoadBillMain(linterid);
            }
            //#endregion
            //#region åˆå§‹åŒ–表格
            DisPlay_HideColumn();
            DisPlay_HideColumn1();
            //#endregion
            //#endregion
@@ -669,7 +674,7 @@
                        break;
                    //列设置
                    case 'set_HideColumn':
                        //get_HideColumn();
                        get_HideColumn();
                        break;
                    //上一行
                    case 'btn_up':
@@ -723,8 +728,8 @@
                        }
                        break;
                    //列设置
                    case 'set_HideColumn':
                        //get_HideColumn();
                    case 'set_HideColumn1':
                        get_HideColumn1();
                        break;
                    //上一行
                    case 'btn_up1':
@@ -1846,8 +1851,10 @@
            }
            //#endregion
            //#region éšè—åˆ—设置
            //#region é¡¹ç›®é˜¶æ®µè¡¨ï¼šéšè—åˆ—设置
            function get_HideColumn() {
                HModName = "PM_ProjectBillSub";
                var colName = "";
                var contentUrl = "";
                for (var i = 1; i < option.cols[0].length - 1; i++) {
@@ -1881,8 +1888,9 @@
                })
            }
            //#endregion
            //#region æ˜¾ç¤ºåˆ—数据
            //#region é¡¹ç›®é˜¶æ®µè¡¨ï¼šæ˜¾ç¤ºåˆ—数据
            function DisPlay_HideColumn() {
                HModName = "PM_ProjectBillSub";
                $.ajax({
                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
                    type: "GET",
@@ -1964,6 +1972,128 @@
            }
            //#endregion
            //#region é¡¹ç›®æˆå‘˜è¡¨ï¼šéšè—åˆ—设置
            function get_HideColumn1() {
                HModName = "PM_ProjectBillSub_Emp";
                var colName = "";
                var contentUrl = "";
                for (var i = 1; i < option1.cols[0].length - 1; i++) {
                    colName += option1.cols[0][i]["title"] + ",";
                }
                var urlStr = window.document.location.pathname;//获取文件路径
                var urlLen = urlStr.split('/');
                for (var i = 0; i < urlLen.length - 4; i++) {
                    contentUrl += "../";
                }
                colName = encodeURI(colName.substring(0, colName.length - 1));//对 URI è¿›è¡Œç¼–码
                contentUrl += '基础资料/隐藏列设置/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
                layer.open({
                    type: 2
                    , skin: "layui-layer-rim" //加上边框
                    , title: "隐藏列设置"  //标题
                    , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                    , shift: 2 //弹出动画
                    , area: ["50%", "90%"] //窗体大小
                    , maxmin: true //设置最大最小按钮是否显示
                    , content: [contentUrl, "yes"]
                    , btn: ["确定", "取消"]
                    , btn1: function (index, laero) {
                        //刷新表格数据
                        DisPlay_HideColumn1();
                        //更新表格缓存的数据
                        layer.close(index);//关闭弹窗
                    }
                })
            }
            //#endregion
            //#region é¡¹ç›®æˆå‘˜è¡¨ï¼šæ˜¾ç¤ºåˆ—数据
            function DisPlay_HideColumn1() {
                HModName = "PM_ProjectBillSub_Emp";
                $.ajax({
                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
                    type: "GET",
                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
                    async: false,
                    success: function (data1) {
                        if (data1.data.length != 0) {
                            var dataCol = [];//数据库查询出的列数据
                            var titleData = ["程序号", "本工序确认记录", "自动移转", "换单准备时间", "本道准备时间", "上道循环周期", "上道固定天数", "开工余量(固数)", "开工余量(天数)", "标准定额", "报废单价", "不合格单价", "工序工价", "班产定额", "可操作设备数", "标准人数", "流转工序", "下道流转工序", "固定生产天数", "生产周期", "暂放区", "周转箱", "周转箱标准", "换模时间", "转移时间", "排队时间", "准备时间", "产线人数", "产线产能", "产线中心", "良率", "加工数量", "运行时间", "时间单位", "图纸编号", "模具编号", "良品仓", "报废品仓", "不良品仓", "工序类型"];//不需要显示的字段 å¯æ‰©å±•
                            dataCol = data1.data[0].HGridString.split(',');
                            for (var i = 0; i < option1.cols[0].length - 2; i++) {
                                var dataCols = dataCol[i].split('|');
                                //隐藏列
                                if (dataCols[1] == 1) {
                                    option1.cols[0][i + 1]["hide"] = true;
                                }
                                //设置列宽
                                if (dataCols[3] > 0) {
                                    option1.cols[0][i + 1]["width"] = dataCols[3];
                                }
                                //设置内容字体大小
                                if (data1.data[0].HFontSize != 0) {
                                    option1.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
                                } else {
                                    option1.cols[0][i + 1]["style"] = "font-size:100%";
                                }
                                //设置列宽
                                //if (data1.data[0].HColumnWidth != 0) {
                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
                                //} else {
                                //    option.cols[0][i + 1]["width"] = "";
                                //}
                                //显示列
                                if (dataCols[1] == 0 && $.inArray(option1.cols[0][i + 1]["title"], titleData) == -1) {
                                    option1.cols[0][i + 1]["hide"] = false;
                                }
                                //字体所在位置(å·¦ å±…中 å³)
                                switch (dataCols[2]) {
                                    case "L":
                                        option1.cols[0][i + 1]["align"] = "left";
                                        break;
                                    case "M":
                                        option1.cols[0][i + 1]["align"] = "center";
                                        break;
                                    case "R":
                                        option1.cols[0][i + 1]["align"] = "right";
                                        break;
                                }
                            }
                            //取消冻结列
                            for (var i = 1; i < option1.cols[0].length - 1; i++) {
                                if (option1.cols[0][i]["fixed"] != null) {
                                    option1.cols[0][i]["fixed"] = null;
                                }
                                else {
                                    break;
                                }
                            }
                            //冻结列
                            if (data1.data[0].HFixCols != 0) {
                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
                                    if ($.inArray(option1.cols[0][i + 1]["title"], titleData) != -1) {
                                        data1.data[0].HFixCols += 1;
                                    }
                                    option1.cols[0][i + 1]["fixed"] = "left";
                                }
                            }
                            table.render(option1);
                        } else {
                            table.render(option1);
                        }
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                })
            }
            //#endregion
            //#region é¡¹ç›®éš¾æ˜“类型下拉框
            function ColFilter() {
                var Organization = "";