From 07cf94734c36d4eae6ddbc4dd338bf5af81a2193 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 28 十月 2024 16:11:39 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

---
 WebTM/views/车间管理/产线/MES_ProductionLinePackagingList.html |  309 +++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 224 insertions(+), 85 deletions(-)

diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackagingList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackagingList.html"
index 86c5e8d..29e8ee2 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackagingList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackagingList.html"
@@ -21,7 +21,7 @@
         <div class="layui-col-md12">
             <div class="layui-card" style="padding: 1px">
                 <div class="layui-card-body" style="padding: 1px;">
-                    <form class="layui-form" action="" lay-filter="component-form-group">
+                    <form class="layui-form" action="" lay-filter="component-form-group"  >
                         <div class="layui-collapse">
                             <div class="layui-colla-item">
                                 <div class="layui-colla-title layui-inline">
@@ -81,6 +81,13 @@
                                             <input type="text" class="layui-input" name="HICMOBillNo" id="HICMOBillNo">
                                         </div>
                                     </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">鏃ユ湡闂撮殧</label>
+                                        <div class="layui-input-block">
+                                            <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
+                                            </select>
+                                        </div>
+                                    </div>
                                     <div class="layui-row" style="padding: 10px 0; margin-left: 4%;">
                                         <div class="layui-inline">
                                             <label class="layui-form-label">鏃ユ湡</label>
@@ -95,34 +102,90 @@
                                             </div>
                                         </div>
                                     </div>
-                                </div>
-                                <div class="layui-row" style="margin-top: 5px; margin-left: 4%;">
-                                    <div class="layui-inline">
-                                        <label class="layui-form-label">杩囨护</label>
-                                        <div class="layui-input-block">
-                                            <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+                                    <div class="layui-row" style="margin-top: 5px; margin-left: 4%;">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator" id="Comparator" lay-filter="Comparator" 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" value="" name="ColContent" id="ColContent">
+                                        </div>
                                     </div>
-                                    <div class="layui-inline">
-                                        <select name="Comparator" id="Comparator" lay-filter="Comparator" 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 class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
+                                                <option value="0" selected="selected"></option>
+                                                <option value="=">=</option>
+                                                <option value=">=">>=</option>
+                                                <option value=">">></option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
+                                                <option value="7">鍖呭惈</option>
+                                                <option value="8">宸﹀寘鍚�</option>
+                                                <option value="9">鍙冲寘鍚�</option>
+                                                <option value="10">涓嶅寘鍚�</option>
+                                            </select>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+                                        </div>
                                     </div>
-                                    <div class="layui-inline">
-                                        <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+
+                                    <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
+                                                <option value="0" selected="selected"></option>
+                                                <option value="=">=</option>
+                                                <option value=">=">>=</option>
+                                                <option value=">">></option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
+                                                <option value="7">鍖呭惈</option>
+                                                <option value="8">宸﹀寘鍚�</option>
+                                                <option value="9">鍙冲寘鍚�</option>
+                                                <option value="10">涓嶅寘鍚�</option>
+                                            </select>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+                                        </div>
                                     </div>
                                 </div>
+                           
                                 <!--<div class="layui-colla-content">
         <div class="layui-inline">
             <div class="layui-inline">
@@ -158,6 +221,9 @@
                                 </button>
                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="Print1" id="Print1">
                                     <i class="layui-icon layui-icon-file"></i>鏅彶鐗规墦鍗�
+                                </button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="WhiteSave" id="WhiteSave">
+                                    <i class="layui-icon layui-icon-file"></i>鐧芥爣鐢熸垚
                                 </button>
                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="BtnDel" id="BtnDel">
                                     <i class="layui-icon layui-icon-file"></i>鍒犻櫎
@@ -254,7 +320,10 @@
                     if (data1.count == 1) {
                         option.data = data1.data;
                         table.render(option);
-
+                        if ($("#HInitTimeCycle").val() == 0 && $("#HInitTimeCycle").val() == "") {
+                            setSelect_HInitTimeCycle();
+                        }
+                    
                         if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                             ColFilter();
                         }
@@ -266,11 +335,30 @@
                 }, error: function () {
                     layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
                 }
-            }); 
+            });
+            //鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
+            form.on('select(HInitTimeCycle)', function (data) {
+                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+                //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+                if (HInitTimeCycle != -1) {
+                    $('#HBeginDate').prop('disabled', true);
+                    $('#HEndDate').prop('disabled', true);
+
+                    $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+                    $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+                    //鎵ц鏌ヨ鏂规硶
+                    $("#btnSearch").click;
+                } else {
+                    $('#HBeginDate').prop('disabled', false);
+                    $('#HEndDate').prop('disabled', false);
+                }
+            });
 
             //閲嶇疆鎸夐挳
             form.on('submit(btnReSearch)', function (data) {
-                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
                 $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
                 $("#HBarCode_Pack").val("");//鍞竴鏉$爜
                 $("#HICMOBillNo").val("");//鏉$爜
@@ -281,6 +369,13 @@
                 $("#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');
                 $("#btnSearch").click();
             });
@@ -299,6 +394,12 @@
                 var Comparator = $("#Comparator").val()
                 var ColContent = $("#ColContent").val();
 
+                var ColName1 = $("#ColName1").val();//澶嶉�夋
+                var Comparator1 = $("#Comparator1").val()
+                var ColContent1 = $("#ColContent1").val();
+                var ColName2 = $("#ColName2").val();//澶嶉�夋
+                var Comparator2 = $("#Comparator2").val()
+                var ColContent2 = $("#ColContent2").val();
                 if (ColName != 0 && Comparator != 0) {
                     var com = "";
                     switch (Comparator) {
@@ -319,6 +420,47 @@
                             break;
                     }
                     sWhere += " and " + ColName + " " + com;
+                } if (ColName1 != 0 && Comparator1 != 0) {
+                    var com1 = "";
+                    switch (Comparator1) {
+                        case "7":
+                            com1 = "like'%" + ColContent1 + "%'";
+                            break;
+                        case "8":
+                            com1 = "like'%" + ColContent1 + "'";
+                            break;
+                        case "9":
+                            com1 = "like'" + ColContent1 + "%'";
+                            break;
+                        case "10":
+                            com1 = "not like'%" + ColContent1 + "%'";
+                            break;
+                        default:
+                            com1 = "" + Comparator1 + "'" + ColContent1 + "'";
+                            break;
+                    }
+                    sWhere += " and " + ColName1 + " " + com1;
+                }
+                if (ColName2 != 0 && Comparator2 != 0) {
+                    var com2 = "";
+                    switch (Comparator2) {
+                        case "7":
+                            com2 = "like'%" + ColContent2 + "%'";
+                            break;
+                        case "8":
+                            com2 = "like'%" + ColContent2 + "'";
+                            break;
+                        case "9":
+                            com2 = "like'" + ColContent2 + "%'";
+                            break;
+                        case "10":
+                            com2 = "not like'%" + ColContent2 + "%'";
+                            break;
+                        default:
+                            com2 = "" + Comparator2 + "'" + ColContent2 + "'";
+                            break;
+                    }
+                    sWhere += " and " + ColName2 + " " + com2;
                 }
 
                 if (HBarCode_Pack) {
@@ -375,7 +517,8 @@
                 //鏍囨敞閫変腑鏍峰紡
                 obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click');
             });
-            //鎵撳嵃鎸夐挳
+ 
+            //鎵撳嵃
             //form.on('submit(Print)', function (obj) {//閫�鍑�
             //    var checkStatus = table.checkStatus("mainTable"); //鑾峰彇閫変腑琛岀姸鎬�
             //    var linterid = checkStatus.data[0].HInterID;
@@ -388,7 +531,7 @@
             //    //window.open("../../views/BaseSet/HBarPlanPrint.html?linterid=" + linterid.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
 
 
-            //    var sWhere = "select * from h_v_SRM_BarCodeBillList where HItemID in(" + linterid + ") order by 鐗╂枡浠g爜";
+            //    var sWhere = "select  a.HBarCode_White HBarCode_White,temp.HSupPartName HSupPartName,temp.HSupBarCodeNumber MFGPartNumber,temp.HCountryType CountryofOrigin,(select REPLACE(item, 'Q', '') from split(a.HBarCode_White, ':') where id = 6) Quantity, temp.HGrossWeight GrossWeight, temp.HPARTNAME PartName , (select item from split(a.HBarCode_White, ':') where id = 2) ContentLabelID , temp.HSupNumber Supplier, REPLACE(convert(varchar(10), GETDATE(), 20), '-', '') + ' ' + convert(varchar(5), GETDATE(), 24) MFGDate , REPLACE(convert(varchar(10), GETDATE(), 20), '-', '') SupplierLotCode , (select REPLACE(item, 'P', '') from split(a.HBarCode_White, ':') where id = 4) BBM   from Sc_PackUnionBillMain a left join  Gy_Material m on a.HMaterID = m.HItemID left join Sc_PackUnionBillBarCode_temp temp on m.HNumber = temp.HMaterNumber where a.HInterID=" + linterid;
 
             //    $.ajax({
             //        type: "GET",
@@ -400,7 +543,8 @@
 
             //                if (data.data.length != 0) {
             //                    var dataPrint = [];
-            //                    dataPrint.push({ "浜у搧鍚嶇О": data.data[0]["浜у搧鍚嶇О"], "鏉$爜缂栧彿": data.data[0]["鏉$爜缂栧彿"], "鏁伴噺": data.data[0]["鏁伴噺"], "鏃ユ湡": data.data[0]["鏃ユ湡"], "鐢熶骇浠诲姟鍗�": data.data[0]["鐢熶骇浠诲姟鍗�"], "娴佽浆鍗$紪鍙�": data.data[0]["娴佽浆鍗$紪鍙�"], "鑷畾涔夊瓧娈�": data.data[0]["鑷畾涔夊瓧娈�"], "椤圭洰缂栧彿": data.data[0]["椤圭洰缂栧彿"] }
+            //                    dataPrint.push(data.data[0]
+            //                        //{ "浜у搧鍚嶇О": data.data[0]["浜у搧鍚嶇О"], "鏉$爜缂栧彿": data.data[0]["鏉$爜缂栧彿"], "鏁伴噺": data.data[0]["鏁伴噺"], "鏃ユ湡": data.data[0]["鏃ユ湡"], "鐢熶骇浠诲姟鍗�": data.data[0]["鐢熶骇浠诲姟鍗�"], "娴佽浆鍗$紪鍙�": data.data[0]["娴佽浆鍗$紪鍙�"], "鑷畾涔夊瓧娈�": data.data[0]["鑷畾涔夊瓧娈�"], "椤圭洰缂栧彿": data.data[0]["椤圭洰缂栧彿"] }
             //                    );
 
             //                    var Customer = {
@@ -410,7 +554,7 @@
             //                    var args = {
             //                        type: "print",
             //                        showOptionDlg: false, //濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
-            //                        report: urlAddRandomNo("../../views/grf/鍖呰鍗曠墿鏂欐爣璇嗗崱(缃戦〉鐗�).grf"),
+            //                        report: urlAddRandomNo("../../grf/鐧芥爣鎵撳嵃.grf"),
             //                        data: Customer
             //                    };
             //                    //var args = {
@@ -432,8 +576,31 @@
             //            layer.msg("閿欒:" + err, { icon: 5 });
             //        }
             //    })
-              
+
             //});
+
+            //鐧芥爣鐢熸垚淇濆瓨
+            form.on('submit(WhiteSave)', function (obj) {//閫�鍑�
+                var checkStatus = table.checkStatus("mainTable"); //鑾峰彇閫変腑琛岀姸鎬�
+                if (checkStatus.data.length == 1) {
+                    var HBarCode_Pack = checkStatus.data[0].鍞竴鏉$爜;
+                    layer.open({                //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞� 
+                        type: 2                         //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
+                        , area: ['100%', '100%']
+                        , title: '鐧芥爣鎵撳嵃'  //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
+                        , closeBtn: 1//鏄剧ず鍏抽棴鎸夐挳
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲                       
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../../杞﹂棿绠$悊/浜х嚎/MES_WhiteLabelGeneration.html?OperationType=1&HBarCode_Pack=' + HBarCode_Pack //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
+                        , resize: false,  //鏄惁鍏佽鐢ㄦ埛璋冩暣寮瑰嚭澶у皬
+
+                    })
+                } else {
+                    layer.msg("璇烽�夋嫨涓�琛岃繘琛岀櫧鏍囩敓鎴�!");
+                }
+            });
+
 
             form.on('submit(Print)', function (obj) {//閫�鍑�
                 var checkStatus = table.checkStatus("mainTable"); //鑾峰彇閫変腑琛岀姸鎬�
@@ -441,58 +608,10 @@
                 ////鎵撳紑鎵撳嵃妯℃澘
                 ////var linterid = $("#HInterID").val();
                 ////var linterid = "28973";
-                //var Type = "HBarCodePrint";
-                //var OpenTmp = "鍖呰鍗曠墿鏂欐爣璇嗗崱(缃戦〉鐗�)";
-                ////var ReportViewer = document.getElementById("ReportViewer");
-                //window.open("../../views/BaseSet/HBarPlanPrint.html?linterid=" + linterid.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
-
-
-                var sWhere = "select  a.HBarCode_White HBarCode_White,temp.HSupPartName HSupPartName,temp.HSupBarCodeNumber MFGPartNumber,temp.HCountryType CountryofOrigin,(select REPLACE(item, 'Q', '') from split(a.HBarCode_White, ':') where id = 6) Quantity, temp.HGrossWeight GrossWeight, temp.HPARTNAME PartName , (select item from split(a.HBarCode_White, ':') where id = 2) ContentLabelID , temp.HSupNumber Supplier, REPLACE(convert(varchar(10), GETDATE(), 20), '-', '') + ' ' + convert(varchar(5), GETDATE(), 24) MFGDate , REPLACE(convert(varchar(10), GETDATE(), 20), '-', '') SupplierLotCode , (select REPLACE(item, 'P', '') from split(a.HBarCode_White, ':') where id = 4) BBM   from Sc_PackUnionBillMain a left join  Gy_Material m on a.HMaterID = m.HItemID left join Sc_PackUnionBillBarCode_temp temp on m.HNumber = temp.HMaterNumber where a.HInterID=" + linterid;
-
-                $.ajax({
-                    type: "GET",
-                    url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                    async: true,
-                    data: { "sWhere": sWhere },
-                    success: function (data) {
-                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-
-                            if (data.data.length != 0) {
-                                var dataPrint = [];
-                                dataPrint.push(data.data[0]
-                                    //{ "浜у搧鍚嶇О": data.data[0]["浜у搧鍚嶇О"], "鏉$爜缂栧彿": data.data[0]["鏉$爜缂栧彿"], "鏁伴噺": data.data[0]["鏁伴噺"], "鏃ユ湡": data.data[0]["鏃ユ湡"], "鐢熶骇浠诲姟鍗�": data.data[0]["鐢熶骇浠诲姟鍗�"], "娴佽浆鍗$紪鍙�": data.data[0]["娴佽浆鍗$紪鍙�"], "鑷畾涔夊瓧娈�": data.data[0]["鑷畾涔夊瓧娈�"], "椤圭洰缂栧彿": data.data[0]["椤圭洰缂栧彿"] }
-                                );
-
-                                var Customer = {
-                                    "Table": dataPrint
-                                }
-
-                                var args = {
-                                    type: "print",
-                                    showOptionDlg: false, //濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
-                                    report: urlAddRandomNo("../../grf/鐧芥爣鎵撳嵃.grf"),
-                                    data: Customer
-                                };
-                                //var args = {
-                                //    report: urlAddRandomNo("../../views/grf/鍖呰鍗曠墿鏂欐爣璇嗗崱(缃戦〉鐗�).grf"),
-                                //    data: Customer
-                                //};
-                                webapp_ws_ajax_run(args);
-                            } else {
-                                layer.msg("鏌ユ棤鏁版嵁!");
-                            }
-
-                        }
-                        else {
-                            layer.msg(data.Message, { icon: 5 });
-                        }
-                        layer.closeAll("loading");
-                    },
-                    error: function (err) {
-                        layer.msg("閿欒:" + err, { icon: 5 });
-                    }
-                })
-
+                var Type = "HBarCodePrint";
+                var OpenTmp = "鐧芥爣鎵撳嵃1";
+                //var ReportViewer = document.getElementById("ReportViewer");
+                window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + linterid.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
             });
 
             //鎵撳嵃鎸夐挳
@@ -575,8 +694,24 @@
                     layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
                 }
             });
+            //#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
+            function setSelect_HInitTimeCycle() {
+                var valueList = [0, 1, 2, 3, 4, 5, 6, 29]; //valuelist鏁扮粍鍖呭惈涓庢椂闂寸浉鍏崇殑鏁存暟鍊�
+                var titleList = ["浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"];  //itilelist涓巚aluelist鍊肩浉瀵逛簬鐨勮〃锛屼笖浣滀负涓嬫媺妗嗘枃鏈樉绀�
 
-            //鍒楁槑鏄剧ず涓嬫媺妗�
+                var HInitTimeCycle_ArrayList = '<option  value="-1" selected="selected" >浠绘剰闂撮殧</option>';//瀹氫箟瀛楃涓睭InitTimeCycle_ArrayList 浣滅敤浜庝笅鎷夊垪鐨刪tml鍐呭 鍖呭惈option鍏冪礌锛屽�间负鈥�1锛屼笖鍦ㄤ笅鎷夋鏄剧ず浠绘剰闂撮殧
+                for (var i = 0; i < valueList.length; i++) {                                   // 閬嶅巻valueList  鏁扮粍  浣挎瘡涓�涓�肩敓鎴愪竴涓搴攐ption鍏冪礌
+                    HInitTimeCycle_ArrayList += '<option  style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';// 鎶婄敓鎴愮殑option鍏冪礌娣诲姞鍏InitTimeCycle_ArrayList瀛楃涓蹭腑
+                }
+
+                $("#HInitTimeCycle").empty();           //浣跨敤jquery鐨別mpty鏂规硶娓呯┖HInitTimeCycle_ArrayList <select>鍏冪礌鐨勫��
+                $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);  //浣跨敤append鏂规硶鏋勫缓涔嬪墠HInitTimeCycle_ArrayList瀛楃涓� 鐨勫唴瀹逛紶鍏InitTimeCycle  
+                form.render('select');       //璋冪敤 閲嶆柊娓叉煋select鍏冪礌
+
+                $("#HInitTimeCycle").val("29");   //浣跨敤jQuery鐨剉al()鏂规硶灏嗕笅鎷夊垪琛ㄧ殑閫変腑鍊艰缃负"29   锛屼笖鏄剧ず銆婅繎涓夋檪澶┿��
+            }
+            //#endregion
+            //#region 鍒楁槑鏄剧ず涓嬫媺妗�
             function ColFilter() {
                 var Organization = '<option  value="0" selected="selected" ></option>';
                 for (var i = 1; i < option.cols[0].length; i++) {
@@ -586,9 +721,13 @@
                 }
                 $("#ColName").empty();
                 $("#ColName").append(Organization);
+                $("#ColName1").empty();
+                $("#ColName1").append(Organization);
+                $("#ColName2").empty();
+                $("#ColName2").append(Organization);
                 form.render('select');
             }
-
+        //#endregion
             //laydate.render({
             //    elem: '#HDate'
             //    , type: 'datetime'

--
Gitblit v1.9.1