MES-WEB-LayUI.git

parent: 74c0ff63 | 补丁 | 提交 | ignore whitespace

九菱工资报表；提料计划报表去除采购订单字段；生产汇报单保存时替换特殊字符；关键件绑定换绑配件码；车间工序全程跟踪报表导出替换换行符

yusijie

2024-11-22 95b22f12bde1de053ac6d3bda5ee2ebd95f16022

九菱工资报表；提料计划报表去除采购订单字段；生产汇报单保存时替换特殊字符；关键件绑定换绑配件码；车间工序全程跟踪报表导出替换换行符

1个文件已添加

6个文件已修改

	WebTM/WebTM.csproj	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/layuiadmin/Scripts/webConfig.js	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/工资管理/工资报表/Pay_PayrollReportByKD.html	604 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/生产管理/日计划报表/ReportPODemandPlanBillList_S.html	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/生产管理/生产汇报单/Sc_Add_ICMOReportBillList.html	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/关键件绑定/Sc_KeyElementBindingList.html	62 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/报表分析/Mes_OrderProcFlowAllReport.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/WebTM.csproj

@@ -415,6 +415,7 @@
    <Content Include="views\åºç¡èµæ\éç¨åºç¡èµæ\Gy_CommonBaseData.html" />
    <Content Include="views\åºç¡èµæ\éèåè®¾ç½®\Gy_GridView_Hide_New.html" />
    <Content Include="views\å·¥èµç®¡ç\å®é¢ç³è¯·\Pay_ProcPriceRequestBillCheckQuery.html" />
    <Content Include="views\å·¥èµç®¡ç\å·¥èµæ¥è¡¨\Pay_PayrollReportByKD.html" />
    <Content Include="views\å·¥èµç®¡ç\å·¥èµæ¥è¡¨\Pay_PaymentEntryReport.html" />
    <Content Include="views\å·¥èµç®¡ç\å·¥èµæ¥è¡¨\Pay_PayWorkShopSumReport.html" />
    <Content Include="views\å·¥èµç®¡ç\å·¥èµæ¥è¡¨\Pay_PaymentDayCheckReport.html" />

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -10,7 +10,7 @@
    var WEBURL = "http://localhost:8082/API/";    //å¼ çå¹¿æ¬å°éç½®
    //var WEBURL = "http://localhost:81/API/"    //ç¿æ¶æ¶æ¬å°éç½®
    //var WEBURL = "http://47.96.97.237/API/";          //æºäºæå¡å¨
/*    var WEBURL = "http://localhost:8082/LuBaoAPI/";   //ä½ææ°æ¬å°éç½®*/
    var WEBURL = "http://localhost:8082/LuBaoAPI/";   //ä½ææ°æ¬å°éç½®
    //var WEBURL = "http://localhost:8088/ARAPI/";      //ä½ææ°æ¬å°éç½®(å®ç)
    //var WEBURL = "http://localhost/API/";             //æ½æµæ¸¸æ¬å°éç½®
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";  //å¥¥é¦

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

New file
@@ -0,0 +1,604 @@
ï»¿<!DOCTYPE html>
<html>
<head>
    <meta 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/HideButton.js"></script>
    <script src="../../../layuiadmin/soulTable.slim.js"></script>
    <script src="../../../layuiadmin/PageTitle.js"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
</head>
<body>
    <div class="layui-fluid">
        <div class="layui-col-md12">
            <div class="layui-card" style="padding: 1px">
                <div class="layui-card-body" style="padding: 1px;">
                    <form class="layui-form" action="" lay-filter="component-form-group">
                        <div class="layui-collapse">
                            <div class="layui-colla-item">
                                <div class="layui-colla-title layui-inline">
                                    <div class="layui-inline">
                                        <span>æ´å¤</span>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">æ¥æé´é</label>
                                    <div class="layui-input-block">
                                        <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">è½¦é´</label>
                                    <div class="layui-input-block" style="width: 190px;">
                                        <select name="HDeptName" id="HDeptName" lay-verify="HDeptName">
                                            <!--å¨ææ¸²æé¨é¨-->
                                        </select>
                                    </div>
                                </div>
                                <div class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;">
                                    <div class="layui-inline">
                                        <label class="layui-form-label">çç»</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input ForFilteringSchemes" name="HGroupName" id="HGroupName" style="width:215px;">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">ç©æä»£ç </label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input ForFilteringSchemes" name="HMaterNumber" id="HMaterNumber" style="width:190px;">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">ç©æåç§°</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input ForFilteringSchemes" name="HMaterName" id="HMaterName" style="width:190px;">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">è§æ ¼åå·</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input ForFilteringSchemes" name="HMaterModel" id="HMaterModel" style="width:170px;">
                                        </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>
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="get_export" id="get_export" style="padding:0 5px">å¯¼åº</button>
                                </div>
                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                    <div class="layui-row" style="margin-top:10px;margin-left:5%;">

                                    </div>                                    
                                </div>
                            </div>
                        </div>
                        <div class="layui-tab layui-tab-card">
                            <div class="layui-tab-content">
                                <div class="layui-tab-item layui-show">
                                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
                                </div>
                            </div>
                        </div>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
                            </div>
                        </script>
                    </form>
                </div>
            </div>
        </div>
    </div>
</body>
</html>
<script>
    layui.config({
        base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
    }).extend({
        index: 'lib/index', //ä¸»å¥å£æ¨¡å
    }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], 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
            , soulTable = layui.soulTable
        var sWhere = "";
        var option = [];
        var HModName = "Pay_PayrollReportByKD";
        var titleData = ["HInterID", "HEntryID", "HBadReasonID", "HSourceInterID", "HSourceEntryID"];//åè¡¨ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
        var ins;  //ç¨äºå¯¼åºexcel

        //#endregion

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

        //åå§åè¡¨æ ¼
        DisPlay_HideColumn();
        //åå§åçé¢
        set_ClearBill();

        //#endregion

        //#region è§¦åäºä»¶ï¼åæ¬form.on(){}æ ¼å¼çææç¹å»äºä»¶ãéæ©äºä»¶ç

        // å¤´å·¥å·æ äºä»¶
        table.on('toolbar(mainTable)', function (obj) {
            switch (obj.event) {
                //åè®¾ç½®
                case 'set_HideColumn': get_HideColumn();
                    break;
            };
        });

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

        //éç½®
        form.on('submit(btnReSearch)', function (data) {
            set_ClearQuery();
        });

        //å¯¼åº
        form.on('submit(get_export)', function (data) {
            var data = option.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().replaceAll(/[\r\n]+/g, '').replaceAll(',','ï¼');  // å°æ¢è¡ç¬¦æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
                    }
                }
            });

            table.exportFile(ins.config.id, option.data, "xls");
        });

        //æ¥æé´éä¸æåè¡¨çå¬
        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);
            }
        });

        //#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);
            }

            //æ ¹æ®æ¥æé´éè®¾ç½®å¼å§æ¶é´ä¸ç»ææ¶é´
            $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
            $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
            DeptName();
            //æ¥è¯¢
            get_FastQuery();
        }

        //çäº§è½¦é´
        function DeptName() {
            //è·åè½¦é´å
            var HDeptName = '<option value="0" style="color:red;" selected>å¨é¨è½¦é´</option>';
            $.ajax({
                type: "get",
                url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
                async: false,
                data: { "HOrgID": sessionStorage["OrganizationID"] },
                success: function (result) {
                    if (result.count == 1) { // è¯´æéªè¯æåäºï¼
                        var data = result.data;
                        for (var i = 0; i < data.length; i++) {
                            if (i == 0)
                                HDeptName += '<option  style="color:blue;"  value="' + data[i].HItemID + '" >' + data[i].HName + '</option>';
                            else
                                HDeptName += '<option  style="color:blue;" value="' + data[i].HItemID + '">' + data[i].HName + '</option>';

                        }
                        $("#HDeptName").append(HDeptName);
                        form.render('select');
                    }
                    layer.closeAll("loading");
                }
            })
        }

        function set_InitGrid() {
            option = {
                elem: '#mainTable'
                //, toolbar: '#toolbarDemo'
                , height: 'full-110'
                , page: true
                , totalRow: true
                , limit: 500
                , data:[]
                , limits: [50, 500, 5000, 20000]
                , cols: []
            };
            table.render(option);
        }

        // æ¥è¯¢
        function get_Display(sWhere) {

            var ajaxLoad = layer.load();
            $.ajax({
                url: GetWEBURL() + '/Pay_PayrollReportByKD/list',
                type: "GET",
                async: false,
                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                success: function (data1) {
                    if (data1.count == 1) {
                        var data = [];//ååæ®µæ°æ®
                        var col = [];
                        var totalArray = ["æ°é", "å³èæ°é", "æªå³èæ°é", "æå°æ¡ç æ°é", "æªæå°æ¡ç æ°é", "å®æ¶æ°é", "éé¢"];

                        //ç»ç©ºçæ°ç»èµå¼
                        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', fixed: 'left', totalRowText: 'è®¡ç®', hide: true  });
                        for (var i = 0; i < data.length; i++) {
                            // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                            if ($.inArray(data[i].name, titleData) > -1) {
                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
                            }
                            else if ($.inArray(data[i].name, totalArray) > -1) { //è®¡ç®å
                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true});
                            } else if (data[i].name == 'åæ®å·') {//æ·»å è¶é¾æ¥
                                col.push({
                                    field: data[i].id, title: data[i].name, align: 'center', sort: true, event: 'åæ®å·', templet: function (d) {
                                        return '<span style="color: blue;">' + d.åæ®å· + '</span>'
                                    }, style: 'cursor: pointer;'
                                });
                            } 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 == "è¡å³éæ¥æ" ? "è¡å³éäºº" : data[i].name) + " ==''?'':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, totalRow: true });
                                        break;
                                    default:
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
                                }
                            }
                        }

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

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

                        if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                            ColFilter();
                        }

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

        // å¿«éè¿æ»¤
        function get_FastQuery() {
            var HBeginDate = $("#HBeginDate").val();
            var HEndDate = $("#HEndDate").val();
            var HDeptID = $("#HDeptName").val();
            var HGroupName = $("#HGroupName").val();
            var HMaterNumber = $("#HMaterNumber").val();
            var HMaterName = $("#HMaterName").val();
            var HMaterModel = $("#HMaterModel").val();

            //if (HBeginDate) {
            //    sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + HBeginDate + "'";
            //}
            //if (HEndDate) {
            //    sWhere += " and CONVERT(varchar(100),æ¥æ, 23) <= '" + HEndDate + "'";
            //}
            //if (HDeptID && HDeptID != 0) {
            //    sWhere += "and HDeptID = " + HDeptID;
            //}
            //if (HGroupName) {
            //    sWhere += " and çç» like '%" + HGroupName + "%'";
            //}
            //if (HMaterNumber) {
            //    sWhere += " and ç©æä»£ç  like '%" + HMaterNumber + "%'";
            //}
            //if (HMaterName) {
            //    sWhere += " and ç©æåç§° like '%" + HMaterName + "%'";
            //}
            //if (HMaterModel) {
            //    sWhere += " and è§æ ¼åå· like '%" + HMaterModel + "%'";
            //}

            sWhere = {
                HBeginDate: HBeginDate
                , HEndDate: HEndDate
                , HDeptID: HDeptID
                , HGroupName: HGroupName
                , HMaterNumber: HMaterNumber
                , HMaterName: HMaterName
                , HMaterModel: HMaterModel
            }

            set_InitGrid();
            get_Display(JSON.stringify(sWhere));
            sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
        }

        function set_ClearQuery() {
            $("#HInitTimeCycle").val(29)
            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"));  //ç»ææ¥æ
            $("#HDeptName").val("0");
            $("#HGroupName").val("");
            $("#HMaterNumber").val("");
            $("#HMaterName").val("");
            $("#HMaterModel").val("");
            $("#ColContent1").val("");
            $("#ColName1").val("0");
            $("#Comparator1").val("0");
            $("#ColContent2").val("");
            $("#ColName2").val("0");
            $("#Comparator2").val("0");
            $("#ColContent").val("");
            $("#ColName").val("0");
            $("#Comparator").val("0");
            form.render('select');

            sWhere = "";
        }

        //éèåè®¾ç½®
        function get_HideColumn() {
            var colName = "";
            var contentUrl = "";
            for (var i = 1; i < option.cols[0].length - 1; 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);//å³éå¼¹çª
                }
            })
        }

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


                        var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®


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

                        for (var i = 0; i < option.cols[0].length - 2; 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 });
                }
            })
        }

        // åææ¾ç¤ºä¸ææ¡
        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');
        }

        //#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("29");
        }
            //#endregion

        //#endregion

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




