MES-WEB-LayUI.git

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

zrg

18 小时以前 05b7d3e941b621531eccd2464622b1e97d4a891a

2个文件已添加

11个文件已修改

	WebTM/WebTM.csproj	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/WMS扫码模块/库存转移/KF_ICInventory_WorkShop_PDA.html	376 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/公用基础资料/xmlLBM_Sc_ProcessExchangeBillList_stock.aspx	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/工资管理/工资报表/Pay_PaymentEntryReport.html	300 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/工资管理/阶梯工价系数/Gy_SteppedPriceCoefficientBillList.html	76 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/物流管理/运输定位/Add_Edit_WL_YayBill.html	52 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/生产管理/报工台工序/不良采集/Sc_QualityReportStepBillList.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/生产管理/添康三周排产/JIT_DayPlanPlatForm_TK.html	130 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/质量管理/检验方案单/QC_Add_CheckProject.html	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/单品过站_小卫/Cj_SaveSNByICMO.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillSync.html	56 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/报表分析/KF_ICInventory_WorkShop.html	857 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/报表分析/Sc_AllowedPrintProcExchangeBillList.html	20 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/WebTM.csproj

@@ -194,6 +194,7 @@
    <Content Include="views\Baseset\åºç¡èµæ\Gy_EnvironmentTestSchemeBillList.html" />
    <Content Include="views\WMSæ«ç æ¨¡å\çäº§é¢æ\Kf_MateOutBackBill_Check_PDA.html" />
    <Content Include="views\WMSæ«ç æ¨¡å\çäº§é¢æ\Kf_MateOutBackBill_CheckList_PDA.html" />
      <Content Include="views\WMSæ«ç æ¨¡å\åºåè½¬ç§»\KF_ICInventory_WorkShop_PDA.html" />
    <Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\Add_Edit_Gy_Driver.html" />
    <Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\Add_Edit_Gy_ItemMoney.html" />
    <Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\Gy_CarList.html" />
@@ -999,6 +1000,7 @@
    <Content Include="views\è½¦é´ç®¡ç\æ¥è¡¨åæ\Cj_HeatTreatmentTemperatureCurveChart.html" />
    <Content Include="views\è½¦é´ç®¡ç\æ¥è¡¨åæ\Cj_SPCOscillationCurve.html" />
    <Content Include="views\è½¦é´ç®¡ç\æ¥è¡¨åæ\Cj_TemperatureCurveDryingMachine.html" />
    <Content Include="views\è½¦é´ç®¡ç\æ¥è¡¨åæ\KF_ICInventory_WorkShop.html" />
    <Content Include="views\è½¦é´ç®¡ç\æ¥è¡¨åæ\Kf_PressurizedWaterNoOutReport.html" />
    <Content Include="views\è½¦é´ç®¡ç\å¯å¨ç¹æ£å\Gy_WorkBeginDotCheckListBill.html" />
    <Content Include="views\è½¦é´ç®¡ç\å¯å¨ç¹æ£å\Gy_WorkBeginDotCheckListBillList.html" />

 WebTM/views/WMSÉ¨ÂëÄ£¿é/¿â´æ×ªÒÆ/KF_ICInventory_WorkShop_PDA.html

New file
@@ -0,0 +1,376 @@
ï»¿<!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/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>
    <style type="text/css">
        input.layui-input.layui-unselect {
            padding-right: 0;
        }
    </style>
</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" style="width: 30px;">æ¥æ</label>
                                    <input type="date" class="layui-input" id="HBeginDate" style="width:110px;" placeholder="yyyy-MM-dd">
                                </div>-->
                                <!--<div class="layui-inline">
                                    <label class="layui-form-label" style="width:5px">-</label>
                                </div>
                                <div class="layui-inline">
                                    <input type="date" class="layui-input" id="HEndDate" style="width:110px;" placeholder="yyyy-MM-dd">
                                </div>-->

                                <div class="layui-inline" style="margin-top:2px;">
                                    <label class="layui-form-label" style="width: 60px;">å æ® å·</label>
                                    <div class="layui-input-inline">
                                        <input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="width:125px;">
                                    </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 class="layui-colla-content" style="padding: 6px; margin-left: 1%;">
                                    <div class="layui-row" style="margin-top:5px">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width:30px;">è¿æ»¤</label>
                                            <div class="layui-input-block" style="width:85px;margin-left:65px;">
                                                <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline" style="width: 85px;">
                                            <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">åå«</option>
                                                <option value="8">å·¦åå«</option>
                                                <option value="9">å³åå«</option>
                                                <option value="10">ä¸åå«</option>
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent" style="width: 85px;">
                                        </div>
                                    </div>
                                </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="btnDel"><i class="layui-icon layui-icon-delete"></i>å é¤</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>éåº</button>
                            </div>
                        </script>
                    </form>
                </div>
            </div>
        </div>
    </div>

    <script>
        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 HModName = "Sc_MouldUpperBillList_PDA";
            //ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
            var titleData = [];

            //#endregion

            //#region è¿å¥é¡µé¢æ¢å è½½

            //#region åå§åçé¢

            set_ClearBill();

            //#endregion

            //#region ç¹å»äºä»¶åæ¬on formäºä»¶ç
            //å¤´å·¥å·æ äºä»¶
            table.on('toolbar(mainTable)', function (obj) {
                switch (obj.event) {
                    //å é¤
                    case 'btnDel': set_DeleteBill();
                        break;
                    case 'btn-exit':
                        layer.confirm('æ¨ç¡®å®è¦éåºåï¼', { icon: 3, title: 'æç¤º' }, function (index) {
                            parent.location.href = "../../../views/index_Mobile.html";
                        });
                        break;
                };
            });

            //éç½®æé®
            form.on('submit(btnReSearch)', function (data) {
                set_ClearQuery();
            });
            //æ¥è¯¢æé®
            form.on('submit(btnSearch)', function (data) {
                get_FastQuery();
            });
       
            //#endregion

            //#region æ¤é¡µé¢ææçæ¹æ³

            //åå§åçé¢
            function set_ClearBill() {
                //åå§åæ¶é´
                $("#HBeginDate").val(Format(new Date() - 1000 * 60 * 60 * 24 * 30, "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                //å è½½æ°æ®å°ç½æ ¼
                get_FastQuery();
            }

            //å è½½ç½æ ¼
            function get_Display(sWhere) {
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/KF_ICInventory_WorkShop/KF_ICInventory_WorkShopList',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    success: function (data1) {
                        if (data1.count == 1) {
                            var data = [];
                            var col = [];
                            //ç»ç©ºçæ°ç»èµå¼
                            for (var key in data1.list) {
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                                var patrn = new RegExp(/^h/i);
                                if (patrn.test(data1.list[key].ColmCols)) {
                                    titleData[key] = data1.list[key].ColmCols;
                                }
                            }
                            //å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
                            col.push({ type: 'checkbox', fixed: 'left' });
                            for (var i = 0; i < data.length; i++) {
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
                                    }
                                }
                            }

                            //å¨ææ¾ç¤ºåå
                            option = {
                                elem: '#mainTable'
                                , toolbar: '#toolbarDemo'
                                , cols: [col]
                                , data: data1.data
                                , height: 'full-110'
                                , page: true
                                , limits: [50, 500, 5000, 50000]
                                , limit: 50
                                , cellMinWidth: 90
                            }
                            table.render(option);

                            ////å·æ°è¡¨æ ¼æ°æ®
                            //DisPlay_HideColumn();

                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                                ColFilter();
                            }
                            layer.close(ajaxLoad);
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                    }
                });
            }

            //#region ç¹å»è¡éä¸é«äº®
            table.on('row(mainTable)', function (obj) {
                //éä¸è¡æ¹åé¢è²
                var flag = !obj.tr.find(':checkbox:first').prop('checked');
                obj.tr.find(':checkbox').prop('checked', flag);
                if (flag) {
                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //è®¾ç½®å¤éæ¡éä¸æ ·å¼
                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//æ¹åå½åtrèæ¯é¢è²ååä½é¢è²
                } else {
                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//åæ¶å¤éæ¡éä¸æ ·å¼
                    $(obj.tr.selector).attr({ "style": "background:" });//åæ¶å½åtré¢è²
                }
                //mainTable ä¸ºè¡¨æ ¼ID   æ³¨ææ¤å¤å¦æIDä¸æ£ç¡®å°å¯¼è´ä½ å¨çå¬å¤éæ¡æ¶è·åä¸å°ä½ éæ©çæ°æ®ï¼åé¢çåªæ¯æ·»å æå é¤éä¸æªéä¸æ ·å¼ä»¥åè®¾ç½®èæ¯è²ï¼åä½é¢è²
                layui.each(table.cache.mainTable, function (i, l) {
                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
                        l.LAY_CHECKED = flag;
                    }
                });
            })
            //#endregion

            //å¿«éè¿æ»¤
            function get_FastQuery() {
                //var HBeginDate = $("#HBeginDate").val();//èµ·å§æ¥æ
                //var HEndDate = $("#HEndDate").val();//æªæ¢æ¥æ
                var HBillNo = $("#HBillNo").val();//åæ®å·
                var ColName = $("#ColName").val();//å¤éæ¡
                var Comparator = $("#Comparator").val()
                var ColContent = $("#ColContent").val();

                if (ColName != 0 && Comparator != 0) {
                    var com = "";
                    switch (Comparator) {
                        case "7":
                            com = "like'%" + ColContent + "%'";
                            break;
                        case "8":
                            com = "like'%" + ColContent + "'";
                            break;
                        case "9":
                            com = "like'" + ColContent + "%'";
                            break;
                        case "10":
                            com = "not like'%" + ColContent + "%'";
                            break;
                        default:
                            com = "" + Comparator + "'" + ColContent + "'";
                            break;
                    }
                    sWhere += " and " + ColName + " " + com;
                }

                if (HBillNo) {
                    sWhere += " and åæ®å· like '%" + HBillNo + "%'";
                }
                //if (HBeginDate != "" && HEndDate != "") {
                //    sWhere += "and æ¥æ between '" + HBeginDate + "' and '" + HEndDate + "'";
                //}
                get_Display(sWhere);
                //è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
                sWhere = "";
            }

            //éç½®è¿æ»¤æ¡ä»¶
            function set_ClearQuery() {
                //åå§åæ¶é´
                //$("#HBeginDate").val(Format(new Date() - 1000 * 60 * 60 * 24 * 30, "yyyy-MM-dd"));
                //$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HBillNo").val("");
                $("#ColContent").val("");
                $("#ColName").val("0");
                $("#Comparator").val("0");
                form.render('select');
                sWhere = "";
            }

            //åææ¾ç¤ºä¸ææ¡
            function ColFilter() {
                var Organization = '<option  value="0" selected="selected" ></option>';
                for (var i = 1; i < option.cols[0].length; i++) {
                    if (option.cols[0][i].hide != true) {
                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
                    }
                }
                $("#ColName").empty();
                $("#ColName").append(Organization);
                form.render('select');
            }

            //å é¤
            function set_DeleteBill() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length > 0) {
                    var HInterID = [];
                    for (var i = 0; i < data.length; i++) {
                        HInterID.push(data[i].hmainid.toString() + "_" + data[i].hsubid.toString());
                    }

                    //é»è¾å é¤æ¹æ³
                    layer.confirm("ç¡®è®¤è¦å é¤åï¼å é¤åä¸è½æ¢å¤", { title: "å é¤ç¡®è®¤" }, function (index) {
                        $.ajax({
                            type: "GET",
                            url: GetWEBURL() + "/Sc_MouldUpperBill/DeltetSc_MouldUpperBill", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
                            data: { "HInterID": HInterID.toString(), "HPRDORGID": sessionStorage["OrganizationID"], "user": sessionStorage["HUserName"] },
                            success: function (result) {
                                if (result.count == 1) {
                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                        // å¾å°frameç´¢å¼
                                        var index = layer.getFrameIndex(window.name);
                                        //å³éå½åframe
                                        layer.close(index);
                                        //ä¿®æ¹ä¸ºååå·æ°çé¢
                                        get_FastQuery();
                                    });

                                } else {
                                    layer.alert(result.code + result.Message, { icon: 5 });
                                }
                            }, error: function () {
                                layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                            }
                        });
                    })
                }
                else {
                    layer.msg('è¯·éæ©ä¸è¡æ°æ®å é¤ï¼');
                }
            }

            //#endregion
        });
    </script>
</body>
</html>

 WebTM/views/»ù´¡×ÊÁÏ/¹«ÓÃ»ù´¡×ÊÁÏ/xmlLBM_Sc_ProcessExchangeBillList_stock.aspx

