工作任务维护,任务汇报列表,工程项目维护,工作周计划列表,工作周总结列表 把分页模式 全部改为 数据库分页;
9个文件已修改
886 ■■■■ 已修改文件
WebTM/views/项目管理/周计划/PM_WorkReportWeekBillMainList.html 93 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/项目管理/周计划/PM_WorkTaskWeekBillList.html 102 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/项目管理/工作任务/PM_WorkTaskBillList.html 90 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/项目管理/工作任务/PM_WorkTaskReportBillList.html 91 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/项目管理/工程项目/PM_ProjectBill.html 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/项目管理/工程项目/PM_ProjectBillList.html 100 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/销售出库/Kf_SellOutBill.html 249 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/销售出库/Kf_SellOutBillList.html 151 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/验收入库/外购入库/Kf_POStockInBillList.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/ÏîÄ¿¹ÜÀí/Öܼƻ®/PM_WorkReportWeekBillMainList.html
@@ -200,6 +200,7 @@
                            </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <div id="page" style="position: relative; bottom: 0;"></div>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>新增</button>
@@ -242,7 +243,7 @@
            var option = [];
            var sWhere = "";
            var HModName = "h_v_PM_WorkReportWeekBillMainList";
            var optionPage = [];
            //#region ã€åŠ¨æ€èŽ·å–æ¨¡å—åç§°ã€‘
            var HModuleType = "4757";
            //通过单据类型,从数据库动态获取单据模块命名,引用js文件 PageTitle.js
@@ -348,12 +349,14 @@
            //#region é‡ç½®æŒ‰é’®
            form.on('submit(btnReSearch)', function (data) {
                optionPage.curr = 1;
                set_ClearQuery();
            });
            //#endregion
            //#region æŸ¥è¯¢æŒ‰é’®
            form.on('submit(btnSearch)', function (data) {
                optionPage.curr = 1;
                get_FastQuery(2);
            });
            //#endregion
@@ -384,7 +387,7 @@
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , height: 'full-50'
                    , page: true
                    , page: false
                    , totalRow: true
                    //, cellMinWidth: 90
                    , limit: 50
@@ -393,6 +396,26 @@
                        soulTable.render(this);
                    }
                };
                optionPage = {
                    elem: 'page', //注意,这里的 page æ˜¯ ID,不用加 # å·
                    count: 10000, //数据总数,从服务端得到
                    limit: 50,
                    limits: [50, 500, 1000, 2000],
                    layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
                    jump: function (obj, first) {
                        //console.log(obj)
                        //obj包含了当前分页的所有参数,比如:
                        //console.log(obj.curr); //得到当前页,以便向服务端请求对应页的数据。
                        //console.log(obj.limit); //得到每页显示的条数
                        //首次不执行
                        if (!first) {
                            //do something
                            get_FastQuery();
                        }
                    }
                }
                laypage.render(optionPage);
            }
            //#endregion
@@ -460,6 +483,70 @@
                });
            }
            //分页
            function get_DisplayPage(sWhere) {
                var ajaxLoad = layer.load();
                //进入页面显示的缓存列表
                $.ajax({
                    url: GetWEBURL() + '/PM_WorkTaskWeekBill/PM_WorkReportWeekBillpage',
                    type: "GET",
                    async: false,
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": optionPage.curr, "size": optionPage.limit },
                    success: function (data1) {
                        option.limit = optionPage.limit;//改变表格页大小
                        if (data1.code == 1) {
                            optionPage.count = data1.count;//改变列表数据总数
                            var totalArray = ["计划工时", "消耗工时", "有效工时", "延期任务", "超前任务"];
                            var data = [];
                            var col = [];
                            //给空的数组赋值
                            for (var key in data1.list) {
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                            }
                            //在列表左边添加勾选框
                            col.push({ type: 'checkbox', fixed: 'left' });
                            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) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else if ($.inArray(data[i].name, totalArray) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
                                } else {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
                                    }
                                }
                            }
                            //设置列
                            option.cols = [col];
                            //处理并设置表格数据
                            option.data = data1.data;
                            laypage.render(optionPage);
                            table.render(option);
                            //刷新表格数据
                            DisPlay_HideColumn();
                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                                ColFilter();
                            }
                            layer.close(ajaxLoad);
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
            //#endregion
            //#region å¿«é€Ÿè¿‡æ»¤
@@ -556,7 +643,7 @@
                }
                
                get_Display(sWhere);
                get_DisplayPage(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }
            //#endregion
WebTM/views/ÏîÄ¿¹ÜÀí/Öܼƻ®/PM_WorkTaskWeekBillList.html
@@ -170,6 +170,7 @@
                            </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <div id="page" style="position: relative; bottom: 0;"></div>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>新增</button>
@@ -217,7 +218,7 @@
            var option = [];
            var sWhere = "";
            var HModName = "h_v_PM_WorkTaskWeekBillList";
            var optionPage = [];
            //#region ã€åŠ¨æ€èŽ·å–æ¨¡å—åç§°ã€‘
            var HModuleType = "4756";
            //通过单据类型,从数据库动态获取单据模块命名,引用js文件 PageTitle.js
@@ -334,12 +335,14 @@
            //#region é‡ç½®æŒ‰é’®
            form.on('submit(btnReSearch)', function (data) {
                optionPage.curr = 1;
                set_ClearQuery();
            });
            //#endregion
            //#region æŸ¥è¯¢æŒ‰é’®
            form.on('submit(btnSearch)', function (data) {
                optionPage.curr = 1;
                get_FastQuery(2);
            });
            //#endregion
