MES-WEB-LayUI.git

parent: 938065f6 | 补丁 | 提交 | ignore whitespace

1.生产订单单据列表增加 2个自定义过滤，一共3个自定义过滤框 2.计划平台选择源单返回时，如果这个物料对应的工艺路线的工作中心下属只有一个生...

yangle

2024-04-07 8fda2aa8704abad02a0f0ec0b0dce806a8ddc8ec

1.生产订单单据列表 增加 2个自定义过滤，一共3个自定义过滤框 2.计划平台 选择源单返回时，如果这个物料对应的工艺路线的工作中心 下属只有 一个生产资源，则 默认带出这个 生产资源，并带入小时产能等信息； 3.选择生产资源列时，按F7出来全部生产资源，F8则出来这个物料工艺路线的工作中心下属的全部生产资源；（选择框可以另外单独做 一个）

3个文件已修改

1个文件已添加

	WebTM/WebTM.csproj	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/Baseset/基础资料/Gy_Source.html	123 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html	117 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm.html	151 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/WebTM.csproj

@@ -127,6 +127,7 @@
    <Content Include="views\Baseset\åºç¡èµæ\Gy_ConveyCompList.html" />
    <Content Include="views\Baseset\åºç¡èµæ\Gy_ConveyTypeList.html" />
    <Content Include="views\Baseset\åºç¡èµæ\Gy_GroupList.html" />
    <Content Include="views\Baseset\åºç¡èµæ\Gy_Source.html" />
    <Content Include="views\Baseset\åºç¡èµæ\Gy_SupplierListNew.html" />
    <Content Include="views\Baseset\åºç¡èµæ\Gy_EquipFileBillMainList.html" />
    <Content Include="views\Baseset\åºç¡èµæ\Gy_GetProcNoList.html" />

 WebTM/views/Baseset/»ù´¡×ÊÁÏ/Gy_Source.html

New file
@@ -0,0 +1,123 @@
ï»¿<!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.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
</head>
<body>
    <div class="layui-fluid">
        <div class="layui-card">
            <!--<div class="layui-card-header"></div>-->
            <div class="layui-card-body" style="padding: 15px;">
                <form class="layui-form" action="" lay-filter="component-form-group">
                    <div class="layui-form-item">
                        <div class="layui-inline">
                            <label class="layui-form-label">è¿æ»¤å</label>
                            <div class="layui-input-inline">
                                <input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="è¯·è¾å¥è¿æ»¤å" class="layui-input">
                            </div>
                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">å¿«éæ¥è¯¢</button>
                            <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">è¿å</button>
                        </div>
                    </div>
                </form>
            </div>
        </div>
    </div>
    <table class="layui-hide" id="mainTable"></table>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script>
        function getUrlVars() {
            var vars = [], hash;
            var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
            for (var i = 0; i < hashes.length; i++) {
                hash = hashes[i].split('=');
                vars.push(hash[0]);
                vars[hash[0]] = hash[1];
            }
            return vars;
        }
        var params = getUrlVars();
        var HMaterID = params[params[0]];


        layui.use(['table', 'form', 'layer'], function () {
            var table = layui.table
            , form = layui.form
            , layer = layui.layer;

            form.on('submit(HQuery)', function () { 
                //var sMainStr = JSON.stringify(table.cache['mainTable']);
                RoadQuery($('#Value').val(), sessionStorage["OrganizationID"]);
            });
            form.on('submit(FH)', function () { 
                //var sMainStr = JSON.stringify(table.cache['mainTable']);
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (data.length == 0) {
                    return layer.msg("è¯·éæ©æ°æ®!");
                }
                parent.GetGySource(data[0]);
                var index = parent.layer.getFrameIndex(window.name);
                parent.layer.close(index);
            });
            RoadQuery($('#Value').val(), sessionStorage["OrganizationID"]);
            table.render({
                elem: '#mainTable'
                // , url: '/demo/table/user/'
               , data: []
              , cellMinWidth: 80 //å¨å±å®ä¹å¸¸è§ååæ ¼çæå°å®½åº¦ï¼layui 2.2.1 æ°å¢
              , cols: [[
                  { type: 'radio' }
                , { field: 'HItemID', width: 150, title: 'çäº§èµæºID', hide: true }
                  , { field: 'HNumber', width: 150, title: 'çäº§èµæºä»£ç ' }
                  , { field: 'HName', width: 150, title: 'çäº§èµæºåç§°', sort: true }
              ]]
                , page: true
                , limits: [50, 500, 5000, 50000],
                limit: 50
            });
            ///å è½½æ¾ç¤ºæ°æ®
            function RoadQuery(Where, HOtherOrgID) {
                var Value = Where;
                if (Value == null) {
                    Value = '';
                }
                if (HMaterID == null || HMaterID == undefined) {
                    Value ="";
                }
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/Web/GetSouceList_Json",
                    async: true,
                    data: { "HMaterID": HMaterID,"Value": Value, "HOrgID": HOtherOrgID },
                    success: function (result) {
                        ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
                        table.reload('mainTable', {
                            data: ajaxReturnData
                            , height: 'full-70'
                            , loading: false
                            , done: function (index, res) {

                            }
                        });
                    },
                    error: function (result) {
                        console.log(result);
                        //layer.msg('è·åéè´è®¢ååºç°å¼å¸¸', { icon: 2, time: 2000 });
                    }
                });
            };
        });
    </script>

</body>
</html>

 WebTM/views/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillList.html

@@ -151,6 +151,60 @@
                                    </div>
                                    <div class="layui-row" style="margin-top:5px">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">è¿æ»¤1</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">è¿æ»¤2</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 class="layui-row" style="margin-top:5px">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">åæ®å·</label>
                                            <div class="layui-input-block">
                                                <input type="text" class="layui-input ForFilteringSchemes" name="HBillno2" id="HBillno2" style="width:190px;">
@@ -821,6 +875,13 @@
                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 = "";
@@ -842,6 +903,52 @@
                            break;
                    }
                    sWhere += " and " + ColName + " " + com;
                }


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


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

                //ä¼ éçåæ°ä¸ä¸ºNAN
@@ -924,6 +1031,12 @@
                $("#ColContent").val("");
                $("#ColName").val("0");
                $("#Comparator").val("0");
                $("#ColContent1").val("");
                $("#ColName1").val("0");
                $("#Comparator1").val("0");
                $("#ColContent2").val("");
                $("#ColName2").val("0");
                $("#Comparator2").val("0");
                form.render('select');
                sWhere = "";
            }
@@ -1855,6 +1968,10 @@
                }
                $("#ColName").empty();
                $("#ColName").append(Organization);
                $("#ColName1").empty();
                $("#ColName1").append(Organization);
                $("#ColName2").empty();
                $("#ColName2").append(Organization);
                form.render('select');
            }


 WebTM/views/Éú²ú¹ÜÀí/Éú²ú¼Æ»®Æ½Ì¨/JIT_DayPlanPlatForm.html

@@ -2209,6 +2209,27 @@
                        }
                        option.data = dataPush;
                        table.render(option);

                        //è·åä¸æ¹æäº§åè¡¨æ°æ®,ç¨äºå¯¹æ¯ä¸æ¹çäº§è®¢ååè¡¨ï¼å°ä¸æ¹çäº§è®¢ååè¡¨ç¸åçæ°æ®ä¸æ¾ç¤º
                        var compareList = [];
                        for (var i = 0; i < option.data.length; i++) {
                            var temp = option.data[i]["æºåä¸»åç "] + "|" + option.data[i]["æºåååç "];
                            compareList.push(temp);
                        }

                        //åé¤ä¸æ¹æäº§åè¡¨ä¸å·²ç»å å¥ççäº§è®¢å
                        var tables = [];
                        for (var i = 0; i < option2.data.length; i++) {
                            var temp = option2.data[i]["hmainid"] + "|" + option2.data[i]["HEntryID"];
                            if ($.inArray(temp, compareList) == -1) {
                                tables.push(option2.data[i]);
                            }
                        }
                        option2.data = tables;

                        //éæ°æ¸²æåè¡¨2
                        table.render(option2);

                        layer.close(ajaxLoad);
                    } else {
                        layer.close(ajaxLoad);
@@ -2575,17 +2596,60 @@
                                layer.close(index);//å³éå¼¹çª
                            }
                            , end: function () {
                                obj.update({
                                    "HSourceID": OptionData[0].HItemID
                                    , "çäº§èµæº": OptionData[0].çäº§èµæºåç§°
                                })
                                if (OptionData.length > 0) {
                                    obj.update({
                                        "HSourceID": OptionData[0].HItemID
                                        , "çäº§èµæº": OptionData[0].çäº§èµæºåç§°
                                    })
                                    OptionData = [];
                                }
                            }
                        })
                    }
                    obj.event = "";
                    return false;
                }
                } else if (event.key == "F8") {
                    //çäº§èµæº
                    if (obj.event == "HSourceID") {
                        layer.open({
                            type: 2
                            , skin: "layui-layer-rim" //å ä¸è¾¹æ¡
                            , title: "çäº§èµæºåè¡¨"  //æ é¢
                            , closeBtn: 1  //çªä½å³ä¸è§å³é ç æ ·å¼
                            , shift: 2 //å¼¹åºå¨ç»
                            , area: ["90%", "90%"] //çªä½å¤§å°
                            , maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
                            , content: ["../../Baseset/åºç¡èµæ/Gy_Source.html?HMaterID=" + obj.data["HMaterID"], "yes"]
                            , btn: ["ç¡®å®", "åæ¶"]
                            , btn1: function (index, laero) {
                                //æé®ä¸  çåè°
                                var iframeWindow = window["layui-layer-iframe" + index];//è·åå¼¹æ¡é¡µé¢
                                var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//è·åéä¸çæ°æ®

                                if (checkStatus.data.length != 1) {
                                    return layer.msg("è¯·éæ©ä¸æ¡æ°æ®");
                                }
                                OptionData[0] = checkStatus.data[0];
                                //æ´æ°è¡¨æ ¼ç¼åçæ°æ®
                                obj.update({
                                    "HSourceID": checkStatus.data[0].HItemID
                                    , "çäº§èµæº": checkStatus.data[0].HName
                                })
                                layer.close(index);//å³éå¼¹çª
                            }
                            , end: function () {
                                if (OptionData.length > 0) {
                                    obj.update({
                                        "HSourceID": OptionData[0].HItemID
                                        , "çäº§èµæº": OptionData[0].HName
                                    })
                                    OptionData = [];
                                }
                            }
                        })
                    }
                    obj.event = "";
                }
            })
        }

@@ -2646,7 +2710,6 @@
            }
        }


        //æ¥è¯¢æªæäº§ççäº§è®¢å
        function get_Display2(sWhere_ICMO) {
            var ajaxLoad = layer.load();
@@ -2697,6 +2760,27 @@

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


                        //è·åä¸æ¹æäº§åè¡¨æ°æ®,ç¨äºå¯¹æ¯ä¸æ¹çäº§è®¢ååè¡¨ï¼å°ä¸æ¹çäº§è®¢ååè¡¨ç¸åçæ°æ®ä¸æ¾ç¤º
                        var compareList = [];
                        for (var i = 0; i < option.data.length; i++) {
                            var temp = option.data[i]["æºåä¸»åç "] + "|" + option.data[i]["æºåååç "];
                            compareList.push(temp);
                        }

                        //åé¤ä¸æ¹æäº§åè¡¨ä¸å·²ç»å å¥ççäº§è®¢å
                        var tables = [];
                        for (var i = 0; i < option2.data.length; i++) {
                            var temp = option2.data[i]["hmainid"] + "|" + option2.data[i]["HEntryID"];
                            if ($.inArray(temp, compareList) == -1) {
                                tables.push(option2.data[i]);
                            }
                        }
                        option2.data = tables;

                        //éæ°æ¸²æåè¡¨2
                        table.render(option2);

                        layer.close(ajaxLoad);
                        //if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
@@ -2826,57 +2910,17 @@
                //    obj[key] = value;
                //}
                //è·åå¾éä¸çå¾æçäº§è®¢å
                //è·åæ°æ®
                var hmainid = [];
                //var HEntryID = [];
                for (var i = 0; i < checkStatus.data.length; i++) {
                    var newObj = {
                        "HMaterID" : data[i].HMaterID,
                        "HProdORGID" : data[i].HPRDORGID,
                        "HUnitID" : data[i].HUnitID,
                        "HWorkShopID" : data[i].HDeptID,
                        "æåæ°é" : data[i].çäº§ä»»å¡åæ°é,
                        "æºåä¸»åç " : data[i].hmainid,
                        "æºåååç " : data[i].HEntryID,
                        "ç©æä»£ç " : data[i].äº§åä»£ç ,
                        "ç©æåç§°" : data[i].äº§ååç§°,
                        "çäº§ç»ç»": data[i].çäº§ç»ç»,
                        "çäº§è®¢ååæ®ç±»å" : data[i].åæ®ç±»å,
                        "çäº§è®¢åå·" : data[i].åæ®å·,
                        "çäº§è®¢åæç»è¡å·" : data[i].HEntryID,
                        "çäº§è½¦é´" : data[i].çäº§è½¦é´,
                        "è§æ ¼åå·" : data[i].è§æ ¼åå·,
                        "è®¡åå¼å§æ¥æ" : data[i].è®¡åå¼å·¥æ¥æ,
                        "è®¡åæ°é" : data[i].çäº§ä»»å¡åæ°é,
                        "è®¡åç»ææ¥æ" : data[i].è®¡åå®å·¥æ¥æ,
                        "è®¡éåä½" : data[i].è®¡éåä½,
                        "è®¢åå¯ææ°é" : data[i].çäº§ä»»å¡åæ°é,
                        "è®¢åççº§" : data[i].è®¢åççº§,
                        "è®¢åç±»å" : data[i].åæ®ç±»å,
                        "éå®è®¢åå·" : data[i].éå®è®¢åå·,
                        "éå®è®¢åæ°é" : data[i].éå®æ°é
                    }

                    option.data.push(newObj);
                    table.render(option)
                }

                //è·åä¸æ¹æäº§åè¡¨æ°æ®,ç¨äºå¯¹æ¯ä¸æ¹çäº§è®¢ååè¡¨ï¼å°ä¸æ¹çäº§è®¢ååè¡¨ç¸åçæ°æ®ä¸æ¾ç¤º
                var compareList = [];
                for (var i = 0; i < option.data.length; i++) {
                    var temp = option.data[i]["æºåä¸»åç "] + "|" + option.data[i]["æºåååç "];
                    compareList.push(temp);
                }

                //åé¤ä¸æ¹æäº§åè¡¨ä¸å·²ç»å å¥ççäº§è®¢å
                var tables = [];
                for (var i = 0; i < option2.data.length; i++) {
                    var temp = option2.data[i]["hmainid"] + "|" + option2.data[i]["HEntryID"];
                    if ($.inArray(temp, compareList) == -1) {
                        tables.push(option2.data[i]);
                    if ($.inArray(checkStatus.data[i]["hmainid"] + '_' + checkStatus.data[i]["HEntryID"], hmainid) == -1) {
                        hmainid.push(checkStatus.data[i]["hmainid"] + '_' + checkStatus.data[i]["HEntryID"]);
                    }
                }
                option2.data = tables;

                //éæ°æ¸²æåè¡¨2
                table.render(option2);
                //æ¥è¯¢çäº§è®¢å
                SelectICMOBill(hmainid);

                //var wait = layer.load();
                ////é»è¾æ¹æ³
@@ -3166,4 +3210,5 @@
    function GetGySource(data) {
        OptionData[0] = data
    }

</script>

			@@ -127,6 +127,7 @@
			<Content Include="views\Baseset\åºç¡èµæ\Gy_ConveyCompList.html" />
			<Content Include="views\Baseset\åºç¡èµæ\Gy_ConveyTypeList.html" />
			<Content Include="views\Baseset\åºç¡èµæ\Gy_GroupList.html" />
			<Content Include="views\Baseset\åºç¡èµæ\Gy_Source.html" />
			<Content Include="views\Baseset\åºç¡èµæ\Gy_SupplierListNew.html" />
			<Content Include="views\Baseset\åºç¡èµæ\Gy_EquipFileBillMainList.html" />
			<Content Include="views\Baseset\åºç¡èµæ\Gy_GetProcNoList.html" />

New file
			@@ -0,0 +1,123 @@
			ï»¿<!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.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
			<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
			<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
			</head>
			<body>
			<div class="layui-fluid">
			<div class="layui-card">
			<!--<div class="layui-card-header"></div>-->
			<div class="layui-card-body" style="padding: 15px;">
			<form class="layui-form" action="" lay-filter="component-form-group">
			<div class="layui-form-item">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤å</label>
			<div class="layui-input-inline">
			<input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="è¯·è¾å¥è¿æ»¤å" class="layui-input">
			</div>
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">å¿«éæ¥è¯¢</button>
			<button type="button" lay-submit="" class="layui-btn" lay-filter="FH">è¿å</button>
			</div>
			</div>
			</form>
			</div>
			</div>
			</div>
			<table class="layui-hide" id="mainTable"></table>
			<script src="../../../layuiadmin/layui/layui.js"></script>
			<script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
			<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script>
			function getUrlVars() {
			var vars = [], hash;
			var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
			for (var i = 0; i < hashes.length; i++) {
			hash = hashes[i].split('=');
			vars.push(hash[0]);
			vars[hash[0]] = hash[1];
			}
			return vars;
			}
			var params = getUrlVars();
			var HMaterID = params[params[0]];


			layui.use(['table', 'form', 'layer'], function () {
			var table = layui.table
			, form = layui.form
			, layer = layui.layer;

			form.on('submit(HQuery)', function () {
			//var sMainStr = JSON.stringify(table.cache['mainTable']);
			RoadQuery($('#Value').val(), sessionStorage["OrganizationID"]);
			});
			form.on('submit(FH)', function () {
			//var sMainStr = JSON.stringify(table.cache['mainTable']);
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			if (data.length == 0) {
			return layer.msg("è¯·éæ©æ°æ®!");
			}
			parent.GetGySource(data[0]);
			var index = parent.layer.getFrameIndex(window.name);
			parent.layer.close(index);
			});
			RoadQuery($('#Value').val(), sessionStorage["OrganizationID"]);
			table.render({
			elem: '#mainTable'
			// , url: '/demo/table/user/'
			, data: []
			, cellMinWidth: 80 //å¨å±å®ä¹å¸¸è§ååæ ¼çæå°å®½åº¦ï¼layui 2.2.1 æ°å¢
			, cols: [[
			{ type: 'radio' }
			, { field: 'HItemID', width: 150, title: 'çäº§èµæºID', hide: true }
			, { field: 'HNumber', width: 150, title: 'çäº§èµæºä»£ç ' }
			, { field: 'HName', width: 150, title: 'çäº§èµæºåç§°', sort: true }
			]]
			, page: true
			, limits: [50, 500, 5000, 50000],
			limit: 50
			});
			///å è½½æ¾ç¤ºæ°æ®
			function RoadQuery(Where, HOtherOrgID) {
			var Value = Where;
			if (Value == null) {
			Value = '';
			}
			if (HMaterID == null \|\| HMaterID == undefined) {
			Value ="";
			}
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Web/GetSouceList_Json",
			async: true,
			data: { "HMaterID": HMaterID,"Value": Value, "HOrgID": HOtherOrgID },
			success: function (result) {
			ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
			table.reload('mainTable', {
			data: ajaxReturnData
			, height: 'full-70'
			, loading: false
			, done: function (index, res) {

			}
			});
			},
			error: function (result) {
			console.log(result);
			//layer.msg('è·åéè´è®¢ååºç°å¼å¸¸', { icon: 2, time: 2000 });
			}
			});
			};
			});
			</script>

			</body>
			</html>

			@@ -151,6 +151,60 @@
			</div>
			<div class="layui-row" style="margin-top:5px">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤1</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">è¿æ»¤2</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 class="layui-row" style="margin-top:5px">
			<div class="layui-inline">
			<label class="layui-form-label">åæ®å·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input ForFilteringSchemes" name="HBillno2" id="HBillno2" style="width:190px;">
			@@ -821,6 +875,13 @@
			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 = "";
			@@ -842,6 +903,52 @@
			break;
			}
			sWhere += " and " + ColName + " " + com;
			}


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


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

			//ä¼ éçåæ°ä¸ä¸ºNAN
			@@ -924,6 +1031,12 @@
			$("#ColContent").val("");
			$("#ColName").val("0");
			$("#Comparator").val("0");
			$("#ColContent1").val("");
			$("#ColName1").val("0");
			$("#Comparator1").val("0");
			$("#ColContent2").val("");
			$("#ColName2").val("0");
			$("#Comparator2").val("0");
			form.render('select');
			sWhere = "";
			}
			@@ -1855,6 +1968,10 @@
			}
			$("#ColName").empty();
			$("#ColName").append(Organization);
			$("#ColName1").empty();
			$("#ColName1").append(Organization);
			$("#ColName2").empty();
			$("#ColName2").append(Organization);
			form.render('select');
			}

			@@ -2209,6 +2209,27 @@
			}
			option.data = dataPush;
			table.render(option);

			//è·åä¸æ¹æäº§åè¡¨æ°æ®,ç¨äºå¯¹æ¯ä¸æ¹çäº§è®¢ååè¡¨ï¼å°ä¸æ¹çäº§è®¢ååè¡¨ç¸åçæ°æ®ä¸æ¾ç¤º
			var compareList = [];
			for (var i = 0; i < option.data.length; i++) {
			var temp = option.data[i]["æºåä¸»åç "] + "\|" + option.data[i]["æºåååç "];
			compareList.push(temp);
			}

			//åé¤ä¸æ¹æäº§åè¡¨ä¸å·²ç»å å¥ççäº§è®¢å
			var tables = [];
			for (var i = 0; i < option2.data.length; i++) {
			var temp = option2.data[i]["hmainid"] + "\|" + option2.data[i]["HEntryID"];
			if ($.inArray(temp, compareList) == -1) {
			tables.push(option2.data[i]);
			}
			}
			option2.data = tables;

			//éæ°æ¸²æåè¡¨2
			table.render(option2);

			layer.close(ajaxLoad);
			} else {
			layer.close(ajaxLoad);
			@@ -2575,17 +2596,60 @@
			layer.close(index);//å³éå¼¹çª
			}
			, end: function () {
			obj.update({
			"HSourceID": OptionData[0].HItemID
			, "çäº§èµæº": OptionData[0].çäº§èµæºåç§°
			})
			if (OptionData.length > 0) {
			obj.update({
			"HSourceID": OptionData[0].HItemID
			, "çäº§èµæº": OptionData[0].çäº§èµæºåç§°
			})
			OptionData = [];
			}
			}
			})
			}
			obj.event = "";
			return false;
			}
			} else if (event.key == "F8") {
			//çäº§èµæº
			if (obj.event == "HSourceID") {
			layer.open({
			type: 2
			, skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			, title: "çäº§èµæºåè¡¨" //æ é¢
			, closeBtn: 1 //çªä½å³ä¸è§å³é ç æ ·å¼
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ["../../Baseset/åºç¡èµæ/Gy_Source.html?HMaterID=" + obj.data["HMaterID"], "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			var iframeWindow = window["layui-layer-iframe" + index];//è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//è·åéä¸çæ°æ®

			if (checkStatus.data.length != 1) {
			return layer.msg("è¯·éæ©ä¸æ¡æ°æ®");
			}
			OptionData[0] = checkStatus.data[0];
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"HSourceID": checkStatus.data[0].HItemID
			, "çäº§èµæº": checkStatus.data[0].HName
			})
			layer.close(index);//å³éå¼¹çª
			}
			, end: function () {
			if (OptionData.length > 0) {
			obj.update({
			"HSourceID": OptionData[0].HItemID
			, "çäº§èµæº": OptionData[0].HName
			})
			OptionData = [];
			}
			}
			})
			}
			obj.event = "";
			}
			})
			}

			@@ -2646,7 +2710,6 @@
			}
			}


			//æ¥è¯¢æªæäº§ççäº§è®¢å
			function get_Display2(sWhere_ICMO) {
			var ajaxLoad = layer.load();
			@@ -2697,6 +2760,27 @@

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


			//è·åä¸æ¹æäº§åè¡¨æ°æ®,ç¨äºå¯¹æ¯ä¸æ¹çäº§è®¢ååè¡¨ï¼å°ä¸æ¹çäº§è®¢ååè¡¨ç¸åçæ°æ®ä¸æ¾ç¤º
			var compareList = [];
			for (var i = 0; i < option.data.length; i++) {
			var temp = option.data[i]["æºåä¸»åç "] + "\|" + option.data[i]["æºåååç "];
			compareList.push(temp);
			}

			//åé¤ä¸æ¹æäº§åè¡¨ä¸å·²ç»å å¥ççäº§è®¢å
			var tables = [];
			for (var i = 0; i < option2.data.length; i++) {
			var temp = option2.data[i]["hmainid"] + "\|" + option2.data[i]["HEntryID"];
			if ($.inArray(temp, compareList) == -1) {
			tables.push(option2.data[i]);
			}
			}
			option2.data = tables;

			//éæ°æ¸²æåè¡¨2
			table.render(option2);

			layer.close(ajaxLoad);
			//if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
			@@ -2826,57 +2910,17 @@
			// obj[key] = value;
			//}
			//è·åå¾éä¸çå¾æçäº§è®¢å
			//è·åæ°æ®
			var hmainid = [];
			//var HEntryID = [];
			for (var i = 0; i < checkStatus.data.length; i++) {
			var newObj = {
			"HMaterID" : data[i].HMaterID,
			"HProdORGID" : data[i].HPRDORGID,
			"HUnitID" : data[i].HUnitID,
			"HWorkShopID" : data[i].HDeptID,
			"æåæ°é" : data[i].çäº§ä»»å¡åæ°é,
			"æºåä¸»åç " : data[i].hmainid,
			"æºåååç " : data[i].HEntryID,
			"ç©æä»£ç " : data[i].äº§åä»£ç ,
			"ç©æåç§°" : data[i].äº§ååç§°,
			"çäº§ç»ç»": data[i].çäº§ç»ç»,
			"çäº§è®¢ååæ®ç±»å" : data[i].åæ®ç±»å,
			"çäº§è®¢åå·" : data[i].åæ®å·,
			"çäº§è®¢åæç»è¡å·" : data[i].HEntryID,
			"çäº§è½¦é´" : data[i].çäº§è½¦é´,
			"è§æ ¼åå·" : data[i].è§æ ¼åå·,
			"è®¡åå¼å§æ¥æ" : data[i].è®¡åå¼å·¥æ¥æ,
			"è®¡åæ°é" : data[i].çäº§ä»»å¡åæ°é,
			"è®¡åç»ææ¥æ" : data[i].è®¡åå®å·¥æ¥æ,
			"è®¡éåä½" : data[i].è®¡éåä½,
			"è®¢åå¯ææ°é" : data[i].çäº§ä»»å¡åæ°é,
			"è®¢åççº§" : data[i].è®¢åççº§,
			"è®¢åç±»å" : data[i].åæ®ç±»å,
			"éå®è®¢åå·" : data[i].éå®è®¢åå·,
			"éå®è®¢åæ°é" : data[i].éå®æ°é
			}

			option.data.push(newObj);
			table.render(option)
			}

			//è·åä¸æ¹æäº§åè¡¨æ°æ®,ç¨äºå¯¹æ¯ä¸æ¹çäº§è®¢ååè¡¨ï¼å°ä¸æ¹çäº§è®¢ååè¡¨ç¸åçæ°æ®ä¸æ¾ç¤º
			var compareList = [];
			for (var i = 0; i < option.data.length; i++) {
			var temp = option.data[i]["æºåä¸»åç "] + "\|" + option.data[i]["æºåååç "];
			compareList.push(temp);
			}

			//åé¤ä¸æ¹æäº§åè¡¨ä¸å·²ç»å å¥ççäº§è®¢å
			var tables = [];
			for (var i = 0; i < option2.data.length; i++) {
			var temp = option2.data[i]["hmainid"] + "\|" + option2.data[i]["HEntryID"];
			if ($.inArray(temp, compareList) == -1) {
			tables.push(option2.data[i]);
			if ($.inArray(checkStatus.data[i]["hmainid"] + '_' + checkStatus.data[i]["HEntryID"], hmainid) == -1) {
			hmainid.push(checkStatus.data[i]["hmainid"] + '_' + checkStatus.data[i]["HEntryID"]);
			}
			}
			option2.data = tables;

			//éæ°æ¸²æåè¡¨2
			table.render(option2);
			//æ¥è¯¢çäº§è®¢å
			SelectICMOBill(hmainid);

			//var wait = layer.load();
			////é»è¾æ¹æ³
			@@ -3166,4 +3210,5 @@
			function GetGySource(data) {
			OptionData[0] = data
			}

			</script>