MES-WEB-LayUI.git

			@@ -15,6 +15,7 @@
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/HideButton.js"></script>
			<script src="../../../layuiadmin/soulTable.slim.js"></script>
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
			</head>
			<body>
			<div class="layui-fluid">
			@@ -30,35 +31,41 @@
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">æ¥æé´é</label>
			<div class="layui-input-block">
			<select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">å¼å§æ¥æ</label>
			<div class="layui-input-block">
			<input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ç»ææ¥æ</label>
			<div class="layui-input-block">
			<input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">åæ®å·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="WorkCenter" id="WorkCenter">
			</div>
			</div>
			<div class="layui-inline">
			<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="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: 50%;display: inline-block;" readonly>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" 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">
			<label class="layui-form-label" style="width: 85px;">çäº§è®¢åç»ç»</label>
			<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
			<select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
			<!--å¨ææ¸²æç»ç»-->
			</select>
			</div>
			</div>
			<button class="layui-btn layuiadmin-btn-order" type="button" style="display:none;" lay-submit="" lay-filter="btnSearch" id="btnSearch">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding: 0 5px; display: none;">éç½®</button>
			<div class="layui-row" style="margin-top:10px;margin-left:5%;">
			<!--å¶ä»æ¡ä»¶-->
			<div class="layui-inline">
			<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="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: 50%;display: inline-block;" readonly>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" 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">
			<label class="layui-form-label" style="width: 76px;">ç©æåç§°</label>
			<div class="layui-input-block" style="margin-left: 107px;">
			@@ -71,6 +78,28 @@
			<input type="text" class="layui-input" name="HModel" id="HModel">
			</div>
			</div>
			</div>
			<div class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">çäº§è®¢åç»ç»</label>
			<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
			<select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
			<!--å¨ææ¸²æç»ç»-->
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">é¡¹ç®å·</label>
			<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
			<select name="HProject" id="HProject" class=" ForFilteringSchemes" lay-verify="HProject">
			<!--å¨ææ¸²æç»ç»-->
			</select>
			</div>
			</div>
			<button class="layui-btn layuiadmin-btn-order" type="button" style="display:none;" lay-submit="" lay-filter="btnSearch" id="btnSearch">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding: 0 5px; display: none;">éç½®</button>
			</div>
			<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">

			@@ -101,6 +130,61 @@
			<input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
			</div>
			</div>
			<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-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>
			</div>
			@@ -126,13 +210,14 @@
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_DeleteBill" id="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>å é¤</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>å¯¼åº</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="set_HideButton"><i class="layui-icon layui-icon-form"></i>æé®è®¾ç½®</button>
			</div>
			</script>
			<script type="text/html" id="toolbarDemo2">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_HideColumn2" id="get_HideColumn2"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_HideColumn2" id="get_HideColumn2"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			</div>
			</script>
			</form>
			@@ -166,15 +251,36 @@
			var titleData = ["hmainid", "åæ®ç±»å", "HMaterID", "hunitid", "HOrgID", "HMainCenterID", "å·¥ä½", "HMainProcID", "å·¥åºåç§°", "ä¸»è¿è¡æ¶é´", "è¿è¡æ¶é´åä½", "ä¸»å å·¥æ°é", "æè´¨", "å¾å·çæ¬", "HMainGroupID", "çç»", "å·¥ä»·", "æ åèµæºæ°", "å èµæºå¢é", "åèµæºåé", "HItemID", "HPRDORGID"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			var titleData2 = ["hmainid", "hsubid", "ç¨åºå·", "æ¬å·¥åºç¡®è®¤è®°å½", "èªå¨ç§»è½¬", "æ¢ååå¤æ¶é´", "æ¬éåå¤æ¶é´", "ä¸éå¾ªç¯å¨æ", "ä¸éåºå®å¤©æ°", "å¼å·¥ä½éï¼åºæ°ï¼", "å¼å·¥ä½éï¼å¤©æ°ï¼", "æ åå®é¢", "æ¥åºåä»·", "ä¸åæ ¼åä»·", "å·¥åºå·¥ä»·", "çäº§å®é¢", "å¯æä½è®¾å¤æ°", "æ åäººæ°", "æµè½¬å·¥åº", "ä¸éæµè½¬å·¥åº", "åºå®çäº§å¤©æ°", "çäº§å¨æ", "ææ¾åº", "å¨è½¬ç®±", "å¨è½¬ç®±æ å", "æ¢æ¨¡æ¶é´", "è½¬ç§»æ¶é´", "æéæ¶é´", "åå¤æ¶é´", "äº§çº¿äººæ°", "äº§çº¿äº§è½", "äº§çº¿ä¸å¿", "è¯ç", "å å·¥æ°é", "è¿è¡æ¶é´", "æ¶é´åä½", "å¾çº¸ç¼å·", "æ¨¡å·ç¼å·", "è¯åä»", "æ¥åºåä»", "ä¸è¯åä»", "å·¥åºç±»å", "hprocid", "HSupID", "HCenterID", "HCenterID_S", "å·¥æ®µ", "å¼å·¥ä½éå¤©æ°", "å¼å·¥ä½éåºæ°", "ç´¯è®¡è¯ç", "è¶é¢æ¯ä¾", "HDayWorkQty", "HGroupID", "HWorkerID", "HSourceID", "å å·¥åä»·", "HNextProcFlag", "HBadWHID", "HBadWHName", "HWasterWHID", "HWasterWHName", "HWHID", "HWHName"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±

			//è·ååæ°
			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 HMaterID = "";
			var HProID = 0;
			var params = getUrlVars();
			if (params[params[0]] != "undefined") {
			HMaterID = params[params[0]]; //ä»åæ°ä¸è·å
			HProID = params[params[1]]; //ä»åæ°ä¸è·å
			}

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

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



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

			//#endregion

			@@ -203,6 +309,10 @@
			break;
			//éåºæé®
			case 'get_Exit': Pub_Close(2);
			break;
			//å¯¼åºexcel
			case 'get_export':
			get_Export();
			break;
			//åè®¾ç½®
			case 'set_HideColumn': get_HideColumn();
			@@ -268,15 +378,52 @@
			}
			})
			}
			//æ¥æé´éä¸æåè¡¨çå¬
			form.on('select(HInitTimeCycle)', function (data) {
			var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
			//è¥æ¥æé´éä¸ä¸º ä»»æé´éï¼åç¦ç¨å¼å§æ¥æä¸ç»ææ¥æçéæ©
			if (HInitTimeCycle != -1) {
			$('#HBeginDate').prop('disabled', true);
			$('#HEndDate').prop('disabled', true);

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

			//æ§è¡æ¥è¯¢æ¹æ³
			get_FastQuery();
			} else {
			$('#HBeginDate').prop('disabled', false);
			$('#HEndDate').prop('disabled', false);
			}
			});

			//#endregion

			//#region åå§åçé¢
			function set_ClearBill() {
			//åå§åæ¥æé´éãå¼å§æ¥æãç»ææ¥æ
			setSelect_HInitTimeCycle();
			//è¥æ¥æé´éä¸ä¸º ä»»æé´éï¼åç¦ç¨å¼å§æ¥æä¸ç»ææ¥æçéæ©
			var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
			if (HInitTimeCycle != -1) {
			$('#HBeginDate').prop('disabled', true);
			$('#HEndDate').prop('disabled', true);
			} else {
			$('#HBeginDate').prop('disabled', false);
			$('#HEndDate').prop('disabled', false);
			}

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

			}
			//#endregion

			@@ -298,15 +445,25 @@

			//#region éç½®è¿æ»¤æ¡ä»¶æ¹æ³
			function set_ClearQuery() {
			var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //å¼å§æ¥æ
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); //ç»ææ¥æ
			$("#WorkCenter").val("");//åæ®å·
			$("#HMaterID").val(0);//ç©æ
			$("#HMaterName").val("");//ç©æ
			$("#HMaterNumber").val("");//ç©æ
			$("#HModel").val("");//ç©æ
			$("#HOrderProcNO").val("");//åæ®ç±»å
			$("#HProject").val("");
			$("#ColContent").val("");
			$("#ColName").val("0");
			$("#Comparator").val("0");
			$("#ColContent1").val("");
			$("#ColName1").val("0");
			$("#Comparator1").val("0");
			$("#ColContent2").val("");
			$("#ColName2").val("0");
			$("#Comparator2").val("0");s
			$("#HOrgID").val(sessionStorage["OrganizationID"]);
			form.render('select');
			$("#btnSearch").click();
			@@ -315,7 +472,48 @@
			//#endregion



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

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

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

			$("#HInitTimeCycle").val("29");
			}
			//#endregion

			//#region è·åé¡¹ç®å·
			function Get_HProject() {
			//è·åé¡¹ç®å·
			var HProjectList = '<option value="0" style="color:red;" selected></option>';
			$.ajax({
			type: "get",
			url: GetWEBURL() + "/Gy_Material/Get_HProject",
			async: false,
			data: { "HOrgID": sessionStorage["OrganizationID"] },
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			var data = result.data;
			for (var i = 0; i < data.length; i++) {
			HProjectList += '<option style="color:blue;" value="' + data[i].HName + '" >' + data[i].HName + '</option>';
			}
			$("#HProject").append(HProjectList);
			form.render('select');

			}
			layer.closeAll("loading");
			}
			})
			}
			//#endregion

			//ç©æ
			function get_btnHMaterID() {
			@@ -343,6 +541,35 @@
			}
			})
			}
			//#endregion çå¬ç½æ ¼è¡¨ä½äºä»¶
			table.on('tool(mainTable)', function (obj) {
			var data = obj.data;

			//åæ®å·è¶é¾æ¥
			if (obj.event == 'åæ®å·') { //æ£æ¥ obj.event æ¯å¦çäºåç¬¦ä¸² 'åæ®å·'ãå¦æçäºï¼åæ§è¡ifå¾ªç¯
			var linterid = data.hmainid.toString(); //å£°æåélinterid ä¸º data.hmainid
			//if (AllowLoadData(sSubStr) != false) {//éç©ºéªè¯
			layer.open({ //ä½¿ç¨ layerçopenæå¼å¼¹åº å±
			type: 2 //è¡¨ç¤ºå¼¹åºå±çåå®¹æ¯ä¸ä¸ª iframe
			, area: ['100%', '100%']
			, title: 'ç¼è¾' //è®¾ç½®å¼¹åºå±çååååé
			, closeBtn: 1//æ¾ç¤ºå³éæé®
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: '../å·¥èºè·¯çº¿/Gy_RoutingBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=3301' //è®¾ç½® iframe ç URLï¼URL ä¸åå«äºæ¥è¯¢åæ°ï¼æ¥è°ç¨æéè¦çå¼

			, resize: false, //æ¯å¦åè®¸ç¨æ·è°æ´å¼¹åºå¤§å°
			end: function () { //å½å³éæ¶è°ç¨
			get_FastQuery(table, option);
			}
			, cancel: function () { //ç¹å»åæ¶æ¶ä½¿ç¨åè°
			//$(".layui-btn").removeClass("layui-btn-disabled");
			}
			})
			}
			});
			//#endregion

			//#region æ¥è¯¢
			function get_Display(sWhere) {
			@@ -357,6 +584,7 @@
			if (data1.count == 1) {
			var data = [];
			var col = [];
			var totalArray = [];
			//ç»ç©ºçæ°ç»èµå¼
			for (var key in data1.list) {
			data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
			@@ -367,6 +595,10 @@
			// if (data[i].name == 'HInterID' \|\| data[i].name == 'HBillType' \|\| data[i].name == 'hmainid') {
			if ($.inArray(data[i].name, titleData) > -1) {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
			} else if ($.inArray(data[i].name, totalArray) > -1) { //è®¡ç®å
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
			} else if (data[i].name == 'åæ®å·') {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: 'åæ®å·' });
			}
			else {
			switch (data[i].Type) {
			@@ -386,9 +618,25 @@
			}
			}
			}
			//å¨ææ¾ç¤ºåå
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, cols: [col]
			, data: data1.data
			, height: 800
			, page: true
			, totalRow: true
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			, done: function (res, curr, count) {
			soulTable.render(this);
			}
			}
			option.cols = [col];
			option.data = data1.data;
			table.render(option);
			ins = table.render(option);

			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();
			@@ -517,7 +765,10 @@

			//#region å¿«éè¿æ»¤
			function get_FastQuery(number) {
			var HDate = $("#HBeginDate").val();//å¼å§æ¥æ
			var HDate1 = $("#HEndDate").val();//ç»ææ¥æ
			var HOrgID = "";
			var HProject = $("#HProject").val();
			var HOrderProcNO = $("#HOrderProcNO").val();//åæ®ç±»å
			//var HMaterID = $("#HMaterID").val();
			var HMaterName = $("#HMaterName").val();
			@@ -527,6 +778,12 @@
			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 = "";
			@@ -550,7 +807,62 @@
			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 = "" + Comparator + "'" + ColContent + "'";
			break;
			}
			sWhere += " and " + ColName2 + " " + com2;
			}


			if (HMaterID != "" && HMaterID != "undefined" && HMaterID != null) {
			//ä»å«çé¡µé¢æå¼ä¼ å¥Hmateridå¼ï¼è®¾ç½®ç©æè¿æ»¤,æªå³é
			sWhere += " and HMaterID = " + HMaterID + " and isnull(å®¡æ ¸äºº,'''')<>'''' ";
			} else {
			if (HDate) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + HDate + "'";
			}
			if (HDate1) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) <= '" + HDate1 + "'";
			}
			}

			if (number == 1) {
			HOrgID = sessionStorage["OrganizationID"];
			}
			@@ -576,9 +888,37 @@
			if (HOrgID) {
			sWhere += " and HOrgID = '" + HOrgID + "'";
			}
			if (number==2) {
			if (HProject) {
			sWhere += " and é¡¹ç®å· like '%" + HProject + "%'";
			}
			}

			sWhere += " and HBillSubType<>'SUB' ";
			get_Display(sWhere);
			sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			}
			//#endregion

			//#region å¯¼åºExecel
			function get_Export() {
			var ModRightNameCheck = "Gy_RoutingBillListQuery_ExportExcel";

			//é»è¾å®¡æ ¸æ¹æ³
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.count == 1) {
			table.exportFile(ins.config.id, option.data, "xls");
			} else {
			layer.alert("å½åæ¨¡åæ²¡æå¯¼åºæé!", { icon: 5 });
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}
			//#endregion

			@@ -732,7 +1072,7 @@
			})
			}

			//#region æç» éèåè®¾ç½®
			//#region æç» éèåè®¾ç½®
			function get_HideColumn2() {
			var colName = "";
			var contentUrl = "";
			@@ -780,7 +1120,8 @@


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

			var titleData = ["hmainid", "åæ®ç±»å", "HMaterID", "hunitid", "HOrgID", "HMainCenterID", "å·¥ä½", "HMainProcID", "å·¥åºåç§°", "ä¸»è¿è¡æ¶é´", "è¿è¡æ¶é´åä½", "ä¸»å å·¥æ°é", "æè´¨", "å¾å·çæ¬", "HMainGroupID", "çç»", "å·¥ä»·", "æ åèµæºæ°", "å èµæºå¢é", "åèµæºåé", "HItemID", "HPRDORGID"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			// var titleData2 = ["hmainid", "hsubid", "ç¨åºå·", "æ¬å·¥åºç¡®è®¤è®°å½", "èªå¨ç§»è½¬", "æ¢ååå¤æ¶é´", "æ¬éåå¤æ¶é´", "ä¸éå¾ªç¯å¨æ", "ä¸éåºå®å¤©æ°", "å¼å·¥ä½éï¼åºæ°ï¼", "å¼å·¥ä½éï¼å¤©æ°ï¼", "æ åå®é¢", "æ¥åºåä»·", "ä¸åæ ¼åä»·", "å·¥åºå·¥ä»·", "çäº§å®é¢", "å¯æä½è®¾å¤æ°", "æ åäººæ°", "æµè½¬å·¥åº", "ä¸éæµè½¬å·¥åº", "åºå®çäº§å¤©æ°", "çäº§å¨æ", "ææ¾åº", "å¨è½¬ç®±", "å¨è½¬ç®±æ å", "æ¢æ¨¡æ¶é´", "è½¬ç§»æ¶é´", "æéæ¶é´", "åå¤æ¶é´", "äº§çº¿äººæ°", "äº§çº¿äº§è½", "äº§çº¿ä¸å¿", "è¯ç", "å å·¥æ°é", "è¿è¡æ¶é´", "æ¶é´åä½", "å¾çº¸ç¼å·", "æ¨¡å·ç¼å·", "è¯åä»", "æ¥åºåä»", "ä¸è¯åä»", "å·¥åºç±»å", "hprocid", "HSupID", "HCenterID", "HCenterID_S", "å·¥æ®µ", "å¼å·¥ä½éå¤©æ°", "å¼å·¥ä½éåºæ°", "ç´¯è®¡è¯ç", "è¶é¢æ¯ä¾", "HDayWorkQty", "HGroupID", "HWorkerID", "HSourceID", "å å·¥åä»·", "HNextProcFlag", "HBadWHID", "HBadWHName", "HWasterWHID", "HWasterWHName", "HWHID", "HWHName"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			dataCol = data1.data[0].HGridString.split(',');

			for (var i = 1; i < option.cols[0].length - 1; i++) {
			@@ -947,7 +1288,9 @@
			}
			}
			$("#ColName").empty();
			$("#ColName").append(Organization);
			$("#ColName").append(Organization); $("#ColName1").empty();
			$("#ColName1").append(Organization); $("#ColName2").empty();
			$("#ColName2").append(Organization);
			form.render('select');
			}
			//#endregion