@@ -371,7 +374,7 @@
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , height: 'full-50'
                    , page: true
                    , page: false
                    , totalRow: true
                    //, cellMinWidth: 90
                    , limit: 50
@@ -380,6 +383,26 @@
                        soulTable.render(this);
                    }
                };
                optionPage = {
                    elem: 'page', //注意,这里的 page æ˜¯ ID,不用加 # å·
                    count: 10000, //数据总数,从服务端得到
                    limit: 50,
                    limits: [50, 500, 1000, 2000],
                    layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
                    jump: function (obj, first) {
                        //console.log(obj)
                        //obj包含了当前分页的所有参数,比如:
                        //console.log(obj.curr); //得到当前页,以便向服务端请求对应页的数据。
                        //console.log(obj.limit); //得到每页显示的条数
                        //首次不执行
                        if (!first) {
                            //do something
                            get_FastQuery();
                        }
                    }
                }
                laypage.render(optionPage);
            }
            //#endregion
@@ -528,6 +551,79 @@
                });
            }
            //分页
            function get_DisplayPage(sWhere) {
                var ajaxLoad = layer.load();
                //进入页面显示的缓存列表
                $.ajax({
                    url: GetWEBURL() + '/PM_WorkTaskWeekBill/page',
                    type: "GET",
                    async: false,
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": optionPage.curr, "size": optionPage.limit },
                    success: function (data1) {
                        option.limit = optionPage.limit;//改变表格页大小
                        if (data1.code == 1) {
                            optionPage.count = data1.count;//改变列表数据总数
                            var totalArray = ["预计时间", "已汇报时间"];
                            var data = [];
                            var col = [];
                            //给空的数组赋值
                            for (var key in data1.list) {
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                            }
                            //在列表左边添加勾选框
                            col.push({ type: 'checkbox', fixed: 'left' });
                            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) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else if ($.inArray(data[i].name, totalArray) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
                                } else {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
                                    }
                                }
                            }
                            //手动添加周一至周日字段
                            col.push({ field: "HMonday", title: "周一", align: 'center', sort: true, width: 120 });
                            col.push({ field: "HTuesday", title: "周二", align: 'center', sort: true, width: 120 })
                            col.push({ field: "HWednesday", title: "周三", align: 'center', sort: true, width: 120 })
                            col.push({ field: "HThursday", title: "周四", align: 'center', sort: true, width: 120 })
                            col.push({ field: "HFriday", title: "周五", align: 'center', sort: true, width: 120 })
                            col.push({ field: "HSaturday", title: "周六", align: 'center', sort: true, width: 120 })
                            col.push({ field: "HSunday", title: "周日", align: 'center', sort: true, width: 120 })
                            //设置列
                            option.cols = [col];
                            //处理并设置表格数据
                            option.data = dealSearchData(data1.data);
                            laypage.render(optionPage);
                            table.render(option);
                            //刷新表格数据
                            DisPlay_HideColumn();
                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                                ColFilter();
                            }
                            layer.close(ajaxLoad);
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
            //#endregion
            //#region å¿«é€Ÿè¿‡æ»¤
@@ -644,7 +740,7 @@
                    sWhere += " and è®¡åˆ’人 like '%" + HPlanEmp + "%'";
                }
                get_Display(sWhere);
                get_DisplayPage(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }
            //#endregion
WebTM/views/ÏîÄ¿¹ÜÀí/¹¤×÷ÈÎÎñ/PM_WorkTaskBillList.html
@@ -169,6 +169,7 @@
                            </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <div id="page" style="position: relative; bottom: 0;"></div>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>新增</button>
@@ -226,7 +227,7 @@
            var option = [];
            var sWhere = "";
            var HModName = "PM_WorkTaskBillList";
            var optionPage = [];
            //#region ã€åŠ¨æ€èŽ·å–æ¨¡å—åç§°ã€‘
            var HModuleType = "4753";
            //通过单据类型,从数据库动态获取单据模块命名,引用js文件 PageTitle.js
@@ -383,12 +384,14 @@
            //#region é‡ç½®æŒ‰é’®
            form.on('submit(btnReSearch)', function (data) {
                optionPage.curr = 1;
                set_ClearQuery();
            });
            //#endregion
            //#region æŸ¥è¯¢æŒ‰é’®
            form.on('submit(btnSearch)', function (data) {
                optionPage.curr = 1;
                get_FastQuery(2);
            });
            //#endregion
@@ -422,7 +425,7 @@
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , height: 'full-50'
                    , page: true
                    , page: false
                    , sort: true  //重点1:这里的sort表示 table表在取得接口数据后,对页面渲染后的table数据进行排序。同时,这里的true ä¼šå½±å“é¡µé¢sort ä¸Šä¸‹å°ç®­å¤´çš„ æ˜¾ç¤ºæ•ˆæžœ
                    , totalRow: true
                    //, cellMinWidth: 90
@@ -432,6 +435,26 @@
                        soulTable.render(this);
                    }
                };
                optionPage = {
                    elem: 'page', //注意,这里的 page æ˜¯ ID,不用加 # å·
                    count: 10000, //数据总数,从服务端得到
                    limit: 50,
                    limits: [50, 500, 1000, 2000],
                    layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
                    jump: function (obj, first) {
                        //console.log(obj)
                        //obj包含了当前分页的所有参数,比如:
                        //console.log(obj.curr); //得到当前页,以便向服务端请求对应页的数据。
                        //console.log(obj.limit); //得到每页显示的条数
                        //首次不执行
                        if (!first) {
                            //do something
                            get_FastQuery();
                        }
                    }
                }
                laypage.render(optionPage);
            }
            //#endregion
@@ -521,6 +544,67 @@
                });
            }
            //分页
            function get_DisplayPage() {
                var ajaxLoad = layer.load();
                //进入页面显示的缓存列表
                $.ajax({
                    url: GetWEBURL() + '/PM_WorkTaskBill/page',
                    type: "GET",
                    async: false,
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": optionPage.curr, "size": optionPage.limit },
                    success: function (data1) {
                        option.limit = optionPage.limit;//改变表格页大小
                        if (data1.code == 1) {
                            optionPage.count = data1.count;//改变列表数据总数
                            var totalArray = ["评估工时", "自评工时", "已耗用工时"];
                            var data = [];
                            var col = [];
                            //给空的数组赋值
                            for (var key in data1.list) {
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                            }
                            //在列表左边添加勾选框
                            col.push({ type: 'checkbox', fixed: 'left' });
                            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) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else if ($.inArray(data[i].name, totalArray) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
                                } else {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
                                    }
                                }
                            }
                            option.cols = [col];
                            option.data = data1.data;
                            laypage.render(optionPage);
                            table.render(option);
                            //刷新表格数据
                            DisPlay_HideColumn();
                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                                ColFilter();
                            }
                            layer.close(ajaxLoad);
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
            //#endregion
            //#region å¿«é€Ÿè¿‡æ»¤
@@ -635,7 +719,7 @@
                    sWhere += " and æŽ¥å•人 like '%" + HReceiveEmp + "%'";
                }
                get_Display(sWhere);
                get_DisplayPage(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }
            //#endregion
WebTM/views/ÏîÄ¿¹ÜÀí/¹¤×÷ÈÎÎñ/PM_WorkTaskReportBillList.html
@@ -171,6 +171,7 @@
                            </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <div id="page" style="position: relative; bottom: 0;"></div>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>新增</button>
@@ -226,7 +227,7 @@
            var option = [];
            var sWhere = "";
            var HModName = "PM_WorkTaskReportBillList";
            var optionPage = [];
            //#region ã€åŠ¨æ€èŽ·å–æ¨¡å—åç§°ã€‘
            var HModuleType = "4754";
            //通过单据类型,从数据库动态获取单据模块命名,引用js文件 PageTitle.js
@@ -358,12 +359,14 @@
            //#region é‡ç½®æŒ‰é’®
            form.on('submit(btnReSearch)', function (data) {
                optionPage.curr = 1;
                set_ClearQuery();
            });
            //#endregion
            //#region æŸ¥è¯¢æŒ‰é’®
            form.on('submit(btnSearch)', function (data) {
                optionPage.curr = 1;
                get_FastQuery(2);
            });
            //#endregion
@@ -395,7 +398,7 @@
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , height: 'full-50'
                    , page: true
                    , page: false
                    , totalRow: true
                    //, cellMinWidth: 90
                    , limit: 50
@@ -404,6 +407,26 @@
                        soulTable.render(this);
                    }
                };
                optionPage = {
                    elem: 'page', //注意,这里的 page æ˜¯ ID,不用加 # å·
                    count: 10000, //数据总数,从服务端得到
                    limit: 50,
                    limits: [50, 500, 1000, 2000],
                    layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
                    jump: function (obj, first) {
                        //console.log(obj)
                        //obj包含了当前分页的所有参数,比如:
                        //console.log(obj.curr); //得到当前页,以便向服务端请求对应页的数据。
                        //console.log(obj.limit); //得到每页显示的条数
                        //首次不执行
                        if (!first) {
                            //do something
                            get_FastQuery();
                        }
                    }
                }
                laypage.render(optionPage);
            }
            //#endregion
@@ -494,6 +517,68 @@
                });
            }
            //分页
            function get_DisplayPage(sWhere) {
                var ajaxLoad = layer.load();
                //进入页面显示的缓存列表
                $.ajax({
                    url: GetWEBURL() + '/PM_WorkTaskReportBill/page',
                    type: "GET",
                    async: false,
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": optionPage.curr, "size": optionPage.limit },
                    success: function (data1) {
                        option.limit = optionPage.limit;//改变表格页大小
                        if (data1.code == 1) {
                            optionPage.count = data1.count;//改变列表数据总数
                            var totalArray = ["评估工时", "自评工时", "已耗用工时"];
                            var data = [];
                            var col = [];
                            //给空的数组赋值
                            for (var key in data1.list) {
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                            }
                            //在列表左边添加勾选框
                            col.push({ type: 'checkbox', fixed: 'left' });
                            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) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else if ($.inArray(data[i].name, totalArray) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
                                } else {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
                                    }
                                }
                            }
                            option.cols = [col];
                            option.data = data1.data;
                            laypage.render(optionPage);
                            table.render(option);
                            //刷新表格数据
                            DisPlay_HideColumn();
                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                                ColFilter();
                            }
                            layer.close(ajaxLoad);
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
            //#endregion
            //#region å¿«é€Ÿè¿‡æ»¤
@@ -611,7 +696,7 @@
                    sWhere += " and æ±‡æŠ¥äºº like '%" + HReportEmp + "%'";
                }
                get_Display(sWhere);
                get_DisplayPage(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }
            //#endregion
WebTM/views/ÏîÄ¿¹ÜÀí/¹¤³ÌÏîÄ¿/PM_ProjectBill.html
@@ -984,10 +984,10 @@
                $('li[lay-id="3"]').hide();
                $('li[lay-id="4"]').hide();
            } else if (HBillSubType == "任务类") {
                $('li[lay-id="2"]').hide();
                $('li[lay-id="2"]').first().hide();
                $('li[lay-id="3"]').hide();
            } else {
                $('li[lay-id="2"]').hide();
                $('li[lay-id="2"]').first().hide();
                $('li[lay-id="4"]').hide();
            }
            //#region ã€åŠ¨æ€èŽ·å–æ¨¡å—åç§°ã€‘
@@ -2231,10 +2231,10 @@
                            $('li[lay-id="3"]').hide();
                            $('li[lay-id="4"]').hide();
                        } else if (HBillSubType == "任务类") {
                            $('li[lay-id="2"]').hide();
                            $('li[lay-id="2"]').first().hide();
                            $('li[lay-id="3"]').hide();
                        } else {
                            $('li[lay-id="2"]').hide();
                            $('li[lay-id="2"]').first().hide();
                            $('li[lay-id="4"]').hide();
                        }
                        //主表 èµ‹å€¼
WebTM/views/ÏîÄ¿¹ÜÀí/¹¤³ÌÏîÄ¿/PM_ProjectBillList.html
@@ -101,6 +101,7 @@
                            </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <div id="page" style="position: relative; bottom: 0;"></div>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>新增</button>
@@ -148,7 +149,7 @@
            var option = [];
            var sWhere = "";
            var HModName = "PM_ProjectBillList";
            var optionPage = [];
            //#region ã€åŠ¨æ€èŽ·å–æ¨¡å—åç§°ã€‘
            var HModuleType = "4750";
            //通过单据类型,从数据库动态获取单据模块命名,引用js文件 PageTitle.js
@@ -284,12 +285,14 @@
            //#region é‡ç½®æŒ‰é’®
            form.on('submit(btnReSearch)', function (data) {
                optionPage.curr = 1;
                set_ClearQuery();
            });
            //#endregion
            //#region æŸ¥è¯¢æŒ‰é’®
            form.on('submit(btnSearch)', function (data) {
                optionPage.curr = 1;
                get_FastQuery(2);
            });
            //#endregion
@@ -328,7 +331,7 @@
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , height: 'full-50'
                    , page: true
                    , page: false
                    , totalRow: true
                    //, cellMinWidth: 90
                    , limit: 50
@@ -337,6 +340,26 @@
                        soulTable.render(this);
                    }
                };
                optionPage = {
                    elem: 'page', //注意,这里的 page æ˜¯ ID,不用加 # å·
                    count: 10000, //数据总数,从服务端得到
                    limit: 50,
                    limits: [50, 500, 1000, 2000],
                    layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
                    jump: function (obj, first) {
                        //console.log(obj)
                        //obj包含了当前分页的所有参数,比如:
                        //console.log(obj.curr); //得到当前页,以便向服务端请求对应页的数据。
                        //console.log(obj.limit); //得到每页显示的条数
                        //首次不执行
                        if (!first) {
                            //do something
                            get_FastQuery();
                        }
                    }
                }
                laypage.render(optionPage);
            }
            //#endregion
@@ -427,6 +450,68 @@
                });
            }
            //分页
            function get_DisplayPage(sWhere) {
                var ajaxLoad = layer.load();
                //进入页面显示的缓存列表
                $.ajax({
                    url: GetWEBURL() + '/PM_ProjectBill/page',
                    type: "GET",
                    async: false,
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": optionPage.curr, "size": optionPage.limit },
                    success: function (data1) {
                        option.limit = optionPage.limit;//改变表格页大小
                        if (data1.code == 1) {
                            optionPage.count = data1.count;//改变列表数据总数
                            var totalArray = ["合同总金额", "产品费", "实施费", "其它费用", "合同实施人天", "预估二次开发人天", "结算金额", "阶段业绩占比"];
                            var data = [];
                            var col = [];
                            //给空的数组赋值
                            for (var key in data1.list) {
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                            }
                            //在列表左边添加勾选框
                            col.push({ type: 'checkbox', fixed: 'left' });
                            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) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else if ($.inArray(data[i].name, totalArray) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
                                } else {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
                                    }
                                }
                            }
                            option.cols = [col];
                            option.data = data1.data;
                            laypage.render(optionPage);
                            table.render(option);
                            //刷新表格数据
                            DisPlay_HideColumn();
                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                                ColFilter();
                            }
                            layer.close(ajaxLoad);
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
            //#endregion
            //#region åŒå‡»è¿”回数据
@@ -495,8 +580,8 @@
                        sWhere += " and é¡¹ç›®ç»ç† = '" + UserName + "'  and  å•据状态 != '已关闭' ";
                    }
                }
                addSWhereByOpenType();
                get_Display(sWhere);
                //addSWhereByOpenType();
                get_DisplayPage(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }
            //#endregion
@@ -992,17 +1077,18 @@
                var openType = params[params[0]]; //从参数中获取 æ‰“开方式  1直接打开 2其它页面通过选择按钮打开  
                var HOrgID = params[params[1]];
                HBillSubType = (decodeURI(params[params[2]]) != "工程类" && decodeURI(params[params[2]]) != "任务类") ? "项目类" : decodeURI(params[params[2]]);//若解码后type不为工程或任务强制变为项目
                if (openType == 2) {
                    sWhere += " and ISNULL(关闭人,'') = '' and ISNULL(作废人,'') = '' ";
                    if (HBillSubType == "工程类") {
                        sWhere += " and å•据子类型='工程类' "
                    } else if (HBillSubType == "任务类") {
                        sWhere += " and å•据子类型='任务类' "
                    }
                if (openType == 2) {
                    sWhere += " and ISNULL(关闭人,'') = '' and ISNULL(作废人,'') = '' ";
                    $("#HOrgID").val(HOrgID);
                    form.render("select");
                    return true;
                }
                return false;
            }
            //#endregion
