MES-WEB-LayUI.git

parent: 5257299c | 补丁 | 提交 | ignore whitespace

wtt

1 天以前 86a60ffd1bb3a6c748a88fbe6241266f1b43052a

添加添康阶梯工资报表，阶梯工价系数调整

4个文件已修改

	WebTM/views/工资管理/工资报表/Pay_PaymentEntryReport.html	300 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/工资管理/阶梯工价系数/Gy_SteppedPriceCoefficientBillList.html	76 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/生产管理/报工台工序/不良采集/Sc_QualityReportStepBillList.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillSync.html	56 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

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

@@ -13,7 +13,9 @@
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/ext/soulTable.css" media="all">
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/SetColumn.js"></script>
</head>
<body>
    <div class="layui-fluid">
@@ -74,15 +76,39 @@
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>
                            </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="btn-reload"><i class="layui-icon layui-icon-refresh"></i>å·æ°</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>å¯¼åº</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>éåº</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>

                        <div class="layui-tab layui-tab-card" lay-filter="table">
                            <ul class="layui-tab-title">
                                <li class="layui-this">è®¡ä»¶æ°æ®</li>
                                <li>é¶æ¢¯è®¡ä»¶æ°æ®</li>
                            </ul>
                            <div class="layui-tab-content" style="">
                                <div class="layui-tab-item layui-show">
                                    <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="btn-reload"><i class="layui-icon layui-icon-refresh"></i>å·æ°</button>
                                            <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>å¯¼åº</button>
                                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>éåº</button>
                                            <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
                                        </div>
                                    </script>
                                </div>
                                <div class="layui-tab-item ">
                                    <table class="" id="mainTable2" lay-filter="mainTable2"></table>
                                    <script type="text/html" id="toolbarDemo2">
                                        <div class="layui-btn-container">
                                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload2"><i class="layui-icon layui-icon-refresh"></i>å·æ°</button>
                                            <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export2" id="get_export"><i class="layui-icon layui-icon-export"></i>å¯¼åº</button>
                                            <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn2"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
                                        </div>
                                    </script>
                                </div>
                                
                            </div>
                        </script>
                        </div>

                       
                    </form>
                </div>
            </div>
@@ -108,7 +134,9 @@
            var ins;
            var sWhere = "";
            var option = [];
            var option2 = [];
            var HModName = "Pay_PaymentEntryReport";
            var HModName2 = "Pay_PaymentEntryReport2";
            var titleData = [];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
            

@@ -122,14 +150,16 @@

            //æ¥è¯¢æé®
            form.on('submit(btnSearch)', function (data) {
                get_FastQuery();
                get_FastQuery(1);
                get_FastQuery(2);
            });

            //éç½®æé®
            form.on('submit(btnReSearch)', function (data) {
                //æ¸ç©ºè¿æ»¤æ¡ä»¶
                set_ClearQuery();
                get_FastQuery();
                get_FastQuery(1);
                get_FastQuery(2);
            });

            //#region éæ©çç»æé®
