MES-WEB-LayUI.git

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

yangle

2022-07-27 f77ffc3481ce95c0eac82c2887ac23d7bc66778d

销售订单隐藏列
齐套分析明细

6个文件已修改

	WebTM/layuiadmin/Scripts/webConfig.js	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/index.html	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/生产管理/提料计划/JIT_LiftMaterPlanBillEdit.html	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm.html	22 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/生产管理/齐套分析/JIT_CompleteDetailList.html	196 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/销售管理/销售订单/Xs_SeOrderBillDyColList.html	133 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -8,7 +8,7 @@
    //var WEBURL = "http://localhost:8082/lubao";   //é¢æåæ¬å°éç½®
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //æ¨é²æ¬å°éç½®
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //ç« ç´«ææ¬å°éç½®
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //æ¨ä¹æ¬å°éç½®
    var WEBURL = "http://localhost:8082/LuBaoAPI/";    //æ¨ä¹æ¬å°éç½®
    //var WEBURL = "http://10.1.4.155/API/";   //æ±ä¸°å®¢æ·NEW
    //var WEBURL = "http://47.96.97.237/API/";   //æºäºæå¡å¨
    //var WEBURL = "http://183.129.128.86:9090/API/";   //å¯è´å¥ç¹å®¢æ·æå¡å¨å¤ç½
@@ -17,7 +17,7 @@
    //var WEBURL = "http://192.168.0.214/API/";   //çä¸ç¥ºæå¡å¨
    //var WEBURL = "http://192.168.10.66/API/";   //æ£®æ¥·æå¡å¨
    //var WEBURL = "http://localhost/API/";
    var WEBURL = "http://60.191.27.141:8090/API/"; 
    //var WEBURL = "http://60.191.27.141:8090/API/"; 
    return WEBURL
}


 WebTM/views/index.html

@@ -376,6 +376,7 @@
                                            <dl class="layui-nav-child">
                                                <dd><a lay-href="çäº§ç®¡ç/çäº§è®¡åå¹³å°/JIT_DayPlanPlatForm.html" style="margin: 0 0 0 13px;">çäº§è®¡åå¹³å°</a></dd>
                                                <dd><a lay-href="çäº§ç®¡ç/çäº§è®¡åå¹³å°/JIT_DayPlanPlatFormImport.html" style="margin: 0 0 0 13px;">å¯¼å¥</a></dd>
                                                <dd><a lay-href="çäº§ç®¡ç/é½å¥åæ/JIT_CompleteDetailList.html" style="margin: 0 0 0 13px;">é½å¥åæä¿¡æ¯æç»åè¡¨</a></dd>
                                            </dl>
                                        </dd>
                                        <dd>

 WebTM/views/Éú²ú¹ÜÀí/ÌáÁÏ¼Æ»®/JIT_LiftMaterPlanBillEdit.html

@@ -788,7 +788,6 @@
                    success: function (data1) {
                        if (data1.data.length != 0) {


                            var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
                            var titleData = ["HMaterID", "HUnitID", "HWorkShopID", "HPurchaseDeptID"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å± 


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

@@ -208,6 +208,11 @@
            });
        })

        //åå»è¡¨æ ¼äºä»¶
        table.on('rowDouble(mainTable)', function (obj) {
            btnrowDouble(obj.data);
        })

        //å¤´å·¥å·æ äºä»¶
        table.on('toolbar(mainTable)', function (obj) {
            var checkStatus = table.checkStatus('mainTable')
@@ -715,7 +720,6 @@
                }
                , btn2: function (index, layero) { }
            })

        }

        //å¿«éè¿æ»¤