@@ -1045,7 +1131,7 @@
                            //隐藏显示过滤方案的标签信息
                            document.getElementById("HFilterScheme_Now").style.display = "none";
                            //执行查询方法
                            get_FastQuery();
                            //get_FastQuery();
                            form.render("select");
                        }
                    }, error: function () {
WebTM/views/ÁìÁÏ·¢»õ/ÏúÊÛ³ö¿â/Kf_SellOutBill.html
@@ -3144,53 +3144,114 @@
                                    var iframeWindow = window["layui-layer-iframe" + index];//获取弹框页面
                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//获取选中的数据
                                    if (checkStatus.data.length != 1) {
                                        return layer.msg("请选择一条数据");
                                    if (checkStatus.data.length < 1) {
                                        return layer.msg("请选择至少一条数据");
                                    }
                                    var HTaxRate = 0;
                                    //通过供应商id获取税率
                                    var HSupID = $("#HSupID").val();
                                    if (HSupID != 0) {
                                        $.ajax({
                                            url: GetWEBURL() + "/Gy_Customer/xg",
                                            type: "GET",
                                            async: false,
                                            data: {
                                                "HInterID": HSupID
                                            },
                                            success: function (d) {
                                                var HTaxRate = parseInt(d.data[0].增值税率) * 0.01;
                                                //数据校验合格,重算记录
                                                var HQty = obj.data.HQty * 1;                           //数量
                                                var HPrice = obj.data.HPrice * 1;               //单价
                                                HTaxRate = parseInt(d.data[0].增值税率) * 0.01;
                                            }
                                        });
                                    }
                                    if (checkStatus.data.length > 1) {
                                        var rowIndex = $(obj.tr).attr("data-index") * 1;
                                        for (var i = 0; i < checkStatus.data.length; i++) {
                                            if (rowIndex + i >= option.data.length) {
                                                var NewRow = {
                                                    "HMaterID": "0"
                                                    , "物料代码": ""
                                                    , "物料名称": ""
                                                    , "规格型号": ""
                                                    , "HUnitID": "0"
                                                    , "计量单位": ""
                                                    , "HQtyMust": "0"
                                                    , "HQty": "0"
                                                    , "HPieceQty": "0"
                                                    , "HPrice": "0"
                                                    , "HTaxPrice": "0"
                                                    , "HTaxRate": "0"
                                                    , "HMoney": "0"
                                                    , "HTaxMoney": "0"
                                                    , "HWHID": $("#HWHID").val()
                                                    , "发货仓库": $("#HWHName").val()
                                                    , "HRemark": ""
                                                    , "HQty_Full": "0"
                                                    , "HQty_Empty": "0"
                                                    , "HQty_Back": "0"
                                                    , "HCostPrice": "0"
                                                    , "HCostMoney": "0"
                                                    , "HSalePrice": "0"
                                                    , "HSeOrderInterID": 0
                                                    , "HSeOrderEntryID": 0
                                                    , "HSeOrderBillNo": ""
                                                    , "HSourceInterID": "0"
                                                    , "HSourceEntryID": "0"
                                                    , "HSourceBillNo": ""
                                                    , "HSourceBillType": ""
                                                    , "HRelationQty": "0"
                                                    , "HRelationMoney": "0"
                                                    , 'HSPID': "0"
                                                    , 'HSPName': ""
                                                    , 'HSPGroupID': "0"
                                                    , "HSPGroupName": ""
                                                    , 'HSCWHID': "0"
                                                    , 'HSCWHName': ""
                                                    , 'HSCSPID': "0"
                                                    , 'HSCSPName': ""
                                                    , 'HBatchNo': ""
                                                    , 'HPOOrderInterID': "0"
                                                    , 'HPOOrderEntryID': "0"
                                                    , 'HPOOrderBillNo': ""
                                                    , 'HPropertyID': "0"
                                                    , 'HPropertyName': ""
                                                    , 'HSecUnitID': "0"
                                                    , 'HSecUnitName': ""
                                                    , 'HSecUnitRate': "0"
                                                    , 'HEngineNum': ""
                                                    , 'HUnderPanNum': ""
                                                    , 'HLeaveFactCard': ""
                                                };
                                                table.cache["mainTable"].push(NewRow);
                                                option.data = table.cache["mainTable"];
                                                table.render(option);
                                            }
                                            var HQty = option.data[rowIndex + i].HQty * 1;                           //数量
                                            var HPrice = option.data[rowIndex + i].HPrice * 1;               //单价
                                                var HMoney = HQty * HPrice;                     //金额=数量*单价
                                                var HTaxMoney = Number((HMoney * HTaxRate).toFixed(4));         //税额=金额*税率
                                                var HlineTotal = HMoney + HTaxMoney;            //价税合计=金额+税额
                                                var HTaxPrice = Number((HPrice * (1 + HTaxRate)).toFixed(4));        //含税单价=单价*(1+税率)
                                                obj.update({ //更新表格数据
                                                    "HMaterID": checkStatus.data[0].HItemID
                                                    , "物料代码": checkStatus.data[0].物料代码
                                                    , "物料名称": checkStatus.data[0].物料名称
                                                    , "规格型号": checkStatus.data[0].规格型号
                                                    , "HUnitID": checkStatus.data[0].HUnitID
                                                    , "计量单位": checkStatus.data[0].计量单位名称
                                                    , "HTaxRate": HTaxRate * 100
                                                    , HQty: HQty                               //更新HQty字段,HQty
                                                    , HPrice: HPrice                         //更新HPrice字段,HPrice
                                                    , HMoney: HMoney                      //更新HMoney字段,HMoney
                                                    , HTaxMoney: HTaxMoney                  //更新HTaxMoney字段,HTaxMoney
                                                    , HlineTotal: HlineTotal             //更新HlineTotal字段,HlineTotal
                                                    , HTaxPrice, HTaxPrice                   //更新HTaxPrice字段,HTaxPrice
                                                })
                                            option.data[rowIndex + i].HMaterID = checkStatus.data[i].HItemID;
                                            option.data[rowIndex + i].物料代码 = checkStatus.data[i].物料代码;
                                            option.data[rowIndex + i].物料名称 = checkStatus.data[i].物料名称;
                                            option.data[rowIndex + i].规格型号 = checkStatus.data[i].规格型号;
                                            option.data[rowIndex + i].HUnitID = checkStatus.data[i].HUnitID;
                                            option.data[rowIndex + i].计量单位 = checkStatus.data[i].计量单位名称;
                                            option.data[rowIndex + i].HTaxMoney = HTaxMoney;
                                            option.data[rowIndex + i].HlineTotal = HlineTotal;
                                            option.data[rowIndex + i].HTaxPrice = HTaxPrice;
                                            }
                                        });
                                        table.render(option);
                                    } else {
                                        obj.update({ //更新表格数据
                                            "HMaterID": checkStatus.data[0].HItemID
                                            , "物料代码": checkStatus.data[0].物料代码
                                            , "物料名称": checkStatus.data[0].物料名称
                                            , "规格型号": checkStatus.data[0].规格型号
                                            , "HUnitID": checkStatus.data[0].HUnitID
                                            , "计量单位": checkStatus.data[0].计量单位名称
                                        })
                                        HDataTemp = checkStatus.data[0];
                                    }
                                    layer.close(index);//关闭弹窗
@@ -3384,21 +3445,121 @@
                            var iframeWindow = window["layui-layer-iframe" + index];//获取弹框页面
                            var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//获取选中的数据
                            if (checkStatus.data.length != 1) {
                                return layer.msg("请选择一条数据");
                            if (checkStatus.data.length < 1) {
                                return layer.msg("请选择至少一条数据");
                            }
                            var HTaxRate = 0;
                            //通过供应商id获取税率
                            var HSupID = $("#HSupID").val();
                            if (HSupID != 0) {
                                $.ajax({
                                    url: GetWEBURL() + "/Gy_Customer/xg",
                                    type: "GET",
                                    async: false,
                                    data: {
                                        "HInterID": HSupID
                                    },
                                    success: function (d) {
                                        HTaxRate = parseInt(d.data[0].增值税率) * 0.01;
                                    }
                                });
                            }
                            if (checkStatus.data.length > 1) {
                                var rowIndex = $(obj.tr).attr("data-index") * 1;
                                for (var i = 0; i < checkStatus.data.length; i++) {
                                    if (rowIndex + i >= option.data.length) {
                                        var NewRow = {
                                            "HMaterID": "0"
                                            , "物料代码": ""
                                            , "物料名称": ""
                                            , "规格型号": ""
                                            , "HUnitID": "0"
                                            , "计量单位": ""
                                            , "HQtyMust": "0"
                                            , "HQty": "0"
                                            , "HPieceQty": "0"
                                            , "HPrice": "0"
                                            , "HTaxPrice": "0"
                                            , "HTaxRate": "0"
                                            , "HMoney": "0"
                                            , "HTaxMoney": "0"
                                            , "HWHID": $("#HWHID").val()
                                            , "发货仓库": $("#HWHName").val()
                                            , "HRemark": ""
                                            , "HQty_Full": "0"
                                            , "HQty_Empty": "0"
                                            , "HQty_Back": "0"
                                            , "HCostPrice": "0"
                                            , "HCostMoney": "0"
                                            , "HSalePrice": "0"
                                            , "HSeOrderInterID": 0
                                            , "HSeOrderEntryID": 0
                                            , "HSeOrderBillNo": ""
                                            , "HSourceInterID": "0"
                                            , "HSourceEntryID": "0"
                                            , "HSourceBillNo": ""
                                            , "HSourceBillType": ""
                                            , "HRelationQty": "0"
                                            , "HRelationMoney": "0"
                                            , 'HSPID': "0"
                                            , 'HSPName': ""
                                            , 'HSPGroupID': "0"
                                            , "HSPGroupName": ""
                                            , 'HSCWHID': "0"
                                            , 'HSCWHName': ""
                                            , 'HSCSPID': "0"
                                            , 'HSCSPName': ""
                                            , 'HBatchNo': ""
                                            , 'HPOOrderInterID': "0"
                                            , 'HPOOrderEntryID': "0"
                                            , 'HPOOrderBillNo': ""
                                            , 'HPropertyID': "0"
                                            , 'HPropertyName': ""
                                            , 'HSecUnitID': "0"
                                            , 'HSecUnitName': ""
                                            , 'HSecUnitRate': "0"
                                            , 'HEngineNum': ""
                                            , 'HUnderPanNum': ""
                                            , 'HLeaveFactCard': ""
                                        };
                                        table.cache["mainTable"].push(NewRow);
                                        option.data = table.cache["mainTable"];
                                        table.render(option);
                                    }
                                    var HQty = option.data[rowIndex + i].HQty * 1;                           //数量
                                    var HPrice = option.data[rowIndex + i].HPrice * 1;               //单价
                                    var HMoney = HQty * HPrice;                     //金额=数量*单价
                                    var HTaxMoney = Number((HMoney * HTaxRate).toFixed(4));         //税额=金额*税率
                                    var HlineTotal = HMoney + HTaxMoney;            //价税合计=金额+税额
                                    var HTaxPrice = Number((HPrice * (1 + HTaxRate)).toFixed(4));        //含税单价=单价*(1+税率)
                                    option.data[rowIndex + i].HMaterID = checkStatus.data[i].HItemID;
                                    option.data[rowIndex + i].物料代码 = checkStatus.data[i].物料代码;
                                    option.data[rowIndex + i].物料名称 = checkStatus.data[i].物料名称;
                                    option.data[rowIndex + i].规格型号 = checkStatus.data[i].规格型号;
                                    option.data[rowIndex + i].HUnitID = checkStatus.data[i].HUnitID;
                                    option.data[rowIndex + i].计量单位 = checkStatus.data[i].计量单位名称;
                                    option.data[rowIndex + i].HTaxMoney = HTaxMoney;
                                    option.data[rowIndex + i].HlineTotal = HlineTotal;
                                    option.data[rowIndex + i].HTaxPrice = HTaxPrice;
                                }
                                table.render(option);
                            } else {
                            HDataTemp = checkStatus.data[0];
                            }
                            layer.close(index);//关闭弹窗
                        }
                        , end: function () {
                            if (typeof (HDataTemp.HItemID) != "undefined") {
                                //通过供应商id获取税率
                                var Dec = getDecByMaterID(obj.data.HMaterID) //获取精度
                                var HQtyDec = (Dec["HQtyDec"] == null || Dec["HQtyDec"] == 0) ? 4 : Dec["HQtyDec"];  //数量精度
                                var HPriceDec = (Dec["HPriceDec"] == null || Dec["HPriceDec"] == 0) ? 4 : Dec["HPriceDec"];  //单价精度
                                var HMoneyDec = (Dec["HMoneyDec"] == null || Dec["HMoneyDec"] == 0) ? 2 : Dec["HMoneyDec"];  //金额精度
                                var HSupID = $("#HSupID").val();
                                if (HSupID != 0) {
                                    $.ajax({
@@ -3414,14 +3575,9 @@
                                            var HQty = obj.data.HQty * 1;                           //数量
                                            var HPrice = obj.data.HPrice * 1;               //单价
                                            var HMoney = HQty * HPrice;                     //金额=数量*单价
                                            var HTaxMoney = HMoney * (1 + HTaxRate);
                                            var HTaxPrice = Number((HPrice * (1 + HTaxRate)));        //含税单价=单价*(1+税率)
                                            //数字精度
                                            HQty = Number(HQty.toFixed(HQtyDec));
                                            HPrice = Number(HPrice.toFixed(HPriceDec));
                                            HMoney = Number(HMoney.toFixed(HMoneyDec));
                                            HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
                                            HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
                                            var HTaxMoney = Number((HMoney * HTaxRate).toFixed(4));         //税额=金额*税率
                                            var HlineTotal = HMoney + HTaxMoney;            //价税合计=金额+税额
                                            var HTaxPrice = Number((HPrice * (1 + HTaxRate)).toFixed(4));        //含税单价=单价*(1+税率)
                                            obj.update({ //更新表格数据
                                                "HMaterID": HDataTemp.HItemID
                                                , "物料代码": HDataTemp.物料代码
@@ -3434,7 +3590,8 @@
                                                , HPrice: HPrice                         //更新HPrice字段,HPrice
                                                , HMoney: HMoney                      //更新HMoney字段,HMoney
                                                , HTaxMoney: HTaxMoney                  //更新HTaxMoney字段,HTaxMoney
                                                , HTaxPrice: HTaxPrice                   //更新HTaxPrice字段,HTaxPrice
                                                , HlineTotal: HlineTotal             //更新HlineTotal字段,HlineTotal
                                                , HTaxPrice, HTaxPrice                   //更新HTaxPrice字段,HTaxPrice
                                            })
                                        }
                                    });
WebTM/views/ÁìÁÏ·¢»õ/ÏúÊÛ³ö¿â/Kf_SellOutBillList.html
@@ -260,7 +260,7 @@
            //查询条件
            var sWhere = "";
            var option = [];
            var optionPage = [];
            var HModName = "Kf_SellOutBillList";
            var HBillType = "1205";
            var HBillSubType = "";
@@ -408,7 +408,7 @@
                        break;
                    //隐藏列设置
                    case 'HideColumn':
                        get_HideColumn();
                        get_HideColumn(HModName, sessionStorage["HUserName"], option, optionPage, get_FastQuery);
                        break;
                    //按钮设置
                    case 'set_HideButton':
@@ -547,7 +547,6 @@
                DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
                //查询
                get_FastQuery(table, option);
                DisPlay_HideColumn();
                //查询当前登录用户有没有在当前模块设置默认过滤方案
                get_DefaultModule();
            }
@@ -870,14 +869,13 @@
                                }
                            }
                            option.data = result;
                            ins = table.render(option);
                            laypage.render(optionPage);
                            DisPlay_HideColumn();
                            //列设置
                            DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option);
                            //表格加载必需在按钮显示前
                            ins = table.render(option);
                            //刷新按钮显示
                            var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象
                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