@@ -146,18 +176,38 @@

            //#region å¤´å·¥å·æ äºä»¶
            table.on('toolbar(mainTable)', function (obj) {
                var checkStatus = table.checkStatus(obj.config.id);//è·åéä¸è¡ æ°æ®
                switch (obj.event) {
                    //åè®¾ç½®
                    case 'set_HideColumn':
                        get_HideColumn();
                        get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
                        break;
                    case 'btn-reload':
                        get_FastQuery();
                        get_FastQuery(1);
                        break;
                    //å¯¼åºexcel
                    case 'get_export':
                        get_Export();
                        break;
                    //éåº
                    case 'btn-exit': Pub_Close(2);
                        break;
                    default:
                        break;
                }
            });

            table.on('toolbar(mainTable2)', function (obj) {
                switch (obj.event) {
                    //åè®¾ç½®
                    case 'set_HideColumn2':
                        get_HideColumnNoPage(HModName2, sessionStorage["HUserName"], option2, get_FastQuery);
                        break;
                    case 'btn-reload2':
                        get_FastQuery(2);
                        break;
                    //å¯¼åºexcel
                    case 'get_export2':
                        get_Export2();
                        break;
                    //éåº
                    case 'btn-exit': Pub_Close(2);
@@ -178,10 +228,11 @@
                get_Dept();
                //åå§åè¡¨æ ¼
                set_InitGrid();
                $("#HBDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HBDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 7), "yyyy-MM-dd"));
                $("#HEDate").val(Format(new Date(), "yyyy-MM-dd"));
                //æ¥è¯¢
                get_FastQuery(1);
                get_FastQuery(2);
            }
            //#endregion

@@ -189,6 +240,20 @@
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , height: 'full-80'
                    , page: true
                    , cellMinWidth: 90
                    , totalRow: true
                    , limit: 500
                    , limits: [50, 500, 5000, 20000]
                    , done: function (res, curr, count) {
                        soulTable.render(this);
                    }
                    , cols: [[]]
                };
                option2 = {
                    elem: '#mainTable2'
                    , toolbar: '#toolbarDemo2'
                    , height: 'full-80'
                    , page: true
                    , cellMinWidth: 90
@@ -294,10 +359,11 @@
                            
                            option.cols = [col]
                            option.data = data1.data;
                            table.render(option);
                            
                            layer.close(ajaxLoad);

                            DisPlay_HideColumn();
                            DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, []);
                            table.render(option);
                            //layer.alert("æ¥è¯¢æå", { icon: 1 });
                        } else {
                            layer.close(ajaxLoad);
@@ -309,17 +375,83 @@
                    }
                });
            }

            function get_Display2(sWhere) {
                var ajaxLoad = layer.load();

                var sql = "exec h_p_Pay_PaymentEntryReportStepped " + sWhere;

                $.ajax({
                    url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
                    type: "GET",
                    async: false,
                    data: { "sWhere": sql },
                    success: function (data1) {
                        if (data1.count == 1) {
                            var data = [];//ååæ®µæ°æ®
                            var col = [];
                            var totalArray = [];
                            var titleData = [];
                            //ç»ç©ºçæ°ç»èµå¼
                            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', totalRowText: 'åè®¡' });
                            for (var i = 0; i < data.length; i++) {//éådataæ°ç»éçæ°æ®
                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                                if ($.inArray(data[i].name, titleData) > -1) {//æ£æ¥dataãiã.nameæ¯å¦å¨æ°ç»ä¸  //è®¡ç®å
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true, filter: 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, filter: true });
                                } else if (isValidDate(data[i].name)) {
                                    col.push({ field: data[i].name, title: Format(data[i].name, 'MM-dd'), width: 70, totalRow: true, filter: true })
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, filter: true, templet: "<div>{{d." + (data[i].name == "è¡å³éæ¥æ" ? "è¡å³éäºº" : data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, filter: true });
                                    }
                                }
                            }
                            option2.cols = [col];
                            option2.data = data1.data;
                            //åè®¾ç½®
                            DisPlay_HideColumn(HModName2, sessionStorage["HUserName"], option2, []);
                            table.render(option2);
                            layer.close(ajaxLoad);
                        } else {
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                            layer.close(ajaxLoad);
                        }
                    }, error: function () {
                        layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                        layer.close(ajaxLoad);
                    }
                });
            }

            //#endregion

            //#region å¿«éè¿æ»¤
            function get_FastQuery() {
            function get_FastQuery(type) {
                var HBDate = $("#HBDate").val();//å¼å§æ¶é´
                var HEDate = $("#HEDate").val();//ç»ææ¶é´
                var HDeptID = $("#HDeptID").val();
                var HEmpID = $("#HEmpID").val();
                var HGroupID = $("#HGroupID").val();
                sWhere = "'" + HBDate + "','" + HEDate + "','" + HDeptID + "','" + HGroupID + "','" + HEmpID + "'";
                get_Display(sWhere);
                if (type == 1) {
                    get_Display(sWhere);
                } else {
                    get_Display2(sWhere);
                }
                
                sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
            }
            //#endregion
@@ -387,7 +519,7 @@
                                    }
                                }
                            });
                            table.exportFile(ins.config.id, option.data, "xls");
                            table.exportFile("mainTable", option.data, "xls");
                        } else {
                            layer.alert("å½åæ¨¡åæ²¡æå¯¼åºæé!", { icon: 5 });
                        }
@@ -396,6 +528,38 @@
                    }
                });
            }
            function get_Export2() {
                var ModRightNameCheck = "Pay_PaymentEntryReportExcel";

                //é»è¾å®¡æ ¸æ¹æ³
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
                    data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        if (result.count == 1) {
                            var data = option2.data
                            data.forEach((item) => {
                                for (let itemobj in item) {
                                    if (item[itemobj] == null) {
                                        item[itemobj] = "";
                                    }
                                    if (item[itemobj].length > 0) {  // åè®¾åæ®µåä¸ºfield
                                        item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, '');  // å°æ¢è¡ç¬¦æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
                                        item[itemobj] = item[itemobj].toString().replace(/,/g, '');  // å°æ¢è¡ç¬¦æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
                                    }
                                }
                            });
                            table.exportFile("mainTable2", option2.data, "xls");
                        } else {
                            layer.alert("å½åæ¨¡åæ²¡æå¯¼åºæé!", { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                    }
                });
            }

            //#endregion

            //#region éæ©çç»