@@ -752,6 +756,22 @@
            sWhere = ""//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
        }

        //åå»è·³è½¬é½å¥åææç»è¡¨
        function btnrowDouble(obj) {
            HMainICMOEntryID = obj["HICMOEntryID"];
            HMainICMOInterID = obj["HICMOInterID"];
            HICMOInterID = obj["HInterID"];

            layer.open({
                type: 2 //ç±»å
                , skin: 'layui-layer-rim'//å ä¸è¾¹æ¡
                , area: ['90%', '90%']//å¤§å°
                , title: 'é½å¥åææç»è¡¨'//æ é¢
                , shift: 2//å¼¹åºå¨ç»
                , content: ['../../çäº§ç®¡ç/é½å¥åæ/JIT_CompleteDetailList.html?OperationType=1&HMainICMOEntryID=' + HMainICMOEntryID+'&HMainICMOInterID=' + HMainICMOInterID+'&HICMOInterID=' + HICMOInterID, 'yes']
            })
        }

        //éç½®
        function set_ClearQuery() {
            $("#HPlanBeginDate").val(Format(new Date(), "yyyy-MM-dd"));//å¼å·¥èµ·å§æ¥æ

 WebTM/views/Éú²ú¹ÜÀí/ÆëÌ×·ÖÎö/JIT_CompleteDetailList.html

@@ -5,6 +5,7 @@
    <title>é½å¥åæä¿¡æ¯æç»åè¡¨</title>
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
@@ -25,48 +26,73 @@
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">åæ®å·</label>
                                    <div class="layui-input-block" style="margin-left: 120px;">
                                        <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">çäº§è½¦é´</label>
                                    <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">ç©æç¼ç </label>
                                    <div class="layui-input-block" style="margin-left: 77px;">
                                        <input type="hidden" class="layui-input" lay-verify="HWorkShopID" name="HWorkShopID" id="HWorkShopID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                        <input type="text" class="layui-input" lay-verify="HWorkShopIDName" name="HWorkShopIDName" id="HWorkShopIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHWorkShopID" id="btnHWorkShopID" style="padding: 0 10px;float: right;margin-right: 3px;">
                                        <input type="hidden" class="layui-input" lay-verify="HMaterID" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                        <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterNumber" id="btnHMaterNumber" style="padding: 0 10px;float: right;margin-right: 3px;">
                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                        </button>
                                    </div>
                                </div>
                                <div class="layui-inline" style="margin-left:30px">
                                    <label class="layui-form-label">é½å¥ç¶æ</label>
                                    <div class="layui-input-block" style="width:190px;">
                                        <select name="HComplete" id="HComplete" lay-filter="HComplete">
                                            <option value="">å¨é¨</option>
                                            <option value="é½å¥">é½å¥</option>
                                            <option value="æªé½å¥">æªé½å¥</option>
                                        </select>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">æ¥è®¡åæ¥æ</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input" id="HPlanDate" style="width:190px;">
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">æ¥è¯¢</button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch">éç½®</button>
                                <!--<div class="layui-colla-content">
                <div class="layui-inline">
                    <div class="layui-inline">
                        <span>å¶ä»æ¡ä»¶></span>
                    </div>
                </div>
                <div class="layui-inline">
                    <label class="layui-form-label" style="width: 85px;">ç©æä»£ç </label>
                    <div class="layui-input-block" style="margin-left: 120px;">
                        <input type="text" class="layui-input" name="ç©æä»£ç " id="ç©æä»£ç ">
                    </div>
                </div>
                <div class="layui-inline">
                    <label class="layui-form-label" style="width: 85px;">èµæºä»£ç </label>
                    <div class="layui-input-block" style="margin-left: 120px;">
                        <input type="text" class="layui-input" name="èµæºä»£ç " id="èµæºä»£ç ">
                    </div>
                </div>
                <div class="layui-inline">
                    <label class="layui-form-label" style="width: 85px;">é¨é¨ä»£ç </label>
                    <div class="layui-input-block" style="margin-left: 120px;">
                        <input type="text" class="layui-input" name="é¨é¨ä»£ç " id="é¨é¨ä»£ç ">
                    </div>
                </div>
            </div>-->
                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                    <div class="layui-row" style="margin-top:10px;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">ç©æåç§°</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;display: inline-block;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">çäº§è®¢å</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="" id="">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 100px;">ææ éè´è®¢å</label>
                                            <div class="layui-input-block" style="width: 190px; margin-left: 130px;">
                                                <select name="" lay-filter="">
                                                    <option value="å¨é¨" selected>å¨é¨</option>
                                                    <option value="æéè´è®¢å">æéè´è®¢å</option>
                                                    <option value="æ éè´è®¢å">æ éè´è®¢å</option>
                                                </select>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">è§æ ¼åå·</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" style="background-color:#efefef4d;display: inline-block;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">éå®è®¢å</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="" id="">
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -100,8 +126,30 @@
            , util = layui.util
        var sWhere = "";
        var option = [];
        //åå§åçé¢
        var HMainICMOEntryID = -1;//ä¸»çäº§è®¢åååç 
        var HMainICMOInterID = -1;//ä¸»çäº§è®¢åä¸»åç 
        var HICMOInterID = -1;//æ¥è®¡åè®¢åä¸»åç 
        //#endregion

        //#region åå§åçé¢

        var params = getUrlVars();
        var OperationType = params[params[0]]; 

        //å¤ææ¯å¦æåæ°ä¼ é
        if (!isNaN(OperationType)) {
            HMainICMOEntryID = params[params[1]];
            HMainICMOInterID = params[params[2]];
            HICMOInterID = params[params[3]];
        }

        set_ClearBill();
       

        //#endregion

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

        //#region å¤´å·¥å·æ äºä»¶
        table.on('toolbar(mainTable)', function (obj) {
            switch (obj.event) {
@@ -116,11 +164,14 @@
                    break;
            };
        });
        //#region çäº§è½¦é´
        form.on('submit(btnHWorkShopID)', function (data) {
            btnHWorkShopID();
        //#endregion

        //#region ç©æ
        form.on('submit(btnHMaterNumber)', function (data) {
            btnHMaterNumber();
        });
        //#endregion

        //#region éç½®æé®
        form.on('submit(btnReSearch)', function (data) {
            set_ClearQuery();
@@ -132,9 +183,15 @@
            get_FastQuery();
        });
        //#endregion

        //#endregion

        //#region æ¬é¡µé¢è¢«è°ç¨çæææ¹æ³

        //#region åå§åçé¢
        function set_ClearBill() {
            //åå§åæ¥æ
            $("#HPlanDate").val(Format(new Date(), 'yyyy-MM-dd'));
            //åå§åè¡¨æ ¼
            set_InitGrid();
            //æ¥è¯¢
@@ -160,11 +217,12 @@
                    , { field: 'æ¥è®¡åè®¢åä¸»åç ', title: 'æ¥è®¡åè®¢åä¸»åç ', hide: true }
                    , { field: 'ä¸»çäº§è®¢åååç ', title: 'ä¸»çäº§è®¢åååç ', hide: true }
                    , { field: 'ä¸»çäº§è®¢åä¸»åç ', title: 'ä¸»çäº§è®¢åä¸»åç ', hide: true }
                    , { field: 'æ¥è®¡åæ¥æ', title: 'æ¥è®¡åæ¥æ' }
                    , { field: 'æ¥è®¡åæ¥æ', title: 'æ¥è®¡åæ¥æ', templet: "<div>{{d.æ¥è®¡åæ¥æ =='' ?'':layui.util.toDateString(d.æ¥è®¡åæ¥æ, 'yyyy-MM-dd')}}</div>" }
                    , { field: 'ç©æID', title: 'ç©æID', hide: true }
                    , { field: 'ç©æç¼ç ', title: 'ç©æç¼ç '  }
                    , { field: 'ç©æåç§°', title: 'ç©æåç§°' }
                    , { field: 'è®¡ååææ°é', title: 'è®¡ååææ°é' }
                    , { field: 'é½å¥ç¶æ', title: 'é½å¥ç¶æ' }
                    , { field: 'é½å¥æ°é', title: 'é½å¥æ°é' }
                    , { field: 'ç¼ºææ°é', title: 'ç¼ºææ°é' }
                    , { field: 'é¢æå ç¨æ°é', title: 'é¢æå ç¨æ°é' }
@@ -189,7 +247,7 @@
            $.ajax({
                url: GetWEBURL() + '/JIT_Complete/JIT_CompleteDetailList',
                type: "GET",
                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                data: { "sWhere": sWhere, "HMainICMOEntryID": HMainICMOEntryID, "HMainICMOInterID": HMainICMOInterID, "HICMOInterID": HICMOInterID },
                success: function (result) {
                    if (result.count == 1) {
                        option.data = result.data;
@@ -211,14 +269,22 @@

        //#region å¿«éè¿æ»¤
        function get_FastQuery() {
            var HBillNo = $("#HBillNo").val();
            var HWorkShopIDName = $("#HWorkShopIDName").val();
            var HMaterID = $("#HMaterID").val();
            var HMaterNumber = $("#HMaterNumber").val();
            var HComplete = $("#HComplete").val();
            var HPlanDate = $("#HPlanDate").val();
         
            if (HBillNo) {
                sWhere += " and åæ®å· like '%" + HBillNo + "%'";
            if (HMaterID!="0") {
                sWhere += " and ç©æID = '" + HMaterID + "'";
            }
            if (HWorkShopIDName) {
                sWhere += " and è½¦é´åç§° = '" + HWorkShopIDName + "'";
            if (HMaterNumber) {
                sWhere += " and ç©æç¼ç  = '" + HMaterNumber + "'";
            }
            if (HComplete) {
                sWhere += " and é½å¥ç¶æ = '" + HComplete + "'";
            }
            if (HPlanDate) {
                sWhere += " and æ¥è®¡åæ¥æ = '" + HPlanDate + "'";
            }
            get_Display(sWhere);
            sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
@@ -227,22 +293,26 @@

        //#region éç½®è¿æ»¤æ¡ä»¶æ¹æ³
        function set_ClearQuery() {
            $("#HWorkShopIDName").val("");
            $("#HBillNo").val("");
            $("#HWorkShopID").val("");
            $("#HMaterID").val("0");
            $("#HMaterNumber").val("");
            $('#HComplete').val("");
            $("#HPlanDate").val(Format(new Date(), 'yyyy-MM-dd'));
            $("#HMaterName").val("");
            $("#HMaterModel").val("");
            form.render('select');
            sWhere = "";
        }
        //#endregion

        //çäº§è½¦é´åè¡¨
        function btnHWorkShopID() {
        //ç©æåè¡¨
        function btnHMaterNumber() {
            layer.open({
                type: 2 //ç±»å
                , skin: 'layui-layer-rim'//å ä¸è¾¹æ¡
                , area: ['90%', '90%']//å¤§å°
                , title: 'çäº§è½¦é´åè¡¨'//æ é¢
                , title: 'ç©æåè¡¨'//æ é¢
                , shift: 2//å¼¹åºå¨ç»
                , content: ['../../Baseset/åºç¡èµæ/Gy_DepartmentList.html', 'yes']
                , content: ['../../Baseset/åºç¡èµæ/Gy_MaterialList.html', 'yes']
                , btn: ['ç¡®å®', 'åæ¶']
                , btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
                    var iframeWindow = window['layui-layer-iframe' + index]  //è·åå¼¹æ¡é¡µé¢
@@ -251,14 +321,28 @@
                        return layer.msg('è¯·éæ©æ°æ®');
                    }
                    //è·åæ°æ®
                    $("#HWorkShopID").val(checkStatus.data[0].HItemID);//è½¦é´id
                    $("#HWorkShopIDName").val(checkStatus.data[0].HName);//è½¦é´åç§°
                    $("#HMaterID").val(checkStatus.data[0].HItemID);
                    $("#HMaterNumber").val(checkStatus.data[0].HNumber);
                    $("#HMaterName").val(checkStatus.data[0].HName);
                    $("#HMaterModel").val(checkStatus.data[0].HModel);
                    layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
                }
                , btn2: function (index, layero) { }
            })

        }

        //è·ååæ°
        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;
        }
        //#endregion
        //ä»¥ä¸æ¯layuiæ¨¡å
    });

 WebTM/views/ÏúÊÛ¹ÜÀí/ÏúÊÛ¶©µ¥/Xs_SeOrderBillDyColList.html

@@ -2,13 +2,12 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title>éå®è®¢ååè¡¨</title>
    <title>éå®è®¢åå¨æåè¡¨</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <!--<script src="../../../layuiadmin/layui/layui.js"></script>-->
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
@@ -58,14 +57,6 @@
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                </button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>

                                <div class="layui-inline">
                                    <label class="layui-form-label">åæ®å·</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HBillno2" id="HBillno2" style="width:190px;">
                                    </div>
                                </div>

                                <div class="layui-colla-content">
                                    <div class="layui-inline">
                                        <div class="layui-inline">
@@ -99,10 +90,6 @@
            </div>
        </div>
    </div>
    <!--<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>
        layui.config({
            base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
@@ -160,66 +147,6 @@
                    , cellMinWidth: 90
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]
                    , cols: [[
                        { type: 'checkbox', fixed: 'left' }
                       ,{ field: 'hmainid', title: 'hmainid', sort: true, hide: true }
                        , { field: 'æ¥æ', title: 'æ¥æ', width: 125}
                        , { field: 'åæ®å·', title: 'åæ®å·', width: 125 }
                        , { field: 'HBillType', title: 'HBillType', hide: true }
                        , { field: 'HCusID', title: 'HCusID', hide: true }
                        , { field: 'å®¢æ·ä»£ç ', title: 'å®¢æ·ä»£ç ', width: 125 }
                        , { field: 'å®¢æ·', title: 'å®¢æ·' }
                        , { field: 'äº¤è´§å°å', title: 'äº¤è´§å°å', width: 125 }
                        , { field: 'HSSID', title: 'HSSID', hide: true }
                        , { field: 'ç»ç®æ¹å¼ä»£ç ', title: 'ç»ç®æ¹å¼ä»£ç ', width: 125 }
                        , { field: 'ç»ç®æ¹å¼', title: 'ç»ç®æ¹å¼', width: 125}
                        , { field: 'ç»ç®æ¥æ', title: 'ç»ç®æ¥æ', width: 170}
                        , { field: 'HCurID', title: 'HCurID', hide: true }
                        , { field: 'å¸å«ä»£ç ', title: 'å¸å«ä»£ç ' }
                        , { field: 'å¸å«', title: 'å¸å«' }
                        , { field: 'æ±ç', title: 'æ±ç' }
                        , { field: 'HDeptID', title: 'HDeptID', hide: true }
                        , { field: 'é¨é¨ä»£ç ', title: 'é¨é¨ä»£ç ', width: 125 }
                        , { field: 'é¨é¨', title: 'é¨é¨', width: 125 }
                        , { field: 'éå®æ¹å¼', title: 'éå®æ¹å¼' }
                        , { field: 'HManagerID', title: 'HManagerID', hide: true }
                        , { field: 'ä¸»ç®¡ä»£ç ', title: 'ä¸»ç®¡ä»£ç ' }
                        , { field: 'ä¸»ç®¡', title: 'ä¸»ç®¡' }
                        , { field: 'HEmpID', title: 'HEmpID', hide: true }
                        , { field: 'ä¸å¡åä»£ç ', title: 'ä¸å¡åä»£ç ' }
                        , { field: 'ä¸å¡å', title: 'ä¸å¡å' }
                        , { field: 'æè¦', title: 'æè¦' }
                        , { field: 'è¡¨å¤´å¤æ³¨', title: 'è¡¨å¤´å¤æ³¨' }
                        , { field: 'hsubid', title: 'hsubid', hide: true }
                        , { field: 'HMaterID', title: 'HMaterID', hide: true }
                        , { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ' }
                        , { field: 'ç©æåç§°', title: 'ç©æåç§°' }
                        , { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·' }
                        , { field: 'æ¹å·', title: 'æ¹å·' }
                        , { field: 'HUnitID', title: 'HUnitID', hide: true }
                        , { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ' }
                        , { field: 'è®¡éåä½', title: 'è®¡éåä½' }
                        , { field: 'æ°é', title: 'æ°é' }
                        , { field: 'åä»·', title: 'åä»·' }
                        , { field: 'éé¢', title: 'éé¢' }
                        , { field: 'ç¨ç', title: 'ç¨ç' }
                        , { field: 'ç¨é¢', title: 'ç¨é¢' }
                        , { field: 'ä»·ç¨åè®¡', title: 'ä»·ç¨åè®¡' }
                        , { field: 'æºååå·', title: 'æºååå·' }
                        , { field: 'è®¡åè·è¸ªå·', title: 'è®¡åè·è¸ªå·' }
                        , { field: 'è¡¨ä½å¤æ³¨', title: 'è¡¨ä½å¤æ³¨' }
                        , { field: 'å¶åäºº', title: 'å¶åäºº', width: 125 }
                        , { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ', width: 200, templet: "<div>{{d.å¶åæ¥æ ==null ?'':layui.util.toDateString(d.å¶åæ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
                        , { field: 'å®¡æ ¸äºº', title: 'å®¡æ ¸äºº', width: 125 }
                        , { field: 'å®¡æ ¸æ¥æ', title: 'å®¡æ ¸æ¥æ', width: 200, templet: "<div>{{d.å®¡æ ¸æ¥æ ==null ? '':layui.util.toDateString(d.å®¡æ ¸æ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
                        , { field: 'ä¿®æ¹äºº', title: 'ä¿®æ¹äºº', width: 125 }
                        , { field: 'ä¿®æ¹æ¥æ', title: 'ä¿®æ¹æ¥æ', width: 200, templet: "<div>{{d.ä¿®æ¹æ¥æ ==null ?'':layui.util.toDateString(d.ä¿®æ¹æ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
                        , { field: 'å³éäºº', title: 'å³éäºº', width: 125 }
                        , { field: 'å³éæ¥æ', title: 'å³éæ¥æ', width: 200, templet: "<div>{{d.å³éæ¥æ ==null ?'':layui.util.toDateString(d.å³éæ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
                        , { field: 'ä½åºäºº', title: 'ä½åºäºº', width: 125 }
                        , { field: 'ä½åºæ¥æ', title: 'ä½åºæ¥æ', width: 200, templet: "<div>{{d.ä½åºæ¥æ ==null ?'':layui.util.toDateString(d.ä½åºæ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>" }

                    ]]
                };
            }

@@ -227,15 +154,40 @@
            function get_Display(sWhere) {
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/Xs_SeOrderBill/list',
                    url: GetWEBURL() + '/Xs_SeOrderBill/DyColList',
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    data: { "sWhere": sWhere, "user": "admin" },
                    success: function (data1) {
                        var col = [];
                        if (data1.count == 1) {
                            var data = [];
                            //ç»ç©ºçæ°ç»èµå¼
                            for (var key in data1.list) {
                                data.push({ "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                            }
                            //å¤ææ¯å¦æ¯çº¯è±æ
                            var patrn = new RegExp("[\u4E00-\u9FA5]+");//ä¸æ
                            for (var i = 0; i < data.length; i++) {
                                if (!patrn.test(data[i].name)) {
                                    col.push({ field: data[i].name, title: data[i].name, hide: true }); //éèå
                                }
                                else {
                                    switch (data[i].Type) {
                                        case 'DateTime':
                                            col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                            break;
                                        default:
                                            col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, width: 200 });
                                    }
                                }
                            }
                            option.cols = [col];
                            option.data = data1.data;
                            table.render(option);
                            layer.close(ajaxLoad);
                        } else {
                        }
                        else
                        {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
@@ -286,33 +238,6 @@
                $("#HDeptID").val("");
                $("#HMangerID").val("");
                sWhere = "";
            }
            //éæ°åæ¥æé®
            function set_ResCnz() {
                var HBillno2 = $('#HBillno2').val();
                $.ajax({
                    url: GetWEBURL() + '/Cg_POOrderBill/Resynchronize',
                    type: "GET",
                    data: { "HBillNo": HBillno2, "HBillType": 1401 },
                    success: function (result) {
                        if (result.count == 1) {
                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                // å¾å°frameç´¢å¼
                                var index = layer.getFrameIndex(window.name);
                                //å³éå½åframe
                                layer.close(index);
                                //ä¿®æ¹ä¸ºååå·æ°çé¢
                                window.location.reload();
                            });

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

			@@ -8,7 +8,7 @@
			//var WEBURL = "http://localhost:8082/lubao"; //é¢æåæ¬å°éç½®
			//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //æ¨é²æ¬å°éç½®
			//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //ç« ç´«ææ¬å°éç½®
			//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //æ¨ä¹æ¬å°éç½®
			var WEBURL = "http://localhost:8082/LuBaoAPI/"; //æ¨ä¹æ¬å°éç½®
			//var WEBURL = "http://10.1.4.155/API/"; //æ±ä¸°å®¢æ·NEW
			//var WEBURL = "http://47.96.97.237/API/"; //æºäºæå¡å¨
			//var WEBURL = "http://183.129.128.86:9090/API/"; //å¯è´å¥ç¹å®¢æ·æå¡å¨å¤ç½
			@@ -17,7 +17,7 @@
			//var WEBURL = "http://192.168.0.214/API/"; //çä¸ç¥ºæå¡å¨
			//var WEBURL = "http://192.168.10.66/API/"; //æ£®æ¥·æå¡å¨
			//var WEBURL = "http://localhost/API/";
			var WEBURL = "http://60.191.27.141:8090/API/";
			//var WEBURL = "http://60.191.27.141:8090/API/";
			return WEBURL
			}

			@@ -376,6 +376,7 @@
			<dl class="layui-nav-child">
			<dd><a lay-href="çäº§ç®¡ç/çäº§è®¡åå¹³å°/JIT_DayPlanPlatForm.html" style="margin: 0 0 0 13px;">çäº§è®¡åå¹³å°</a></dd>
			<dd><a lay-href="çäº§ç®¡ç/çäº§è®¡åå¹³å°/JIT_DayPlanPlatFormImport.html" style="margin: 0 0 0 13px;">å¯¼å¥</a></dd>
			<dd><a lay-href="çäº§ç®¡ç/é½å¥åæ/JIT_CompleteDetailList.html" style="margin: 0 0 0 13px;">é½å¥åæä¿¡æ¯æç»åè¡¨</a></dd>
			</dl>
			</dd>
			<dd>

			@@ -788,7 +788,6 @@
			success: function (data1) {
			if (data1.data.length != 0) {


			var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
			var titleData = ["HMaterID", "HUnitID", "HWorkShopID", "HPurchaseDeptID"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±

			@@ -208,6 +208,11 @@
			});
			})

			//åå»è¡¨æ ¼äºä»¶
			table.on('rowDouble(mainTable)', function (obj) {
			btnrowDouble(obj.data);
			})

			//å¤´å·¥å·æ äºä»¶
			table.on('toolbar(mainTable)', function (obj) {
			var checkStatus = table.checkStatus('mainTable')
			@@ -715,7 +720,6 @@
			}
			, btn2: function (index, layero) { }
			})

			}

			//å¿«éè¿æ»¤
			@@ -752,6 +756,22 @@
			sWhere = ""//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			}

			//åå»è·³è½¬é½å¥åææç»è¡¨
			function btnrowDouble(obj) {
			HMainICMOEntryID = obj["HICMOEntryID"];
			HMainICMOInterID = obj["HICMOInterID"];
			HICMOInterID = obj["HInterID"];

			layer.open({
			type: 2 //ç±»å
			, skin: 'layui-layer-rim'//å ä¸è¾¹æ¡
			, area: ['90%', '90%']//å¤§å°
			, title: 'é½å¥åææç»è¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../çäº§ç®¡ç/é½å¥åæ/JIT_CompleteDetailList.html?OperationType=1&HMainICMOEntryID=' + HMainICMOEntryID+'&HMainICMOInterID=' + HMainICMOInterID+'&HICMOInterID=' + HICMOInterID, 'yes']
			})
			}

			//éç½®
			function set_ClearQuery() {
			$("#HPlanBeginDate").val(Format(new Date(), "yyyy-MM-dd"));//å¼å·¥èµ·å§æ¥æ

			@@ -5,6 +5,7 @@
			<title>é½å¥åæä¿¡æ¯æç»åè¡¨</title>
			<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
			<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
			<script src="../../../layuiadmin/layui/layui.js"></script>
			<script src="../../../layuiadmin/Scripts/json2.js"></script>
			<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
			@@ -25,48 +26,73 @@
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">åæ®å·</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HBillNo" id="HBillNo">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">çäº§è½¦é´</label>
			<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">ç©æç¼ç </label>
			<div class="layui-input-block" style="margin-left: 77px;">
			<input type="hidden" class="layui-input" lay-verify="HWorkShopID" name="HWorkShopID" id="HWorkShopID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
			<input type="text" class="layui-input" lay-verify="HWorkShopIDName" name="HWorkShopIDName" id="HWorkShopIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHWorkShopID" id="btnHWorkShopID" style="padding: 0 10px;float: right;margin-right: 3px;">
			<input type="hidden" class="layui-input" lay-verify="HMaterID" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
			<input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterNumber" id="btnHMaterNumber" style="padding: 0 10px;float: right;margin-right: 3px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			</div>
			</div>
			<div class="layui-inline" style="margin-left:30px">
			<label class="layui-form-label">é½å¥ç¶æ</label>
			<div class="layui-input-block" style="width:190px;">
			<select name="HComplete" id="HComplete" lay-filter="HComplete">
			<option value="">å¨é¨</option>
			<option value="é½å¥">é½å¥</option>
			<option value="æªé½å¥">æªé½å¥</option>
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">æ¥è®¡åæ¥æ</label>
			<div class="layui-input-block">
			<input type="date" class="layui-input" id="HPlanDate" style="width:190px;">
			</div>
			</div>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">æ¥è¯¢</button>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch">éç½®</button>
			<!--<div class="layui-colla-content">
			<div class="layui-inline">
			<div class="layui-inline">
			<span>å¶ä»æ¡ä»¶></span>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ç©æä»£ç </label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="ç©æä»£ç " id="ç©æä»£ç ">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">èµæºä»£ç </label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="èµæºä»£ç " id="èµæºä»£ç ">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">é¨é¨ä»£ç </label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="é¨é¨ä»£ç " id="é¨é¨ä»£ç ">
			</div>
			</div>
			</div>-->
			<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
			<div class="layui-row" style="margin-top:10px;">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ç©æåç§°</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;display: inline-block;" readonly>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">çäº§è®¢å</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="" id="">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 100px;">ææ éè´è®¢å</label>
			<div class="layui-input-block" style="width: 190px; margin-left: 130px;">
			<select name="" lay-filter="">
			<option value="å¨é¨" selected>å¨é¨</option>
			<option value="æéè´è®¢å">æéè´è®¢å</option>
			<option value="æ éè´è®¢å">æ éè´è®¢å</option>
			</select>
			</div>
			</div>
			</div>
			<div class="layui-row" style="margin-top: 10px; margin-bottom: 10px;">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">è§æ ¼åå·</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" style="background-color:#efefef4d;display: inline-block;" readonly>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">éå®è®¢å</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="" id="">
			</div>
			</div>
			</div>
			</div>
			</div>
			</div>
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			@@ -100,8 +126,30 @@
			, util = layui.util
			var sWhere = "";
			var option = [];
			//åå§åçé¢
			var HMainICMOEntryID = -1;//ä¸»çäº§è®¢åååç
			var HMainICMOInterID = -1;//ä¸»çäº§è®¢åä¸»åç
			var HICMOInterID = -1;//æ¥è®¡åè®¢åä¸»åç
			//#endregion

			//#region åå§åçé¢

			var params = getUrlVars();
			var OperationType = params[params[0]];

			//å¤ææ¯å¦æåæ°ä¼ é
			if (!isNaN(OperationType)) {
			HMainICMOEntryID = params[params[1]];
			HMainICMOInterID = params[params[2]];
			HICMOInterID = params[params[3]];
			}

			set_ClearBill();


			//#endregion

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

			//#region å¤´å·¥å·æ äºä»¶
			table.on('toolbar(mainTable)', function (obj) {
			switch (obj.event) {
			@@ -116,11 +164,14 @@
			break;
			};
			});
			//#region çäº§è½¦é´
			form.on('submit(btnHWorkShopID)', function (data) {
			btnHWorkShopID();
			//#endregion

			//#region ç©æ
			form.on('submit(btnHMaterNumber)', function (data) {
			btnHMaterNumber();
			});
			//#endregion

			//#region éç½®æé®
			form.on('submit(btnReSearch)', function (data) {
			set_ClearQuery();
			@@ -132,9 +183,15 @@
			get_FastQuery();
			});
			//#endregion

			//#endregion

			//#region æ¬é¡µé¢è¢«è°ç¨çæææ¹æ³

			//#region åå§åçé¢
			function set_ClearBill() {
			//åå§åæ¥æ
			$("#HPlanDate").val(Format(new Date(), 'yyyy-MM-dd'));
			//åå§åè¡¨æ ¼
			set_InitGrid();
			//æ¥è¯¢
			@@ -160,11 +217,12 @@
			, { field: 'æ¥è®¡åè®¢åä¸»åç ', title: 'æ¥è®¡åè®¢åä¸»åç ', hide: true }
			, { field: 'ä¸»çäº§è®¢åååç ', title: 'ä¸»çäº§è®¢åååç ', hide: true }
			, { field: 'ä¸»çäº§è®¢åä¸»åç ', title: 'ä¸»çäº§è®¢åä¸»åç ', hide: true }
			, { field: 'æ¥è®¡åæ¥æ', title: 'æ¥è®¡åæ¥æ' }
			, { field: 'æ¥è®¡åæ¥æ', title: 'æ¥è®¡åæ¥æ', templet: "<div>{{d.æ¥è®¡åæ¥æ =='' ?'':layui.util.toDateString(d.æ¥è®¡åæ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'ç©æID', title: 'ç©æID', hide: true }
			, { field: 'ç©æç¼ç ', title: 'ç©æç¼ç ' }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°' }
			, { field: 'è®¡ååææ°é', title: 'è®¡ååææ°é' }
			, { field: 'é½å¥ç¶æ', title: 'é½å¥ç¶æ' }
			, { field: 'é½å¥æ°é', title: 'é½å¥æ°é' }
			, { field: 'ç¼ºææ°é', title: 'ç¼ºææ°é' }
			, { field: 'é¢æå ç¨æ°é', title: 'é¢æå ç¨æ°é' }
			@@ -189,7 +247,7 @@
			$.ajax({
			url: GetWEBURL() + '/JIT_Complete/JIT_CompleteDetailList',
			type: "GET",
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
			data: { "sWhere": sWhere, "HMainICMOEntryID": HMainICMOEntryID, "HMainICMOInterID": HMainICMOInterID, "HICMOInterID": HICMOInterID },
			success: function (result) {
			if (result.count == 1) {
			option.data = result.data;
			@@ -211,14 +269,22 @@

			//#region å¿«éè¿æ»¤
			function get_FastQuery() {
			var HBillNo = $("#HBillNo").val();
			var HWorkShopIDName = $("#HWorkShopIDName").val();
			var HMaterID = $("#HMaterID").val();
			var HMaterNumber = $("#HMaterNumber").val();
			var HComplete = $("#HComplete").val();
			var HPlanDate = $("#HPlanDate").val();

			if (HBillNo) {
			sWhere += " and åæ®å· like '%" + HBillNo + "%'";
			if (HMaterID!="0") {
			sWhere += " and ç©æID = '" + HMaterID + "'";
			}
			if (HWorkShopIDName) {
			sWhere += " and è½¦é´åç§° = '" + HWorkShopIDName + "'";
			if (HMaterNumber) {
			sWhere += " and ç©æç¼ç = '" + HMaterNumber + "'";
			}
			if (HComplete) {
			sWhere += " and é½å¥ç¶æ = '" + HComplete + "'";
			}
			if (HPlanDate) {
			sWhere += " and æ¥è®¡åæ¥æ = '" + HPlanDate + "'";
			}
			get_Display(sWhere);
			sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			@@ -227,22 +293,26 @@

			//#region éç½®è¿æ»¤æ¡ä»¶æ¹æ³
			function set_ClearQuery() {
			$("#HWorkShopIDName").val("");
			$("#HBillNo").val("");
			$("#HWorkShopID").val("");
			$("#HMaterID").val("0");
			$("#HMaterNumber").val("");
			$('#HComplete').val("");
			$("#HPlanDate").val(Format(new Date(), 'yyyy-MM-dd'));
			$("#HMaterName").val("");
			$("#HMaterModel").val("");
			form.render('select');
			sWhere = "";
			}
			//#endregion

			//çäº§è½¦é´åè¡¨
			function btnHWorkShopID() {
			//ç©æåè¡¨
			function btnHMaterNumber() {
			layer.open({
			type: 2 //ç±»å
			, skin: 'layui-layer-rim'//å ä¸è¾¹æ¡
			, area: ['90%', '90%']//å¤§å°
			, title: 'çäº§è½¦é´åè¡¨'//æ é¢
			, title: 'ç©æåè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../Baseset/åºç¡èµæ/Gy_DepartmentList.html', 'yes']
			, content: ['../../Baseset/åºç¡èµæ/Gy_MaterialList.html', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			@@ -251,14 +321,28 @@
			return layer.msg('è¯·éæ©æ°æ®');
			}
			//è·åæ°æ®
			$("#HWorkShopID").val(checkStatus.data[0].HItemID);//è½¦é´id
			$("#HWorkShopIDName").val(checkStatus.data[0].HName);//è½¦é´åç§°
			$("#HMaterID").val(checkStatus.data[0].HItemID);
			$("#HMaterNumber").val(checkStatus.data[0].HNumber);
			$("#HMaterName").val(checkStatus.data[0].HName);
			$("#HMaterModel").val(checkStatus.data[0].HModel);
			layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) { }
			})

			}

			//è·ååæ°
			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;
			}
			//#endregion
			//ä»¥ä¸æ¯layuiæ¨¡å
			});

			@@ -2,13 +2,12 @@
			<html xmlns="http://www.w3.org/1999/xhtml">
			<head>
			<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
			<title>éå®è®¢ååè¡¨</title>
			<title>éå®è®¢åå¨æåè¡¨</title>
			<meta name="renderer" content="webkit">
			<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
			<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
			<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
			<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
			<!--<script src="../../../layuiadmin/layui/layui.js"></script>-->
			<script src="../../../layuiadmin/layui/layui.js"></script>
			<script src="../../../layuiadmin/layui/layui.js"></script>
			<script src="../../../layuiadmin/Scripts/json2.js"></script>
			@@ -58,14 +57,6 @@
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>

			<div class="layui-inline">
			<label class="layui-form-label">åæ®å·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HBillno2" id="HBillno2" style="width:190px;">
			</div>
			</div>

			<div class="layui-colla-content">
			<div class="layui-inline">
			<div class="layui-inline">
			@@ -99,10 +90,6 @@
			</div>
			</div>
			</div>
			<!--<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>
			layui.config({
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			@@ -160,66 +147,6 @@
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			, cols: [[
			{ type: 'checkbox', fixed: 'left' }
			,{ field: 'hmainid', title: 'hmainid', sort: true, hide: true }
			, { field: 'æ¥æ', title: 'æ¥æ', width: 125}
			, { field: 'åæ®å·', title: 'åæ®å·', width: 125 }
			, { field: 'HBillType', title: 'HBillType', hide: true }
			, { field: 'HCusID', title: 'HCusID', hide: true }
			, { field: 'å®¢æ·ä»£ç ', title: 'å®¢æ·ä»£ç ', width: 125 }
			, { field: 'å®¢æ·', title: 'å®¢æ·' }
			, { field: 'äº¤è´§å°å', title: 'äº¤è´§å°å', width: 125 }
			, { field: 'HSSID', title: 'HSSID', hide: true }
			, { field: 'ç»ç®æ¹å¼ä»£ç ', title: 'ç»ç®æ¹å¼ä»£ç ', width: 125 }
			, { field: 'ç»ç®æ¹å¼', title: 'ç»ç®æ¹å¼', width: 125}
			, { field: 'ç»ç®æ¥æ', title: 'ç»ç®æ¥æ', width: 170}
			, { field: 'HCurID', title: 'HCurID', hide: true }
			, { field: 'å¸å«ä»£ç ', title: 'å¸å«ä»£ç ' }
			, { field: 'å¸å«', title: 'å¸å«' }
			, { field: 'æ±ç', title: 'æ±ç' }
			, { field: 'HDeptID', title: 'HDeptID', hide: true }
			, { field: 'é¨é¨ä»£ç ', title: 'é¨é¨ä»£ç ', width: 125 }
			, { field: 'é¨é¨', title: 'é¨é¨', width: 125 }
			, { field: 'éå®æ¹å¼', title: 'éå®æ¹å¼' }
			, { field: 'HManagerID', title: 'HManagerID', hide: true }
			, { field: 'ä¸»ç®¡ä»£ç ', title: 'ä¸»ç®¡ä»£ç ' }
			, { field: 'ä¸»ç®¡', title: 'ä¸»ç®¡' }
			, { field: 'HEmpID', title: 'HEmpID', hide: true }
			, { field: 'ä¸å¡åä»£ç ', title: 'ä¸å¡åä»£ç ' }
			, { field: 'ä¸å¡å', title: 'ä¸å¡å' }
			, { field: 'æè¦', title: 'æè¦' }
			, { field: 'è¡¨å¤´å¤æ³¨', title: 'è¡¨å¤´å¤æ³¨' }
			, { field: 'hsubid', title: 'hsubid', hide: true }
			, { field: 'HMaterID', title: 'HMaterID', hide: true }
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ' }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°' }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·' }
			, { field: 'æ¹å·', title: 'æ¹å·' }
			, { field: 'HUnitID', title: 'HUnitID', hide: true }
			, { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ' }
			, { field: 'è®¡éåä½', title: 'è®¡éåä½' }
			, { field: 'æ°é', title: 'æ°é' }
			, { field: 'åä»·', title: 'åä»·' }
			, { field: 'éé¢', title: 'éé¢' }
			, { field: 'ç¨ç', title: 'ç¨ç' }
			, { field: 'ç¨é¢', title: 'ç¨é¢' }
			, { field: 'ä»·ç¨åè®¡', title: 'ä»·ç¨åè®¡' }
			, { field: 'æºååå·', title: 'æºååå·' }
			, { field: 'è®¡åè·è¸ªå·', title: 'è®¡åè·è¸ªå·' }
			, { field: 'è¡¨ä½å¤æ³¨', title: 'è¡¨ä½å¤æ³¨' }
			, { field: 'å¶åäºº', title: 'å¶åäºº', width: 125 }
			, { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ', width: 200, templet: "<div>{{d.å¶åæ¥æ ==null ?'':layui.util.toDateString(d.å¶åæ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
			, { field: 'å®¡æ ¸äºº', title: 'å®¡æ ¸äºº', width: 125 }
			, { field: 'å®¡æ ¸æ¥æ', title: 'å®¡æ ¸æ¥æ', width: 200, templet: "<div>{{d.å®¡æ ¸æ¥æ ==null ? '':layui.util.toDateString(d.å®¡æ ¸æ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
			, { field: 'ä¿®æ¹äºº', title: 'ä¿®æ¹äºº', width: 125 }
			, { field: 'ä¿®æ¹æ¥æ', title: 'ä¿®æ¹æ¥æ', width: 200, templet: "<div>{{d.ä¿®æ¹æ¥æ ==null ?'':layui.util.toDateString(d.ä¿®æ¹æ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
			, { field: 'å³éäºº', title: 'å³éäºº', width: 125 }
			, { field: 'å³éæ¥æ', title: 'å³éæ¥æ', width: 200, templet: "<div>{{d.å³éæ¥æ ==null ?'':layui.util.toDateString(d.å³éæ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
			, { field: 'ä½åºäºº', title: 'ä½åºäºº', width: 125 }
			, { field: 'ä½åºæ¥æ', title: 'ä½åºæ¥æ', width: 200, templet: "<div>{{d.ä½åºæ¥æ ==null ?'':layui.util.toDateString(d.ä½åºæ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>" }

			]]
			};
			}

			@@ -227,15 +154,40 @@
			function get_Display(sWhere) {
			var ajaxLoad = layer.load();
			$.ajax({
			url: GetWEBURL() + '/Xs_SeOrderBill/list',
			url: GetWEBURL() + '/Xs_SeOrderBill/DyColList',
			type: "GET",
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
			data: { "sWhere": sWhere, "user": "admin" },
			success: function (data1) {
			var col = [];
			if (data1.count == 1) {
			var data = [];
			//ç»ç©ºçæ°ç»èµå¼
			for (var key in data1.list) {
			data.push({ "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
			}
			//å¤ææ¯å¦æ¯çº¯è±æ
			var patrn = new RegExp("[\u4E00-\u9FA5]+");//ä¸æ
			for (var i = 0; i < data.length; i++) {
			if (!patrn.test(data[i].name)) {
			col.push({ field: data[i].name, title: data[i].name, hide: true }); //éèå
			}
			else {
			switch (data[i].Type) {
			case 'DateTime':
			col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
			break;
			default:
			col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, width: 200 });
			}
			}
			}
			option.cols = [col];
			option.data = data1.data;
			table.render(option);
			layer.close(ajaxLoad);
			} else {
			}
			else
			{
			layer.close(ajaxLoad);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			@@ -286,33 +238,6 @@
			$("#HDeptID").val("");
			$("#HMangerID").val("");
			sWhere = "";
			}
			//éæ°åæ¥æé®
			function set_ResCnz() {
			var HBillno2 = $('#HBillno2').val();
			$.ajax({
			url: GetWEBURL() + '/Cg_POOrderBill/Resynchronize',
			type: "GET",
			data: { "HBillNo": HBillno2, "HBillType": 1401 },
			success: function (result) {
			if (result.count == 1) {
			layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
			// å¾å°frameç´¢å¼
			var index = layer.getFrameIndex(window.name);
			//å³éå½åframe
			layer.close(index);
			//ä¿®æ¹ä¸ºååå·æ°çé¢
			window.location.reload();
			});

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