@@ -16,7 +16,7 @@
            //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");

            //20250731è°æ´ï¼æ¥è¯¢æå°æ°æ®æ¶ï¼æ´æ°æå°æ¥æå°æµè½¬å¡ä¸»è¡¨
            SqlXMLReportData.GenEntireData(this, "select  cast((cast( b.æµæ°´å· as float)/10) as decimal(6,1)) æµæ°´å·,çäº§è®¢åå·,a.çäº§æ°é,a.éå®è®¢åå·,a.æåå·,a.æµè½¬å¡æ°é,a.äº¤è´§æ¥æ,a.äº§åä»£ç ,a.åæ®å·,case when ISNULL(a.çäº§è§æ ¼,'')='' then a.äº§åè§æ ¼ else a.çäº§è§æ ¼ end äº§åè§æ ¼,a.äº§ååç§°,a.æ¥æ,a.è®¡åå®å·¥æ¥æ,a.åæ®å·,b.å·¥åºåç§°,b.æ¨¡å·ç¼å·,b.å·¥èºåæ°,b.å å·¥è¯´æ,case when ISNULL(a.çäº§å¹å®½,0)=0 then a.å¹å®½ else a.çäº§å¹å®½ end å¹å®½,case when ISNULL(a.çäº§åé,0) = 0 then a.åé else a.çäº§åé end åé,a.ç½å¯è¦æ±,a.åºé¨å¤æ³¨,a.å®¢æ·,a.ä¸å¡å,a.æ¯é«,a.å¯¸æ°ç»ç»,a.å¨æ¯é¿,a.å¯å¸å¯åº¦,a.æ¯çº±åç§°åè§æ ¼,a.åºä¸,a.è¾æ°é,a.è¾å©åä½,a.å®åæµæ,a.äº¤è´§æ¥æ,a.æè²è¦æ±,a.è¾æ°é2,a.HAuxUnit2,a.è¾å©åä½2,b.åºç«å³èæ°é from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid   where b.hmainid in("+Request.Params["linterid"] +") order by cast(b.æµæ°´å· as int)","update Sc_ProcessExchangeBillMain set HPrintQty1 = HPrintQty1+1 where HInterID in ("+Request.Params["linterid"] + ") and HPrintDate is null");
            SqlXMLReportData.GenEntireData(this, "select  cast((cast( b.æµæ°´å· as float)/10) as decimal(6,1)) æµæ°´å·,çäº§è®¢åå·,a.çäº§æ°é,a.éå®è®¢åå·,a.æåå·,a.æµè½¬å¡æ°é,a.äº¤è´§æ¥æ,a.äº§åä»£ç ,a.åæ®å·,case when ISNULL(a.çäº§è§æ ¼,'')='' then a.äº§åè§æ ¼ else a.çäº§è§æ ¼ end äº§åè§æ ¼,a.äº§ååç§°,a.æ¥æ,a.è®¡åå®å·¥æ¥æ,a.åæ®å·,b.å·¥åºåç§°,b.æ¨¡å·ç¼å·,b.å·¥èºåæ°,b.å å·¥è¯´æ,case when ISNULL(a.çäº§å¹å®½,0)=0 then a.å¹å®½ else a.çäº§å¹å®½ end å¹å®½,case when ISNULL(a.çäº§åé,0) = 0 then a.åé else a.çäº§åé end åé,a.ç½å¯è¦æ±,a.åºé¨å¤æ³¨,a.å®¢æ·,a.ä¸å¡å,a.æ¯é«,a.å¯¸æ°ç»ç»,a.å¨æ¯é¿,a.å¯å¸å¯åº¦,a.æ¯çº±åç§°åè§æ ¼,a.åºä¸,a.è¾æ°é,a.è¾å©åä½,a.å®åæµæ,a.äº¤è´§æ¥æ,a.æè²è¦æ±,a.è¾æ°é2,a.HAuxUnit2,a.è¾å©åä½2,b.åºç«å³èæ°é from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid   where b.hmainid in("+Request.Params["linterid"] +") order by cast(b.æµæ°´å· as int)","update Sc_ProcessExchangeBillMain set HPrintQty1 = HPrintQty1+1 where HInterID in ("+Request.Params["linterid"] + ") ");

           
        }

 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/ÎïÁ÷¹ÜÀí/ÔËÊä¶¨Î»/Add_Edit_WL_YayBill.html

@@ -1204,47 +1204,7 @@

            //#endregion
            //#region éæ©æºåèµç»åè¡¨
            //#region éæ©æºå
            function get_checkMainSource() {
                var HOrgID = $("#HOrgID").val();
                var url = "../../éå®ç®¡ç/åè´§éç¥å/Xs_SeOutStockBillList.html?openType=2&HOrgID=" + HOrgID;


                layer.open({
                    type: 2//å¼¹çªç±»å
                    , skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
                    , area: ['90%', '90%']//å¤§å°
                    , title: 'æºååè¡¨'//æ é¢
                    , shift: 2//å¼¹åºå¨ç»
                    , content: [url, 'yes']
                    , btn: ['ç¡®å®', 'åæ¶']
                    , btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
                        var iframeWindow = window['layui-layer-iframe' + index]  //è·åå¼¹æ¡é¡µé¢
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//è·åtableçelem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('è¯·éæ©æ°æ®');
                        }
                        var HCusID = $("#HCusID").val();//å¤æå®¢æ·
                        if (HCusID == 0 || HCusID == '') {
                            HCusID = checkStatus.data[0]["HCusID"];
                            $("#HCusID").val(checkStatus.data[0]["HCusID"]); 
                            $("#HCusName").val(checkStatus.data[0]["å®¢æ·"]);
                        }
                        for (var i = 0; i < checkStatus.data.length; i++) {
                            if (checkStatus.data[i]["HCusID"] != HCusID) {
                                layer.msg("ä¸æ¨å¤±è´¥!å·²ç»éä¸çè®°å½ä¸åå¨ä¸åå®¢æ·!");
                                layer.close(index);
                                return;
                            }
                        }

                        //setInitBySeOutStockBill(checkStatus)
                        layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
                    }
                    , btn2: function (index, layero) { }
                })
            }
            //#endregion
         
            //#region éæ©æºå
            function get_checkMainSource() {
                var HOrgID = $("#HOrgID").val();
@@ -1285,6 +1245,10 @@
                            layer.close(index);
                            return;
                        }
                        $("#HMainSourceInterID").val(checkStatus.data[0]["hmainid"]);
                        $("#HMainSourceEntryID").val(checkStatus.data[0]["hsubid"]);
                        $("#HMainSourceBillNo").val(checkStatus.data[0]["åæ®å·"]);
                        $("#HMainSourceBillType").val(checkStatus.data[0]["HBillType"]);
                        appendInitBySeOutStockBill(checkStatus);
                        layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
                    }
@@ -1782,6 +1746,10 @@
                                , "HDate": formatDate(data.æ¥æ)
                                , "HInnerBillNo": data.åé¨åæ®å·
                                , "HOrgID": data.HOrgID
                                , "HMainSourceInterID": data.HMainSourceInterID
                                , "HMainSourceEntryID": data.HMainSourceEntryID
                                , "HMainSourceBillType": data.HMainSourceBillType
                                , "HMainSourceBillNo": data.HMainSourceBillNo


                                , "HCusID": data.HCheckEmp
@@ -1791,7 +1759,7 @@
                                , "HEndAddr": data.ç®çå°
                                , "HEndAddrName": data.ç®çå°åç§°
                                , "HPickAddr": data.æè´§å°å
                                , "HArriverAddr": data.æè´§å°å
                                , "HArriverAddr": data.å°è´§æ¹å¼
                                , "HTransType": data.è¿è¾æ¹å¼
                                , "HCarTypeID": data.è½¦åID
                                , "HCarTypeName": data.è½¦ååç§°

 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/Éú²ú¹ÜÀí/Ìí¿µÈýÖÜÅÅ²ú/JIT_DayPlanPlatForm_TK.html