@@ -459,103 +623,7 @@
            }
            //#endregion

            //#region æ¾ç¤ºåæ°æ®
            function DisPlay_HideColumn() {
                $.ajax({
                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
                    type: "GET",
                    async: false,
                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.data.length != 0) {

                            var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
                            var newCols = [[]];//å¯¹åºæ°æ®åºåé¡ºåºcol
                            newCols[0].push(option.cols[0][0]);//æ¾å¥ç¬¬ä¸ä¸ªcheckbox
                            dataCol = data1.data[0].HGridString.split(',');
                            //åè®¾ç½®åæ°ä¸é¡µé¢åæ°æ¯å¦ä¸è´
                            if (dataCol.length == option.cols[0].length - 1) {
                                //éåå¯»æ¾åè®¾ç½®å¯¹åºåæé¡ºåºæå¥
                                for (var j = 0; j < option.cols[0].length - 1; j++) {
                                    for (var i = 0; i < option.cols[0].length - 1; i++) {
                                        var dataCols = dataCol[j].split('|');
                                        //éæ©ä¸datacolsç¸åºåè¿è¡ä¿®æ¹
                                        if (option.cols[0][i + 1]["field"] == dataCols[5]) {
                                            //éèå
                                            if (dataCols[1] == 1) {
                                                option.cols[0][i + 1]["hide"] = true;
                                            }
                                            //è®¾ç½®åå®½
                                            if (dataCols[3] > 0) {
                                                option.cols[0][i + 1]["width"] = dataCols[3];
                                            }
                                            //è®¾ç½®åå®¹åä½å¤§å°
                                            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[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
                                                option.cols[0][i + 1]["hide"] = false;
                                            }
                                            //ç»è®¡å
                                            if (dataCols[6] == 1) {
                                                option.cols[0][i + 1]["totalRow"] = true;
                                            }
                                            //åä½æå¨ä½ç½®(å·¦ å±ä¸ å³)
                                            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];
                                            }
                                            newCols[0].push(option.cols[0][i + 1]);
                                        }
                                    }
                                }
                                //éåå¾ªç¯åå¤æå¯¹åºåæ°æ¯å¦ä¸è´
                                if (dataCol.length == newCols[0].length - 1) {
                                    option.cols = newCols;
                                    //åæ¶å»ç»å
                                    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";
                                        }
                                    }
                                }
                            }
                            ins = table.render(option);
                        } else {
                            ins = table.render(option);
                        }
                    }, error: function () {
                        layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                    }
                })
            }
            //#endregion
            

            //#region ç¹å»è¡éä¸é«äº®
            //table.on('row(mainTable)', function (obj) {

 WebTM/views/¹¤×Ê¹ÜÀí/½×ÌÝ¹¤¼ÛÏµÊý/Gy_SteppedPriceCoefficientBillList.html

@@ -57,7 +57,7 @@
                                    </div>
                                </div>
                                <!-- å¶åæ¥æï¼åå»ºæ¶é´ï¼è¿æ»¤ -->
                                <div class="layui-inline">
                                <!--<div class="layui-inline">
                                    <label class="layui-form-label">å¼å§æ¥æ</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input ForFilteringSchemes" id="HMakeDate_Begin" style="width:190px;">
@@ -68,7 +68,7 @@
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input ForFilteringSchemes" id="HMakeDate_End" style="width:190px;">
                                    </div>
                                </div>
                                </div>-->
                                <!-- åæ®å·æ¥è¯¢ -->
                                <div class="layui-inline">
                                    <label class="layui-form-label">åæ®å·</label>
@@ -222,11 +222,7 @@
            console.log("GetWEBURL:", typeof GetWEBURL);

            var HModName = "Gy_SteppedPriceCoefficientBillList";
<<<<<<< HEAD
            var HBillType = "";
=======
            var HBillType = "3341";
>>>>>>> 2ed130171719a0848e8356d28055eb1bdf649d01
            var HMaker = sessionStorage["HUserName"];
            var Organization = sessionStorage["Organization"];

@@ -291,10 +287,10 @@
                    case 'btn_Refresh': btn_Refresh();
                        break;
                    //å³é
                    case 'btn_Close': set_CloseBill(1);
                    case 'btn_Close': set_CloseBill(0);
                        break;
                    //åå³é
                    case 'btn_DeClose': set_CloseBill(2);
                    case 'btn_DeClose': set_CloseBill(1);
                        break;
                    //ä½åº
                    case 'btn_Drop': set_DropBill(1);
@@ -372,18 +368,16 @@
                var endDate = new Date();
                var startDate = new Date(endDate - 1000 * 60 * 60 * 24 * 30);

                if (typeof Pub_Format === 'function') {
                    console.log("ä½¿ç¨ Pub_Format å½æ°");
                    $("#HMakeDate_Begin").val(Pub_Format(startDate, "yyyy-MM-dd"));
                    $("#HMakeDate_End").val(Pub_Format(endDate, "yyyy-MM-dd"));
                } else {
                    console.log("Pub_Format ä¸åå¨ï¼ä½¿ç¨åçæ¹æ³");
                    $("#HMakeDate_Begin").val(startDate.toISOString().split('T')[0]);
                    $("#HMakeDate_End").val(endDate.toISOString().split('T')[0]);
                }
                //if (typeof Pub_Format === 'function') {
                //    console.log("ä½¿ç¨ Pub_Format å½æ°");
                //    $("#HMakeDate_Begin").val(Pub_Format(startDate, "yyyy-MM-dd"));
                //    $("#HMakeDate_End").val(Pub_Format(endDate, "yyyy-MM-dd"));
                //} else {
                //    console.log("Pub_Format ä¸åå¨ï¼ä½¿ç¨åçæ¹æ³");
                //    $("#HMakeDate_Begin").val(startDate.toISOString().split('T')[0]);
                //    $("#HMakeDate_End").val(endDate.toISOString().split('T')[0]);
                //}

                console.log("å¼å§æ¥æå¼:", $("#HMakeDate_Begin").val());
                console.log("ç»ææ¥æå¼:", $("#HMakeDate_End").val());

                option = {
                    elem: '#mainTable'
@@ -490,6 +484,7 @@

                        } else {
                            layer.close(wait);
                            option.data = data1.data;
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }

@@ -506,8 +501,8 @@

            //å¿«éè¿æ»¤
            function get_FastQuery() {
                var HMakeDate_Begin = $("#HMakeDate_Begin").val();
                var HMakeDate_End = $("#HMakeDate_End").val();
                //var HMakeDate_Begin = $("#HMakeDate_Begin").val();
                //var HMakeDate_End = $("#HMakeDate_End").val();
                var HBillNo = $("#HBillNo").val();
                var ColName = $("#ColName").val();
                var Comparator = $("#Comparator").val();
@@ -587,12 +582,12 @@
                }

                // æ·»å æ¥ææ¡ä»¶
                if (HMakeDate_Begin) {
                    sWhere += " and CONVERT(date, åæ®æ¥æ) >= '" + HMakeDate_Begin + "'";
                }
                if (HMakeDate_End) {
                    sWhere += " and CONVERT(date, åæ®æ¥æ) <= '" + HMakeDate_End + "'";
                }
                //if (HMakeDate_Begin) {
                //    sWhere += " and CONVERT(date, åæ®æ¥æ) >= '" + HMakeDate_Begin + "'";
                //}
                //if (HMakeDate_End) {
                //    sWhere += " and CONVERT(date, åæ®æ¥æ) <= '" + HMakeDate_End + "'";
                //}
                if (HBillNo) {
                    sWhere += " and åæ®å· like '%" + HBillNo + "%'";
                }
@@ -820,6 +815,33 @@
                    data = checkStatus.data;
                if (data && data.length === 1) {
                    // å®ç°å³éé»è¾
                    var HInterID = data[0].HInterID || data[0].hmainid;
                    if (!HInterID) {
                        layer.msg('åæ®IDæ æï¼', { icon: 5 });
                        return;
                    }
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/Gy_SteppedPriceCoefficientBill/CloseGy_SteppedPriceCoefficientBill",
                        async: false,
                        data: {
                            "HInterID": HInterID,
                            "IsAudit": num,
                            "user": HMaker
                        },
                        success: function (result) {
                            if (result.code === "1") {
                                layer.msg(result.Message || (num === 1 ? "å³éæå" : "åå³éæå"), { time: 1000, icon: 1 }, function () {
                                    $("#btnSearch").trigger('click');
                                });
                            } else {
                                layer.msg(result.Message || "æä½å¤±è´¥", { icon: 2 });
                            }
                        },
                        error: function () {
                            layer.msg('æ¥å£è¯·æ±å¤±è´¥ï¼', { icon: 5 });
                        }
                    });
                } else {
                    layer.msg('è¯·éæ©ä¸è¡æ°æ®ï¼');
                }

 WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/²»Á¼²É¼¯/Sc_QualityReportStepBillList.html

@@ -597,7 +597,7 @@
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var linterid = data[0];
                    var linterid = data[0].hmainid;
                    //if (AllowLoadData(sSubStr) != false) {//éç©ºéªè¯
                    layer.open({
                        type: 2

 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBillSync.html

@@ -9,11 +9,16 @@
    <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/zgqCustom/zgqCustom.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/zgqCustom/zgqCustom.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/soulTable.slim.js"></script>
    <script src="../../../layuiadmin/SetColumn.js"></script>
    <script src="../../../layuiadmin/soulTable.slim.js"></script>
    <script src="../../../layuiadmin/PageTitle.js"></script>
    <script src="../../../layuiadmin/modules//tableFilter2.js"></script>
    <script src="../../../layuiadmin/MESLanguage.js"></script>
</head>
<body>
    <div class="layui-fluid">
@@ -229,6 +234,8 @@
                };
                set_ClearQuery();
                get_FastQuery();
                //åå§åèªå¨åæ¥ä¸æ¬¡
                get_InSync_Batch2(option.data);
            }


@@ -338,6 +345,7 @@
                $.ajax({
                    url: GetWEBURL() + '/Cj_StationOutBill/get_Display',
                    type: "GET",
                    async: false,
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "HBillSubType": "3791" },
                    success: function (data1) {
                        if (data1.count == 0) {
@@ -375,8 +383,9 @@
                            }
                            option.cols = [col];
                            option.data = data1.data;
                           
                            //åè®¾ç½®
                            DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option);
                            DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option,[]);
                        }
                        table.render(option);
                        layer.close(wait);