</script>

 WebTM/views/Éú²ú¹ÜÀí/ÈÕ¼Æ»®±¨±í/ReportPODemandPlanBillList_S.html

@@ -266,10 +266,10 @@
            columns.push({ field: 'ç»ç»', title: 'éè´ç»ç»', sort: true});
            columns.push({ field: 'FMATERIALNAME', title: 'ç©æåç§°', sort: true});
            columns.push({ field: 'FSPECIFICATION', title: 'ç©æè§æ ¼', sort: true});
            columns.push({ field: 'FNAME', title: 'ä¾åºå', sort: true});
            columns.push({ field: 'FSUMQTY', title: 'åè®¡', sort: true});
            columns.push({ field: 'HPOOrderBillNo', title: 'éè´è®¢åå·', sort: true});
            columns.push({ field: 'HSeOrderBillNo', title: 'éæ±åå·', sort: true});
            columns.push({ field: 'FNAME', title: 'ä¾åºå', sort: true });
            columns.push({ field: 'FSUMQTY', title: 'åè®¡', sort: true, hide: true });
            columns.push({ field: 'HPOOrderBillNo', title: 'éè´è®¢åå·', sort: true, hide: true });
            columns.push({ field: 'HSeOrderBillNo', title: 'éæ±åå·', sort: true, hide: true });
            //columns.push({ field: 'HPOOrderBillRemark', title: 'æè¦' });
            //columns.push({ field: 'HPOOrderBillNote', title: 'å¤æ³¨' });
            //columns.push({ field: 'éè´å', title: 'éè´å' });

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú»ã±¨µ¥/Sc_Add_ICMOReportBillList.html

@@ -549,6 +549,13 @@
                var row = [];
                for (var i = 0; i < table.cache['mainTable'].length; i++) {
                    if (table.cache['mainTable'][i] != "") {
                        if (table.cache["mainTable"][i].HMaterName.indexOf("\"") != -1 || table.cache["mainTable"][i].HMaterName.indexOf(";") != -1) {
                            table.cache["mainTable"][i].HMaterName = table.cache["mainTable"][i].HMaterName.replaceAll("\"", "â").replaceAll(";", "ï¼")
                        }
                        if (table.cache["mainTable"][i].HMaterSpec.indexOf("\"") != -1 || table.cache["mainTable"][i].HMaterSpec.indexOf(";") != -1) {
                            table.cache["mainTable"][i].HMaterSpec = table.cache["mainTable"][i].HMaterSpec.replaceAll("\"", "â").replaceAll(";", "ï¼")
                        }
                        
                        row.push(table.cache['mainTable'][i])
                    }
                }

 WebTM/views/³µ¼ä¹ÜÀí/¹Ø¼ü¼þ°ó¶¨/Sc_KeyElementBindingList.html

@@ -148,7 +148,7 @@
                                </div>
                            </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <table class="layui-hide" 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="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>å é¤</button>
@@ -225,8 +225,45 @@

            //#region è§¦åäºä»¶ï¼åæ¬form.on(){}æ ¼å¼çææç¹å»äºä»¶ãéæ©äºä»¶ç

            //#region å¤´å·¥å·æ äºä»¶
            //#endregion  çå¬ç½æ ¼è¡¨ä½äºä»¶
            table.on('tool(mainTable)', function (obj) {
                var data = obj.data;
                var HPartsOld = data.éä»¶æ¡ç ;

                if (obj.event === 'éä»¶æ¡ç ') {
                    layer.prompt({
                        formType: 2
                        , area: ['400px', '50px'] //èªå®ä¹ææ¬åå®½é«
                        , title: 'æ¿æ¢éå®è®¢åå·ä¸º ã ' + data.éå®è®¢åå· + ' ã ï¼ç©æä»£ç ä¸º ã ' + data.äº§åä»£ç  + ' ã çéä»¶ç ç»å®'
                        , value: '' //ææ¬æ¡é»è®¤æ¾ç¤ºåå®¹
                    }, function (value, index) {
                        layer.close(index);
                        //æ´æ°éä»¶æ¡ç 
                        $.ajax({
                            type: "GET",
                            url: GetWEBURL() + "Sc_KeyElementBinding/UpdatePartsCode",
                            async: false,
                            data: { "HInterID": data.hmainid, "HEntryID": data.hsubid, "HPartsCode": value, "HPartsOld": HPartsOld, "HOrgID": sessionStorage["OrganizationID"], "user": sessionStorage["HUserName"] },
                            success: function (result) {
                                if (result.code == 1) {
                                    //åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
                                    obj.update({
                                        éä»¶æ¡ç : value
                                    });
                                } else {
                                    layer.alert(result.Message, { icon: 5 });
                                }
                            },
                            error: function (result) {
                                layer.alert(result.Message, { icon: 5 });
                            }
                        });
                    });
                }
            });
            //#endregion

            //#region å¤´å·¥å·æ äºä»¶
            table.on('toolbar(mainTable)', function (obj) {
                switch (obj.event) {
                    //æ°å¢
@@ -268,7 +305,7 @@
                    //å¯¼åºexcel
                    case 'get_export':
                        get_Export();
                        break;
                        break;                  
                    //éåºæé®
                    case 'get_Exit': Pub_Close(2);
                        break;
@@ -317,7 +354,7 @@
                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
                        l.LAY_CHECKED = true;
                    }
                });         
                });               
            });
            //#endregion

@@ -367,13 +404,7 @@
            }
            //#endregion
            //#endregion
            //#endregion  çå¬ç½æ ¼è¡¨ä½äºä»¶
            table.on('tool(mainTable)', function (obj) {
                var data = obj.data;

                
            });
             //#endregion
          
            //#region æ¥è¯¢
            function get_Display(sWhere) {
                var ajaxLoad = layer.load();
@@ -402,6 +433,9 @@
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
                                } else if (data[i].name == 'åæ®å·') {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: 'åæ®å·' });
                                }
                                else if (data[i].name == 'éä»¶æ¡ç ') {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: 'éä»¶æ¡ç ' });
                                }
                                else {
                                    switch (data[i].Type) {
@@ -609,7 +643,7 @@

                table.exportFile(ins.config.id, option.data, "xls");
            }
            //#endregion
            //#endregion          

            //#region å é¤
            function set_DeleteBill() {
@@ -817,7 +851,9 @@
                            dataCol = data1.data[0].HGridString.split(',');

                            for (var i = 0; i < option.cols[0].length - 1; i++) {
                                var dataCols = dataCol[i].split('|');
                                if (dataCol[i]) {
                                    var dataCols = dataCol[i].split('|');
                                }                               
                                //éèå
                                if (dataCols[1] == 1) {
                                    option.cols[0][i + 1]["hide"] = true;

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

@@ -133,7 +133,7 @@
                                    item[itemobj] = "";
                                }
                                if (item[itemobj].length > 0) {  // åè®¾åæ®µåä¸ºfield
                                    item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, '');  // å°æ¢è¡ç¬¦æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
                                    item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, '').replaceAll(',','ï¼');  // å°æ¢è¡ç¬¦æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
                                }
                            }
                        });

			@@ -415,6 +415,7 @@
			<Content Include="views\åºç¡èµæ\éç¨åºç¡èµæ\Gy_CommonBaseData.html" />
			<Content Include="views\åºç¡èµæ\éèåè®¾ç½®\Gy_GridView_Hide_New.html" />
			<Content Include="views\å·¥èµç®¡ç\å®é¢ç³è¯·\Pay_ProcPriceRequestBillCheckQuery.html" />
			<Content Include="views\å·¥èµç®¡ç\å·¥èµæ¥è¡¨\Pay_PayrollReportByKD.html" />
			<Content Include="views\å·¥èµç®¡ç\å·¥èµæ¥è¡¨\Pay_PaymentEntryReport.html" />
			<Content Include="views\å·¥èµç®¡ç\å·¥èµæ¥è¡¨\Pay_PayWorkShopSumReport.html" />
			<Content Include="views\å·¥èµç®¡ç\å·¥èµæ¥è¡¨\Pay_PaymentDayCheckReport.html" />

			@@ -10,7 +10,7 @@
			var WEBURL = "http://localhost:8082/API/"; //å¼ çå¹¿æ¬å°éç½®
			//var WEBURL = "http://localhost:81/API/" //ç¿æ¶æ¶æ¬å°éç½®
			//var WEBURL = "http://47.96.97.237/API/"; //æºäºæå¡å¨
			/* var WEBURL = "http://localhost:8082/LuBaoAPI/"; //ä½ææ°æ¬å°éç½®*/
			var WEBURL = "http://localhost:8082/LuBaoAPI/"; //ä½ææ°æ¬å°éç½®
			//var WEBURL = "http://localhost:8088/ARAPI/"; //ä½ææ°æ¬å°éç½®(å®ç)
			//var WEBURL = "http://localhost/API/"; //æ½æµæ¸¸æ¬å°éç½®
			//var WEBURL = "http://61.164.86.218:8099/ABAPI/"; //å¥¥é¦

New file
			@@ -0,0 +1,604 @@
			ï»¿<!DOCTYPE html>
			<html>
			<head>
			<meta 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/HideButton.js"></script>
			<script src="../../../layuiadmin/soulTable.slim.js"></script>
			<script src="../../../layuiadmin/PageTitle.js"></script>
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
			</head>
			<body>
			<div class="layui-fluid">
			<div class="layui-col-md12">
			<div class="layui-card" style="padding: 1px">
			<div class="layui-card-body" style="padding: 1px;">
			<form class="layui-form" action="" lay-filter="component-form-group">
			<div class="layui-collapse">
			<div class="layui-colla-item">
			<div class="layui-colla-title layui-inline">
			<div class="layui-inline">
			<span>æ´å¤</span>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">æ¥æé´é</label>
			<div class="layui-input-block">
			<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">è½¦é´</label>
			<div class="layui-input-block" style="width: 190px;">
			<select name="HDeptName" id="HDeptName" lay-verify="HDeptName">
			<!--å¨ææ¸²æé¨é¨-->
			</select>
			</div>
			</div>
			<div class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;">
			<div class="layui-inline">
			<label class="layui-form-label">çç»</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input ForFilteringSchemes" name="HGroupName" id="HGroupName" style="width:215px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ç©æä»£ç </label>
			<div class="layui-input-block">
			<input type="text" class="layui-input ForFilteringSchemes" name="HMaterNumber" id="HMaterNumber" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ç©æåç§°</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input ForFilteringSchemes" name="HMaterName" id="HMaterName" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">è§æ ¼åå·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input ForFilteringSchemes" name="HMaterModel" id="HMaterModel" style="width:170px;">
			</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>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="get_export" id="get_export" style="padding:0 5px">å¯¼åº</button>
			</div>
			<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
			<div class="layui-row" style="margin-top:10px;margin-left:5%;">

			</div>
			</div>
			</div>
			</div>
			<div class="layui-tab layui-tab-card">
			<div class="layui-tab-content">
			<div class="layui-tab-item layui-show">
			<table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
			</div>
			</div>
			</div>
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			</div>
			</script>
			</form>
			</div>
			</div>
			</div>
			</div>
			</body>
			</html>
			<script>
			layui.config({
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			}).extend({
			index: 'lib/index', //ä¸»å¥å£æ¨¡å
			}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], 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
			, soulTable = layui.soulTable
			var sWhere = "";
			var option = [];
			var HModName = "Pay_PayrollReportByKD";
			var titleData = ["HInterID", "HEntryID", "HBadReasonID", "HSourceInterID", "HSourceEntryID"];//åè¡¨ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			var ins; //ç¨äºå¯¼åºexcel

			//#endregion

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

			//åå§åè¡¨æ ¼
			DisPlay_HideColumn();
			//åå§åçé¢
			set_ClearBill();

			//#endregion

			//#region è§¦åäºä»¶ï¼åæ¬form.on(){}æ ¼å¼çææç¹å»äºä»¶ãéæ©äºä»¶ç

			// å¤´å·¥å·æ äºä»¶
			table.on('toolbar(mainTable)', function (obj) {
			switch (obj.event) {
			//åè®¾ç½®
			case 'set_HideColumn': get_HideColumn();
			break;
			};
			});

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

			//éç½®
			form.on('submit(btnReSearch)', function (data) {
			set_ClearQuery();
			});

			//å¯¼åº
			form.on('submit(get_export)', function (data) {
			var data = option.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().replaceAll(/[\r\n]+/g, '').replaceAll(',','ï¼'); // å°æ¢è¡ç¬¦æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
			}
			}
			});

			table.exportFile(ins.config.id, option.data, "xls");
			});

			//æ¥æé´éä¸æåè¡¨çå¬
			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);
			}
			});

			//#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);
			}

			//æ ¹æ®æ¥æé´éè®¾ç½®å¼å§æ¶é´ä¸ç»ææ¶é´
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
			DeptName();
			//æ¥è¯¢
			get_FastQuery();
			}

			//çäº§è½¦é´
			function DeptName() {
			//è·åè½¦é´å
			var HDeptName = '<option value="0" style="color:red;" selected>å¨é¨è½¦é´</option>';
			$.ajax({
			type: "get",
			url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
			async: false,
			data: { "HOrgID": sessionStorage["OrganizationID"] },
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			var data = result.data;
			for (var i = 0; i < data.length; i++) {
			if (i == 0)
			HDeptName += '<option style="color:blue;" value="' + data[i].HItemID + '" >' + data[i].HName + '</option>';
			else
			HDeptName += '<option style="color:blue;" value="' + data[i].HItemID + '">' + data[i].HName + '</option>';

			}
			$("#HDeptName").append(HDeptName);
			form.render('select');
			}
			layer.closeAll("loading");
			}
			})
			}

			function set_InitGrid() {
			option = {
			elem: '#mainTable'
			//, toolbar: '#toolbarDemo'
			, height: 'full-110'
			, page: true
			, totalRow: true
			, limit: 500
			, data:[]
			, limits: [50, 500, 5000, 20000]
			, cols: []
			};
			table.render(option);
			}

			// æ¥è¯¢
			function get_Display(sWhere) {

			var ajaxLoad = layer.load();
			$.ajax({
			url: GetWEBURL() + '/Pay_PayrollReportByKD/list',
			type: "GET",
			async: false,
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.count == 1) {
			var data = [];//ååæ®µæ°æ®
			var col = [];
			var totalArray = ["æ°é", "å³èæ°é", "æªå³èæ°é", "æå°æ¡ç æ°é", "æªæå°æ¡ç æ°é", "å®æ¶æ°é", "éé¢"];

			//ç»ç©ºçæ°ç»èµå¼
			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', fixed: 'left', totalRowText: 'è®¡ç®', hide: true });
			for (var i = 0; i < data.length; i++) {
			// if (data[i].name == 'HInterID' \|\| data[i].name == 'HBillType' \|\| data[i].name == 'hmainid') {
			if ($.inArray(data[i].name, titleData) > -1) {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
			}
			else if ($.inArray(data[i].name, totalArray) > -1) { //è®¡ç®å
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true});
			} else if (data[i].name == 'åæ®å·') {//æ·»å è¶é¾æ¥
			col.push({
			field: data[i].id, title: data[i].name, align: 'center', sort: true, event: 'åæ®å·', templet: function (d) {
			return '<span style="color: blue;">' + d.åæ®å· + '</span>'
			}, style: 'cursor: pointer;'
			});
			} 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 == "è¡å³éæ¥æ" ? "è¡å³éäºº" : data[i].name) + " ==''?'':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, totalRow: true });
			break;
			default:
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
			}
			}
			}

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

			}
			}
			ins = table.render(option);

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

			if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
			ColFilter();
			}

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

			// å¿«éè¿æ»¤
			function get_FastQuery() {
			var HBeginDate = $("#HBeginDate").val();
			var HEndDate = $("#HEndDate").val();
			var HDeptID = $("#HDeptName").val();
			var HGroupName = $("#HGroupName").val();
			var HMaterNumber = $("#HMaterNumber").val();
			var HMaterName = $("#HMaterName").val();
			var HMaterModel = $("#HMaterModel").val();

			//if (HBeginDate) {
			// sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + HBeginDate + "'";
			//}
			//if (HEndDate) {
			// sWhere += " and CONVERT(varchar(100),æ¥æ, 23) <= '" + HEndDate + "'";
			//}
			//if (HDeptID && HDeptID != 0) {
			// sWhere += "and HDeptID = " + HDeptID;
			//}
			//if (HGroupName) {
			// sWhere += " and çç» like '%" + HGroupName + "%'";
			//}
			//if (HMaterNumber) {
			// sWhere += " and ç©æä»£ç like '%" + HMaterNumber + "%'";
			//}
			//if (HMaterName) {
			// sWhere += " and ç©æåç§° like '%" + HMaterName + "%'";
			//}
			//if (HMaterModel) {
			// sWhere += " and è§æ ¼åå· like '%" + HMaterModel + "%'";
			//}

			sWhere = {
			HBeginDate: HBeginDate
			, HEndDate: HEndDate
			, HDeptID: HDeptID
			, HGroupName: HGroupName
			, HMaterNumber: HMaterNumber
			, HMaterName: HMaterName
			, HMaterModel: HMaterModel
			}

			set_InitGrid();
			get_Display(JSON.stringify(sWhere));
			sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			}

			function set_ClearQuery() {
			$("#HInitTimeCycle").val(29)
			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")); //ç»ææ¥æ
			$("#HDeptName").val("0");
			$("#HGroupName").val("");
			$("#HMaterNumber").val("");
			$("#HMaterName").val("");
			$("#HMaterModel").val("");
			$("#ColContent1").val("");
			$("#ColName1").val("0");
			$("#Comparator1").val("0");
			$("#ColContent2").val("");
			$("#ColName2").val("0");
			$("#Comparator2").val("0");
			$("#ColContent").val("");
			$("#ColName").val("0");
			$("#Comparator").val("0");
			form.render('select');

			sWhere = "";
			}

			//éèåè®¾ç½®
			function get_HideColumn() {
			var colName = "";
			var contentUrl = "";
			for (var i = 1; i < option.cols[0].length - 1; 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);//å³éå¼¹çª
			}
			})
			}

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


			var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®


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

			for (var i = 0; i < option.cols[0].length - 2; 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 });
			}
			})
			}

			// åææ¾ç¤ºä¸ææ¡
			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');
			}

			//#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("29");
			}
			//#endregion

			//#endregion

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




			</script>

			@@ -266,10 +266,10 @@
			columns.push({ field: 'ç»ç»', title: 'éè´ç»ç»', sort: true});
			columns.push({ field: 'FMATERIALNAME', title: 'ç©æåç§°', sort: true});
			columns.push({ field: 'FSPECIFICATION', title: 'ç©æè§æ ¼', sort: true});
			columns.push({ field: 'FNAME', title: 'ä¾åºå', sort: true});
			columns.push({ field: 'FSUMQTY', title: 'åè®¡', sort: true});
			columns.push({ field: 'HPOOrderBillNo', title: 'éè´è®¢åå·', sort: true});
			columns.push({ field: 'HSeOrderBillNo', title: 'éæ±åå·', sort: true});
			columns.push({ field: 'FNAME', title: 'ä¾åºå', sort: true });
			columns.push({ field: 'FSUMQTY', title: 'åè®¡', sort: true, hide: true });
			columns.push({ field: 'HPOOrderBillNo', title: 'éè´è®¢åå·', sort: true, hide: true });
			columns.push({ field: 'HSeOrderBillNo', title: 'éæ±åå·', sort: true, hide: true });
			//columns.push({ field: 'HPOOrderBillRemark', title: 'æè¦' });
			//columns.push({ field: 'HPOOrderBillNote', title: 'å¤æ³¨' });
			//columns.push({ field: 'éè´å', title: 'éè´å' });

			@@ -549,6 +549,13 @@
			var row = [];
			for (var i = 0; i < table.cache['mainTable'].length; i++) {
			if (table.cache['mainTable'][i] != "") {
			if (table.cache["mainTable"][i].HMaterName.indexOf("\"") != -1 \|\| table.cache["mainTable"][i].HMaterName.indexOf(";") != -1) {
			table.cache["mainTable"][i].HMaterName = table.cache["mainTable"][i].HMaterName.replaceAll("\"", "â").replaceAll(";", "ï¼")
			}
			if (table.cache["mainTable"][i].HMaterSpec.indexOf("\"") != -1 \|\| table.cache["mainTable"][i].HMaterSpec.indexOf(";") != -1) {
			table.cache["mainTable"][i].HMaterSpec = table.cache["mainTable"][i].HMaterSpec.replaceAll("\"", "â").replaceAll(";", "ï¼")
			}

			row.push(table.cache['mainTable'][i])
			}
			}

			@@ -148,7 +148,7 @@
			</div>
			</div>
			</div>
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			<table class="layui-hide" 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="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>å é¤</button>
			@@ -225,8 +225,45 @@

			//#region è§¦åäºä»¶ï¼åæ¬form.on(){}æ ¼å¼çææç¹å»äºä»¶ãéæ©äºä»¶ç

			//#region å¤´å·¥å·æ äºä»¶
			//#endregion çå¬ç½æ ¼è¡¨ä½äºä»¶
			table.on('tool(mainTable)', function (obj) {
			var data = obj.data;
			var HPartsOld = data.éä»¶æ¡ç ;

			if (obj.event === 'éä»¶æ¡ç ') {
			layer.prompt({
			formType: 2
			, area: ['400px', '50px'] //èªå®ä¹ææ¬åå®½é«
			, title: 'æ¿æ¢éå®è®¢åå·ä¸º ã ' + data.éå®è®¢åå· + ' ã ï¼ç©æä»£ç ä¸º ã ' + data.äº§åä»£ç + ' ã çéä»¶ç ç»å®'
			, value: '' //ææ¬æ¡é»è®¤æ¾ç¤ºåå®¹
			}, function (value, index) {
			layer.close(index);
			//æ´æ°éä»¶æ¡ç
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "Sc_KeyElementBinding/UpdatePartsCode",
			async: false,
			data: { "HInterID": data.hmainid, "HEntryID": data.hsubid, "HPartsCode": value, "HPartsOld": HPartsOld, "HOrgID": sessionStorage["OrganizationID"], "user": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.code == 1) {
			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			obj.update({
			éä»¶æ¡ç : value
			});
			} else {
			layer.alert(result.Message, { icon: 5 });
			}
			},
			error: function (result) {
			layer.alert(result.Message, { icon: 5 });
			}
			});
			});
			}
			});
			//#endregion

			//#region å¤´å·¥å·æ äºä»¶
			table.on('toolbar(mainTable)', function (obj) {
			switch (obj.event) {
			//æ°å¢
			@@ -268,7 +305,7 @@
			//å¯¼åºexcel
			case 'get_export':
			get_Export();
			break;
			break;
			//éåºæé®
			case 'get_Exit': Pub_Close(2);
			break;
			@@ -317,7 +354,7 @@
			if (obj.tr.index() == l.LAY_TABLE_INDEX) {
			l.LAY_CHECKED = true;
			}
			});
			});
			});
			//#endregion

			@@ -367,13 +404,7 @@
			}
			//#endregion
			//#endregion
			//#endregion çå¬ç½æ ¼è¡¨ä½äºä»¶
			table.on('tool(mainTable)', function (obj) {
			var data = obj.data;


			});
			//#endregion

			//#region æ¥è¯¢
			function get_Display(sWhere) {
			var ajaxLoad = layer.load();
			@@ -402,6 +433,9 @@
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
			} else if (data[i].name == 'åæ®å·') {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: 'åæ®å·' });
			}
			else if (data[i].name == 'éä»¶æ¡ç ') {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: 'éä»¶æ¡ç ' });
			}
			else {
			switch (data[i].Type) {
			@@ -609,7 +643,7 @@

			table.exportFile(ins.config.id, option.data, "xls");
			}
			//#endregion
			//#endregion

			//#region å é¤
			function set_DeleteBill() {
			@@ -817,7 +851,9 @@
			dataCol = data1.data[0].HGridString.split(',');

			for (var i = 0; i < option.cols[0].length - 1; i++) {
			var dataCols = dataCol[i].split('\|');
			if (dataCol[i]) {
			var dataCols = dataCol[i].split('\|');
			}
			//éèå
			if (dataCols[1] == 1) {
			option.cols[0][i + 1]["hide"] = true;

			@@ -133,7 +133,7 @@
			item[itemobj] = "";
			}
			if (item[itemobj].length > 0) { // åè®¾åæ®µåä¸ºfield
			item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, ''); // å°æ¢è¡ç¬¦æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
			item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, '').replaceAll(',','ï¼'); // å°æ¢è¡ç¬¦æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
			}
			}
			});