@@ -872,11 +872,15 @@
            columns.push({ field: 'è®¡åæªå®ææ°', title: 'è®¡åæªå®ææ°', width: 150, filter: true });
            columns.push({ field: 'æ¨æ¥æ°é', title: 'æ¨æ¥æ°é', filter: true });
            columns.push({ field: 'ä¼åçº§', title: 'ä¼åçº§', width: 150, edit: 'text', sort: true });
            
            columns.push({ field: 'çäº§èµæº', title: 'çäº§èµæº', width: 150, edit: 'text', event: "HSourceID", filter: true });
            columns.push({ field: 'çäº§è½¦é´', title: 'çäº§è½¦é´', width: 150, sort: true, filter: true });
            columns.push({ field: 'è¦è´§æ¥æ', title: 'è¦è´§æ¥æ', width: 150, templet: "<div>{{d.è¦è´§æ¥æ ==null ?'':layui.util.toDateString(d.è¦è´§æ¥æ, 'yyyy-MM-dd')}}</div>", event: "HDeliveryDate", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
            columns.push({ field: 'å¼å·¥æ¥æ', title: 'å¼å·¥æ¥æ', width: 150, templet: "<div>{{d.å¼å·¥æ¥æ ==null ?'':layui.util.toDateString(d.å¼å·¥æ¥æ, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd]' } });
            columns.push({ field: 'å®å·¥æ¥æ', title: 'å®å·¥æ¥æ', width: 150, templet: "<div>{{d.å®å·¥æ¥æ ==null ?'':layui.util.toDateString(d.å®å·¥æ¥æ, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd]' } });
            columns.push({ field: 'çäº§è½¦é´', title: 'çäº§è½¦é´', width: 150 });
            columns.push({ field: 'å¼å·¥æ¥æ', title: 'å¼å·¥æ¥æ', width: 150, templet: "<div>{{d.å¼å·¥æ¥æ ==null ?'':layui.util.toDateString(d.å¼å·¥æ¥æ, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
            columns.push({ field: 'å®å·¥æ¥æ', title: 'å®å·¥æ¥æ', width: 150, templet: "<div>{{d.å®å·¥æ¥æ ==null ?'':layui.util.toDateString(d.å®å·¥æ¥æ, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });

            //columns.push({ field: 'å¼å·¥æ¥æ', title: 'å¼å·¥æ¥æ', width: 150, templet: "<div>{{d.å¼å·¥æ¥æ ==null ?'':layui.util.toDateString(d.å¼å·¥æ¥æ, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd]' } });
            //columns.push({ field: 'å®å·¥æ¥æ', title: 'å®å·¥æ¥æ', width: 150, templet: "<div>{{d.å®å·¥æ¥æ ==null ?'':layui.util.toDateString(d.å®å·¥æ¥æ, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd]' } });

            columns.push({ field: 'ä¸å¡ç¶æ', title: 'ä¸å¡ç¶æ', width: 150, sort: true, hide: true });
            columns.push({ field: 'äº§çº¿å¥åºæ°é', title: 'äº§çº¿å¥åºæ°é', width: 150, sort: true, hide: true });
@@ -887,28 +891,31 @@
            for (var i = 0; i < HArrangeProductDayQty; i++) {
                columns.push(dateColumns[i]);//0
            }

            
            columns.push({ field: 'æªææ°é', title: 'å¯ææ°é', width: 150, sort: true, hide: true });
            columns.push({ field: 'åæ®å·', title: 'åæ®å·', hide: true, sort: true });
            columns.push({ field: 'éå®è®¢åå®¡æ ¸æ¥æ', title: 'éå®è®¢åå®¡æ ¸æ¥æ', width: 150, templet: "<div>{{d.éå®è®¢åå®¡æ ¸æ¥æ ==null ?'':layui.util.toDateString(d.éå®è®¢åå®¡æ ¸æ¥æ, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
            columns.push({ field: 'è®¢åç±»å', title: 'è®¢åç±»å', width: 150, sort: true });
            columns.push({ field: 'çäº§èµæºç¼ç ', title: 'çäº§èµæºç¼ç ', width: 150, sort: true });
            columns.push({ field: 'çäº§è½¦é´ç¼ç ', title: 'çäº§è½¦é´ç¼ç ', width: 150, sort: true })
            columns.push({ field: 'çäº§å¨æ', title: 'çäº§å¨æ', width: 150, sort: true });
            columns.push({ field: 'ç»ç»ç¼ç ', title: 'ç»ç»ç¼ç ', width: 150, sort: true });
            columns.push({ field: 'çäº§ç»ç»', title: 'çäº§ç»ç»', width: 150, sort: true });
            columns.push({ field: 'çäº§è®¢åæç»è¡å·', title: 'çäº§è®¢åæç»è¡å·', width: 150, sort: true });
            columns.push({ field: 'è®¢åç±»å', title: 'è®¢åç±»å', width: 150, sort: true });
            columns.push({ field: 'çäº§è®¢ååæ®ç±»å', title: 'æºåè®¢ååæ®ç±»å', width: 150, sort: true });
            columns.push({ field: 'è®¢åççº§', title: 'è®¢åççº§', width: 150, sort: true });
            columns.push({ field: 'è®¢åäº¤è´§æ', title: 'è®¢åäº¤è´§æ', width: 150, templet: "<div>{{d.è®¢åäº¤è´§æ =='1900-01-01' ?'':layui.util.toDateString(d.è®¢åäº¤è´§æ, 'yyyy-MM-dd')}}</div>", sort: true });
            columns.push({ field: 'è®¢åéæ±æ°é', title: 'è®¢åéæ±æ°é', width: 150, sort: true });
            columns.push({ field: 'å¼å·¥ä½é', title: 'å¼å·¥ä½é', width: 150, sort: true });
            columns.push({ field: 'çäº§å¨æ', title: 'çäº§å¨æ', width: 150, sort: true });
            columns.push({ field: 'æè¿å¼å·¥æ¥æ', title: 'æè¿å¼å·¥æ¥æ', width: 150, templet: "<div>{{d.æè¿å¼å·¥æ¥æ =='' ?'':layui.util.toDateString(d.æè¿å¼å·¥æ¥æ, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
            columns.push({ field: 'æè¿å®å·¥æ¥æ', title: 'æè¿å®å·¥æ¥æ', width: 150, templet: "<div>{{d.æè¿å®å·¥æ¥æ =='' ?'':layui.util.toDateString(d.æè¿å®å·¥æ¥æ, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
            columns.push({ field: 'éå®è®¢åå®¡æ ¸æ¥æ', title: 'éå®è®¢åå®¡æ ¸æ¥æ', width: 150, hide: true, templet: "<div>{{d.éå®è®¢åå®¡æ ¸æ¥æ ==null ?'':layui.util.toDateString(d.éå®è®¢åå®¡æ ¸æ¥æ, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
            columns.push({ field: 'çäº§è®¢ååæ®ç±»å', title: 'æºåè®¢ååæ®ç±»å', width: 150, sort: true, hide: true });
            columns.push({ field: 'è®¢åççº§', title: 'è®¢åççº§', width: 150, sort: true, hide: true});
            columns.push({ field: 'è®¢åäº¤è´§æ', title: 'è®¢åäº¤è´§æ', width: 150, hide: true, templet: "<div>{{d.è®¢åäº¤è´§æ =='1900-01-01' ?'':layui.util.toDateString(d.è®¢åäº¤è´§æ, 'yyyy-MM-dd')}}</div>", sort: true });
            columns.push({ field: 'è®¢åéæ±æ°é', title: 'è®¢åéæ±æ°é', width: 150, sort: true, hide: true });
            columns.push({ field: 'å¼å·¥ä½é', title: 'å¼å·¥ä½é', width: 150, sort: true, hide: true });
            columns.push({ field: 'æè¿å¼å·¥æ¥æ', title: 'æè¿å¼å·¥æ¥æ', width: 150, hide: true, templet: "<div>{{d.æè¿å¼å·¥æ¥æ =='' ?'':layui.util.toDateString(d.æè¿å¼å·¥æ¥æ, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
            columns.push({ field: 'æè¿å®å·¥æ¥æ', title: 'æè¿å®å·¥æ¥æ', width: 150, hide: true, templet: "<div>{{d.æè¿å®å·¥æ¥æ =='' ?'':layui.util.toDateString(d.æè¿å®å·¥æ¥æ, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });

            columns.push({ field: 'æºåä¸»åç ', title: 'æºåä¸»åç ', width: 150, sort: true });
            columns.push({ field: 'æºåååç ', title: 'æºåååç ', width: 150, sort: true });
            columns.push({ field: 'hmainid', title: 'æ¥è®¡åå·¥åä¸»ç ', width: 150, sort: true });
            columns.push({ field: 'æºåä¸»åç ', title: 'æºåä¸»åç ', width: 150, sort: true, hide: true });
            columns.push({ field: 'æºåååç ', title: 'æºåååç ', width: 150, sort: true, hide: true });
            columns.push({ field: 'hmainid', title: 'æ¥è®¡åå·¥åä¸»ç ', width: 150, sort: true, hide: true });           
            columns.push({ field: 'è®¡éåä½', title: 'è®¡éåä½', width: 150, sort: true });
            columns.push({ field: 'æåæ°é', title: 'æåæ°é', width: 150 });//0
            columns.push({ field: 'æªå¥åºæ°é', title: 'æªå¥åºæ°é', width: 150 });//0
            columns.push({ field: 'æªå¥åºæ°é', title: 'æªå¥åºæ°é', width: 150, hide: true });//0
            columns.push({ field: 'HICMOInterID', title: 'HICMOInterID', width: 150, hide: true });
            columns.push({ field: 'HGroupID', title: 'HGroupID', width: 150, hide: true });
            columns.push({ field: 'HGroupName', title: 'HGroupName', width: 150, hide: true });
@@ -919,18 +926,18 @@
            columns.push({ field: 'HUnitID', title: 'HUnitID', hide: true });
            columns.push({ field: 'HProdORGID', title: 'HProdORGID', hide: true });
            columns.push({ field: 'HEmpID', title: 'HEmpID', hide: true });
            columns.push({ field: 'æåæ±æ¥æ°é', title: 'æåæ±æ¥æ°é', width: 150, edit: 'text', sort: true });
            columns.push({ field: 'éå®è®¢åæ°é', title: 'éå®è®¢åæ°é', width: 150, sort: true });//0
            columns.push({ field: 'æ¥è®¡åæ°éæ»é', title: 'æ¥è®¡åæ°éæ»é', width: 150, sort: true });//0
            columns.push({ field: 'æåæ°é', title: 'æåæ°é', width: 150, edit: 'text' });
            columns.push({ field: 'æåæ±æ¥æ°é', title: 'æåæ±æ¥æ°é', width: 150, edit: 'text', sort: true, hide: true});
            columns.push({ field: 'éå®è®¢åæ°é', title: 'éå®è®¢åæ°é', width: 150, sort: true, hide: true });//0
            columns.push({ field: 'æ¥è®¡åæ°éæ»é', title: 'æ¥è®¡åæ°éæ»é', width: 150, sort: true, hide: true });//0
            //columns.push({ field: 'æåæ°é', title: 'æåæ°é', width: 150, edit: 'text' });
            columns.push({ field: 'ä»æ¥ä¹åæ¥è®¡åæ°é', title: 'ä»æ¥ä¹åæ¥è®¡åæ°é', width: 150, sort: true });//0
            columns.push({ field: 'è®¡åå¼å§æ¥æ', title: 'é¢è®¡å¼å·¥æ¥æ', width: 150, templet: "<div>{{d.è®¡åå¼å§æ¥æ ==null ?'':layui.util.toDateString(d.è®¡åå¼å§æ¥æ, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
            columns.push({ field: 'è®¡åç»ææ¥æ', title: 'è®¡åç»ææ¥æ', width: 150, templet: "<div>{{d.è®¡åç»ææ¥æ ==null ?'':layui.util.toDateString(d.è®¡åç»ææ¥æ, 'yyyy-MM-dd')}}</div>", event: "HPlanEndDate", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
            columns.push({ field: 'ææ©å¼å·¥æ¥æ', title: 'ææ©å¼å·¥æ¥æ', width: 150, templet: "<div>{{d.ææ©å¼å·¥æ¥æ ==null ?'':layui.util.toDateString(d.ææ©å¼å·¥æ¥æ, 'yyyy-MM-dd')}}</div>", event: "HEarlyDate", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
            columns.push({ field: 'æä½å·¥', title: 'æä½å·¥', width: 150, edit: 'text', event: "HEmpID" });
            columns.push({ field: 'è®¡åå¼å§æ¥æ', title: 'é¢è®¡å¼å·¥æ¥æ', width: 150, hide: true, templet: "<div>{{d.è®¡åå¼å§æ¥æ ==null ?'':layui.util.toDateString(d.è®¡åå¼å§æ¥æ, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
            columns.push({ field: 'è®¡åç»ææ¥æ', title: 'è®¡åç»ææ¥æ', width: 150, hide: true, templet: "<div>{{d.è®¡åç»ææ¥æ ==null ?'':layui.util.toDateString(d.è®¡åç»ææ¥æ, 'yyyy-MM-dd')}}</div>", event: "HPlanEndDate", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
            columns.push({ field: 'ææ©å¼å·¥æ¥æ', title: 'ææ©å¼å·¥æ¥æ', width: 150, hide: true, templet: "<div>{{d.ææ©å¼å·¥æ¥æ ==null ?'':layui.util.toDateString(d.ææ©å¼å·¥æ¥æ, 'yyyy-MM-dd')}}</div>", event: "HEarlyDate", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
            columns.push({ field: 'æä½å·¥', title: 'æä½å·¥', width: 150, edit: 'text', event: "HEmpID", hide: true });
            columns.push({ field: 'HMouldID', title: 'HMouldID', width: 150, hide: true });
            columns.push({ field: 'HMouldPCTime', title: 'HMouldPCTime', width: 150, hide: true });
            columns.push({ field: 'æéå·¥ä½æ°', title: 'æéå·¥ä½æ°', width: 150 });
            columns.push({ field: 'æéå·¥ä½æ°', title: 'æéå·¥ä½æ°', width: 150, hide: true });
            columns.push({ field: 'ä½¿ç¨å·¥è£', title: 'ä½¿ç¨å·¥è£', width: 150, hide: true });
            columns.push({ fixed: 'right', title: 'æä½', toolbar: '#barDemo' });
            option_columns = columns;
@@ -1420,17 +1427,24 @@
                }
            });

            var sql = "";

            if ($("#HMergeDept").val() == "æ¯") {
                //æ ¹æ®è½¦é´å é¤æ²¡æéå®çæ°æ®
                var sql = "delete from Sc_WorkBillSortBillSub where HLockedSub != 1 and HInterID in (select HInterID from Sc_WorkBillSortBillMain where (HWorkShopID=102357 or HWorkShopID=102359) and HLockOrder != 1 )";
                sql = "delete from Sc_WorkBillSortBillSub where HLockedSub != 1 and HInterID in (select HInterID from Sc_WorkBillSortBillMain where (HWorkShopID=102357 or HWorkShopID=102359) and HLockOrder != 1 )";
            } else {
                //æ ¹æ®è½¦é´å é¤æ²¡æéå®çæ°æ®
                var sql = "delete from Sc_WorkBillSortBillSub where HLockedSub != 1 and HInterID in (select HInterID from Sc_WorkBillSortBillMain where HWorkShopID=" + HWorkShopID + " and HLockOrder != 1 )";
                sql = "delete from Sc_WorkBillSortBillSub where HLockedSub != 1 and HInterID in (select HInterID from Sc_WorkBillSortBillMain where HWorkShopID=" + HWorkShopID + " and HLockOrder != 1 )";
            }

            if ($("#HWorkShopID").val() == "15035828") {
                //æ ¹æ®æäº§æ è®°å é¤æ²¡æéå®çæ°æ®ï¼éä»¶è½¦é´ï¼
                var sql = "delete from Sc_WorkBillSortBillSub where HLockedSub != 1 and HInterID in (select HInterID from Sc_WorkBillSortBillMain with(nolock) where HRemark = 'éä»¶è®¢å' and HLockOrder != 1 )";
                sql = "delete from Sc_WorkBillSortBillSub where HLockedSub != 1 and HInterID in (select HInterID from Sc_WorkBillSortBillMain with(nolock) where HRemark = 'éä»¶è®¢å' and HLockOrder != 1 )";
            }

            if ($("#HWorkShopID").val().split(",").length >= 2) {
                //æ ¹æ®è½¦é´å é¤æ²¡æéå®çæ°æ®
                sql = "delete from Sc_WorkBillSortBillSub where HLockedSub != 1 and HInterID in (select HInterID from Sc_WorkBillSortBillMain where HWorkShopID in (" + HWorkShopID + ") and HLockOrder != 1 )";
            }

            $.ajax({
@@ -3469,6 +3483,18 @@
            })
        }

        //function get_Export() {
        //    var data = option.data
        //    data.forEach((item) => {
        //        // å¦ææä¸ªåæ®µçå¼å¤ªé¿ï¼éè¦å»é¤æ¢è¡ç¬¦
        //        if (item.è§æ ¼åå·.length > 0) {  // åè®¾åæ®µåä¸ºfield
        //            item.è§æ ¼åå· = item.è§æ ¼åå·.replace(/[\r\n]+/g, '');  // å°æ¢è¡ç¬¦æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
        //            item.è§æ ¼åå· = item.è§æ ¼åå·.replace(/[,]+/g, 'ï¼');  // å°æ¢åå·æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
        //        }
        //    });
        //    table.exportFile(ins.config.id, data, "xls");
        //}

        function get_Export() {
            var data = option.data
            data.forEach((item) => {
@@ -3478,18 +3504,54 @@
                    item.è§æ ¼åå· = item.è§æ ¼åå·.replace(/[,]+/g, 'ï¼');  // å°æ¢åå·æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
                }
            });
            for (let i = 19; i < option.cols[0].length - 40; i++)
            for (let i = 22; i < option.cols[0].length - 45; i++)
            {
                option.cols[0][i].title = Format(option.cols[0][i].title, 'MM-dd').toString();
                option.cols[0][i].title = ("2026" + "-" + Format(option.cols[0][i].title, 'MM-dd').toString()).toString();
            }

            table.exportFile(ins.config.id, data, "xls");
            // æ¥éª¤2ï¼å®ä¹éè¦æé¤çåæ®µï¼ä¸å¯¼åºçåæ®µï¼æ¤å¤æé¤ operate å å¯é¢å¤æ·»å å¶ä»åæ®µï¼
            var excludeFields = ['éå®å·¥å', 'æ¨æ¥æ°é', 'è¦è´§æ¥æ', 'ä¸å¡ç¶æ', 'äº§çº¿å¥åºæ°é', 'æªææ°é', 'éå®è®¢åå®¡æ ¸æ¥æ', 'è®¢åç±»å', 'çäº§è®¢ååæ®ç±»å', 'è®¢åççº§', 'è®¢åäº¤è´§æ', 'è®¢åéæ±æ°é', 'å¼å·¥ä½é', 'çäº§å¨æ', 'æè¿å¼å·¥æ¥æ', 'æè¿å®å·¥æ¥æ', 'æºåä¸»åç ', 'æºåååç ', 'hmainid', 'è®¡éåä½', 'æåæ°é', 'æªå¥åºæ°é', 'HICMOInterID', 'HGroupID', 'HGroupName', 'HMaterID', 'HSourceID', 'HWorkShopID', 'HUnitID', 'HProdORGID', 'HEmpID', 'æåæ±æ¥æ°é', 'éå®è®¢åæ°é', 'æ¥è®¡åæ°éæ»é', 'æåæ°é', 'ä»æ¥ä¹åæ¥è®¡åæ°é', 'è®¡åå¼å§æ¥æ', 'è®¡åç»ææ¥æ', 'ææ©å¼å·¥æ¥æ', 'æä½å·¥', 'HMouldID', 'HMouldPCTime', 'æéå·¥ä½æ°', 'ä½¿ç¨å·¥è£'];

            for (let i = 19; i < option.cols[0].length - 40; i++) {
            // æ¥éª¤3ï¼çéæ°æ®ï¼çæä»åå«éå¯¼åºåæ®µçæ°æ°æ®
            var exportData = data.map(function (item) {
                var newItem = {};
                // éåå½åæ°æ®é¡¹çææåæ®µ
                for (var key in item) {
                    // ä»ä¿çä¸å¨æé¤åè¡¨ä¸çåæ®µ
                    if (!excludeFields.includes(key)) {
                        newItem[key] = item[key];
                    }
                }
                return newItem;
            });


            let processedData = preprocessData(data);


            table.exportFile(ins.config.id, processedData, "xls");

            for (let i = 22; i < option.cols[0].length - 45; i++) {
                option.cols[0][i].title = Format(option.cols[0][i].title, 'MM.dd');
            }
        }


        function preprocessData(data) {
            return data.map(row => {
                return Object.keys(row).reduce((acc, key) => {
                    let value = row[key];
                    if (typeof value === 'number' || typeof value === 'string') {
                        value = String(value).replace(/"/g, '"');
                    } else if (value instanceof Date) {
                        value = value.toISOString().replace('T', ' ').replace('Z', '');
                    }
                    acc[key] = value;
                    return acc;
                }, {});
            });
        }

        //éèåè®¾ç½®
        function get_HideColumn() {
            var colName = "";

 WebTM/views/ÖÊÁ¿¹ÜÀí/¼ìÑé·½°¸µ¥/QC_Add_CheckProject.html

@@ -883,6 +883,7 @@
                                            HSampleSchemeName: checkStatus.data[0].æ½æ ·æ¹æ¡,
                                            HAnalysisMethod: checkStatus.data[0].åææ¹æ³,
                                        });
                                        OptionData[0] = obj.data;
                                        layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
                                    }
                                    else {
@@ -904,9 +905,12 @@
                                            });
                                        }

                                        table.reload("mainTable", {
                                            data: buttonArr    //å°æ°æ®éæ°è½½å¥è¡¨æ ¼
                                        })
                                        //table.reload("mainTable", {
                                        //    data: buttonArr    //å°æ°æ®éæ°è½½å¥è¡¨æ ¼
                                        //})

                                        option.data = buttonArr;
                                        table.render(option);

                                        layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
                                    }

 WebTM/views/³µ¼ä¹ÜÀí/µ¥Æ·¹ýÕ¾_Ð¡ÎÀ/Cj_SaveSNByICMO.html

@@ -227,7 +227,7 @@
                        success: function (result) {
                            if (result.count == 1) { // è¯´æéªè¯æåäºï¼
                                layer.close(wait);
                                layer.alert(result.Message, { icon: 5 });
                                layer.alert(result.Message, { icon: 1 });
                            }
                            else {
                                layer.close(wait);

 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')

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

New file
@@ -0,0 +1,857 @@
ï»¿
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<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/HideButton.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.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>

</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">
                                        <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes"
                                                lay-filter="HInitTimeCycle" style="width:190px;">
                                        </select>
                                    </div>
                                </div>-->
                                <!--<div class="layui-inline">
                                    <label class="layui-form-label">å¼å§æ¥æ</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate"
                                               style="width:190px;">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">ç»ææ¥æ</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate"
                                               style="width:190px;">
                                    </div>
                                </div>-->
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">å°è½¦æ¡ç </label>
                                    <div class="layui-input-block" style="margin-left: 120px;">
                                        <input type="text" class="layui-input" name="HCarBarCode" id="HCarBarCode">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">æ¡ç </label>
                                    <div class="layui-input-block" style="margin-left: 120px;">
                                        <input type="text" class="layui-input" name="HBarCode" id="HBarCode">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">ç©æä»£ç </label>
                                    <div class="layui-input-block" style="margin-left: 120px;">
                                        <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber">
                                    </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 class="layui-inline" style="margin-left:80px;">
                                    <label class="layui-form-label" style="width: 85px;">ä»åºåç§°</label>
                                    <div class="layui-input-block" style="margin-left: 120px;">
                                        <input type="text" class="layui-input" name="HWHID" id="HWHID" value="0" style="display:none">
                                        <input type="text" class="layui-input" name="HWHName" id="HWHName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;">
                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHWHID" id="btnHWHID" style="padding: 0 10px; margin-right: 3px;">
                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                        </button>
                                    </div>
                                </div>
                                <div class="layui-inline" style="margin-left: -60px;">
                                    <label class="layui-form-label" style="width: 85px;">ä»ä½åç§°</label>
                                    <div class="layui-input-block" style="margin-left: 120px;">
                                        <input type="text" class="layui-input" name="HSPID" id="HSPID" value="0" style="display:none">
                                        <input type="text" class="layui-input" name="HStockPlaceName" id="HStockPlaceName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;">
                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHStockPlaceID" id="btnHStockPlaceID" style="padding: 0 10px; margin-right: 3px;">
                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                        </button>
                                    </div>
                                </div>
                                <!--æ¾ç¤ºå½åè¿æ»¤æ¹æ¡-->
                                <div class="layui-inline" style="margin-left:5px;">
                                    <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
                                </div>
                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                    <div class="layui-row" style="margin-top:10px;">
                                        <div class="layui-row" style="margin-top:5px">
                                            <div class="layui-inline">
                                                <label class="layui-form-label">è¿æ»¤</label>
                                                <div class="layui-input-block">
                                                    <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;" class="ForFilteringSchemes">
                                                    </select>
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;" class="ForFilteringSchemes">
                                                    <option value="0" selected="selected"></option>
                                                    <option value="=">=</option>
                                                    <option value=">=">>=</option>
                                                    <option value=">">></option>
                                                    <option value="<="><=</option>
                                                    <option value="<"><</option>
                                                    <option value="<>"><></option>
                                                    <option value="7">åå«</option>
                                                    <option value="8">å·¦åå«</option>
                                                    <option value="9">å³åå«</option>
                                                    <option value="10">ä¸åå«</option>
                                                </select>
                                            </div>
                                            <div class="layui-inline">
                                                <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
                                            </div>
                                            <div class="layui-row" style="margin-top:5px">
                                                <div class="layui-inline">
                                                    <label class="layui-form-label">è¿æ»¤</label>
                                                    <div class="layui-input-block">
                                                        <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
                                                        </select>
                                                    </div>
                                                </div>
                                                <div class="layui-inline">
                                                    <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
                                                        <option value="0" selected="selected"></option>
                                                        <option value="=">=</option>
                                                        <option value=">=">>=</option>
                                                        <option value=">">></option>
                                                        <option value="<="><=</option>
                                                        <option value="<"><</option>
                                                        <option value="<>"><></option>
                                                        <option value="7">åå«</option>
                                                        <option value="8">å·¦åå«</option>
                                                        <option value="9">å³åå«</option>
                                                        <option value="10">ä¸åå«</option>
                                                    </select>
                                                </div>
                                                <div class="layui-inline">
                                                    <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
                                                </div>
                                            </div>
                                            <div class="layui-row" style="margin-top:5px">
                                                <div class="layui-inline">
                                                    <label class="layui-form-label">è¿æ»¤</label>
                                                    <div class="layui-input-block">
                                                        <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
                                                        </select>
                                                    </div>
                                                </div>
                                                <div class="layui-inline">
                                                    <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
                                                        <option value="0" selected="selected"></option>
                                                        <option value="=">=</option>
                                                        <option value=">=">>=</option>
                                                        <option value=">">></option>
                                                        <option value="<="><=</option>
                                                        <option value="<"><</option>
                                                        <option value="<>"><></option>
                                                        <option value="7">åå«</option>
                                                        <option value="8">å·¦åå«</option>
                                                        <option value="9">å³åå«</option>
                                                        <option value="10">ä¸åå«</option>
                                                    </select>
                                                </div>
                                                <div class="layui-inline">
                                                    <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
                                                </div>
                                            </div>
                                        </div>
                                    </div>
                                </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_export" id="get_export"><i class="layui-icon layui-icon-export"></i>å¯¼åº</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideButton"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>æé®è®¾ç½®</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="ExitButton"><i class="layui-icon layui-icon-logout"></i>éåº</button>
                            </div>
                        </script>

                    </form>
                </div>
            </div>
        </div>
    </div>

    <script>
        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
            //æ¥è¯¢æ¡ä»¶
            var sWhere = "";
            var option = [];
            var HModName = "Kf_WorkShopICStockBillList";
            //ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
            var titleData = ["HMaterID", "HProcID", "HGroupID", "HSourceID", "HBadReasonID"];


            var ins;                        //ç¨äºå¯¼åºexcel
            //#endregion

            //#region è¿å¥é¡µé¢æ¢å è½½
            //åå§åçé¢
            set_ClearBill();
            //#endregion

            //#region è§¦åäºä»¶ï¼åæ¬form.on(){}æ ¼å¼çææç¹å»äºä»¶ãéæ©äºä»¶ç
            //å¤´å·¥å·æ äºä»¶
            table.on('toolbar(mainTable)', function (obj) {
                var checkStatus = table.checkStatus(obj.config.id);
                switch (obj.event) {
                    //å·æ°
                    case 'get_Refresh': get_Refresh();
                        break;
                    //éåºæé®
                    case 'get_Exit': Pub_Close(2);
                        break;
                    //å¯¼åºexcel
                    case 'get_export':
                        get_Export();
                        break;
                    //åè®¾ç½®
                    case 'set_HideColumn': get_HideColumn();
                        break;
                    case 'set_HideButton':
                        var btns = document.getElementsByTagName("button");     //è·åæ¬é¡µæææé®å¯¹è±¡
                        var HBillType = "Kf_WorkShopICStockBillList";
                        get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
                        break;
                };
            });
            //æ¥è¯¢æé®
            form.on('submit(btnSearch)', function (data) {
                get_FastQuery();
            });
            // éç½®æé®
            form.on('submit(btnReSearch)', function (data) {
                set_ClearQuery();
            });
            //#endregion

            //#region ç¹å»è¡éä¸é«äº®
            table.on('row(mainTable)', function (obj) {
                //éä¸è¡æ¹åé¢è²
                var flag = !obj.tr.find(':checkbox:first').prop('checked');
                obj.tr.find(':checkbox').prop('checked', flag);
                if (flag) {
                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //è®¾ç½®å¤éæ¡éä¸æ ·å¼
                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//æ¹åå½åtrèæ¯é¢è²ååä½é¢è²
                } else {
                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//åæ¶å¤éæ¡éä¸æ ·å¼
                    $(obj.tr.selector).attr({ "style": "background:" });//åæ¶å½åtré¢è²
                }
                //mainTable ä¸ºè¡¨æ ¼ID   æ³¨ææ¤å¤å¦æIDä¸æ£ç¡®å°å¯¼è´ä½ å¨çå¬å¤éæ¡æ¶è·åä¸å°ä½ éæ©çæ°æ®ï¼åé¢çåªæ¯æ·»å æå é¤éä¸æªéä¸æ ·å¼ä»¥åè®¾ç½®èæ¯è²ï¼åä½é¢è²
                layui.each(table.cache.mainTable, function (i, l) {
                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
                        l.LAY_CHECKED = flag;
                    }
                });
            })
            //#endregion

            //#region æ¤é¡µé¢æææ¹æ³
            // åå§åçé¢
            function set_ClearBill() {
                //åå§åæ¥æé´éãå¼å§æ¥æãç»ææ¥æ
                setSelect_HInitTimeCycle();
                //è¥æ¥æé´éä¸ä¸º ä»»æé´éï¼åç¦ç¨å¼å§æ¥æä¸ç»ææ¥æçéæ©
                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
                if (HInitTimeCycle != -1) {
                    $('#HBeginDate').prop('disabled', true);
                    $('#HEndDate').prop('disabled', true);
                } else {
                    $('#HBeginDate').prop('disabled', false);
                    $('#HEndDate').prop('disabled', false);
                }
                var today = new Date();
                var twoDaysAgo = new Date();
                twoDaysAgo.setDate(today.getDate() - 2);
                //æ ¹æ®æ¥æé´éè®¾ç½®å¼å§æ¶é´ä¸ç»ææ¶é´
                $("#HBeginDate").val(Format(twoDaysAgo, "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                //åå§åè¡¨æ ¼
                set_InitGrid();
                get_FastQuery();
            }

            //åå§åè¡¨æ ¼
            function set_InitGrid() {
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , height: 'full-50'
                    , totalRow: true
                    , page: true
                    , limits: [50, 500, 5000, 50000]
                    , limit: 50
                    , cellMinWidth: 90

                };
                var data = [];
                option.cols = [[
                    { field: 'æ°é', title: 'æ°é', width: 100 }
                    , { field: 'ä»åº', title: 'ä»åº', width: 100 }
                    , { field: 'ä»ä½', title: 'ä»ä½', width: 100 }
                    , { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 100 }
                    , { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 100 }
                    , { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 100 }
                    , { field: 'æ¹æ¬¡', title: 'æ¹æ¬¡', width: 100 }
                    , { field: 'è¾å©å±æ§', title: 'è¾å©å±æ§', width: 100 }
                    , { field: 'çäº§æ¥æ', title: 'çäº§æ¥æ', width: 100 }
                    , { field: 'æææè³', title: 'æææè³', width: 100 }
                    , { field: 'ç»ç»', title: 'ç»ç»', width: 100 }
                ]];
                option.data = data;
                table.render(option);
            }

            //å°è½¦ç¼ç åè½¦æ¹æ³
            $('#HCarBarCode').on('keydown', function (event) {
                var HCarBarCode = $('#HCarBarCode').val();
                if (event.keyCode == 13) {
                    if (!HCarBarCode) {
                        layer.msg(get_MessageError("[0000-2-019]æ¡å½¢ç ä¸è½ä¸ºç©ºï¼", sessionStorage["HTranSlate"]))
                        return;
                    }
                    get_FastQuery();
                }
            });



            //ç©æä»£ç åè½¦æ¹æ³
            $('#HMaterNumber').on('keydown', function (event) {
                var HMaterNumber = $('#HMaterNumber').val();
                if (event.keyCode == 13) {
                    if (!HMaterNumber) {
                        layer.msg(get_MessageError("[0000-2-019]æ¡å½¢ç ä¸è½ä¸ºç©ºï¼", sessionStorage["HTranSlate"]))
                        return;
                    }
                    get_FastQuery();
                }
            });

            //#region åå§æ¥æé´é ä¸æåè¡¨
            function setSelect_HInitTimeCycle() {
                var valueList = [0, 1, 2, 3, 4, 5, 6, 29];
                var titleList = ["ä»å¤©", "è¿ä¸¤å¤©", "è¿ä¸å¤©", "è¿åå¤©", "è¿äºå¤©", "è¿åå¤©", "è¿ä¸å¤©", "è¿30å¤©"];

                var HInitTimeCycle_ArrayList = '<option  value="-1" selected="selected" >ä»»æé´é</option>';
                for (var i = 0; i < valueList.length; i++) {
                    HInitTimeCycle_ArrayList += '<option  style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';
                }

                $("#HInitTimeCycle").empty();
                $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
                form.render('select');

                $("#HInitTimeCycle").val("-1");
            }
            //#endregion
            //æ¥è¯¢ HCarBarCode, HBillType, HProcExBillNo, HMaterNumber, HWHID, HSPID, 
            function get_Display(sWhere) {
                var index = layer.load(0, { shade: false });
                var ajaxLoad = layer.load();
                //è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
                $.ajax({

                    url: GetWEBURL() + '/KF_ICInventory_WorkShop/KF_ICInventory_WorkShopList',
                    type: "GET",
                    async:false,
                    data: { "sWhere": sWhere },
                    success: function (data1) {
                        if (data1.count >-1) {
                            var data = [];
                            var col = [];
                            //ç»ç©ºçæ°ç»èµå¼
                            for (var key in data1.list) {
                                //å¨æè·ååè¡¨ææåå
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                                //è·åä¸éè¦æ¾ç¤ºçåï¼Hå¼å¤´çåä¸æ¾ç¤ºï¼
                                var patrn = new RegExp(/^h/i);
                                if (patrn.test(data1.list[key].ColmCols)) {
                                    titleData[key] = data1.list[key].ColmCols;
                                }
                            }
                            //å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
                            col.push({ type: 'checkbox', totalRowText: 'åè®¡', fixed: 'left' });
                            for (var i = 0; i < data.length; i++) {
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
                                }
                                else {
                                    switch (data[i].Type) {
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
                                            break;
                                        case 'long':
                                        case 'Int32':
                                        case 'Int64':
                                        case 'double':
                                        case 'Decimal':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                    }
                                }
                            }

                            //å¨ææ¾ç¤ºåå
                            option = {
                                elem: '#mainTable'
                                , toolbar: '#toolbarDemo'
                                , cols: [col]
                                , data: data1.data
                                , height: 'full-80'
                                , totalRow: true
                                , page: true
                                , limits: [50, 500, 5000, 50000]
                                , limit: 50
                                , cellMinWidth: 90
                            }
                            ins = table.render(option);
                            ////å·æ°æé®æ¾ç¤º
                            //var btns = document.getElementsByTagName("button");     //è·åæ¬é¡µæææé®å¯¹è±¡
                            //var HBillType = "Kf_WorkShopICStockBillList";
                            //Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);

                            //å·æ°è¡¨æ ¼æ°æ®
                            DisPlay_HideColumn();
                            if ($("#ColName option").length < 1) {
                                ColFilter();

                            }
                            layer.close(ajaxLoad);
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                    }
                });
                layer.close(index);
            }

            //å¿«éæ¥è¯¢
            function get_FastQuery() {
                var HWHName = $("#HWHName").val();
                var HBarCode = $("#HBarCode").val();
                var HStockPlaceName = $("#HStockPlaceName").val();
                //var HBeginDate = $("#HBeginDate").val();
                //var HEndDate = $("#HEndDate").val();
                var HCarBarCode = $('#HCarBarCode').val()
                var HMaterNumber = $('#HMaterNumber').val()
                var HWHID = $("#HWHID").val()
                var HSPID = $("#HSPID").val()
                var ColName = $("#ColName").val();//å¤éæ¡
                var Comparator = $("#Comparator").val()
                var ColContent = $("#ColContent").val();
                var ColName1 = $("#ColName1").val();//å¤éæ¡
                var Comparator1 = $("#Comparator1").val()
                var ColContent1 = $("#ColContent1").val();
                var ColName2 = $("#ColName2").val();//å¤éæ¡
                var Comparator2 = $("#Comparator2").val()
                var ColContent2 = $("#ColContent2").val();
                if (ColName != 0 && Comparator != 0) {
                    var com = "";
                    switch (Comparator) {
                        case "7":
                            com = "like'%" + ColContent + "%'";
                            break;
                        case "8":
                            com = "like'%" + ColContent + "'";
                            break;
                        case "9":
                            com = "like'" + ColContent + "%'";
                            break;
                        case "10":
                            com = "not like'%" + ColContent + "%'";
                            break;
                        default:
                            com = "" + Comparator + "'" + ColContent + "'";
                            break;
                    }
                    sWhere += " and " + ColName + " " + com;
                }
                if (ColName1 != 0 && Comparator1 != 0) {
                    var com1 = "";
                    switch (Comparator1) {
                        case "7":
                            com1 = "like'%" + ColContent1 + "%'";
                            break;
                        case "8":
                            com1 = "like'%" + ColContent1 + "'";
                            break;
                        case "9":
                            com1 = "like'" + ColContent1 + "%'";
                            break;
                        case "10":
                            com1 = "not like'%" + ColContent1 + "%'";
                            break;
                        default:
                            com1 = "" + Comparator1 + "'" + ColContent1 + "'";
                            break;
                    }
                    sWhere += " and " + ColName1 + " " + com1;
                }
                if (ColName2 != 0 && Comparator2 != 0) {
                    var com2 = "";
                    switch (Comparator2) {
                        case "7":
                            com2 = "like'%" + ColContent2 + "%'";
                            break;
                        case "8":
                            com2 = "like'%" + ColContent2 + "'";
                            break;
                        case "9":
                            com2 = "like'" + ColContent2 + "%'";
                            break;
                        case "10":
                            com2 = "not like'%" + ColContent2 + "%'";
                            break;
                        default:
                            com2 = "" + Comparator2 + "'" + ColContent2 + "'";
                            break;
                    }
                    sWhere += " and " + ColName2 + " " + com2;
                }
                //if (HBeginDate && HEndDate) {
                //    sWhere += " and  CONVERT(varchar(100),æä½æ¶é´, 23) between '" + HBeginDate + "' and  '" + HEndDate + "' "
                //}
                if (HStockPlaceName) {
                    sWhere += "and ä»ä½åç§° like '%" + HStockPlaceName + "%'";

                }
                if (HWHName) sWhere += "and ä»åºåç§° like '%" + HWHName + "%'";
                if (HCarBarCode) sWhere += "and å°è½¦æ¡ç  like '%" + HCarBarCode + "%'";
                if (HBarCode) sWhere += "and æ¡ç  like '%" + HBarCode + "%'";
                get_Display(sWhere);
                sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å

            }

            //éç½®å¿«éæ¥è¯¢
            function set_ClearQuery() {
                /*var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;*/
                //$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //å¼å§æ¥æ
                //$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));  //ç»ææ¥æ
                $('#HCarBarCode').val("")
                $('#HBarCode').val("")
                $('#HProcExBillNo').val("")
                $('#HMaterNumber').val("")
                $("#HWHID").val(0)
                $("#HWHName").val("")
                $("#HSPID").val(0)
                $("#HStockPlaceName").val("")
                $("#ColContent").val("");
                $("#ColName").val("0");
                $("#Comparator").val("0");
                $("#ColContent1").val("");
                $("#ColName1").val("0");
                $("#Comparator1").val("0");
                $("#ColContent2").val("");
                $("#ColName2").val("0");
                $("#Comparator2").val("0");
                sWhere = "";
                get_FastQuery();
            }


            //#region å¯¼åºExecel
            function get_Export() {
                option.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().replaceAll(/[\r\n]+/g, '').replaceAll(',', 'ï¼').replaceAll(';', 'ï¼').replaceAll('"', 'â').replaceAll('\'', 'â');  // å°æ¢è¡ç¬¦æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
                        }
                    }
                });

                table.exportFile(ins.config.id, option.data, "xls");
            }
            //#endregion
            //æ¥æé´éä¸æåè¡¨çå¬
            form.on('select(HInitTimeCycle)', function (data) {
                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
                //è¥æ¥æé´éä¸ä¸º ä»»æé´éï¼åç¦ç¨å¼å§æ¥æä¸ç»ææ¥æçéæ©
                if (HInitTimeCycle != -1) {
                    $('#HBeginDate').prop('disabled', true);
                    $('#HEndDate').prop('disabled', true);

                    $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
                    $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));

                    //æ§è¡æ¥è¯¢æ¹æ³
                    get_FastQuery();
                } else {
                    $('#HBeginDate').prop('disabled', false);
                    $('#HEndDate').prop('disabled', false);
                }
            });
            //ä»åº
            form.on('submit(btnHWHID)', function () {
                //é¡µé¢å±-èªå®ä¹
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
                    title: 'ä»åºåè¡¨',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../../views/åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Warehouse.html?openType=2', 'yes'],
                    btn: ['ç¡®å®', 'åæ¶']
                    , btn1: function (index, layero) {
                        //æé®ãæé®ä¸ãçåè°
                        var iframeWindow = window['layui-layer-iframe' + index]  //è·åå¼¹æ¡é¡µé¢
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//è·åtableçelem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('è¯·éæ©æ°æ®');
                        }
                        $("#HWHName").val(checkStatus.data[0].ä»åºåç§°);
                        $("#HWHID").val(checkStatus.data[0].HItemID);
                        layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
                    }
                    , btn2: function (index, layero) {
                        //æé®ãæé®äºãçåè°
                        //return false å¼å¯è¯¥ä»£ç å¯ç¦æ¢ç¹å»è¯¥æé®å³é
                    },
                    end: function () {

                    },
                    success: function (layero, index) {

                    }
                });
            });

            //é»è®¤ä»ä½
            form.on('submit(btnHStockPlaceID)', function () {
                //é¡µé¢å±-èªå®ä¹
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
                    title: 'ä»ä½åè¡¨',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_StockPlace_List.html?openType=2', 'yes'],
                    btn: ['ç¡®å®', 'åæ¶']
                    , btn1: function (index, layero) {
                        //æé®ãæé®ä¸ãçåè°
                        var iframeWindow = window['layui-layer-iframe' + index]  //è·åå¼¹æ¡é¡µé¢
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//è·åtableçelem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('è¯·éæ©æ°æ®');
                        }
                        $("#HStockPlaceName").val(checkStatus.data[0].ä»ä½åç§°);
                        $("#HSPID").val(checkStatus.data[0].HMainID);
                        layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
                    }
                    , btn2: function (index, layero) {
                        //æé®ãæé®äºãçåè°
                        //return false å¼å¯è¯¥ä»£ç å¯ç¦æ¢ç¹å»è¯¥æé®å³é
                    },
                    end: function () {

                    },
                    success: function (layero, index) {

                    }
                });
            });

            //#region éèåè®¾ç½®
            function get_HideColumn() {
                var colName = "";
                var contentUrl = "";
                for (var i = 1; i < option.cols[0].length; i++) {
                    colName += option.cols[0][i]["title"] + ",";
                }
                var urlStr = window.document.location.pathname;//è·åæä»¶è·¯å¾
                var urlLen = urlStr.split('/');
                for (var i = 0; i < urlLen.length - 4; i++) {
                    contentUrl += "../";
                }
                colName = encodeURI(colName.substring(0, colName.length - 1));//å¯¹ URI è¿è¡ç¼ç 

                contentUrl += 'åºç¡èµæ/éèåè®¾ç½®/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;

                layer.open({
                    type: 2
                    , skin: "layui-layer-rim" //å ä¸è¾¹æ¡
                    , title: "éèåè®¾ç½®"  //æ é¢
                    , closeBtn: 1  //çªä½å³ä¸è§å³é ç æ ·å¼
                    , shift: 2 //å¼¹åºå¨ç»
                    , area: ["50%", "90%"] //çªä½å¤§å°
                    , maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
                    , content: [contentUrl, "yes"]
                    , btn: ["ç¡®å®", "åæ¶"]
                    , btn1: function (index, laero) {
                        //å·æ°è¡¨æ ¼æ°æ®
                        DisPlay_HideColumn();
                        //æ´æ°è¡¨æ ¼ç¼åçæ°æ®
                        layer.close(index);//å³éå¼¹çª
                    }
                })
            }
            //#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 titleData = ["åæ®ID", "HMouldID", "hsubid", "HManagerID", "æºåä¸»åç ", "æºåååç "];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±

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

                            for (var i = 0; i < option.cols[0].length - 1; i++) {
                                var dataCols = dataCol[i].split('|');
                                //éèå
                                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 (data1.data[0].HColumnWidth != 0) {
                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
                                //} else {
                                //    option.cols[0][i + 1]["width"] = "";
                                //}
                                //æ¾ç¤ºå
                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
                                    option.cols[0][i + 1]["hide"] = false;
                                }
                                //åä½æå¨ä½ç½®(å·¦ å±ä¸ å³)
                                switch (dataCols[2]) {
                                    case "L":
                                        option.cols[0][i + 1]["align"] = "left";
                                        break;
                                    case "M":
                                        option.cols[0][i + 1]["align"] = "center";
                                        break;
                                    case "R":
                                        option.cols[0][i + 1]["align"] = "right";
                                        break;
                                }
                            }

                            //åæ¶å»ç»å
                            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";
                                }
                            }
                            table.render(option);
                        } else {
                            table.render(option);
                        }
                    }, error: function () {
                        layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                    }
                })
            }
            //#endregion

            //#region åææ¾ç¤ºä¸ææ¡
            function ColFilter() {
                var Organization = '<option  value="0" selected="selected" ></option>';
                for (var i = 1; i < option.cols[0].length; i++) {
                    if (option.cols[0][i].hide != true) {
                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
                    }
                }
                $("#ColName").empty();
                $("#ColName").append(Organization);
                $("#ColName1").empty();
                $("#ColName1").append(Organization);
                $("#ColName2").empty();
                $("#ColName2").append(Organization);
                form.render('select');
            }
            //#endregion

            //ä»¥ä¸æ¯layuiæ¨¡å
        });
    </script>

</body>
</html>

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

@@ -349,16 +349,16 @@
                            }
                            //å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡è¡' });
                            col.push({
                                field: "æ¯å¦æå°",
                                title: "æ¯å¦æå°",
                                align: 'center',
                                sort: true,
                                width: 100,
                                templet: function (d) {
                                    return d.æå°æ¥æ ? 'å·²æå°' : '';
                                }
                            });
                            //col.push({
                            //    field: "æ¯å¦æå°",
                            //    title: "æ¯å¦æå°",
                            //    align: 'center',
                            //    sort: true,
                            //    width: 100,
                            //    templet: function (d) {
                            //        return d.æå°æ¥æ ? 'å·²æå°' : '';
                            //    }
                            //});
                            for (var i = 0; i < data.length; i++) {
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå

			@@ -194,6 +194,7 @@
			<Content Include="views\Baseset\åºç¡èµæ\Gy_EnvironmentTestSchemeBillList.html" />
			<Content Include="views\WMSæ«ç æ¨¡å\çäº§é¢æ\Kf_MateOutBackBill_Check_PDA.html" />
			<Content Include="views\WMSæ«ç æ¨¡å\çäº§é¢æ\Kf_MateOutBackBill_CheckList_PDA.html" />
			<Content Include="views\WMSæ«ç æ¨¡å\åºåè½¬ç§»\KF_ICInventory_WorkShop_PDA.html" />
			<Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\Add_Edit_Gy_Driver.html" />
			<Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\Add_Edit_Gy_ItemMoney.html" />
			<Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\Gy_CarList.html" />
			@@ -999,6 +1000,7 @@
			<Content Include="views\è½¦é´ç®¡ç\æ¥è¡¨åæ\Cj_HeatTreatmentTemperatureCurveChart.html" />
			<Content Include="views\è½¦é´ç®¡ç\æ¥è¡¨åæ\Cj_SPCOscillationCurve.html" />
			<Content Include="views\è½¦é´ç®¡ç\æ¥è¡¨åæ\Cj_TemperatureCurveDryingMachine.html" />
			<Content Include="views\è½¦é´ç®¡ç\æ¥è¡¨åæ\KF_ICInventory_WorkShop.html" />
			<Content Include="views\è½¦é´ç®¡ç\æ¥è¡¨åæ\Kf_PressurizedWaterNoOutReport.html" />
			<Content Include="views\è½¦é´ç®¡ç\å¯å¨ç¹æ£å\Gy_WorkBeginDotCheckListBill.html" />
			<Content Include="views\è½¦é´ç®¡ç\å¯å¨ç¹æ£å\Gy_WorkBeginDotCheckListBillList.html" />

New file
			@@ -0,0 +1,376 @@
			ï»¿<!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/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>
			<style type="text/css">
			input.layui-input.layui-unselect {
			padding-right: 0;
			}
			</style>
			</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" style="width: 30px;">æ¥æ</label>
			<input type="date" class="layui-input" id="HBeginDate" style="width:110px;" placeholder="yyyy-MM-dd">
			</div>-->
			<!--<div class="layui-inline">
			<label class="layui-form-label" style="width:5px">-</label>
			</div>
			<div class="layui-inline">
			<input type="date" class="layui-input" id="HEndDate" style="width:110px;" placeholder="yyyy-MM-dd">
			</div>-->

			<div class="layui-inline" style="margin-top:2px;">
			<label class="layui-form-label" style="width: 60px;">å æ® å·</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="width:125px;">
			</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 class="layui-colla-content" style="padding: 6px; margin-left: 1%;">
			<div class="layui-row" style="margin-top:5px">
			<div class="layui-inline">
			<label class="layui-form-label" style="width:30px;">è¿æ»¤</label>
			<div class="layui-input-block" style="width:85px;margin-left:65px;">
			<select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName">
			</select>
			</div>
			</div>
			<div class="layui-inline" style="width: 85px;">
			<select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator">
			<option value="0" selected="selected"></option>
			<option value="=">=</option>
			<option value=">=">>=</option>
			<option value=">">></option>
			<option value="<="><=</option>
			<option value="<"><</option>
			<option value="<>"><></option>
			<option value="7">åå«</option>
			<option value="8">å·¦åå«</option>
			<option value="9">å³åå«</option>
			<option value="10">ä¸åå«</option>
			</select>
			</div>
			<div class="layui-inline">
			<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent" style="width: 85px;">
			</div>
			</div>
			</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="btnDel"><i class="layui-icon layui-icon-delete"></i>å é¤</button>-->
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>éåº</button>
			</div>
			</script>
			</form>
			</div>
			</div>
			</div>
			</div>

			<script>
			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 HModName = "Sc_MouldUpperBillList_PDA";
			//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			var titleData = [];

			//#endregion

			//#region è¿å¥é¡µé¢æ¢å è½½

			//#region åå§åçé¢

			set_ClearBill();

			//#endregion

			//#region ç¹å»äºä»¶åæ¬on formäºä»¶ç
			//å¤´å·¥å·æ äºä»¶
			table.on('toolbar(mainTable)', function (obj) {
			switch (obj.event) {
			//å é¤
			case 'btnDel': set_DeleteBill();
			break;
			case 'btn-exit':
			layer.confirm('æ¨ç¡®å®è¦éåºåï¼', { icon: 3, title: 'æç¤º' }, function (index) {
			parent.location.href = "../../../views/index_Mobile.html";
			});
			break;
			};
			});

			//éç½®æé®
			form.on('submit(btnReSearch)', function (data) {
			set_ClearQuery();
			});
			//æ¥è¯¢æé®
			form.on('submit(btnSearch)', function (data) {
			get_FastQuery();
			});

			//#endregion

			//#region æ¤é¡µé¢ææçæ¹æ³

			//åå§åçé¢
			function set_ClearBill() {
			//åå§åæ¶é´
			$("#HBeginDate").val(Format(new Date() - 1000 * 60 * 60 * 24 * 30, "yyyy-MM-dd"));
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
			//å è½½æ°æ®å°ç½æ ¼
			get_FastQuery();
			}

			//å è½½ç½æ ¼
			function get_Display(sWhere) {
			var ajaxLoad = layer.load();
			$.ajax({
			url: GetWEBURL() + '/KF_ICInventory_WorkShop/KF_ICInventory_WorkShopList',
			type: "GET",
			data: { "sWhere": sWhere },
			success: function (data1) {
			if (data1.count == 1) {
			var data = [];
			var col = [];
			//ç»ç©ºçæ°ç»èµå¼
			for (var key in data1.list) {
			data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
			var patrn = new RegExp(/^h/i);
			if (patrn.test(data1.list[key].ColmCols)) {
			titleData[key] = data1.list[key].ColmCols;
			}
			}
			//å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
			col.push({ type: 'checkbox', fixed: 'left' });
			for (var i = 0; i < data.length; i++) {
			if ($.inArray(data[i].name, titleData) > -1) {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
			}
			else {
			switch (data[i].Type) {
			//int
			case 'DateTime':
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
			break;
			default:
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
			}
			}
			}

			//å¨ææ¾ç¤ºåå
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, cols: [col]
			, data: data1.data
			, height: 'full-110'
			, page: true
			, limits: [50, 500, 5000, 50000]
			, limit: 50
			, cellMinWidth: 90
			}
			table.render(option);

			////å·æ°è¡¨æ ¼æ°æ®
			//DisPlay_HideColumn();

			if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
			ColFilter();
			}
			layer.close(ajaxLoad);
			} else {
			layer.close(ajaxLoad);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.close(ajaxLoad);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}

			//#region ç¹å»è¡éä¸é«äº®
			table.on('row(mainTable)', function (obj) {
			//éä¸è¡æ¹åé¢è²
			var flag = !obj.tr.find(':checkbox:first').prop('checked');
			obj.tr.find(':checkbox').prop('checked', flag);
			if (flag) {
			obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //è®¾ç½®å¤éæ¡éä¸æ ·å¼
			$(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//æ¹åå½åtrèæ¯é¢è²ååä½é¢è²
			} else {
			obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//åæ¶å¤éæ¡éä¸æ ·å¼
			$(obj.tr.selector).attr({ "style": "background:" });//åæ¶å½åtré¢è²
			}
			//mainTable ä¸ºè¡¨æ ¼ID æ³¨ææ¤å¤å¦æIDä¸æ£ç¡®å°å¯¼è´ä½ å¨çå¬å¤éæ¡æ¶è·åä¸å°ä½ éæ©çæ°æ®ï¼åé¢çåªæ¯æ·»å æå é¤éä¸æªéä¸æ ·å¼ä»¥åè®¾ç½®èæ¯è²ï¼åä½é¢è²
			layui.each(table.cache.mainTable, function (i, l) {
			if (obj.tr.index() == l.LAY_TABLE_INDEX) {
			l.LAY_CHECKED = flag;
			}
			});
			})
			//#endregion

			//å¿«éè¿æ»¤
			function get_FastQuery() {
			//var HBeginDate = $("#HBeginDate").val();//èµ·å§æ¥æ
			//var HEndDate = $("#HEndDate").val();//æªæ¢æ¥æ
			var HBillNo = $("#HBillNo").val();//åæ®å·
			var ColName = $("#ColName").val();//å¤éæ¡
			var Comparator = $("#Comparator").val()
			var ColContent = $("#ColContent").val();

			if (ColName != 0 && Comparator != 0) {
			var com = "";
			switch (Comparator) {
			case "7":
			com = "like'%" + ColContent + "%'";
			break;
			case "8":
			com = "like'%" + ColContent + "'";
			break;
			case "9":
			com = "like'" + ColContent + "%'";
			break;
			case "10":
			com = "not like'%" + ColContent + "%'";
			break;
			default:
			com = "" + Comparator + "'" + ColContent + "'";
			break;
			}
			sWhere += " and " + ColName + " " + com;
			}

			if (HBillNo) {
			sWhere += " and åæ®å· like '%" + HBillNo + "%'";
			}
			//if (HBeginDate != "" && HEndDate != "") {
			// sWhere += "and æ¥æ between '" + HBeginDate + "' and '" + HEndDate + "'";
			//}
			get_Display(sWhere);
			//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			sWhere = "";
			}

			//éç½®è¿æ»¤æ¡ä»¶
			function set_ClearQuery() {
			//åå§åæ¶é´
			//$("#HBeginDate").val(Format(new Date() - 1000 * 60 * 60 * 24 * 30, "yyyy-MM-dd"));
			//$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
			$("#HBillNo").val("");
			$("#ColContent").val("");
			$("#ColName").val("0");
			$("#Comparator").val("0");
			form.render('select');
			sWhere = "";
			}

			//åææ¾ç¤ºä¸ææ¡
			function ColFilter() {
			var Organization = '<option value="0" selected="selected" ></option>';
			for (var i = 1; i < option.cols[0].length; i++) {
			if (option.cols[0][i].hide != true) {
			Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
			}
			}
			$("#ColName").empty();
			$("#ColName").append(Organization);
			form.render('select');
			}

			//å é¤
			function set_DeleteBill() {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			if (checkStatus.data.length > 0) {
			var HInterID = [];
			for (var i = 0; i < data.length; i++) {
			HInterID.push(data[i].hmainid.toString() + "_" + data[i].hsubid.toString());
			}

			//é»è¾å é¤æ¹æ³
			layer.confirm("ç¡®è®¤è¦å é¤åï¼å é¤åä¸è½æ¢å¤", { title: "å é¤ç¡®è®¤" }, function (index) {
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Sc_MouldUpperBill/DeltetSc_MouldUpperBill", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			data: { "HInterID": HInterID.toString(), "HPRDORGID": sessionStorage["OrganizationID"], "user": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.count == 1) {
			layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
			// å¾å°frameç´¢å¼
			var index = layer.getFrameIndex(window.name);
			//å³éå½åframe
			layer.close(index);
			//ä¿®æ¹ä¸ºååå·æ°çé¢
			get_FastQuery();
			});

			} else {
			layer.alert(result.code + result.Message, { icon: 5 });
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			})
			}
			else {
			layer.msg('è¯·éæ©ä¸è¡æ°æ®å é¤ï¼');
			}
			}

			//#endregion
			});
			</script>
			</body>
			</html>

			@@ -16,7 +16,7 @@
			//OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");

			//20250731è°æ´ï¼æ¥è¯¢æå°æ°æ®æ¶ï¼æ´æ°æå°æ¥æå°æµè½¬å¡ä¸»è¡¨
			SqlXMLReportData.GenEntireData(this, "select cast((cast( b.æµæ°´å· as float)/10) as decimal(6,1)) æµæ°´å·,çäº§è®¢åå·,a.çäº§æ°é,a.éå®è®¢åå·,a.æåå·,a.æµè½¬å¡æ°é,a.äº¤è´§æ¥æ,a.äº§åä»£ç ,a.åæ®å·,case when ISNULL(a.çäº§è§æ ¼,'')='' then a.äº§åè§æ ¼ else a.çäº§è§æ ¼ end äº§åè§æ ¼,a.äº§ååç§°,a.æ¥æ,a.è®¡åå®å·¥æ¥æ,a.åæ®å·,b.å·¥åºåç§°,b.æ¨¡å·ç¼å·,b.å·¥èºåæ°,b.å å·¥è¯´æ,case when ISNULL(a.çäº§å¹å®½,0)=0 then a.å¹å®½ else a.çäº§å¹å®½ end å¹å®½,case when ISNULL(a.çäº§åé,0) = 0 then a.åé else a.çäº§åé end åé,a.ç½å¯è¦æ±,a.åºé¨å¤æ³¨,a.å®¢æ·,a.ä¸å¡å,a.æ¯é«,a.å¯¸æ°ç»ç»,a.å¨æ¯é¿,a.å¯å¸å¯åº¦,a.æ¯çº±åç§°åè§æ ¼,a.åºä¸,a.è¾æ°é,a.è¾å©åä½,a.å®åæµæ,a.äº¤è´§æ¥æ,a.æè²è¦æ±,a.è¾æ°é2,a.HAuxUnit2,a.è¾å©åä½2,b.åºç«å³èæ°é from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid where b.hmainid in("+Request.Params["linterid"] +") order by cast(b.æµæ°´å· as int)","update Sc_ProcessExchangeBillMain set HPrintQty1 = HPrintQty1+1 where HInterID in ("+Request.Params["linterid"] + ") and HPrintDate is null");
			SqlXMLReportData.GenEntireData(this, "select cast((cast( b.æµæ°´å· as float)/10) as decimal(6,1)) æµæ°´å·,çäº§è®¢åå·,a.çäº§æ°é,a.éå®è®¢åå·,a.æåå·,a.æµè½¬å¡æ°é,a.äº¤è´§æ¥æ,a.äº§åä»£ç ,a.åæ®å·,case when ISNULL(a.çäº§è§æ ¼,'')='' then a.äº§åè§æ ¼ else a.çäº§è§æ ¼ end äº§åè§æ ¼,a.äº§ååç§°,a.æ¥æ,a.è®¡åå®å·¥æ¥æ,a.åæ®å·,b.å·¥åºåç§°,b.æ¨¡å·ç¼å·,b.å·¥èºåæ°,b.å å·¥è¯´æ,case when ISNULL(a.çäº§å¹å®½,0)=0 then a.å¹å®½ else a.çäº§å¹å®½ end å¹å®½,case when ISNULL(a.çäº§åé,0) = 0 then a.åé else a.çäº§åé end åé,a.ç½å¯è¦æ±,a.åºé¨å¤æ³¨,a.å®¢æ·,a.ä¸å¡å,a.æ¯é«,a.å¯¸æ°ç»ç»,a.å¨æ¯é¿,a.å¯å¸å¯åº¦,a.æ¯çº±åç§°åè§æ ¼,a.åºä¸,a.è¾æ°é,a.è¾å©åä½,a.å®åæµæ,a.äº¤è´§æ¥æ,a.æè²è¦æ±,a.è¾æ°é2,a.HAuxUnit2,a.è¾å©åä½2,b.åºç«å³èæ°é from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid where b.hmainid in("+Request.Params["linterid"] +") order by cast(b.æµæ°´å· as int)","update Sc_ProcessExchangeBillMain set HPrintQty1 = HPrintQty1+1 where HInterID in ("+Request.Params["linterid"] + ") ");


			}

			@@ -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('è¯·éæ©ä¸è¡æ°æ®ï¼');
			}

			@@ -1204,47 +1204,7 @@

			//#endregion
			//#region éæ©æºåèµç»åè¡¨
			//#region éæ©æºå
			function get_checkMainSource() {
			var HOrgID = $("#HOrgID").val();
			var url = "../../éå®ç®¡ç/åè´§éç¥å/Xs_SeOutStockBillList.html?openType=2&HOrgID=" + HOrgID;


			layer.open({
			type: 2//å¼¹çªç±»å
			, skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
			, area: ['90%', '90%']//å¤§å°
			, title: 'æºååè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: [url, 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//è·åtableçelem:"#test"
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			var HCusID = $("#HCusID").val();//å¤æå®¢æ·
			if (HCusID == 0 \|\| HCusID == '') {
			HCusID = checkStatus.data[0]["HCusID"];
			$("#HCusID").val(checkStatus.data[0]["HCusID"]);
			$("#HCusName").val(checkStatus.data[0]["å®¢æ·"]);
			}
			for (var i = 0; i < checkStatus.data.length; i++) {
			if (checkStatus.data[i]["HCusID"] != HCusID) {
			layer.msg("ä¸æ¨å¤±è´¥!å·²ç»éä¸çè®°å½ä¸åå¨ä¸åå®¢æ·!");
			layer.close(index);
			return;
			}
			}

			//setInitBySeOutStockBill(checkStatus)
			layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) { }
			})
			}
			//#endregion

			//#region éæ©æºå
			function get_checkMainSource() {
			var HOrgID = $("#HOrgID").val();
			@@ -1285,6 +1245,10 @@
			layer.close(index);
			return;
			}
			$("#HMainSourceInterID").val(checkStatus.data[0]["hmainid"]);
			$("#HMainSourceEntryID").val(checkStatus.data[0]["hsubid"]);
			$("#HMainSourceBillNo").val(checkStatus.data[0]["åæ®å·"]);
			$("#HMainSourceBillType").val(checkStatus.data[0]["HBillType"]);
			appendInitBySeOutStockBill(checkStatus);
			layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			@@ -1782,6 +1746,10 @@
			, "HDate": formatDate(data.æ¥æ)
			, "HInnerBillNo": data.åé¨åæ®å·
			, "HOrgID": data.HOrgID
			, "HMainSourceInterID": data.HMainSourceInterID
			, "HMainSourceEntryID": data.HMainSourceEntryID
			, "HMainSourceBillType": data.HMainSourceBillType
			, "HMainSourceBillNo": data.HMainSourceBillNo


			, "HCusID": data.HCheckEmp
			@@ -1791,7 +1759,7 @@
			, "HEndAddr": data.ç®çå°
			, "HEndAddrName": data.ç®çå°åç§°
			, "HPickAddr": data.æè´§å°å
			, "HArriverAddr": data.æè´§å°å
			, "HArriverAddr": data.å°è´§æ¹å¼
			, "HTransType": data.è¿è¾æ¹å¼
			, "HCarTypeID": data.è½¦åID
			, "HCarTypeName": data.è½¦ååç§°

			@@ -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

			@@ -872,11 +872,15 @@
			columns.push({ field: 'è®¡åæªå®ææ°', title: 'è®¡åæªå®ææ°', width: 150, filter: true });
			columns.push({ field: 'æ¨æ¥æ°é', title: 'æ¨æ¥æ°é', filter: true });
			columns.push({ field: 'ä¼åçº§', title: 'ä¼åçº§', width: 150, edit: 'text', sort: true });

			columns.push({ field: 'çäº§èµæº', title: 'çäº§èµæº', width: 150, edit: 'text', event: "HSourceID", filter: true });
			columns.push({ field: 'çäº§è½¦é´', title: 'çäº§è½¦é´', width: 150, sort: true, filter: true });
			columns.push({ field: 'è¦è´§æ¥æ', title: 'è¦è´§æ¥æ', width: 150, templet: "<div>{{d.è¦è´§æ¥æ ==null ?'':layui.util.toDateString(d.è¦è´§æ¥æ, 'yyyy-MM-dd')}}</div>", event: "HDeliveryDate", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
			columns.push({ field: 'å¼å·¥æ¥æ', title: 'å¼å·¥æ¥æ', width: 150, templet: "<div>{{d.å¼å·¥æ¥æ ==null ?'':layui.util.toDateString(d.å¼å·¥æ¥æ, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd]' } });
			columns.push({ field: 'å®å·¥æ¥æ', title: 'å®å·¥æ¥æ', width: 150, templet: "<div>{{d.å®å·¥æ¥æ ==null ?'':layui.util.toDateString(d.å®å·¥æ¥æ, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd]' } });
			columns.push({ field: 'çäº§è½¦é´', title: 'çäº§è½¦é´', width: 150 });
			columns.push({ field: 'å¼å·¥æ¥æ', title: 'å¼å·¥æ¥æ', width: 150, templet: "<div>{{d.å¼å·¥æ¥æ ==null ?'':layui.util.toDateString(d.å¼å·¥æ¥æ, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
			columns.push({ field: 'å®å·¥æ¥æ', title: 'å®å·¥æ¥æ', width: 150, templet: "<div>{{d.å®å·¥æ¥æ ==null ?'':layui.util.toDateString(d.å®å·¥æ¥æ, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });

			//columns.push({ field: 'å¼å·¥æ¥æ', title: 'å¼å·¥æ¥æ', width: 150, templet: "<div>{{d.å¼å·¥æ¥æ ==null ?'':layui.util.toDateString(d.å¼å·¥æ¥æ, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd]' } });
			//columns.push({ field: 'å®å·¥æ¥æ', title: 'å®å·¥æ¥æ', width: 150, templet: "<div>{{d.å®å·¥æ¥æ ==null ?'':layui.util.toDateString(d.å®å·¥æ¥æ, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd]' } });

			columns.push({ field: 'ä¸å¡ç¶æ', title: 'ä¸å¡ç¶æ', width: 150, sort: true, hide: true });
			columns.push({ field: 'äº§çº¿å¥åºæ°é', title: 'äº§çº¿å¥åºæ°é', width: 150, sort: true, hide: true });
			@@ -887,28 +891,31 @@
			for (var i = 0; i < HArrangeProductDayQty; i++) {
			columns.push(dateColumns[i]);//0
			}


			columns.push({ field: 'æªææ°é', title: 'å¯ææ°é', width: 150, sort: true, hide: true });
			columns.push({ field: 'åæ®å·', title: 'åæ®å·', hide: true, sort: true });
			columns.push({ field: 'éå®è®¢åå®¡æ ¸æ¥æ', title: 'éå®è®¢åå®¡æ ¸æ¥æ', width: 150, templet: "<div>{{d.éå®è®¢åå®¡æ ¸æ¥æ ==null ?'':layui.util.toDateString(d.éå®è®¢åå®¡æ ¸æ¥æ, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
			columns.push({ field: 'è®¢åç±»å', title: 'è®¢åç±»å', width: 150, sort: true });
			columns.push({ field: 'çäº§èµæºç¼ç ', title: 'çäº§èµæºç¼ç ', width: 150, sort: true });
			columns.push({ field: 'çäº§è½¦é´ç¼ç ', title: 'çäº§è½¦é´ç¼ç ', width: 150, sort: true })
			columns.push({ field: 'çäº§å¨æ', title: 'çäº§å¨æ', width: 150, sort: true });
			columns.push({ field: 'ç»ç»ç¼ç ', title: 'ç»ç»ç¼ç ', width: 150, sort: true });
			columns.push({ field: 'çäº§ç»ç»', title: 'çäº§ç»ç»', width: 150, sort: true });
			columns.push({ field: 'çäº§è®¢åæç»è¡å·', title: 'çäº§è®¢åæç»è¡å·', width: 150, sort: true });
			columns.push({ field: 'è®¢åç±»å', title: 'è®¢åç±»å', width: 150, sort: true });
			columns.push({ field: 'çäº§è®¢ååæ®ç±»å', title: 'æºåè®¢ååæ®ç±»å', width: 150, sort: true });
			columns.push({ field: 'è®¢åççº§', title: 'è®¢åççº§', width: 150, sort: true });
			columns.push({ field: 'è®¢åäº¤è´§æ', title: 'è®¢åäº¤è´§æ', width: 150, templet: "<div>{{d.è®¢åäº¤è´§æ =='1900-01-01' ?'':layui.util.toDateString(d.è®¢åäº¤è´§æ, 'yyyy-MM-dd')}}</div>", sort: true });
			columns.push({ field: 'è®¢åéæ±æ°é', title: 'è®¢åéæ±æ°é', width: 150, sort: true });
			columns.push({ field: 'å¼å·¥ä½é', title: 'å¼å·¥ä½é', width: 150, sort: true });
			columns.push({ field: 'çäº§å¨æ', title: 'çäº§å¨æ', width: 150, sort: true });
			columns.push({ field: 'æè¿å¼å·¥æ¥æ', title: 'æè¿å¼å·¥æ¥æ', width: 150, templet: "<div>{{d.æè¿å¼å·¥æ¥æ =='' ?'':layui.util.toDateString(d.æè¿å¼å·¥æ¥æ, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
			columns.push({ field: 'æè¿å®å·¥æ¥æ', title: 'æè¿å®å·¥æ¥æ', width: 150, templet: "<div>{{d.æè¿å®å·¥æ¥æ =='' ?'':layui.util.toDateString(d.æè¿å®å·¥æ¥æ, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
			columns.push({ field: 'éå®è®¢åå®¡æ ¸æ¥æ', title: 'éå®è®¢åå®¡æ ¸æ¥æ', width: 150, hide: true, templet: "<div>{{d.éå®è®¢åå®¡æ ¸æ¥æ ==null ?'':layui.util.toDateString(d.éå®è®¢åå®¡æ ¸æ¥æ, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
			columns.push({ field: 'çäº§è®¢ååæ®ç±»å', title: 'æºåè®¢ååæ®ç±»å', width: 150, sort: true, hide: true });
			columns.push({ field: 'è®¢åççº§', title: 'è®¢åççº§', width: 150, sort: true, hide: true});
			columns.push({ field: 'è®¢åäº¤è´§æ', title: 'è®¢åäº¤è´§æ', width: 150, hide: true, templet: "<div>{{d.è®¢åäº¤è´§æ =='1900-01-01' ?'':layui.util.toDateString(d.è®¢åäº¤è´§æ, 'yyyy-MM-dd')}}</div>", sort: true });
			columns.push({ field: 'è®¢åéæ±æ°é', title: 'è®¢åéæ±æ°é', width: 150, sort: true, hide: true });
			columns.push({ field: 'å¼å·¥ä½é', title: 'å¼å·¥ä½é', width: 150, sort: true, hide: true });
			columns.push({ field: 'æè¿å¼å·¥æ¥æ', title: 'æè¿å¼å·¥æ¥æ', width: 150, hide: true, templet: "<div>{{d.æè¿å¼å·¥æ¥æ =='' ?'':layui.util.toDateString(d.æè¿å¼å·¥æ¥æ, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
			columns.push({ field: 'æè¿å®å·¥æ¥æ', title: 'æè¿å®å·¥æ¥æ', width: 150, hide: true, templet: "<div>{{d.æè¿å®å·¥æ¥æ =='' ?'':layui.util.toDateString(d.æè¿å®å·¥æ¥æ, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });

			columns.push({ field: 'æºåä¸»åç ', title: 'æºåä¸»åç ', width: 150, sort: true });
			columns.push({ field: 'æºåååç ', title: 'æºåååç ', width: 150, sort: true });
			columns.push({ field: 'hmainid', title: 'æ¥è®¡åå·¥åä¸»ç ', width: 150, sort: true });
			columns.push({ field: 'æºåä¸»åç ', title: 'æºåä¸»åç ', width: 150, sort: true, hide: true });
			columns.push({ field: 'æºåååç ', title: 'æºåååç ', width: 150, sort: true, hide: true });
			columns.push({ field: 'hmainid', title: 'æ¥è®¡åå·¥åä¸»ç ', width: 150, sort: true, hide: true });
			columns.push({ field: 'è®¡éåä½', title: 'è®¡éåä½', width: 150, sort: true });
			columns.push({ field: 'æåæ°é', title: 'æåæ°é', width: 150 });//0
			columns.push({ field: 'æªå¥åºæ°é', title: 'æªå¥åºæ°é', width: 150 });//0
			columns.push({ field: 'æªå¥åºæ°é', title: 'æªå¥åºæ°é', width: 150, hide: true });//0
			columns.push({ field: 'HICMOInterID', title: 'HICMOInterID', width: 150, hide: true });
			columns.push({ field: 'HGroupID', title: 'HGroupID', width: 150, hide: true });
			columns.push({ field: 'HGroupName', title: 'HGroupName', width: 150, hide: true });
			@@ -919,18 +926,18 @@
			columns.push({ field: 'HUnitID', title: 'HUnitID', hide: true });
			columns.push({ field: 'HProdORGID', title: 'HProdORGID', hide: true });
			columns.push({ field: 'HEmpID', title: 'HEmpID', hide: true });
			columns.push({ field: 'æåæ±æ¥æ°é', title: 'æåæ±æ¥æ°é', width: 150, edit: 'text', sort: true });
			columns.push({ field: 'éå®è®¢åæ°é', title: 'éå®è®¢åæ°é', width: 150, sort: true });//0
			columns.push({ field: 'æ¥è®¡åæ°éæ»é', title: 'æ¥è®¡åæ°éæ»é', width: 150, sort: true });//0
			columns.push({ field: 'æåæ°é', title: 'æåæ°é', width: 150, edit: 'text' });
			columns.push({ field: 'æåæ±æ¥æ°é', title: 'æåæ±æ¥æ°é', width: 150, edit: 'text', sort: true, hide: true});
			columns.push({ field: 'éå®è®¢åæ°é', title: 'éå®è®¢åæ°é', width: 150, sort: true, hide: true });//0
			columns.push({ field: 'æ¥è®¡åæ°éæ»é', title: 'æ¥è®¡åæ°éæ»é', width: 150, sort: true, hide: true });//0
			//columns.push({ field: 'æåæ°é', title: 'æåæ°é', width: 150, edit: 'text' });
			columns.push({ field: 'ä»æ¥ä¹åæ¥è®¡åæ°é', title: 'ä»æ¥ä¹åæ¥è®¡åæ°é', width: 150, sort: true });//0
			columns.push({ field: 'è®¡åå¼å§æ¥æ', title: 'é¢è®¡å¼å·¥æ¥æ', width: 150, templet: "<div>{{d.è®¡åå¼å§æ¥æ ==null ?'':layui.util.toDateString(d.è®¡åå¼å§æ¥æ, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
			columns.push({ field: 'è®¡åç»ææ¥æ', title: 'è®¡åç»ææ¥æ', width: 150, templet: "<div>{{d.è®¡åç»ææ¥æ ==null ?'':layui.util.toDateString(d.è®¡åç»ææ¥æ, 'yyyy-MM-dd')}}</div>", event: "HPlanEndDate", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
			columns.push({ field: 'ææ©å¼å·¥æ¥æ', title: 'ææ©å¼å·¥æ¥æ', width: 150, templet: "<div>{{d.ææ©å¼å·¥æ¥æ ==null ?'':layui.util.toDateString(d.ææ©å¼å·¥æ¥æ, 'yyyy-MM-dd')}}</div>", event: "HEarlyDate", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
			columns.push({ field: 'æä½å·¥', title: 'æä½å·¥', width: 150, edit: 'text', event: "HEmpID" });
			columns.push({ field: 'è®¡åå¼å§æ¥æ', title: 'é¢è®¡å¼å·¥æ¥æ', width: 150, hide: true, templet: "<div>{{d.è®¡åå¼å§æ¥æ ==null ?'':layui.util.toDateString(d.è®¡åå¼å§æ¥æ, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
			columns.push({ field: 'è®¡åç»ææ¥æ', title: 'è®¡åç»ææ¥æ', width: 150, hide: true, templet: "<div>{{d.è®¡åç»ææ¥æ ==null ?'':layui.util.toDateString(d.è®¡åç»ææ¥æ, 'yyyy-MM-dd')}}</div>", event: "HPlanEndDate", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
			columns.push({ field: 'ææ©å¼å·¥æ¥æ', title: 'ææ©å¼å·¥æ¥æ', width: 150, hide: true, templet: "<div>{{d.ææ©å¼å·¥æ¥æ ==null ?'':layui.util.toDateString(d.ææ©å¼å·¥æ¥æ, 'yyyy-MM-dd')}}</div>", event: "HEarlyDate", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
			columns.push({ field: 'æä½å·¥', title: 'æä½å·¥', width: 150, edit: 'text', event: "HEmpID", hide: true });
			columns.push({ field: 'HMouldID', title: 'HMouldID', width: 150, hide: true });
			columns.push({ field: 'HMouldPCTime', title: 'HMouldPCTime', width: 150, hide: true });
			columns.push({ field: 'æéå·¥ä½æ°', title: 'æéå·¥ä½æ°', width: 150 });
			columns.push({ field: 'æéå·¥ä½æ°', title: 'æéå·¥ä½æ°', width: 150, hide: true });
			columns.push({ field: 'ä½¿ç¨å·¥è£', title: 'ä½¿ç¨å·¥è£', width: 150, hide: true });
			columns.push({ fixed: 'right', title: 'æä½', toolbar: '#barDemo' });
			option_columns = columns;
			@@ -1420,17 +1427,24 @@
			}
			});

			var sql = "";

			if ($("#HMergeDept").val() == "æ¯") {
			//æ ¹æ®è½¦é´å é¤æ²¡æéå®çæ°æ®
			var sql = "delete from Sc_WorkBillSortBillSub where HLockedSub != 1 and HInterID in (select HInterID from Sc_WorkBillSortBillMain where (HWorkShopID=102357 or HWorkShopID=102359) and HLockOrder != 1 )";
			sql = "delete from Sc_WorkBillSortBillSub where HLockedSub != 1 and HInterID in (select HInterID from Sc_WorkBillSortBillMain where (HWorkShopID=102357 or HWorkShopID=102359) and HLockOrder != 1 )";
			} else {
			//æ ¹æ®è½¦é´å é¤æ²¡æéå®çæ°æ®
			var sql = "delete from Sc_WorkBillSortBillSub where HLockedSub != 1 and HInterID in (select HInterID from Sc_WorkBillSortBillMain where HWorkShopID=" + HWorkShopID + " and HLockOrder != 1 )";
			sql = "delete from Sc_WorkBillSortBillSub where HLockedSub != 1 and HInterID in (select HInterID from Sc_WorkBillSortBillMain where HWorkShopID=" + HWorkShopID + " and HLockOrder != 1 )";
			}

			if ($("#HWorkShopID").val() == "15035828") {
			//æ ¹æ®æäº§æ è®°å é¤æ²¡æéå®çæ°æ®ï¼éä»¶è½¦é´ï¼
			var sql = "delete from Sc_WorkBillSortBillSub where HLockedSub != 1 and HInterID in (select HInterID from Sc_WorkBillSortBillMain with(nolock) where HRemark = 'éä»¶è®¢å' and HLockOrder != 1 )";
			sql = "delete from Sc_WorkBillSortBillSub where HLockedSub != 1 and HInterID in (select HInterID from Sc_WorkBillSortBillMain with(nolock) where HRemark = 'éä»¶è®¢å' and HLockOrder != 1 )";
			}

			if ($("#HWorkShopID").val().split(",").length >= 2) {
			//æ ¹æ®è½¦é´å é¤æ²¡æéå®çæ°æ®
			sql = "delete from Sc_WorkBillSortBillSub where HLockedSub != 1 and HInterID in (select HInterID from Sc_WorkBillSortBillMain where HWorkShopID in (" + HWorkShopID + ") and HLockOrder != 1 )";
			}

			$.ajax({
			@@ -3469,6 +3483,18 @@
			})
			}

			//function get_Export() {
			// var data = option.data
			// data.forEach((item) => {
			// // å¦ææä¸ªåæ®µçå¼å¤ªé¿ï¼éè¦å»é¤æ¢è¡ç¬¦
			// if (item.è§æ ¼åå·.length > 0) { // åè®¾åæ®µåä¸ºfield
			// item.è§æ ¼åå· = item.è§æ ¼åå·.replace(/[\r\n]+/g, ''); // å°æ¢è¡ç¬¦æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
			// item.è§æ ¼åå· = item.è§æ ¼åå·.replace(/[,]+/g, 'ï¼'); // å°æ¢åå·æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
			// }
			// });
			// table.exportFile(ins.config.id, data, "xls");
			//}

			function get_Export() {
			var data = option.data
			data.forEach((item) => {
			@@ -3478,18 +3504,54 @@
			item.è§æ ¼åå· = item.è§æ ¼åå·.replace(/[,]+/g, 'ï¼'); // å°æ¢åå·æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
			}
			});
			for (let i = 19; i < option.cols[0].length - 40; i++)
			for (let i = 22; i < option.cols[0].length - 45; i++)
			{
			option.cols[0][i].title = Format(option.cols[0][i].title, 'MM-dd').toString();
			option.cols[0][i].title = ("2026" + "-" + Format(option.cols[0][i].title, 'MM-dd').toString()).toString();
			}

			table.exportFile(ins.config.id, data, "xls");
			// æ¥éª¤2ï¼å®ä¹éè¦æé¤çåæ®µï¼ä¸å¯¼åºçåæ®µï¼æ¤å¤æé¤ operate å å¯é¢å¤æ·»å å¶ä»åæ®µï¼
			var excludeFields = ['éå®å·¥å', 'æ¨æ¥æ°é', 'è¦è´§æ¥æ', 'ä¸å¡ç¶æ', 'äº§çº¿å¥åºæ°é', 'æªææ°é', 'éå®è®¢åå®¡æ ¸æ¥æ', 'è®¢åç±»å', 'çäº§è®¢ååæ®ç±»å', 'è®¢åççº§', 'è®¢åäº¤è´§æ', 'è®¢åéæ±æ°é', 'å¼å·¥ä½é', 'çäº§å¨æ', 'æè¿å¼å·¥æ¥æ', 'æè¿å®å·¥æ¥æ', 'æºåä¸»åç ', 'æºåååç ', 'hmainid', 'è®¡éåä½', 'æåæ°é', 'æªå¥åºæ°é', 'HICMOInterID', 'HGroupID', 'HGroupName', 'HMaterID', 'HSourceID', 'HWorkShopID', 'HUnitID', 'HProdORGID', 'HEmpID', 'æåæ±æ¥æ°é', 'éå®è®¢åæ°é', 'æ¥è®¡åæ°éæ»é', 'æåæ°é', 'ä»æ¥ä¹åæ¥è®¡åæ°é', 'è®¡åå¼å§æ¥æ', 'è®¡åç»ææ¥æ', 'ææ©å¼å·¥æ¥æ', 'æä½å·¥', 'HMouldID', 'HMouldPCTime', 'æéå·¥ä½æ°', 'ä½¿ç¨å·¥è£'];

			for (let i = 19; i < option.cols[0].length - 40; i++) {
			// æ¥éª¤3ï¼çéæ°æ®ï¼çæä»åå«éå¯¼åºåæ®µçæ°æ°æ®
			var exportData = data.map(function (item) {
			var newItem = {};
			// éåå½åæ°æ®é¡¹çææåæ®µ
			for (var key in item) {
			// ä»ä¿çä¸å¨æé¤åè¡¨ä¸çåæ®µ
			if (!excludeFields.includes(key)) {
			newItem[key] = item[key];
			}
			}
			return newItem;
			});


			let processedData = preprocessData(data);


			table.exportFile(ins.config.id, processedData, "xls");

			for (let i = 22; i < option.cols[0].length - 45; i++) {
			option.cols[0][i].title = Format(option.cols[0][i].title, 'MM.dd');
			}
			}


			function preprocessData(data) {
			return data.map(row => {
			return Object.keys(row).reduce((acc, key) => {
			let value = row[key];
			if (typeof value === 'number' \|\| typeof value === 'string') {
			value = String(value).replace(/"/g, '"');
			} else if (value instanceof Date) {
			value = value.toISOString().replace('T', ' ').replace('Z', '');
			}
			acc[key] = value;
			return acc;
			}, {});
			});
			}

			//éèåè®¾ç½®
			function get_HideColumn() {
			var colName = "";

			@@ -883,6 +883,7 @@
			HSampleSchemeName: checkStatus.data[0].æ½æ ·æ¹æ¡,
			HAnalysisMethod: checkStatus.data[0].åææ¹æ³,
			});
			OptionData[0] = obj.data;
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			else {
			@@ -904,9 +905,12 @@
			});
			}

			table.reload("mainTable", {
			data: buttonArr //å°æ°æ®éæ°è½½å¥è¡¨æ ¼
			})
			//table.reload("mainTable", {
			// data: buttonArr //å°æ°æ®éæ°è½½å¥è¡¨æ ¼
			//})

			option.data = buttonArr;
			table.render(option);

			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}

			@@ -227,7 +227,7 @@
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			layer.close(wait);
			layer.alert(result.Message, { icon: 5 });
			layer.alert(result.Message, { icon: 1 });
			}
			else {
			layer.close(wait);

			@@ -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')

			@@ -349,16 +349,16 @@
			}
			//å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
			col.push({ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡è¡' });
			col.push({
			field: "æ¯å¦æå°",
			title: "æ¯å¦æå°",
			align: 'center',
			sort: true,
			width: 100,
			templet: function (d) {
			return d.æå°æ¥æ ? 'å·²æå°' : '';
			}
			});
			//col.push({
			// field: "æ¯å¦æå°",
			// title: "æ¯å¦æå°",
			// align: 'center',
			// sort: true,
			// width: 100,
			// templet: function (d) {
			// return d.æå°æ¥æ ? 'å·²æå°' : '';
			// }
			//});
			for (var i = 0; i < data.length; i++) {
			if ($.inArray(data[i].name, titleData) > -1) {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå