MES-WEB-LayUI.git

parent: e73dfda0 | 补丁 | 提交 | ignore whitespace

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

yangle

2022-07-28 1275962d9821ed611e8170e40e1167150a1c39cd

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

3个文件已修改

2个文件已添加

	WebTM/WebTM.csproj	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/index.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/工资管理/工资报表/ReportList.html	349 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/工资管理/工资报表/ReportList2.html	351 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/采购管理/采购订单/Cg_POOrderBillList.html	192 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/WebTM.csproj

@@ -713,6 +713,8 @@
    <Content Include="views\å·¥èµç®¡ç\Gy_WorkPayTypeBillList.html" />
    <Content Include="views\å·¥èµç®¡ç\Gy_WorkTypeBillEdit.html" />
    <Content Include="views\å·¥èµç®¡ç\Gy_WorkTypeBillList.html" />
    <Content Include="views\å·¥èµç®¡ç\å·¥èµæ¥è¡¨\ReportList2.html" />
    <Content Include="views\å·¥èµç®¡ç\å·¥èµæ¥è¡¨\ReportList.html" />
    <Content Include="views\å·¥èµç®¡ç\å·¥èµç»ç®å%28ä¸ªäºº%29\Pay_SingleBalBillEdit.html" />
    <Content Include="views\å·¥èµç®¡ç\å·¥èµç»ç®å%28ä¸ªäºº%29\Pay_SingleBalBillList.html" />
    <Content Include="views\å·¥èµç®¡ç\å·¥èµç»ç®å%28å¶ä»%29\Pay_OtherBalBillEdit.html" />

 WebTM/views/index.html

@@ -760,6 +760,8 @@
                                        <dd><a lay-href="å·¥èµç®¡ç/èå¤æ±æ¥å/Pay_WorkTimesBillList_yqn.html">èå¤æ±æ¥åç»´æ¤</a></dd>
                                    </dl>
                                </dd>
                                <dd><a lay-href="å·¥èµç®¡ç/å·¥èµæ¥è¡¨/ReportList.html">è®¡ä»¶å·¥èµæ¥è¡¨</a></dd>
                                <dd><a lay-href="å·¥èµç®¡ç/å·¥èµæ¥è¡¨/ReportList2.html">æåº¦å·¥èµæ¥è¡¨</a></dd>
                                <dd>
                                    <a>æ£è¡¥èµæ</a>
                                    <dl class="layui-nav-child">

 WebTM/views/¹¤×Ê¹ÜÀí/¹¤×Ê±¨±í/ReportList.html