@@ -432,6 +441,47 @@
                    layer.msg('è¯·éæ©è³å°ä¸è¡æ°æ®ï¼');
                }
            }
            //æ¹éåæ¥
            function get_InSync_Batch2(data) {
                if (data.length == 0) {
                    return;
                } 
                if (data.length > 0) {
                    var InterID = '';
                    var BillNo = '';
                    syncMessage = [];
                    for (var i = 0; i < data.length; i++) {
                        InterID = (data[i].hmainid.toString());
                        BillNo = (data[i].åæ®å·.toString());
                        $.ajax({
                            type: "GET",
                            url: GetWEBURL() + "/Cj_StationOutBill/set_SaveStationOutBill_CLD_Json", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
                            async: true,
                            data: { "HInterID": InterID, "HBillNo": BillNo, "HMaker": sessionStorage["HUserName"] },
                            dataType: "json",
                            success: function (data1) {
                                if (data1.count == 1) { // è¯´æéªè¯æåäºï¼
                                    layer.msg(data1.Message, { time: 1 * 1000, icon: 1 }, function () {
                                        var index = parent.layer.getFrameIndex(window.name); //åå¾å°å½åiframeå±çç´¢å¼
                                        parent.layer.close(index); //åæ§è¡å³é Â  Â  Â  Â  Â Â  Â Â Â  Â 
                                    });
                                }
                                else {
                                    let errMessage = [];
                                    errMessage.push(data1.Message);
                                    syncMessage.push(errMessage);
                                    layer.alert(data1.Message, { icon: 5 });

                                }
                            },
                            error: function (err) {
                                layer.alert(err.Message, { icon: 5 });
                            }
                        });
                    }
                }
                
            }
            //åæ¥
            function get_InSync() {
                var checkStatus = table.checkStatus('mainTable')

			@@ -13,7 +13,9 @@
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
			<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
			<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
			<link rel="stylesheet" href="../../../layuiadmin/ext/soulTable.css" media="all">
			<script src="../../../layuiadmin/layui/layui.js"></script>
			<script src="../../../layuiadmin/SetColumn.js"></script>
			</head>
			<body>
			<div class="layui-fluid">
			@@ -74,15 +76,39 @@
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>
			</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="btn-reload"><i class="layui-icon layui-icon-refresh"></i>å·æ°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>å¯¼åº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>éåº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>

			<div class="layui-tab layui-tab-card" lay-filter="table">
			<ul class="layui-tab-title">
			<li class="layui-this">è®¡ä»¶æ°æ®</li>
			<li>é¶æ¢¯è®¡ä»¶æ°æ®</li>
			</ul>
			<div class="layui-tab-content" style="">
			<div class="layui-tab-item layui-show">
			<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="btn-reload"><i class="layui-icon layui-icon-refresh"></i>å·æ°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>å¯¼åº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>éåº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			</div>
			</script>
			</div>
			<div class="layui-tab-item ">
			<table class="" id="mainTable2" lay-filter="mainTable2"></table>
			<script type="text/html" id="toolbarDemo2">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload2"><i class="layui-icon layui-icon-refresh"></i>å·æ°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_export2" id="get_export"><i class="layui-icon layui-icon-export"></i>å¯¼åº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn2"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			</div>
			</script>
			</div>

			</div>
			</script>
			</div>


			</form>
			</div>
			</div>
			@@ -108,7 +134,9 @@
			var ins;
			var sWhere = "";
			var option = [];
			var option2 = [];
			var HModName = "Pay_PaymentEntryReport";
			var HModName2 = "Pay_PaymentEntryReport2";
			var titleData = [];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±


			@@ -122,14 +150,16 @@

			//æ¥è¯¢æé®
			form.on('submit(btnSearch)', function (data) {
			get_FastQuery();
			get_FastQuery(1);
			get_FastQuery(2);
			});

			//éç½®æé®
			form.on('submit(btnReSearch)', function (data) {
			//æ¸ç©ºè¿æ»¤æ¡ä»¶
			set_ClearQuery();
			get_FastQuery();
			get_FastQuery(1);
			get_FastQuery(2);
			});

			//#region éæ©çç»æé®
			@@ -146,18 +176,38 @@

			//#region å¤´å·¥å·æ äºä»¶
			table.on('toolbar(mainTable)', function (obj) {
			var checkStatus = table.checkStatus(obj.config.id);//è·åéä¸è¡ æ°æ®
			switch (obj.event) {
			//åè®¾ç½®
			case 'set_HideColumn':
			get_HideColumn();
			get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
			break;
			case 'btn-reload':
			get_FastQuery();
			get_FastQuery(1);
			break;
			//å¯¼åºexcel
			case 'get_export':
			get_Export();
			break;
			//éåº
			case 'btn-exit': Pub_Close(2);
			break;
			default:
			break;
			}
			});

			table.on('toolbar(mainTable2)', function (obj) {
			switch (obj.event) {
			//åè®¾ç½®
			case 'set_HideColumn2':
			get_HideColumnNoPage(HModName2, sessionStorage["HUserName"], option2, get_FastQuery);
			break;
			case 'btn-reload2':
			get_FastQuery(2);
			break;
			//å¯¼åºexcel
			case 'get_export2':
			get_Export2();
			break;
			//éåº
			case 'btn-exit': Pub_Close(2);
			@@ -178,10 +228,11 @@
			get_Dept();
			//åå§åè¡¨æ ¼
			set_InitGrid();
			$("#HBDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
			$("#HBDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 7), "yyyy-MM-dd"));
			$("#HEDate").val(Format(new Date(), "yyyy-MM-dd"));
			//æ¥è¯¢
			get_FastQuery(1);
			get_FastQuery(2);
			}
			//#endregion

			@@ -189,6 +240,20 @@
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, height: 'full-80'
			, page: true
			, cellMinWidth: 90
			, totalRow: true
			, limit: 500
			, limits: [50, 500, 5000, 20000]
			, done: function (res, curr, count) {
			soulTable.render(this);
			}
			, cols: [[]]
			};
			option2 = {
			elem: '#mainTable2'
			, toolbar: '#toolbarDemo2'
			, height: 'full-80'
			, page: true
			, cellMinWidth: 90
			@@ -294,10 +359,11 @@

			option.cols = [col]
			option.data = data1.data;
			table.render(option);

			layer.close(ajaxLoad);

			DisPlay_HideColumn();
			DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, []);
			table.render(option);
			//layer.alert("æ¥è¯¢æå", { icon: 1 });
			} else {
			layer.close(ajaxLoad);
			@@ -309,17 +375,83 @@
			}
			});
			}

			function get_Display2(sWhere) {
			var ajaxLoad = layer.load();

			var sql = "exec h_p_Pay_PaymentEntryReportStepped " + sWhere;

			$.ajax({
			url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
			type: "GET",
			async: false,
			data: { "sWhere": sql },
			success: function (data1) {
			if (data1.count == 1) {
			var data = [];//ååæ®µæ°æ®
			var col = [];
			var totalArray = [];
			var titleData = [];
			//ç»ç©ºçæ°ç»èµå¼
			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', totalRowText: 'åè®¡' });
			for (var i = 0; i < data.length; i++) {//éådataæ°ç»éçæ°æ®
			// if (data[i].name == 'HInterID' \|\| data[i].name == 'HBillType' \|\| data[i].name == 'hmainid') {
			if ($.inArray(data[i].name, titleData) > -1) {//æ£æ¥dataãiã.nameæ¯å¦å¨æ°ç»ä¸ //è®¡ç®å
			col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true, filter: 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, filter: true });
			} else if (isValidDate(data[i].name)) {
			col.push({ field: data[i].name, title: Format(data[i].name, 'MM-dd'), width: 70, totalRow: true, filter: true })
			}
			else {
			switch (data[i].Type) {
			//int
			case 'DateTime':
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, filter: true, templet: "<div>{{d." + (data[i].name == "è¡å³éæ¥æ" ? "è¡å³éäºº" : data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
			break;
			default:
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, filter: true });
			}
			}
			}
			option2.cols = [col];
			option2.data = data1.data;
			//åè®¾ç½®
			DisPlay_HideColumn(HModName2, sessionStorage["HUserName"], option2, []);
			table.render(option2);
			layer.close(ajaxLoad);
			} else {
			layer.alert(data1.code + data1.Message, { icon: 5 });
			layer.close(ajaxLoad);
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			layer.close(ajaxLoad);
			}
			});
			}

			//#endregion

			//#region å¿«éè¿æ»¤
			function get_FastQuery() {
			function get_FastQuery(type) {
			var HBDate = $("#HBDate").val();//å¼å§æ¶é´
			var HEDate = $("#HEDate").val();//ç»ææ¶é´
			var HDeptID = $("#HDeptID").val();
			var HEmpID = $("#HEmpID").val();
			var HGroupID = $("#HGroupID").val();
			sWhere = "'" + HBDate + "','" + HEDate + "','" + HDeptID + "','" + HGroupID + "','" + HEmpID + "'";
			get_Display(sWhere);
			if (type == 1) {
			get_Display(sWhere);
			} else {
			get_Display2(sWhere);
			}

			sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			}
			//#endregion
			@@ -387,7 +519,7 @@
			}
			}
			});
			table.exportFile(ins.config.id, option.data, "xls");
			table.exportFile("mainTable", option.data, "xls");
			} else {
			layer.alert("å½åæ¨¡åæ²¡æå¯¼åºæé!", { icon: 5 });
			}
			@@ -396,6 +528,38 @@
			}
			});
			}
			function get_Export2() {
			var ModRightNameCheck = "Pay_PaymentEntryReportExcel";

			//é»è¾å®¡æ ¸æ¹æ³
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.count == 1) {
			var data = option2.data
			data.forEach((item) => {
			for (let itemobj in item) {
			if (item[itemobj] == null) {
			item[itemobj] = "";
			}
			if (item[itemobj].length > 0) { // åè®¾åæ®µåä¸ºfield
			item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, ''); // å°æ¢è¡ç¬¦æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
			item[itemobj] = item[itemobj].toString().replace(/,/g, ''); // å°æ¢è¡ç¬¦æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
			}
			}
			});
			table.exportFile("mainTable2", option2.data, "xls");
			} else {
			layer.alert("å½åæ¨¡åæ²¡æå¯¼åºæé!", { icon: 5 });
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}

			//#endregion

			//#region éæ©çç»
			@@ -459,103 +623,7 @@
			}
			//#endregion

			//#region æ¾ç¤ºåæ°æ®
			function DisPlay_HideColumn() {
			$.ajax({
			url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
			type: "GET",
			async: false,
			data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.data.length != 0) {

			var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
			var newCols = [[]];//å¯¹åºæ°æ®åºåé¡ºåºcol
			newCols[0].push(option.cols[0][0]);//æ¾å¥ç¬¬ä¸ä¸ªcheckbox
			dataCol = data1.data[0].HGridString.split(',');
			//åè®¾ç½®åæ°ä¸é¡µé¢åæ°æ¯å¦ä¸è´
			if (dataCol.length == option.cols[0].length - 1) {
			//éåå¯»æ¾åè®¾ç½®å¯¹åºåæé¡ºåºæå¥
			for (var j = 0; j < option.cols[0].length - 1; j++) {
			for (var i = 0; i < option.cols[0].length - 1; i++) {
			var dataCols = dataCol[j].split('\|');
			//éæ©ä¸datacolsç¸åºåè¿è¡ä¿®æ¹
			if (option.cols[0][i + 1]["field"] == dataCols[5]) {
			//éèå
			if (dataCols[1] == 1) {
			option.cols[0][i + 1]["hide"] = true;
			}
			//è®¾ç½®åå®½
			if (dataCols[3] > 0) {
			option.cols[0][i + 1]["width"] = dataCols[3];
			}
			//è®¾ç½®åå®¹åä½å¤§å°
			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[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
			option.cols[0][i + 1]["hide"] = false;
			}
			//ç»è®¡å
			if (dataCols[6] == 1) {
			option.cols[0][i + 1]["totalRow"] = true;
			}
			//åä½æå¨ä½ç½®(å·¦ å±ä¸ å³)
			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];
			}
			newCols[0].push(option.cols[0][i + 1]);
			}
			}
			}
			//éåå¾ªç¯åå¤æå¯¹åºåæ°æ¯å¦ä¸è´
			if (dataCol.length == newCols[0].length - 1) {
			option.cols = newCols;
			//åæ¶å»ç»å
			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";
			}
			}
			}
			}
			ins = table.render(option);
			} else {
			ins = table.render(option);
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			})
			}
			//#endregion


			//#region ç¹å»è¡éä¸é«äº®
			//table.on('row(mainTable)', function (obj) {

			@@ -57,7 +57,7 @@
			</div>
			</div>
			<!-- å¶åæ¥æï¼åå»ºæ¶é´ï¼è¿æ»¤ -->
			<div class="layui-inline">
			<!--<div class="layui-inline">
			<label class="layui-form-label">å¼å§æ¥æ</label>
			<div class="layui-input-block">
			<input type="date" class="layui-input ForFilteringSchemes" id="HMakeDate_Begin" style="width:190px;">
			@@ -68,7 +68,7 @@
			<div class="layui-input-block">
			<input type="date" class="layui-input ForFilteringSchemes" id="HMakeDate_End" style="width:190px;">
			</div>
			</div>
			</div>-->
			<!-- åæ®å·æ¥è¯¢ -->
			<div class="layui-inline">
			<label class="layui-form-label">åæ®å·</label>
			@@ -222,11 +222,7 @@
			console.log("GetWEBURL:", typeof GetWEBURL);

			var HModName = "Gy_SteppedPriceCoefficientBillList";
			<<<<<<< HEAD
			var HBillType = "";
			=======
			var HBillType = "3341";
			>>>>>>> 2ed130171719a0848e8356d28055eb1bdf649d01
			var HMaker = sessionStorage["HUserName"];
			var Organization = sessionStorage["Organization"];

			@@ -291,10 +287,10 @@
			case 'btn_Refresh': btn_Refresh();
			break;
			//å³é
			case 'btn_Close': set_CloseBill(1);
			case 'btn_Close': set_CloseBill(0);
			break;
			//åå³é
			case 'btn_DeClose': set_CloseBill(2);
			case 'btn_DeClose': set_CloseBill(1);
			break;
			//ä½åº
			case 'btn_Drop': set_DropBill(1);
			@@ -372,18 +368,16 @@
			var endDate = new Date();
			var startDate = new Date(endDate - 1000 * 60 * 60 * 24 * 30);

			if (typeof Pub_Format === 'function') {
			console.log("ä½¿ç¨ Pub_Format å½æ°");
			$("#HMakeDate_Begin").val(Pub_Format(startDate, "yyyy-MM-dd"));
			$("#HMakeDate_End").val(Pub_Format(endDate, "yyyy-MM-dd"));
			} else {
			console.log("Pub_Format ä¸åå¨ï¼ä½¿ç¨åçæ¹æ³");
			$("#HMakeDate_Begin").val(startDate.toISOString().split('T')[0]);
			$("#HMakeDate_End").val(endDate.toISOString().split('T')[0]);
			}
			//if (typeof Pub_Format === 'function') {
			// console.log("ä½¿ç¨ Pub_Format å½æ°");
			// $("#HMakeDate_Begin").val(Pub_Format(startDate, "yyyy-MM-dd"));
			// $("#HMakeDate_End").val(Pub_Format(endDate, "yyyy-MM-dd"));
			//} else {
			// console.log("Pub_Format ä¸åå¨ï¼ä½¿ç¨åçæ¹æ³");
			// $("#HMakeDate_Begin").val(startDate.toISOString().split('T')[0]);
			// $("#HMakeDate_End").val(endDate.toISOString().split('T')[0]);
			//}

			console.log("å¼å§æ¥æå¼:", $("#HMakeDate_Begin").val());
			console.log("ç»ææ¥æå¼:", $("#HMakeDate_End").val());

			option = {
			elem: '#mainTable'
			@@ -490,6 +484,7 @@

			} else {
			layer.close(wait);
			option.data = data1.data;
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}

			@@ -506,8 +501,8 @@

			//å¿«éè¿æ»¤
			function get_FastQuery() {
			var HMakeDate_Begin = $("#HMakeDate_Begin").val();
			var HMakeDate_End = $("#HMakeDate_End").val();
			//var HMakeDate_Begin = $("#HMakeDate_Begin").val();
			//var HMakeDate_End = $("#HMakeDate_End").val();
			var HBillNo = $("#HBillNo").val();
			var ColName = $("#ColName").val();
			var Comparator = $("#Comparator").val();
			@@ -587,12 +582,12 @@
			}

			// æ·»å æ¥ææ¡ä»¶
			if (HMakeDate_Begin) {
			sWhere += " and CONVERT(date, åæ®æ¥æ) >= '" + HMakeDate_Begin + "'";
			}
			if (HMakeDate_End) {
			sWhere += " and CONVERT(date, åæ®æ¥æ) <= '" + HMakeDate_End + "'";
			}
			//if (HMakeDate_Begin) {
			// sWhere += " and CONVERT(date, åæ®æ¥æ) >= '" + HMakeDate_Begin + "'";
			//}
			//if (HMakeDate_End) {
			// sWhere += " and CONVERT(date, åæ®æ¥æ) <= '" + HMakeDate_End + "'";
			//}
			if (HBillNo) {
			sWhere += " and åæ®å· like '%" + HBillNo + "%'";
			}
			@@ -820,6 +815,33 @@
			data = checkStatus.data;
			if (data && data.length === 1) {
			// å®ç°å³éé»è¾
			var HInterID = data[0].HInterID \|\| data[0].hmainid;
			if (!HInterID) {
			layer.msg('åæ®IDæ æï¼', { icon: 5 });
			return;
			}
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Gy_SteppedPriceCoefficientBill/CloseGy_SteppedPriceCoefficientBill",
			async: false,
			data: {
			"HInterID": HInterID,
			"IsAudit": num,
			"user": HMaker
			},
			success: function (result) {
			if (result.code === "1") {
			layer.msg(result.Message \|\| (num === 1 ? "å³éæå" : "åå³éæå"), { time: 1000, icon: 1 }, function () {
			$("#btnSearch").trigger('click');
			});
			} else {
			layer.msg(result.Message \|\| "æä½å¤±è´¥", { icon: 2 });
			}
			},
			error: function () {
			layer.msg('æ¥å£è¯·æ±å¤±è´¥ï¼', { icon: 5 });
			}
			});
			} else {
			layer.msg('è¯·éæ©ä¸è¡æ°æ®ï¼');
			}

			@@ -597,7 +597,7 @@
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			var linterid = data[0];
			var linterid = data[0].hmainid;
			//if (AllowLoadData(sSubStr) != false) {//éç©ºéªè¯
			layer.open({
			type: 2

			@@ -9,11 +9,16 @@
			<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/zgqCustom/zgqCustom.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/zgqCustom/zgqCustom.js"></script>
			<script src="../../../layuiadmin/PubCustom.js"></script>
			<script src="../../../layuiadmin/soulTable.slim.js"></script>
			<script src="../../../layuiadmin/SetColumn.js"></script>
			<script src="../../../layuiadmin/soulTable.slim.js"></script>
			<script src="../../../layuiadmin/PageTitle.js"></script>
			<script src="../../../layuiadmin/modules//tableFilter2.js"></script>
			<script src="../../../layuiadmin/MESLanguage.js"></script>
			</head>
			<body>
			<div class="layui-fluid">
			@@ -229,6 +234,8 @@
			};
			set_ClearQuery();
			get_FastQuery();
			//åå§åèªå¨åæ¥ä¸æ¬¡
			get_InSync_Batch2(option.data);
			}


			@@ -338,6 +345,7 @@
			$.ajax({
			url: GetWEBURL() + '/Cj_StationOutBill/get_Display',
			type: "GET",
			async: false,
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "HBillSubType": "3791" },
			success: function (data1) {
			if (data1.count == 0) {
			@@ -375,8 +383,9 @@
			}
			option.cols = [col];
			option.data = data1.data;

			//åè®¾ç½®
			DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option);
			DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option,[]);
			}
			table.render(option);
			layer.close(wait);
			@@ -432,6 +441,47 @@
			layer.msg('è¯·éæ©è³å°ä¸è¡æ°æ®ï¼');
			}
			}
			//æ¹éåæ¥
			function get_InSync_Batch2(data) {
			if (data.length == 0) {
			return;
			}
			if (data.length > 0) {
			var InterID = '';
			var BillNo = '';
			syncMessage = [];
			for (var i = 0; i < data.length; i++) {
			InterID = (data[i].hmainid.toString());
			BillNo = (data[i].åæ®å·.toString());
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Cj_StationOutBill/set_SaveStationOutBill_CLD_Json", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			async: true,
			data: { "HInterID": InterID, "HBillNo": BillNo, "HMaker": sessionStorage["HUserName"] },
			dataType: "json",
			success: function (data1) {
			if (data1.count == 1) { // è¯´æéªè¯æåäºï¼
			layer.msg(data1.Message, { time: 1 * 1000, icon: 1 }, function () {
			var index = parent.layer.getFrameIndex(window.name); //åå¾å°å½åiframeå±çç´¢å¼
			parent.layer.close(index); //åæ§è¡å³é Â Â Â Â Â Â Â Â Â Â
			});
			}
			else {
			let errMessage = [];
			errMessage.push(data1.Message);
			syncMessage.push(errMessage);
			layer.alert(data1.Message, { icon: 5 });

			}
			},
			error: function (err) {
			layer.alert(err.Message, { icon: 5 });
			}
			});
			}
			}

			}
			//åæ¥
			function get_InSync() {
			var checkStatus = table.checkStatus('mainTable')