@@ -897,8 +895,6 @@
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
                DisPlay_HideColumn();
                layer.close(wait);
            }
@@ -1765,138 +1761,6 @@
            }
            //#endregion
            //#region éšè—åˆ—设置
            function get_HideColumn() {
                var colName = "";
                for (var i = 1; i < option.cols[0].length - 1; i++) {
                    colName += option.cols[0][i]["field"] + ",";
                }
                colName = encodeURI(colName.substring(0, colName.length - 1));//对 URI è¿›è¡Œç¼–码
                layer.open({
                    type: 2
                    , skin: "layui-layer-rim" //加上边框
                    , title: "隐藏列设置"  //标题
                    , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                    , shift: 2 //弹出动画
                    , area: ["50%", "90%"] //窗体大小
                    , maxmin: true //设置最大最小按钮是否显示
                    , content: ['../../基础资料/隐藏列设置/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
                    , btn: ["确定", "取消"]
                    , btn1: function (index, laero) {
                        //初始化页大小
                        DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
                        //直接执行列表筛选 åŠ è½½æ•°æ®åˆ°ç½‘æ ¼
                        get_FastQuery(table, option);
                        //更新表格缓存的数据
                        layer.close(index);//关闭弹窗
                    }
                })
            }
            //#endregion
            //#region æ˜¾ç¤ºåˆ—数据
            function DisPlay_HideColumn() {
                $.ajax({
                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
                    async: false,
                    type: "GET",
                    async: false,
                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.data.length != 0) {
                            var dataCol = [];//数据库查询出的列数据
                            //var titleData = ["hmainid", "hsupid", "HEmpID", "hmanagerid", "hsecmanagerid", "发货人", "hkeeperid", "保管员", "HDeptID", "销售方式", "hsubid", "hmaterid","hunitid", "HWHID"];//不需要显示的字段 å¯æ‰©å±•
                            dataCol = data1.data[0].HGridString.split(',');
                            for (var i = 0; i < option.cols[0].length - 2; i++) {
                                if (dataCol.length <= i) {
                                    break;
                                }
                                var dataCols = dataCol[i].split('|');
                                //隐藏列
                                if (dataCols[1] == 1) {
                                    option.cols[0][i + 1]["hide"] = true;
                                }
                                //设置内容字体大小
                                if (data1.data[0].HFontSize != 0) {
                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
                                } else {
                                    option.cols[0][i + 1]["style"] = "font-size:100%";
                                }
                                //设置列宽
                                if (dataCols[3] > 0) {
                                    option.cols[0][i + 1]["width"] = dataCols[3];
                                }
                                //显示列
                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
                                    option.cols[0][i + 1]["hide"] = false;
                                }
                                //字体所在位置(å·¦ å±…中 å³)
                                switch (dataCols[2]) {
                                    case "L":
                                        option.cols[0][i + 1]["align"] = "left";
                                        break;
                                    case "M":
                                        option.cols[0][i + 1]["align"] = "center";
                                        break;
                                    case "R":
                                        option.cols[0][i + 1]["align"] = "right";
                                        break;
                                }
                                //设置表格title属性显示别名
                                //if (dataCols[4] != null && dataCols[4] != "") {
                                //    option.cols[0][i + 1]["title"] = dataCols[4];
                                //}
                            }
                            //取消冻结列
                            for (var i = 1; i < option.cols[0].length - 1; i++) {
                                if (option.cols[0][i]["fixed"] != null) {
                                    option.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(option.cols[0][i + 1]["title"], titleData) != -1) {
                                        data1.data[0].HFixCols += 1;
                                    }
                                    option.cols[0][i + 1]["fixed"] = "left";
                                }
                            }
                            //设置列排序
                            for (var i = 1; i < option.cols[0].length; i++) {
                                if (data1.data[0].HSortFlag == "是") {
                                    option.cols[0][i]["sort"] = true;
                                }
                                else {
                                    option.cols[0][i]["sort"] = false;
                                }
                            }
                            table.render(option);
                            //刷新按钮显示
                            var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象
                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
                        } else {
                            table.render(option);
                            //刷新按钮显示
                            var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象
                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
                        }
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                })
            }
            //#endregion
            //#region åˆ—明显示下拉框
            function ColFilter() {
                var Organization = '<option  value="0" selected="selected" ></option>';
@@ -1990,12 +1854,11 @@
                if (openType == 2) {
                    addSWhere = " and çŠ¶æ€ = '已审核' and HOrgID = " + HOrgID;
                }
                    if (HBillSubType == "工程类") {
                        addSWhere += "and HBillSubType='工程类'"
                    } else if (HBillSubType == "任务类") {
                        addSWhere += "and HBillSubType='任务类'"
                    }
                }
                return addSWhere;
            }
WebTM/views/ÑéÊÕÈë¿â/Í⹺Èë¿â/Kf_POStockInBillList.html
@@ -1641,11 +1641,11 @@
                if (openType == 2) {
                    addSWhere = " and çŠ¶æ€ = '已审核' and è¡ŒçŠ¶æ€ = '' and HOrgID = " + HOrgID;
                }
                    if (HBillSubType == "工程类") {
                        addSWhere += "and HBillSubType='工程类'"
                    } else if (HBillSubType == "任务类") {
                        addSWhere += "and HBillSubType='任务类'"
                    }
                }
                return addSWhere;
            }