New file
@@ -0,0 +1,349 @@
ï»¿<!DOCTYPE html>
<html>
<head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title>è®¡ä»¶å·¥èµæ¥è¡¨</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
</head>
<body>
    <div class="layui-fluid">
        <div class="layui-col-md12">
            <div class="layui-card" style="padding: 1px">
                <div class="layui-card-body" style="padding: 1px;">
                    <form class="layui-form" action="" lay-filter="component-form-group">
                        <div class="layui-collapse">
                            <div class="layui-colla-item">
                                <div class="layui-colla-title layui-inline">
                                    <div class="layui-inline">
                                        <span>æ´å¤</span>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">æ¥æ</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
                                    </div>
                                </div>
                                <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>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>
                                </div>
                            </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>
                            </div>
                        </script>
                    </form>
                </div>
            </div>
        </div>
    </div>
    <script type="text/javascript">
        layui.config({
            base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
        }).extend({
            index: 'lib/index', //ä¸»å¥å£æ¨¡å
        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
            //#region å¬å±åé
            var $ = layui.$
                , admin = layui.admin
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , element = layui.element
                , laypage = layui.laypage
                , laydate = layui.laydate
                , util = layui.util
          

            //æ¥è¯¢æ¡ä»¶
            var sWhere = "";
            var option = []; var columns = [];
            var Name = "MouldProdInHouseCellWidth";
            //#endregion
          
            //#region è¿å¥é¡µé¢æ¢å è½½
            set_ClearBill();
            //#endregion
            //#region ç¹å»äºä»¶åæ¬on formäºä»¶ç
            //å¤´å·¥å·æ äºä»¶
            table.on('toolbar(mainTable)', function (obj) {
                switch (obj.event) {
                    //æ°å¢æé®
                    case 'btn-Add': set_AddNew();
                        break;
                    //ç¼è¾æé®
                    case 'btn-Edit': set_ShowBill();
                        break;
                    //å é¤æé®
                    case 'btn-Delete': set_DeleteBill();
                        break;
                    //æµè§
                    case 'btn-view': get_ViewReport();
                        break;
                    //æå°
                    case 'btn-print': get_PrintReport();
                        break;
                    //å·æ°
                    case 'get_Refresh': set_Refresh();
                        break;

                    //éåº
                    case 'get_Exit': Pub_Close(2);
                        break;
                    //åé
                    case 'btn-fp': set_Distribut();
                        break;
                    //åå¸
                    case 'btn-fb': set_Release();
                        break;
                    //ä¼åçº§
                    case 'btn-yxj': set_Yxj();
                        break;
                    case 'btn-back': set_Back();
                        break;
                };
            });
            //éç½®æé®
            form.on('submit(btnReSearch)', function (data) {
                set_ClearQuery();
            });
            //æ¥è¯¢æé®
            form.on('submit(btnSearch)', function (data) {
                get_FastQuery(table, option);
            });
            //#endregion
            //#region æ¤é¡µé¢æææ¹æ³
            function set_ClearBill() {
                //åå§åè¡¨æ ¼
                set_InitGrid();
                //ç´æ¥æ§è¡åè¡¨çé å è½½æ°æ®å°ç½æ ¼
                get_FastQuery(table, option)
            }
            //åå§åè¡¨æ ¼
            function set_InitGrid() {
                $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd"));
                $.ajax({
                    url: GetWEBURL() + '/Pay_PieceRateWageReport/list2',
                    type: "GET",
                    async: false,
                    data: { "sWhere": Format(new Date(), "yyyy-MM-dd")},
                    success: function (data1) {
                        if (data1.count == 1) {
                            columns = data1.data;
                            columns.unshift({ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' });
                        } else {
                            layer.alert(data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                    }
                });
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , page: true
                    , cellMinWidth: 120
                    , totalRow: true
                    , limit: 500
                    , height: 'full-50'
                    , cols: [columns]
                    , limits: [500, 5000, 20000]
                    , done: function (res, curr, count) {

                    }
                };
                ////è®¾ç½®åå®½
                //var colWidth = getColumnsWidth();
                //if (colWidth == "" || colWidth == []) {

                //}
                //else {
                //    $.each(columns, function (x, m) {
                //        m["width"] = colWidth[x];
                //    });
                //}
            }
            //å è½½ç½æ ¼
            function get_Display(sWhere) {
                var wait = layer.load();//é®ç½©
                $.ajax({
                    url: GetWEBURL() + '/Pay_PieceRateWageReport/list',
                    type: "GET",
                    data: { "sWhere": sWhere},
                    success: function (data1) {
                        if (data1.count == 1) {
                            DataList = data1.data;
                            option.data = data1.data;
                            table.render(option);
                            layer.close(wait);
                        } else {
                            layer.close(wait);
                            layer.alert(data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(wait);
                        layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                    }
                });
            }
            //è·ååå®½
            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(200);   //é»è®¤å®½åº¦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);
            }
            //å¿«éè¿æ»¤
            function get_FastQuery(table, option) {
                var HBeginDate = $("#HBeginDate").val();//å¼å§æ¥æ
                if (HBeginDate) {
                    sWhere = HBeginDate;
                }
                var index = layer.load(0);
                get_Display(sWhere);
                //è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
                sWhere = "";
            }
            //éç½®è¿æ»¤æ¡ä»¶
            function set_ClearQuery() {
                $('#HStatus').find("option[value='-1']").attr("selected", true);
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HBillNo").val("");
                $("#HEmpName").val("");
                $("#HMaterNumber").val("");
                $("#HMaterName").val("");
                $("#HSupName").val("");
                $("select[name='HFeedback']").val("");
                sWhere = Format(new Date(), "yyyy-MM-dd");
                get_Display(sWhere);
            }
            //å·æ°
            function set_Refresh() {
                $("#btnSearch").click();
            }
            //ä»¥ä¸æ¯layuiæ¨¡å
        });
    </script>
</body>
</html>

 WebTM/views/¹¤×Ê¹ÜÀí/¹¤×Ê±¨±í/ReportList2.html

New file
@@ -0,0 +1,351 @@
ï»¿<!DOCTYPE html>
<html>
<head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title>æåº¦å·¥èµæ¥è¡¨</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
</head>
<body>
    <div class="layui-fluid">
        <div class="layui-col-md12">
            <div class="layui-card" style="padding: 1px">
                <div class="layui-card-body" style="padding: 1px;">
                    <form class="layui-form" action="" lay-filter="component-form-group">
                        <div class="layui-collapse">
                            <div class="layui-colla-item">
                                <div class="layui-colla-title layui-inline">
                                    <div class="layui-inline">
                                        <span>æ´å¤</span>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">æ¥æ</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" id="HBeginDate" style="width:190px;">
                                    </div>
                                </div>
                                <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>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>
                                </div>
                            </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>
                            </div>
                        </script>
                    </form>
                </div>
            </div>
        </div>
    </div>
    <script type="text/javascript">
        layui.config({
            base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
        }).extend({
            index: 'lib/index', //ä¸»å¥å£æ¨¡å
        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
            //#region å¬å±åé
            var $ = layui.$
                , admin = layui.admin
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , element = layui.element
                , laypage = layui.laypage
                , laydate = layui.laydate
                , util = layui.util
            //æ¥è¯¢æ¡ä»¶
            var sWhere = "";
            var option = []; var columns = [];
            var Name = "MouldProdInHouseCellWidth";
            //#endregion
            //å¹´æéæ©å¨
            laydate.render({
                elem: '#HBeginDate'
                , type: 'month'
            });
            //#region è¿å¥é¡µé¢æ¢å è½½
            set_ClearBill();
            //#endregion
            //#region ç¹å»äºä»¶åæ¬on formäºä»¶ç
            //å¤´å·¥å·æ äºä»¶
            table.on('toolbar(mainTable)', function (obj) {
                switch (obj.event) {
                    //æ°å¢æé®
                    case 'btn-Add': set_AddNew();
                        break;
                    //ç¼è¾æé®
                    case 'btn-Edit': set_ShowBill();
                        break;
                    //å é¤æé®
                    case 'btn-Delete': set_DeleteBill();
                        break;
                    //æµè§
                    case 'btn-view': get_ViewReport();
                        break;
                    //æå°
                    case 'btn-print': get_PrintReport();
                        break;
                    //å·æ°
                    case 'get_Refresh': set_Refresh();
                        break;

                    //éåº
                    case 'get_Exit': Pub_Close(2);
                        break;
                    //åé
                    case 'btn-fp': set_Distribut();
                        break;
                    //åå¸
                    case 'btn-fb': set_Release();
                        break;
                    //ä¼åçº§
                    case 'btn-yxj': set_Yxj();
                        break;
                    case 'btn-back': set_Back();
                        break;
                };
            });
            //éç½®æé®
            form.on('submit(btnReSearch)', function (data) {
                set_ClearQuery();
            });
            //æ¥è¯¢æé®
            form.on('submit(btnSearch)', function (data) {
                get_FastQuery(table, option);
            });
            //#endregion
            //#region æ¤é¡µé¢æææ¹æ³
            function set_ClearBill() {
                //åå§åè¡¨æ ¼
                //set_InitGrid();
                $("#HBeginDate").val(Format(new Date(), "yyyy-MM"));
                //ç´æ¥æ§è¡åè¡¨çé å è½½æ°æ®å°ç½æ ¼
                get_FastQuery(table, option)
            }
            //åå§åè¡¨æ ¼
            function set_InitGrid() {
                $.ajax({
                    url: GetWEBURL() + '/Pay_MonthlySalaryReport/list2',
                    type: "GET",
                    async: false,
                    data: { "sWhere": $("#HBeginDate").val()},
                    success: function (data1) {
                        if (data1.count == 1) {
                            columns = data1.data;
                            columns.unshift({ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' });
                        } else {
                            layer.alert(data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                    }
                });
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , page: true
                    , cellMinWidth: 120
                    , totalRow: true
                    , limit: 500
                    , height: 'full-50'
                    , cols: [columns]
                    , limits: [500, 5000, 20000]
                    , done: function (res, curr, count) {

                    }
                };
                ////è®¾ç½®åå®½
                //var colWidth = getColumnsWidth();
                //if (colWidth == "" || colWidth == []) {

                //}
                //else {
                //    $.each(columns, function (x, m) {
                //        m["width"] = colWidth[x];
                //    });
                //}
            }
            //å è½½ç½æ ¼
            function get_Display(sWhere) {
                set_InitGrid();
                var wait = layer.load();//é®ç½©
                $.ajax({
                    url: GetWEBURL() + '/Pay_MonthlySalaryReport/list',
                    type: "GET",
                    data: { "sWhere": sWhere},
                    success: function (data1) {
                        if (data1.count == 1) {
                            DataList = data1.data;
                            option.data = data1.data;
                            table.render(option);
                            layer.close(wait);
                        } else {
                            layer.close(wait);
                            layer.alert(data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(wait);
                        layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                    }
                });
            }
            //è·ååå®½
            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(200);   //é»è®¤å®½åº¦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);
            }
            //å¿«éè¿æ»¤
            function get_FastQuery(table, option) {
                var HBeginDate = $("#HBeginDate").val();//å¼å§æ¥æ
                if (HBeginDate) {
                    sWhere = HBeginDate;
                }
                var index = layer.load(0);
                get_Display(sWhere);
                //è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
                sWhere = "";
            }
            //éç½®è¿æ»¤æ¡ä»¶
            function set_ClearQuery() {
                $('#HStatus').find("option[value='-1']").attr("selected", true);
                $("#HBeginDate").val(Format(new Date(), "yyyy-MM"));
                $("#HBillNo").val("");
                $("#HEmpName").val("");
                $("#HMaterNumber").val("");
                $("#HMaterName").val("");
                $("#HSupName").val("");
                $("select[name='HFeedback']").val("");
                sWhere = Format(new Date(), "yyyy-MM");
                get_Display(sWhere);
            }
            //å·æ°
            function set_Refresh() {
                $("#btnSearch").click();
            }
            //ä»¥ä¸æ¯layuiæ¨¡å
        });
    </script>
</body>
</html>

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

@@ -76,8 +76,6 @@
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">éæ°åæ¥</button>-->


                                <div class="layui-colla-content">
                                    <div class="layui-inline">
                                        <label class="layui-form-label">åæ®å·</label>
@@ -103,11 +101,11 @@
                                        </div>
                                    </div>
                                    <!--<div class="layui-inline">
        <label class="layui-form-label">åé¦ç¶æ</label>
        <div class="layui-input-block">
            <input type="text" class="layui-input" name="HXTFKStatus" id="HXTFKStatus" style="width:190px;">
        </div>
    </div>-->
                                        <label class="layui-form-label">åé¦ç¶æ</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="HXTFKStatus" id="HXTFKStatus" style="width:190px;">
                                        </div>
                                    </div>-->
                                    <div class="layui-inline">
                                        <label class="layui-form-label">ç©æç¼ç </label>
                                        <div class="layui-input-block">
@@ -196,7 +194,7 @@
                , util = layui.util
            //æ¥è¯¢æ¡ä»¶
            var sWhere = "";
            var option = [];
            var option = []; var columns = [];
            var Name = "MouldProdInHouseCellWidth";
            //#endregion

@@ -298,7 +296,6 @@
            });
            //#endregion


            //#region æ¤é¡µé¢æææ¹æ³
            function set_ClearBill() {
                //åå§åè¡¨æ ¼
@@ -308,87 +305,103 @@
                //å è½½ä¸å¡å
                get_HEmpName();
            }

            //åå§åè¡¨æ ¼
            function set_InitGrid() {
                $("#HBeginDate").val("2022-03-14");
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                var columns = [
                    { type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' }
                    ,{ field: 'hmainid', title: 'hmainid', sort: true, hide: true }
                    , { field: 'æ¥æ', title: 'æ¥æ', width: 120, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
                    , { field: 'åæ®å·', title: 'åæ®å·', width: 150 }
                    , { field: 'ä¾åºå', title: 'ä¾åºå', width: 150 }
                    , { field: 'ä¸å¡å', title: 'ä¸å¡å', width: 100 }
                    , { field: 'HBillType', title: 'HBillType', hide: true }
                    , { field: 'HSupID', title: 'HSupID', hide: true }
                    , { field: 'ä¸å¡ç¶æ', title: 'ä¸å¡ç¶æ', width: 100, hide: true }
                    , { field: 'åéç¶æ', title: 'åéç¶æ', width: 100 }
                    , { field: 'åå¸ç¶æ', title: 'åå¸ç¶æ', width: 100 }
                    , { field: 'ä¾åºåååç¶æ', title: 'ä¾åºåååç¶æ', width: 135 }/*ç©æä»£ç ï¼ç©æåç§°ï¼è§æ ¼åå·ï¼æ¹å·ï¼æ°éï¼åä½ï¼æºååå·*/
                    , { field: 'åé¦ç¶æ', title: 'ä¾åºååé¦ç¶æ', width: 135 }
                    , { field: 'ç©æç¼ç ', title: 'ç©æç¼ç ', width: 120 }
                    , { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 200 }
                    , { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 130 }
                    , { field: 'æ°é', title: 'è®¢åæ°é', width: 100 }
                    , { field: 'æå°æ¡ç æ°é', title: 'æå°æ¡ç æ°é', width: 120 }
                    , { field: 'å³èæ°é', title: 'å·²åè´§æ°é', width: 120 }
                    , { field: 'æªå³èæ°é', title: 'æªå·²åè´§æ°é', width: 120 }
                    , { field: 'å®æç¶æ', title: 'å®æç¶æ', width: 100 }
                    , { field: 'HUnitID', title: 'HUnitID', hide: true }
                    , { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 100 }
                    , { field: 'HUnitID', title: 'HUnitID', hide: true }
                    , { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ', width: 120 }
                    , { field: 'è®¡éåä½', title: 'è®¡éåä½', width: 100 }
                    , { field: 'æ¹å·', title: 'æ¹å·', width: 100 }
                    , { field: 'æ°é', title: 'æ°é', width: 100 }
                    , { field: 'æºååå·', title: 'æºååå·', width: 100 }
                    , { field: 'ä¾åºåä»£ç ', title: 'ä¾åºåä»£ç ', width: 120, hide: true}
                    , { field: 'ä¸å¡åä»£ç ', title: 'ä¸å¡åä»£ç ', width: 100, hide: true}
                    , { field: 'HPriority', title: 'HPriority', width: 100, hide: true }
                    , { field: 'ä¼åçº§', title: 'ä¼åçº§', width: 100 }
                    , { field: 'äº¤è´§å°ç¹', title: 'äº¤è´§å°ç¹', width: 100}
                    , { field: 'HPSStyleID', title: 'HPSStyleID', hide: true }
                    , { field: 'éè´æ¹å¼ä»£ç ', title: 'éè´æ¹å¼ä»£ç ', width: 120}
                    , { field: 'éè´æ¹å¼', title: 'éè´æ¹å¼', width: 100}
                    , { field: 'HSSID', title: 'HSSID', hide: true }
                    , { field: 'ç»ç®æ¹å¼ä»£ç ', title: 'ç»ç®æ¹å¼ä»£ç ', width: 120}
                    , { field: 'ç»ç®æ¹å¼', title: 'ç»ç®æ¹å¼', width: 100}
                    , { field: 'ç»ç®æ¥æ', title: 'ç»ç®æ¥æ', width: 120, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.ç»ç®æ¥æ, 'yyyy-MM-dd')}}</div>" }
                    , { field: 'HCurID', title: 'HCurID', hide: true }
                    , { field: 'å¸å«ä»£ç ', title: 'å¸å«ä»£ç ', width: 100}
                    , { field: 'å¸å«', title: 'å¸å«', width: 100}
                    , { field: 'æ±ç', title: 'æ±ç', width: 100}
                    , { field: 'HDeptID', title: 'HDeptID', hide: true }
                    , { field: 'é¨é¨ä»£ç ', title: 'é¨é¨ä»£ç ', width: 100}
                    , { field: 'é¨é¨', title: 'é¨é¨', width: 100}
                    , { field: 'HManagerID', title: 'HManagerID', hide: true }
                    , { field: 'ä¸»ç®¡ä»£ç ', title: 'ä¸»ç®¡ä»£ç ', width: 100}
                    , { field: 'ä¸»ç®¡', title: 'ä¸»ç®¡', width: 100}
                    , { field: 'HEmpID', title: 'HEmpID', hide: true }
                    , { field: 'æè¦', title: 'æè¦', width: 100}
                    , { field: 'è¡¨å¤´å¤æ³¨', title: 'è¡¨å¤´å¤æ³¨', width: 100}
                    , { field: 'hsubid', title: 'hsubid', hide: true }
                    , { field: 'HMaterID', title: 'HMaterID', hide: true }
                    , { field: 'åä»·', title: 'åä»·', width: 100}
                    , { field: 'éé¢', title: 'éé¢', width: 100}
                    , { field: 'ç¨ç', title: 'ç¨ç', width: 100}
                    , { field: 'ç¨é¢', title: 'ç¨é¢', width: 100}
                    , { field: 'ä»·ç¨åè®¡', title: 'ä»·ç¨åè®¡', width: 100}
                    , { field: 'äº¤è´§æ¥æ', title: 'äº¤è´§æ¥æ', width: 120, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.äº¤è´§æ¥æ, 'yyyy-MM-dd')}}</div>" }
                    , { field: 'è®¡åè·è¸ªå·', title: 'è®¡åè·è¸ªå·', width: 100}
                    , { field: 'è¡¨ä½å¤æ³¨', title: 'è¡¨ä½å¤æ³¨', width: 100}
                    , { field: 'å¶åäºº', title: 'å¶åäºº', width: 100}
                    , { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ', width: 120, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.å¶åæ¥æ, 'yyyy-MM-dd')}}</div>" }
                    , { field: 'å®¡æ ¸äºº', title: 'å®¡æ ¸äºº', width: 100}
                    , { field: 'å®¡æ ¸æ¥æ', title: 'å®¡æ ¸æ¥æ', width: 120, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.å®¡æ ¸æ¥æ, 'yyyy-MM-dd')}}</div>" }
                    , { field: 'ä¿®æ¹äºº', title: 'ä¿®æ¹äºº', width: 100}
                    , { field: 'ä¿®æ¹æ¥æ', title: 'ä¿®æ¹æ¥æ', width: 120, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.ä¿®æ¹æ¥æ, 'yyyy-MM-dd')}}</div>" }
                    , { field: 'å³éäºº', title: 'å³éäºº', width: 100}
                    , { field: 'å³éæ¥æ', title: 'å³éæ¥æ', width: 120, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.å³éæ¥æ, 'yyyy-MM-dd')}}</div>" }
                    , { field: 'ä½åºäºº', title: 'ä½åºäºº', width: 100}
                    , { field: 'ä½åºæ¥æ', title: 'ä½åºæ¥æ', width: 120, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.ä½åºæ¥æ, 'yyyy-MM-dd')}}</div>" }

                ];
                //columns = [
                //     { type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' }
                //    ,{ field: 'hmainid', title: 'hmainid', sort: true, hide: true }
                //    , { field: 'æ¥æ', title: 'æ¥æ', width: 120, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
                //    , { field: 'åæ®å·', title: 'åæ®å·', width: 150 }
                //    , { field: 'ä¾åºå', title: 'ä¾åºå', width: 150 }
                //    , { field: 'ä¸å¡å', title: 'ä¸å¡å', width: 100 }
                //    , { field: 'HBillType', title: 'HBillType', hide: true }
                //    , { field: 'HSupID', title: 'HSupID', hide: true }
                //    , { field: 'ä¸å¡ç¶æ', title: 'ä¸å¡ç¶æ', width: 100, hide: true }
                //    , { field: 'åéç¶æ', title: 'åéç¶æ', width: 100 }
                //    , { field: 'åå¸ç¶æ', title: 'åå¸ç¶æ', width: 100 }
                //    , { field: 'ä¾åºåååç¶æ', title: 'ä¾åºåååç¶æ', width: 135 }/*ç©æä»£ç ï¼ç©æåç§°ï¼è§æ ¼åå·ï¼æ¹å·ï¼æ°éï¼åä½ï¼æºååå·*/
                //    , { field: 'åé¦ç¶æ', title: 'ä¾åºååé¦ç¶æ', width: 135 }
                //    , { field: 'ç©æç¼ç ', title: 'ç©æç¼ç ', width: 120 }
                //    , { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 200 }
                //    , { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 130 }
                //    , { field: 'æ°é', title: 'è®¢åæ°é', width: 100 }
                //    , { field: 'æå°æ¡ç æ°é', title: 'æå°æ¡ç æ°é', width: 120 }
                //    , { field: 'å³èæ°é', title: 'å·²åè´§æ°é', width: 120 }
                //    , { field: 'æªå³èæ°é', title: 'æªå·²åè´§æ°é', width: 120 }
                //    , { field: 'å®æç¶æ', title: 'å®æç¶æ', width: 100 }
                //    , { field: 'HUnitID', title: 'HUnitID', hide: true }
                //    , { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 100 }
                //    , { field: 'HUnitID', title: 'HUnitID', hide: true }
                //    , { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ', width: 120 }
                //    , { field: 'è®¡éåä½', title: 'è®¡éåä½', width: 100 }
                //    , { field: 'æ¹å·', title: 'æ¹å·', width: 100 }
                //    , { field: 'æ°é', title: 'æ°é', width: 100 }
                //    , { field: 'æºååå·', title: 'æºååå·', width: 100 }
                //    , { field: 'ä¾åºåä»£ç ', title: 'ä¾åºåä»£ç ', width: 120, hide: true}
                //    , { field: 'ä¸å¡åä»£ç ', title: 'ä¸å¡åä»£ç ', width: 100, hide: true}
                //    , { field: 'HPriority', title: 'HPriority', width: 100, hide: true }
                //    , { field: 'ä¼åçº§', title: 'ä¼åçº§', width: 100 }
                //    , { field: 'äº¤è´§å°ç¹', title: 'äº¤è´§å°ç¹', width: 100}
                //    , { field: 'HPSStyleID', title: 'HPSStyleID', hide: true }
                //    , { field: 'éè´æ¹å¼ä»£ç ', title: 'éè´æ¹å¼ä»£ç ', width: 120}
                //    , { field: 'éè´æ¹å¼', title: 'éè´æ¹å¼', width: 100}
                //    , { field: 'HSSID', title: 'HSSID', hide: true }
                //    , { field: 'ç»ç®æ¹å¼ä»£ç ', title: 'ç»ç®æ¹å¼ä»£ç ', width: 120}
                //    , { field: 'ç»ç®æ¹å¼', title: 'ç»ç®æ¹å¼', width: 100}
                //    , { field: 'ç»ç®æ¥æ', title: 'ç»ç®æ¥æ', width: 120, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.ç»ç®æ¥æ, 'yyyy-MM-dd')}}</div>" }
                //    , { field: 'HCurID', title: 'HCurID', hide: true }
                //    , { field: 'å¸å«ä»£ç ', title: 'å¸å«ä»£ç ', width: 100}
                //    , { field: 'å¸å«', title: 'å¸å«', width: 100}
                //    , { field: 'æ±ç', title: 'æ±ç', width: 100}
                //    , { field: 'HDeptID', title: 'HDeptID', hide: true }
                //    , { field: 'é¨é¨ä»£ç ', title: 'é¨é¨ä»£ç ', width: 100}
                //    , { field: 'é¨é¨', title: 'é¨é¨', width: 100}
                //    , { field: 'HManagerID', title: 'HManagerID', hide: true }
                //    , { field: 'ä¸»ç®¡ä»£ç ', title: 'ä¸»ç®¡ä»£ç ', width: 100}
                //    , { field: 'ä¸»ç®¡', title: 'ä¸»ç®¡', width: 100}
                //    , { field: 'HEmpID', title: 'HEmpID', hide: true }
                //    , { field: 'æè¦', title: 'æè¦', width: 100}
                //    , { field: 'è¡¨å¤´å¤æ³¨', title: 'è¡¨å¤´å¤æ³¨', width: 100}
                //    , { field: 'hsubid', title: 'hsubid', hide: true }
                //    , { field: 'HMaterID', title: 'HMaterID', hide: true }
                //    , { field: 'åä»·', title: 'åä»·', width: 100}
                //    , { field: 'éé¢', title: 'éé¢', width: 100}
                //    , { field: 'ç¨ç', title: 'ç¨ç', width: 100}
                //    , { field: 'ç¨é¢', title: 'ç¨é¢', width: 100}
                //    , { field: 'ä»·ç¨åè®¡', title: 'ä»·ç¨åè®¡', width: 100}
                //    , { field: 'äº¤è´§æ¥æ', title: 'äº¤è´§æ¥æ', width: 120, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.äº¤è´§æ¥æ, 'yyyy-MM-dd')}}</div>" }
                //    , { field: 'è®¡åè·è¸ªå·', title: 'è®¡åè·è¸ªå·', width: 100}
                //    , { field: 'è¡¨ä½å¤æ³¨', title: 'è¡¨ä½å¤æ³¨', width: 100}
                //    , { field: 'å¶åäºº', title: 'å¶åäºº', width: 100}
                //    , { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ', width: 120, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.å¶åæ¥æ, 'yyyy-MM-dd')}}</div>" }
                //    , { field: 'å®¡æ ¸äºº', title: 'å®¡æ ¸äºº', width: 100}
                //    , { field: 'å®¡æ ¸æ¥æ', title: 'å®¡æ ¸æ¥æ', width: 120, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.å®¡æ ¸æ¥æ, 'yyyy-MM-dd')}}</div>" }
                //    , { field: 'ä¿®æ¹äºº', title: 'ä¿®æ¹äºº', width: 100}
                //    , { field: 'ä¿®æ¹æ¥æ', title: 'ä¿®æ¹æ¥æ', width: 120, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.ä¿®æ¹æ¥æ, 'yyyy-MM-dd')}}</div>" }
                //    , { field: 'å³éäºº', title: 'å³éäºº', width: 100}
                //    , { field: 'å³éæ¥æ', title: 'å³éæ¥æ', width: 120, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.å³éæ¥æ, 'yyyy-MM-dd')}}</div>" }
                //    , { field: 'ä½åºäºº', title: 'ä½åºäºº', width: 100}
                //    , { field: 'ä½åºæ¥æ', title: 'ä½åºæ¥æ', width: 120, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.ä½åºæ¥æ, 'yyyy-MM-dd')}}</div>" }
                //];
                $.ajax({
                    url: GetWEBURL() + '/Cg_POOrderBill/list2',
                    type: "GET",
                    async: false,
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.count == 1) {
                            columns = data1.data;
                            columns.unshift({ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' });
                        } else {
                            layer.alert(data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                    }
                });
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
@@ -414,6 +427,7 @@
                //    });
                //}
            }

            //å è½½ç½æ ¼
            function get_Display(sWhere) {
                var wait = layer.load();//é®ç½©
@@ -536,7 +550,7 @@
                        , title: 'æå°æ¨¡çéæ©'
                        , shade: 0.6 //é®ç½©éæåº¦
                        , maxmin: false //åè®¸å¨å±æå°å
                        , anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯  
                        , 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
                    })
@@ -1005,8 +1019,8 @@

            //å¿«éè¿æ»¤
            function get_FastQuery(table, option) {
                var HStatus = $("select[name='HStatus']").val();// 
                var HStatus2 = $("select[name='HStatus2']").val();// 
                var HStatus = $("select[name='HStatus']").val();//
                var HStatus2 = $("select[name='HStatus2']").val();//
                var HBeginDate = $("#HBeginDate").val();//å¼å§æ¥æ
                var HEndDate = $("#HEndDate").val();//ç»ææ¥æ
                var HBillNo = $("#HBillNo").val(); //åæ®å·

			@@ -713,6 +713,8 @@
			<Content Include="views\å·¥èµç®¡ç\Gy_WorkPayTypeBillList.html" />
			<Content Include="views\å·¥èµç®¡ç\Gy_WorkTypeBillEdit.html" />
			<Content Include="views\å·¥èµç®¡ç\Gy_WorkTypeBillList.html" />
			<Content Include="views\å·¥èµç®¡ç\å·¥èµæ¥è¡¨\ReportList2.html" />
			<Content Include="views\å·¥èµç®¡ç\å·¥èµæ¥è¡¨\ReportList.html" />
			<Content Include="views\å·¥èµç®¡ç\å·¥èµç»ç®å%28ä¸ªäºº%29\Pay_SingleBalBillEdit.html" />
			<Content Include="views\å·¥èµç®¡ç\å·¥èµç»ç®å%28ä¸ªäºº%29\Pay_SingleBalBillList.html" />
			<Content Include="views\å·¥èµç®¡ç\å·¥èµç»ç®å%28å¶ä»%29\Pay_OtherBalBillEdit.html" />

			@@ -760,6 +760,8 @@
			<dd><a lay-href="å·¥èµç®¡ç/èå¤æ±æ¥å/Pay_WorkTimesBillList_yqn.html">èå¤æ±æ¥åç»´æ¤</a></dd>
			</dl>
			</dd>
			<dd><a lay-href="å·¥èµç®¡ç/å·¥èµæ¥è¡¨/ReportList.html">è®¡ä»¶å·¥èµæ¥è¡¨</a></dd>
			<dd><a lay-href="å·¥èµç®¡ç/å·¥èµæ¥è¡¨/ReportList2.html">æåº¦å·¥èµæ¥è¡¨</a></dd>
			<dd>
			<a>æ£è¡¥èµæ</a>
			<dl class="layui-nav-child">

New file
			@@ -0,0 +1,349 @@
			ï»¿<!DOCTYPE html>
			<html>
			<head>
			<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
			<title>è®¡ä»¶å·¥èµæ¥è¡¨</title>
			<meta name="renderer" content="webkit">
			<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
			<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
			<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
			<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
			<script src="../../../layuiadmin/layui/layui.js"></script>
			<script src="../../../layuiadmin/layui/layui.js"></script>
			<script src="../../../layuiadmin/Scripts/json2.js"></script>
			<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/PubCustom.js"></script>
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
			</head>
			<body>
			<div class="layui-fluid">
			<div class="layui-col-md12">
			<div class="layui-card" style="padding: 1px">
			<div class="layui-card-body" style="padding: 1px;">
			<form class="layui-form" action="" lay-filter="component-form-group">
			<div class="layui-collapse">
			<div class="layui-colla-item">
			<div class="layui-colla-title layui-inline">
			<div class="layui-inline">
			<span>æ´å¤</span>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">æ¥æ</label>
			<div class="layui-input-block">
			<input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
			</div>
			</div>
			<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>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>
			</div>
			</div>
			</div>
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>
			</div>
			</script>
			</form>
			</div>
			</div>
			</div>
			</div>
			<script type="text/javascript">
			layui.config({
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			}).extend({
			index: 'lib/index', //ä¸»å¥å£æ¨¡å
			}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
			//#region å¬å±åé
			var $ = layui.$
			, admin = layui.admin
			, layer = layui.layer
			, table = layui.table
			, form = layui.form
			, element = layui.element
			, laypage = layui.laypage
			, laydate = layui.laydate
			, util = layui.util


			//æ¥è¯¢æ¡ä»¶
			var sWhere = "";
			var option = []; var columns = [];
			var Name = "MouldProdInHouseCellWidth";
			//#endregion

			//#region è¿å¥é¡µé¢æ¢å è½½
			set_ClearBill();
			//#endregion
			//#region ç¹å»äºä»¶åæ¬on formäºä»¶ç
			//å¤´å·¥å·æ äºä»¶
			table.on('toolbar(mainTable)', function (obj) {
			switch (obj.event) {
			//æ°å¢æé®
			case 'btn-Add': set_AddNew();
			break;
			//ç¼è¾æé®
			case 'btn-Edit': set_ShowBill();
			break;
			//å é¤æé®
			case 'btn-Delete': set_DeleteBill();
			break;
			//æµè§
			case 'btn-view': get_ViewReport();
			break;
			//æå°
			case 'btn-print': get_PrintReport();
			break;
			//å·æ°
			case 'get_Refresh': set_Refresh();
			break;

			//éåº
			case 'get_Exit': Pub_Close(2);
			break;
			//åé
			case 'btn-fp': set_Distribut();
			break;
			//åå¸
			case 'btn-fb': set_Release();
			break;
			//ä¼åçº§
			case 'btn-yxj': set_Yxj();
			break;
			case 'btn-back': set_Back();
			break;
			};
			});
			//éç½®æé®
			form.on('submit(btnReSearch)', function (data) {
			set_ClearQuery();
			});
			//æ¥è¯¢æé®
			form.on('submit(btnSearch)', function (data) {
			get_FastQuery(table, option);
			});
			//#endregion
			//#region æ¤é¡µé¢æææ¹æ³
			function set_ClearBill() {
			//åå§åè¡¨æ ¼
			set_InitGrid();
			//ç´æ¥æ§è¡åè¡¨çé å è½½æ°æ®å°ç½æ ¼
			get_FastQuery(table, option)
			}
			//åå§åè¡¨æ ¼
			function set_InitGrid() {
			$("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd"));
			$.ajax({
			url: GetWEBURL() + '/Pay_PieceRateWageReport/list2',
			type: "GET",
			async: false,
			data: { "sWhere": Format(new Date(), "yyyy-MM-dd")},
			success: function (data1) {
			if (data1.count == 1) {
			columns = data1.data;
			columns.unshift({ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' });
			} else {
			layer.alert(data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, page: true
			, cellMinWidth: 120
			, totalRow: true
			, limit: 500
			, height: 'full-50'
			, cols: [columns]
			, limits: [500, 5000, 20000]
			, done: function (res, curr, count) {

			}
			};
			////è®¾ç½®åå®½
			//var colWidth = getColumnsWidth();
			//if (colWidth == "" \|\| colWidth == []) {

			//}
			//else {
			// $.each(columns, function (x, m) {
			// m["width"] = colWidth[x];
			// });
			//}
			}
			//å è½½ç½æ ¼
			function get_Display(sWhere) {
			var wait = layer.load();//é®ç½©
			$.ajax({
			url: GetWEBURL() + '/Pay_PieceRateWageReport/list',
			type: "GET",
			data: { "sWhere": sWhere},
			success: function (data1) {
			if (data1.count == 1) {
			DataList = data1.data;
			option.data = data1.data;
			table.render(option);
			layer.close(wait);
			} else {
			layer.close(wait);
			layer.alert(data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.close(wait);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}
			//è·ååå®½
			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(200); //é»è®¤å®½åº¦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);
			}
			//å¿«éè¿æ»¤
			function get_FastQuery(table, option) {
			var HBeginDate = $("#HBeginDate").val();//å¼å§æ¥æ
			if (HBeginDate) {
			sWhere = HBeginDate;
			}
			var index = layer.load(0);
			get_Display(sWhere);
			//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			sWhere = "";
			}
			//éç½®è¿æ»¤æ¡ä»¶
			function set_ClearQuery() {
			$('#HStatus').find("option[value='-1']").attr("selected", true);
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
			$("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd"));
			$("#HBillNo").val("");
			$("#HEmpName").val("");
			$("#HMaterNumber").val("");
			$("#HMaterName").val("");
			$("#HSupName").val("");
			$("select[name='HFeedback']").val("");
			sWhere = Format(new Date(), "yyyy-MM-dd");
			get_Display(sWhere);
			}
			//å·æ°
			function set_Refresh() {
			$("#btnSearch").click();
			}
			//ä»¥ä¸æ¯layuiæ¨¡å
			});
			</script>
			</body>
			</html>

New file
			@@ -0,0 +1,351 @@
			ï»¿<!DOCTYPE html>
			<html>
			<head>
			<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
			<title>æåº¦å·¥èµæ¥è¡¨</title>
			<meta name="renderer" content="webkit">
			<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
			<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
			<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
			<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
			<script src="../../../layuiadmin/layui/layui.js"></script>
			<script src="../../../layuiadmin/layui/layui.js"></script>
			<script src="../../../layuiadmin/Scripts/json2.js"></script>
			<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/PubCustom.js"></script>
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
			</head>
			<body>
			<div class="layui-fluid">
			<div class="layui-col-md12">
			<div class="layui-card" style="padding: 1px">
			<div class="layui-card-body" style="padding: 1px;">
			<form class="layui-form" action="" lay-filter="component-form-group">
			<div class="layui-collapse">
			<div class="layui-colla-item">
			<div class="layui-colla-title layui-inline">
			<div class="layui-inline">
			<span>æ´å¤</span>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">æ¥æ</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" id="HBeginDate" style="width:190px;">
			</div>
			</div>
			<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>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>
			</div>
			</div>
			</div>
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>
			</div>
			</script>
			</form>
			</div>
			</div>
			</div>
			</div>
			<script type="text/javascript">
			layui.config({
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			}).extend({
			index: 'lib/index', //ä¸»å¥å£æ¨¡å
			}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
			//#region å¬å±åé
			var $ = layui.$
			, admin = layui.admin
			, layer = layui.layer
			, table = layui.table
			, form = layui.form
			, element = layui.element
			, laypage = layui.laypage
			, laydate = layui.laydate
			, util = layui.util
			//æ¥è¯¢æ¡ä»¶
			var sWhere = "";
			var option = []; var columns = [];
			var Name = "MouldProdInHouseCellWidth";
			//#endregion
			//å¹´æéæ©å¨
			laydate.render({
			elem: '#HBeginDate'
			, type: 'month'
			});
			//#region è¿å¥é¡µé¢æ¢å è½½
			set_ClearBill();
			//#endregion
			//#region ç¹å»äºä»¶åæ¬on formäºä»¶ç
			//å¤´å·¥å·æ äºä»¶
			table.on('toolbar(mainTable)', function (obj) {
			switch (obj.event) {
			//æ°å¢æé®
			case 'btn-Add': set_AddNew();
			break;
			//ç¼è¾æé®
			case 'btn-Edit': set_ShowBill();
			break;
			//å é¤æé®
			case 'btn-Delete': set_DeleteBill();
			break;
			//æµè§
			case 'btn-view': get_ViewReport();
			break;
			//æå°
			case 'btn-print': get_PrintReport();
			break;
			//å·æ°
			case 'get_Refresh': set_Refresh();
			break;

			//éåº
			case 'get_Exit': Pub_Close(2);
			break;
			//åé
			case 'btn-fp': set_Distribut();
			break;
			//åå¸
			case 'btn-fb': set_Release();
			break;
			//ä¼åçº§
			case 'btn-yxj': set_Yxj();
			break;
			case 'btn-back': set_Back();
			break;
			};
			});
			//éç½®æé®
			form.on('submit(btnReSearch)', function (data) {
			set_ClearQuery();
			});
			//æ¥è¯¢æé®
			form.on('submit(btnSearch)', function (data) {
			get_FastQuery(table, option);
			});
			//#endregion
			//#region æ¤é¡µé¢æææ¹æ³
			function set_ClearBill() {
			//åå§åè¡¨æ ¼
			//set_InitGrid();
			$("#HBeginDate").val(Format(new Date(), "yyyy-MM"));
			//ç´æ¥æ§è¡åè¡¨çé å è½½æ°æ®å°ç½æ ¼
			get_FastQuery(table, option)
			}
			//åå§åè¡¨æ ¼
			function set_InitGrid() {
			$.ajax({
			url: GetWEBURL() + '/Pay_MonthlySalaryReport/list2',
			type: "GET",
			async: false,
			data: { "sWhere": $("#HBeginDate").val()},
			success: function (data1) {
			if (data1.count == 1) {
			columns = data1.data;
			columns.unshift({ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' });
			} else {
			layer.alert(data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, page: true
			, cellMinWidth: 120
			, totalRow: true
			, limit: 500
			, height: 'full-50'
			, cols: [columns]
			, limits: [500, 5000, 20000]
			, done: function (res, curr, count) {

			}
			};
			////è®¾ç½®åå®½
			//var colWidth = getColumnsWidth();
			//if (colWidth == "" \|\| colWidth == []) {

			//}
			//else {
			// $.each(columns, function (x, m) {
			// m["width"] = colWidth[x];
			// });
			//}
			}
			//å è½½ç½æ ¼
			function get_Display(sWhere) {
			set_InitGrid();
			var wait = layer.load();//é®ç½©
			$.ajax({
			url: GetWEBURL() + '/Pay_MonthlySalaryReport/list',
			type: "GET",
			data: { "sWhere": sWhere},
			success: function (data1) {
			if (data1.count == 1) {
			DataList = data1.data;
			option.data = data1.data;
			table.render(option);
			layer.close(wait);
			} else {
			layer.close(wait);
			layer.alert(data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.close(wait);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}
			//è·ååå®½
			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(200); //é»è®¤å®½åº¦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);
			}
			//å¿«éè¿æ»¤
			function get_FastQuery(table, option) {
			var HBeginDate = $("#HBeginDate").val();//å¼å§æ¥æ
			if (HBeginDate) {
			sWhere = HBeginDate;
			}
			var index = layer.load(0);
			get_Display(sWhere);
			//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			sWhere = "";
			}
			//éç½®è¿æ»¤æ¡ä»¶
			function set_ClearQuery() {
			$('#HStatus').find("option[value='-1']").attr("selected", true);
			$("#HBeginDate").val(Format(new Date(), "yyyy-MM"));
			$("#HBillNo").val("");
			$("#HEmpName").val("");
			$("#HMaterNumber").val("");
			$("#HMaterName").val("");
			$("#HSupName").val("");
			$("select[name='HFeedback']").val("");
			sWhere = Format(new Date(), "yyyy-MM");
			get_Display(sWhere);
			}
			//å·æ°
			function set_Refresh() {
			$("#btnSearch").click();
			}
			//ä»¥ä¸æ¯layuiæ¨¡å
			});
			</script>
			</body>
			</html>

			@@ -76,8 +76,6 @@
			</div>
			</div>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">éæ°åæ¥</button>-->


			<div class="layui-colla-content">
			<div class="layui-inline">
			<label class="layui-form-label">åæ®å·</label>
			@@ -103,11 +101,11 @@
			</div>
			</div>
			<!--<div class="layui-inline">
			<label class="layui-form-label">åé¦ç¶æ</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HXTFKStatus" id="HXTFKStatus" style="width:190px;">
			</div>
			</div>-->
			<label class="layui-form-label">åé¦ç¶æ</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HXTFKStatus" id="HXTFKStatus" style="width:190px;">
			</div>
			</div>-->
			<div class="layui-inline">
			<label class="layui-form-label">ç©æç¼ç </label>
			<div class="layui-input-block">
			@@ -196,7 +194,7 @@
			, util = layui.util
			//æ¥è¯¢æ¡ä»¶
			var sWhere = "";
			var option = [];
			var option = []; var columns = [];
			var Name = "MouldProdInHouseCellWidth";
			//#endregion

			@@ -298,7 +296,6 @@
			});
			//#endregion


			//#region æ¤é¡µé¢æææ¹æ³
			function set_ClearBill() {
			//åå§åè¡¨æ ¼
			@@ -308,87 +305,103 @@
			//å è½½ä¸å¡å
			get_HEmpName();
			}

			//åå§åè¡¨æ ¼
			function set_InitGrid() {
			$("#HBeginDate").val("2022-03-14");
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
			var columns = [
			{ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' }
			,{ field: 'hmainid', title: 'hmainid', sort: true, hide: true }
			, { field: 'æ¥æ', title: 'æ¥æ', width: 120, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'åæ®å·', title: 'åæ®å·', width: 150 }
			, { field: 'ä¾åºå', title: 'ä¾åºå', width: 150 }
			, { field: 'ä¸å¡å', title: 'ä¸å¡å', width: 100 }
			, { field: 'HBillType', title: 'HBillType', hide: true }
			, { field: 'HSupID', title: 'HSupID', hide: true }
			, { field: 'ä¸å¡ç¶æ', title: 'ä¸å¡ç¶æ', width: 100, hide: true }
			, { field: 'åéç¶æ', title: 'åéç¶æ', width: 100 }
			, { field: 'åå¸ç¶æ', title: 'åå¸ç¶æ', width: 100 }
			, { field: 'ä¾åºåååç¶æ', title: 'ä¾åºåååç¶æ', width: 135 }/ç©æä»£ç ï¼ç©æåç§°ï¼è§æ ¼åå·ï¼æ¹å·ï¼æ°éï¼åä½ï¼æºååå·/
			, { field: 'åé¦ç¶æ', title: 'ä¾åºååé¦ç¶æ', width: 135 }
			, { field: 'ç©æç¼ç ', title: 'ç©æç¼ç ', width: 120 }
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 200 }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 130 }
			, { field: 'æ°é', title: 'è®¢åæ°é', width: 100 }
			, { field: 'æå°æ¡ç æ°é', title: 'æå°æ¡ç æ°é', width: 120 }
			, { field: 'å³èæ°é', title: 'å·²åè´§æ°é', width: 120 }
			, { field: 'æªå³èæ°é', title: 'æªå·²åè´§æ°é', width: 120 }
			, { field: 'å®æç¶æ', title: 'å®æç¶æ', width: 100 }
			, { field: 'HUnitID', title: 'HUnitID', hide: true }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 100 }
			, { field: 'HUnitID', title: 'HUnitID', hide: true }
			, { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ', width: 120 }
			, { field: 'è®¡éåä½', title: 'è®¡éåä½', width: 100 }
			, { field: 'æ¹å·', title: 'æ¹å·', width: 100 }
			, { field: 'æ°é', title: 'æ°é', width: 100 }
			, { field: 'æºååå·', title: 'æºååå·', width: 100 }
			, { field: 'ä¾åºåä»£ç ', title: 'ä¾åºåä»£ç ', width: 120, hide: true}
			, { field: 'ä¸å¡åä»£ç ', title: 'ä¸å¡åä»£ç ', width: 100, hide: true}
			, { field: 'HPriority', title: 'HPriority', width: 100, hide: true }
			, { field: 'ä¼åçº§', title: 'ä¼åçº§', width: 100 }
			, { field: 'äº¤è´§å°ç¹', title: 'äº¤è´§å°ç¹', width: 100}
			, { field: 'HPSStyleID', title: 'HPSStyleID', hide: true }
			, { field: 'éè´æ¹å¼ä»£ç ', title: 'éè´æ¹å¼ä»£ç ', width: 120}
			, { field: 'éè´æ¹å¼', title: 'éè´æ¹å¼', width: 100}
			, { field: 'HSSID', title: 'HSSID', hide: true }
			, { field: 'ç»ç®æ¹å¼ä»£ç ', title: 'ç»ç®æ¹å¼ä»£ç ', width: 120}
			, { field: 'ç»ç®æ¹å¼', title: 'ç»ç®æ¹å¼', width: 100}
			, { field: 'ç»ç®æ¥æ', title: 'ç»ç®æ¥æ', width: 120, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.ç»ç®æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'HCurID', title: 'HCurID', hide: true }
			, { field: 'å¸å«ä»£ç ', title: 'å¸å«ä»£ç ', width: 100}
			, { field: 'å¸å«', title: 'å¸å«', width: 100}
			, { field: 'æ±ç', title: 'æ±ç', width: 100}
			, { field: 'HDeptID', title: 'HDeptID', hide: true }
			, { field: 'é¨é¨ä»£ç ', title: 'é¨é¨ä»£ç ', width: 100}
			, { field: 'é¨é¨', title: 'é¨é¨', width: 100}
			, { field: 'HManagerID', title: 'HManagerID', hide: true }
			, { field: 'ä¸»ç®¡ä»£ç ', title: 'ä¸»ç®¡ä»£ç ', width: 100}
			, { field: 'ä¸»ç®¡', title: 'ä¸»ç®¡', width: 100}
			, { field: 'HEmpID', title: 'HEmpID', hide: true }
			, { field: 'æè¦', title: 'æè¦', width: 100}
			, { field: 'è¡¨å¤´å¤æ³¨', title: 'è¡¨å¤´å¤æ³¨', width: 100}
			, { field: 'hsubid', title: 'hsubid', hide: true }
			, { field: 'HMaterID', title: 'HMaterID', hide: true }
			, { field: 'åä»·', title: 'åä»·', width: 100}
			, { field: 'éé¢', title: 'éé¢', width: 100}
			, { field: 'ç¨ç', title: 'ç¨ç', width: 100}
			, { field: 'ç¨é¢', title: 'ç¨é¢', width: 100}
			, { field: 'ä»·ç¨åè®¡', title: 'ä»·ç¨åè®¡', width: 100}
			, { field: 'äº¤è´§æ¥æ', title: 'äº¤è´§æ¥æ', width: 120, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.äº¤è´§æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'è®¡åè·è¸ªå·', title: 'è®¡åè·è¸ªå·', width: 100}
			, { field: 'è¡¨ä½å¤æ³¨', title: 'è¡¨ä½å¤æ³¨', width: 100}
			, { field: 'å¶åäºº', title: 'å¶åäºº', width: 100}
			, { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ', width: 120, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.å¶åæ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'å®¡æ ¸äºº', title: 'å®¡æ ¸äºº', width: 100}
			, { field: 'å®¡æ ¸æ¥æ', title: 'å®¡æ ¸æ¥æ', width: 120, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.å®¡æ ¸æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'ä¿®æ¹äºº', title: 'ä¿®æ¹äºº', width: 100}
			, { field: 'ä¿®æ¹æ¥æ', title: 'ä¿®æ¹æ¥æ', width: 120, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.ä¿®æ¹æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'å³éäºº', title: 'å³éäºº', width: 100}
			, { field: 'å³éæ¥æ', title: 'å³éæ¥æ', width: 120, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.å³éæ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'ä½åºäºº', title: 'ä½åºäºº', width: 100}
			, { field: 'ä½åºæ¥æ', title: 'ä½åºæ¥æ', width: 120, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.ä½åºæ¥æ, 'yyyy-MM-dd')}}</div>" }

			];
			//columns = [
			// { type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' }
			// ,{ field: 'hmainid', title: 'hmainid', sort: true, hide: true }
			// , { field: 'æ¥æ', title: 'æ¥æ', width: 120, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
			// , { field: 'åæ®å·', title: 'åæ®å·', width: 150 }
			// , { field: 'ä¾åºå', title: 'ä¾åºå', width: 150 }
			// , { field: 'ä¸å¡å', title: 'ä¸å¡å', width: 100 }
			// , { field: 'HBillType', title: 'HBillType', hide: true }
			// , { field: 'HSupID', title: 'HSupID', hide: true }
			// , { field: 'ä¸å¡ç¶æ', title: 'ä¸å¡ç¶æ', width: 100, hide: true }
			// , { field: 'åéç¶æ', title: 'åéç¶æ', width: 100 }
			// , { field: 'åå¸ç¶æ', title: 'åå¸ç¶æ', width: 100 }
			// , { field: 'ä¾åºåååç¶æ', title: 'ä¾åºåååç¶æ', width: 135 }/ç©æä»£ç ï¼ç©æåç§°ï¼è§æ ¼åå·ï¼æ¹å·ï¼æ°éï¼åä½ï¼æºååå·/
			// , { field: 'åé¦ç¶æ', title: 'ä¾åºååé¦ç¶æ', width: 135 }
			// , { field: 'ç©æç¼ç ', title: 'ç©æç¼ç ', width: 120 }
			// , { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 200 }
			// , { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 130 }
			// , { field: 'æ°é', title: 'è®¢åæ°é', width: 100 }
			// , { field: 'æå°æ¡ç æ°é', title: 'æå°æ¡ç æ°é', width: 120 }
			// , { field: 'å³èæ°é', title: 'å·²åè´§æ°é', width: 120 }
			// , { field: 'æªå³èæ°é', title: 'æªå·²åè´§æ°é', width: 120 }
			// , { field: 'å®æç¶æ', title: 'å®æç¶æ', width: 100 }
			// , { field: 'HUnitID', title: 'HUnitID', hide: true }
			// , { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 100 }
			// , { field: 'HUnitID', title: 'HUnitID', hide: true }
			// , { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ', width: 120 }
			// , { field: 'è®¡éåä½', title: 'è®¡éåä½', width: 100 }
			// , { field: 'æ¹å·', title: 'æ¹å·', width: 100 }
			// , { field: 'æ°é', title: 'æ°é', width: 100 }
			// , { field: 'æºååå·', title: 'æºååå·', width: 100 }
			// , { field: 'ä¾åºåä»£ç ', title: 'ä¾åºåä»£ç ', width: 120, hide: true}
			// , { field: 'ä¸å¡åä»£ç ', title: 'ä¸å¡åä»£ç ', width: 100, hide: true}
			// , { field: 'HPriority', title: 'HPriority', width: 100, hide: true }
			// , { field: 'ä¼åçº§', title: 'ä¼åçº§', width: 100 }
			// , { field: 'äº¤è´§å°ç¹', title: 'äº¤è´§å°ç¹', width: 100}
			// , { field: 'HPSStyleID', title: 'HPSStyleID', hide: true }
			// , { field: 'éè´æ¹å¼ä»£ç ', title: 'éè´æ¹å¼ä»£ç ', width: 120}
			// , { field: 'éè´æ¹å¼', title: 'éè´æ¹å¼', width: 100}
			// , { field: 'HSSID', title: 'HSSID', hide: true }
			// , { field: 'ç»ç®æ¹å¼ä»£ç ', title: 'ç»ç®æ¹å¼ä»£ç ', width: 120}
			// , { field: 'ç»ç®æ¹å¼', title: 'ç»ç®æ¹å¼', width: 100}
			// , { field: 'ç»ç®æ¥æ', title: 'ç»ç®æ¥æ', width: 120, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.ç»ç®æ¥æ, 'yyyy-MM-dd')}}</div>" }
			// , { field: 'HCurID', title: 'HCurID', hide: true }
			// , { field: 'å¸å«ä»£ç ', title: 'å¸å«ä»£ç ', width: 100}
			// , { field: 'å¸å«', title: 'å¸å«', width: 100}
			// , { field: 'æ±ç', title: 'æ±ç', width: 100}
			// , { field: 'HDeptID', title: 'HDeptID', hide: true }
			// , { field: 'é¨é¨ä»£ç ', title: 'é¨é¨ä»£ç ', width: 100}
			// , { field: 'é¨é¨', title: 'é¨é¨', width: 100}
			// , { field: 'HManagerID', title: 'HManagerID', hide: true }
			// , { field: 'ä¸»ç®¡ä»£ç ', title: 'ä¸»ç®¡ä»£ç ', width: 100}
			// , { field: 'ä¸»ç®¡', title: 'ä¸»ç®¡', width: 100}
			// , { field: 'HEmpID', title: 'HEmpID', hide: true }
			// , { field: 'æè¦', title: 'æè¦', width: 100}
			// , { field: 'è¡¨å¤´å¤æ³¨', title: 'è¡¨å¤´å¤æ³¨', width: 100}
			// , { field: 'hsubid', title: 'hsubid', hide: true }
			// , { field: 'HMaterID', title: 'HMaterID', hide: true }
			// , { field: 'åä»·', title: 'åä»·', width: 100}
			// , { field: 'éé¢', title: 'éé¢', width: 100}
			// , { field: 'ç¨ç', title: 'ç¨ç', width: 100}
			// , { field: 'ç¨é¢', title: 'ç¨é¢', width: 100}
			// , { field: 'ä»·ç¨åè®¡', title: 'ä»·ç¨åè®¡', width: 100}
			// , { field: 'äº¤è´§æ¥æ', title: 'äº¤è´§æ¥æ', width: 120, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.äº¤è´§æ¥æ, 'yyyy-MM-dd')}}</div>" }
			// , { field: 'è®¡åè·è¸ªå·', title: 'è®¡åè·è¸ªå·', width: 100}
			// , { field: 'è¡¨ä½å¤æ³¨', title: 'è¡¨ä½å¤æ³¨', width: 100}
			// , { field: 'å¶åäºº', title: 'å¶åäºº', width: 100}
			// , { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ', width: 120, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.å¶åæ¥æ, 'yyyy-MM-dd')}}</div>" }
			// , { field: 'å®¡æ ¸äºº', title: 'å®¡æ ¸äºº', width: 100}
			// , { field: 'å®¡æ ¸æ¥æ', title: 'å®¡æ ¸æ¥æ', width: 120, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.å®¡æ ¸æ¥æ, 'yyyy-MM-dd')}}</div>" }
			// , { field: 'ä¿®æ¹äºº', title: 'ä¿®æ¹äºº', width: 100}
			// , { field: 'ä¿®æ¹æ¥æ', title: 'ä¿®æ¹æ¥æ', width: 120, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.ä¿®æ¹æ¥æ, 'yyyy-MM-dd')}}</div>" }
			// , { field: 'å³éäºº', title: 'å³éäºº', width: 100}
			// , { field: 'å³éæ¥æ', title: 'å³éæ¥æ', width: 120, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.å³éæ¥æ, 'yyyy-MM-dd')}}</div>" }
			// , { field: 'ä½åºäºº', title: 'ä½åºäºº', width: 100}
			// , { field: 'ä½åºæ¥æ', title: 'ä½åºæ¥æ', width: 120, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.ä½åºæ¥æ, 'yyyy-MM-dd')}}</div>" }
			//];
			$.ajax({
			url: GetWEBURL() + '/Cg_POOrderBill/list2',
			type: "GET",
			async: false,
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.count == 1) {
			columns = data1.data;
			columns.unshift({ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' });
			} else {
			layer.alert(data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			@@ -414,6 +427,7 @@
			// });
			//}
			}

			//å è½½ç½æ ¼
			function get_Display(sWhere) {
			var wait = layer.load();//é®ç½©
			@@ -536,7 +550,7 @@
			, title: 'æå°æ¨¡çéæ©'
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: false //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, 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
			})
			@@ -1005,8 +1019,8 @@

			//å¿«éè¿æ»¤
			function get_FastQuery(table, option) {
			var HStatus = $("select[name='HStatus']").val();//
			var HStatus2 = $("select[name='HStatus2']").val();//
			var HStatus = $("select[name='HStatus']").val();//
			var HStatus2 = $("select[name='HStatus2']").val();//
			var HBeginDate = $("#HBeginDate").val();//å¼å§æ¥æ
			var HEndDate = $("#HEndDate").val();//ç»ææ¥æ
			var HBillNo = $("#HBillNo").val(); //åæ®å·