MES-WEB-LayUI.git

			@@ -2,7 +2,7 @@
			<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">
			@@ -31,25 +31,6 @@
			</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">
			@@ -65,34 +46,25 @@
			</button>
			</div>
			</div>
			<div class="layui-row" style="margin-top:10px;margin-left:5%;">
			<!--å¶ä»æ¡ä»¶-->
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 76px;">ç©æåç§°</label>
			<div class="layui-input-block" style="margin-left: 107px;">
			<input type="text" class="layui-input" name="HMaterName" id="HMaterName">
			</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="HModel" id="HModel">
			</div>
			<!--å¶ä»æ¡ä»¶-->
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 76px;">ç©æåç§°</label>
			<div class="layui-input-block" style="margin-left: 107px;">
			<input type="text" class="layui-input" name="HMaterName" id="HMaterName">
			</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="HModel" id="HModel">
			</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>
			@@ -195,13 +167,13 @@
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew" id="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>æ°å¢</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNewSub" id="set_AddNewSub"><i class="layui-icon layui-icon-file-b"></i>æ°å¢åè·¯çº¿</button>
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNewSub" id="set_AddNewSub"><i class="layui-icon layui-icon-file-b"></i>æ°å¢åè·¯çº¿</button>-->
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill" id="set_ShowBill"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>å¤å¶</button>
			<button type="button" class="layui-btn layui-btn-sm" 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" lay-event="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>å¤å¶</button>
			<button type="button" class="layui-btn layui-btn-sm" 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" 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" 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" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>å®¡æ ¸</button>
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>å®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AbandonCheck" id="AbandonCheck"><i class="layui-icon layui-icon-form"></i>åå®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_defaultRoute" id="set_defaultRoute"><i class="layui-icon layui-icon-form"></i>å¯ç¨é»è®¤</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_closeOtherRoute" id="set_closeOtherRoute"><i class="layui-icon layui-icon-form"></i>ç¦ç¨å¶å®</button>
			@@ -212,14 +184,14 @@
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_RejectCheck_Flow" id="RejectCheck_Flow"><i class="layui-icon layui-icon-form"></i>é©³å</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CloseBill" id="set_CloseBill"><i class="layui-icon layui-icon-form"></i>å³é</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CancelCloseBill" id="set_CancelCloseBill"><i class="layui-icon layui-icon-form"></i>åå³é</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-ProcPriceRequestBills" id="btn-ProcPriceRequestBills"><i class="layui-icon layui-icon-delete"></i>å¤è¡ä¸æ¨(å®é¢ç³è¯·å)</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-ProcPriceRequestBills" id="btn-ProcPriceRequestBills"><i class="layui-icon layui-icon-delete"></i>å¤è¡ä¸æ¨(å®é¢ç³è¯·å)</button>-->
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>é¢è§</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>æå°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit"><i class="layui-icon layui-icon-repeat"></i>å®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit"><i class="layui-icon layui-icon-refresh"></i>åå®¡æ ¸</button>-->
			<button type="button" class="layui-btn layui-btn-sm" 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" 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" lay-event="set_HideButton" id="set_HideButton"><i class="layui-icon layui-icon-form"></i>æé®è®¾ç½®</button>
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="set_HideButton"><i class="layui-icon layui-icon-form"></i>æé®è®¾ç½®</button>-->
			</div>
			</script>
			</form>
			@@ -248,11 +220,9 @@
			//var sWhere = " äº§åä»£ç = 'BX0002'";
			var sWhere = "";
			var option = [];
			var page = 1;//åé¡µæ°æ®
			var size = 50;
			var HBillType = 3301;
			var ins; //ç¨äºå¯¼åºexcel
			var HModName = "Gy_RoutingBillList";
			var HModName = "Gy_RoutingBillToInvalidatedList";
			var titleData = [];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			//è·ååæ°
			function getUrlVars() {
			@@ -367,12 +337,7 @@

			//#region æ¥è¯¢æé®
			form.on('submit(btnSearch)', function (data) {//éæ©ä»ä½

			if (page != 1) {
			$("#page a:eq(1)").get(0).click();//ç¹å»åé¡µæ ç¬¬ä¸é¡µ
			} else {
			get_FastQuery(2);
			}
			get_FastQuery(2);
			});
			//#endregion

			@@ -413,51 +378,15 @@
			})
			}

			//æ¥æé´éä¸æåè¡¨çå¬
			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_FastQuery(1);
			//è·åé¡¹ç®å·
			Get_HProject();
			}
			//#endregion

			@@ -465,88 +394,19 @@
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, height: 'full-150'
			, page: false
			, cols: [[]]
			, data: [[]]
			, height: 800
			, page: true
			, totalRow: true
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			, done: function (res, curr, count) {
			soulTable.render(this);
			}
			, cols: [[
			{ type: 'checkbox', fixed: 'left' }
			/* { field: 'hmainid', title: 'hmainid', width: 110 }*/
			, { field: 'åæ®å·', title: 'åæ®å·', sort: true, width: 165 }
			, { field: 'å·¥èºåç§°', title: 'å·¥èºåç§°', width: 170, sort: true }
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 160, sort: true }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 160, sort: true }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 160, sort: true }
			, { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ', width: 115, sort: true }
			, { field: 'è®¡éåä½', title: 'è®¡éåä½', sort: true }
			, { field: 'è¡¨å¤´å¤æ³¨', title: 'è¡¨å¤´å¤æ³¨', sort: true }
			, { field: 'å·¥åºå·', title: 'å·¥åºå·', sort: true }
			, { field: 'å·¥åºä»£ç ', title: 'å·¥åºä»£ç ', sort: true }
			, { field: 'å·¥åº', title: 'å·¥åº', sort: true }
			, { field: 'å·¥ä½ä¸å¿ä»£ç ', title: 'å·¥ä½ä¸å¿ä»£ç ', width: 115, sort: true }
			, { field: 'å·¥ä½ä¸å¿åç§°', title: 'å·¥ä½ä¸å¿åç§°', width: 115, sort: true }
			, { field: 'å¶åäºº', title: 'å¶åäºº', sort: true }
			, { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ', width: 195, sort: true }
			, { field: 'å®¡æ ¸äºº', title: 'å®¡æ ¸äºº', sort: true }
			, { field: 'å®¡æ ¸æ¥æ', title: 'å®¡æ ¸æ¥æ', width: 180, sort: true }
			, { field: 'ä¿®æ¹äºº', title: 'ä¿®æ¹äºº', sort: true }
			, { field: 'ä¿®æ¹æ¥æ', title: 'ä¿®æ¹æ¥æ', width: 180, sort: true }
			, { field: 'é»è®¤å·¥èº', title: 'é»è®¤å·¥èº', sort: true }
			//, { field: 'åæ®ç±»å', title: 'åæ®ç±»å' }
			////, { field: 'hmaterid', title: 'hmaterid', width: 165 }
			//, { field: 'ç»ç»', title: 'ç»ç»' }
			////, { field: 'hsubid', title: 'hsubid', width: 80 }
			//, { field: 'å§å¤æ è®°', title: 'å§å¤æ è®°' }
			////, { field: 'hprocid', title: 'hprocid', width: 105 }
			////, { field: 'HSupID', title: 'HSupID', width: 105 }
			//, { field: 'ä¾åºåä»£ç ', title: 'ä¾åºåä»£ç ' }
			//, { field: 'ä¾åºå', title: 'ä¾åºå' }
			////, { field: 'HCenterID', title: 'HCenterID', width: 105 }
			//, { field: 'æ¶é´åä½', title: 'æ¶é´åä½' }
			//, { field: 'è¿è¡æ¶é´', title: 'è¿è¡æ¶é´' }
			//, { field: 'å å·¥æ°é', title: 'å å·¥æ°é' }
			//, { field: 'åå¤æ¶é´', title: 'åå¤æ¶é´' }
			//, { field: 'æéæ¶é´', title: 'æéæ¶é´' }
			//, { field: 'è½¬ç§»æ¶é´', title: 'è½¬ç§»æ¶é´' }
			//, { field: 'è¯ç', title: 'è¯ç' }
			//, { field: 'ç´¯è®¡è¯ç', title: 'ç´¯è®¡è¯ç' }
			//, { field: 'è¡¨ä½å¤æ³¨', title: 'è¡¨ä½å¤æ³¨' }
			//, { field: 'ä½åºäºº', title: 'ä½åºäºº' }
			//, { field: 'ä½åºæ¥æ', title: 'ä½åºæ¥æ' }
			////, { field: 'HDayWorkQty', title: 'HDayWorkQty', width: 105 }
			////, { field: 'HGroupID', title: 'HGroupID', width: 105 }
			////, { field: 'HWorkerID', title: 'HWorkerID', width: 105 }
			////, { field: 'HSourceID', title: 'HSourceID', width: 105 }
			//, { field: 'å å·¥åä»·', title: 'å å·¥åä»·' }
			////, { field: 'HNextProcFlag', title: 'HNextProcFlag', width: 105 }
			//, { field: 'ä¸éæµè½¬å·¥åº', title: 'ä¸éæµè½¬å·¥åº', width: 150 }
			//, { field: 'æµè½¬å·¥åº', title: 'æµè½¬å·¥åº' }
			]]
			};
			optionPage = {
			elem: 'page', //æ³¨æï¼è¿éç page æ¯ IDï¼ä¸ç¨å # å·
			count: 10000, //æ°æ®æ»æ°ï¼ä»æå¡ç«¯å¾å°
			limit: 50,
			limits: [50, 500, 5000, 50000],
			layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
			jump: function (obj, first) {
			//console.log(obj)
			//objåå«äºå½ååé¡µçææåæ°ï¼æ¯å¦ï¼
			//console.log(obj.curr); //å¾å°å½åé¡µï¼ä»¥ä¾¿åæå¡ç«¯è¯·æ±å¯¹åºé¡µçæ°æ®ã
			//console.log(obj.limit); //å¾å°æ¯é¡µæ¾ç¤ºçæ¡æ°

			//é¦æ¬¡ä¸æ§è¡
			if (!first) {
			//do something
			page = obj.curr;
			size = obj.limit;
			get_FastQuery();
			}
			}
			}
			laypage.render(optionPage);

			}
			//#region æåºåéæ©
			table.on('sort(mainTable)', function (obj) { //æ³¨ï¼sort æ¯å·¥å·æ¡äºä»¶åï¼test æ¯ table åå§å®¹å¨çå±æ§ lay-filter="å¯¹åºçå¼"
			@@ -587,9 +447,6 @@

			//#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("");//ç©æ
			@@ -668,19 +525,12 @@
			//#endregion
			//#region æ¥è¯¢
			function get_Display(sWhere) {
			//sWhere += " and HPRDORGID=" + sessionStorage["OrganizationID"] + " ";
			if (HMaterID != "" && HMaterID != "undefined" && HMaterID != null) {
			sWhere += " and HMaterID = " + HMaterID;
			}
			if (HProID != 0 && HProID != "undefined" && HProID != null) {
			sWhere += " and HMainProcID = " + HProID;
			}
			var ajaxLoad = layer.load();
			$.ajax({
			//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
			url: GetWEBURL() + '/LEMS/MES_Gy_RoutingBillList_Json',
			url: GetWEBURL() + '/Gy_RoutingBill/getInvalidityReport',
			type: "GET",
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "HBillSubType":"3301" },
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
			success: function (data1) {
			if (data1.count == 1) {
			var data = [];//ååæ®µæ°æ®
			@@ -712,23 +562,8 @@
			}
			}
			}
			//å¨ææ¾ç¤ºåå
			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;
			//è®¾ç½®åè¡¨åä¸ä¸ªåæ®åªæç¬¬ä¸æ¡æ°æ®æ¾ç¤ºä¸»è¡¨ä¿¡æ¯ï¼å¶å®è®°å½åªæ¾ç¤ºåè¡¨ä¿¡æ¯
			//è·ååè¡¨åæ°æ®
			var colList = [];
			@@ -773,9 +608,6 @@

			//#region å¿«éè¿æ»¤
			function get_FastQuery(number) {

			var HDate = $("#HBeginDate").val();//å¼å§æ¥æ
			var HDate1 = $("#HEndDate").val();//ç»ææ¥æ
			var HOrgID = "";
			var HOrderProcNO = $("#HOrderProcNO").val();//åæ®ç±»å
			//var HMaterID = $("#HMaterID").val();
			@@ -783,7 +615,6 @@
			var HMaterNumber = $("#HMaterNumber").val();
			var HModel = $("#HModel").val();
			var WorkCenter = $("#WorkCenter").val();//åæ®å·
			var HProject = $("#HProject").val();
			var ColName = $("#ColName").val();//å¤éæ¡
			var Comparator = $("#Comparator").val()
			var ColContent = $("#ColContent").val();
			@@ -798,19 +629,19 @@
			var com = "";
			switch (Comparator) {
			case "7":
			com = "like''%" + ColContent + "%''";
			com = "like'%" + ColContent + "%'";
			break;
			case "8":
			com = "like''%" + ColContent + "''";
			com = "like'%" + ColContent + "'";
			break;
			case "9":
			com = "like''" + ColContent + "%''";
			com = "like'" + ColContent + "%'";
			break;
			case "10":
			com = "not like''%" + ColContent + "%''";
			com = "not like'%" + ColContent + "%'";
			break;
			default:
			com = "" + Comparator + "''" + ColContent + "''";
			com = "" + Comparator + "'" + ColContent + "'";
			break;
			}
			sWhere += " and " + ColName + " " + com;
			@@ -820,19 +651,19 @@
			var com1 = "";
			switch (Comparator1) {
			case "7":
			com1 = "like''%" + ColContent1 + "%''";
			com1 = "like'%" + ColContent1 + "%'";
			break;
			case "8":
			com1 = "like''%" + ColContent1 + "''";
			com1 = "like'%" + ColContent1 + "'";
			break;
			case "9":
			com1 = "like''" + ColContent1 + "%''";
			com1 = "like'" + ColContent1 + "%'";
			break;
			case "10":
			com1 = "not like''%" + ColContent1 + "%''";
			com1 = "not like'%" + ColContent1 + "%'";
			break;
			default:
			com1 = "" + Comparator1 + "''" + ColContent1 + "''";
			com1 = "" + Comparator1 + "'" + ColContent1 + "'";
			break;
			}
			sWhere += " and " + ColName1 + " " + com1;
			@@ -841,32 +672,26 @@
			var com2 = "";
			switch (Comparator2) {
			case "7":
			com2 = "like''%" + ColContent2 + "%''";
			com2 = "like'%" + ColContent2 + "%'";
			break;
			case "8":
			com2 = "like''%" + ColContent2 + "''";
			com2 = "like'%" + ColContent2 + "'";
			break;
			case "9":
			com2 = "like''" + ColContent2 + "%''";
			com2 = "like'" + ColContent2 + "%'";
			break;
			case "10":
			com2 = "not like''%" + ColContent2 + "%''";
			com2 = "not like'%" + ColContent2 + "%'";
			break;
			default:
			com2 = "" + Comparator + "''" + ColContent + "''";
			com2 = "" + Comparator + "'" + ColContent + "'";
			break;
			}
			sWhere += " and " + ColName2 + " " + com2;
			}
			if (HDate) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= ''" + HDate + "''";
			}
			if (HDate1) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) <= ''" + HDate1 + "''";
			}
			if (HMaterID != "" && HMaterID != "undefined" && HMaterID != null) {
			//ä»å«çé¡µé¢æå¼ä¼ å¥Hmateridå¼ï¼è®¾ç½®ç©æè¿æ»¤,æªå³é
			sWhere += " and HMaterID = " + HMaterID + " and å³éäºº=''''";
			sWhere += " and HMaterID = " + HMaterID + " and å³éäºº=''";
			} else {
			//ä¸æ¯ä»å«çé¡µé¢æå¼
			var HMaterID2 = $("#HMaterID").val();
			@@ -883,119 +708,27 @@
			}

			if (HOrderProcNO) {
			sWhere += " and åæ®ç±»å like ''%" + HOrderProcNO + "%''";
			sWhere += " and åæ®ç±»å like '%" + HOrderProcNO + "%'";
			}
			if (HMaterName) {
			sWhere += "and ç©æåç§° like ''%" + HMaterName + "%''";
			sWhere += "and ç©æåç§° like '%" + HMaterName + "%'";
			}
			if (HMaterNumber) {
			sWhere += "and ç©æä»£ç like ''%" + HMaterNumber + "%''";
			sWhere += "and ç©æä»£ç like '%" + HMaterNumber + "%'";
			}
			if (HModel) {
			sWhere += "and è§æ ¼åå· like ''%" + HModel + "%''";
			sWhere += "and è§æ ¼åå· like '%" + HModel + "%'";
			}
			if (WorkCenter) {
			sWhere += " and åæ®å· like ''%" + WorkCenter + "%''";
			sWhere += " and åæ®å· like '%" + WorkCenter + "%'";
			}
			if (HOrgID) {
			sWhere += " and HOrgID = ''" + HOrgID + "''";
			}
			if (number==2) {
			if (HProject!='0') {
			sWhere += " and é¡¹ç®å· like ''%" + HProject + "%''";
			}
			sWhere += " and HOrgID = '" + HOrgID + "'";
			}

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

			//#region åé¡µæ¥è¯¢
			function get_DisplayPage(sWhere) {
			var wait = layer.load();//é®ç½©
			var ajaxLoad = layer.load();
			$.ajax({
			url: GetWEBURL() + '/Gy_RoutingBill/page',
			type: "GET",
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size },
			success: function (data1) {
			option.limit = size;//æ¹åè¡¨æ ¼é¡µå¤§å°
			if (data1.code == 1) {
			optionPage.count = data1.count;//æ¹ååè¡¨æ°æ®æ»æ°
			var data = [];
			var col = [];
			//ç»ç©ºçæ°ç»èµå¼
			for (var key in data1.list) {
			data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
			}
			//å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
			col.push({ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' });
			for (var i = 0; i < data.length; i++) {//éådataæ°ç»éçæ°æ®
			// if (data[i].name == 'HInterID' \|\| data[i].name == 'HBillType' \|\| data[i].name == 'hmainid') {
			if ($.inArray(data[i].name, titleData) > -1) {//æ£æ¥dataãiã.nameæ¯å¦å¨æ°ç»ä¸ //è®¡ç®å
			col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
			} 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) {
			//int
			case 'DateTime':
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + (data[i].name == "è¡å³éæ¥æ" ? "è¡å³éäºº" : data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
			break;
			default:
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
			}
			}
			}


			option.cols = [col];
			option.data = data1.data;
			//è®¾ç½®åè¡¨åä¸ä¸ªåæ®åªæç¬¬ä¸æ¡æ°æ®æ¾ç¤ºä¸»è¡¨ä¿¡æ¯ï¼å¶å®è®°å½åªæ¾ç¤ºåè¡¨ä¿¡æ¯
			//è·ååè¡¨åæ°æ®
			var colList = [];
			for (var i = 0; i < option.cols[0].length; i++) {
			colList.push(option.cols[0][i].field);
			}
			//è®¾ç½®æ°æ®
			var result = data1.data;
			var temp = "";
			for (var i = 0; i < result.length; i++) {
			if (temp != result[i]["åæ®å·"]) {
			temp = result[i]["åæ®å·"];
			} else {
			var initIndex = $.inArray("åæ®å·", colList);
			var lastIndex = $.inArray("hsubid", colList);
			for (var j = initIndex; j < lastIndex; j++) {
			var fieldName = colList[j];
			result[i][fieldName] = "";
			}
			}
			}
			option.data = result;
			laypage.render(optionPage);

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

			layer.close(ajaxLoad);
			if ($("#ColName option").length < 1) {
			ColFilter();
			}
			//layer.alert("æ¥è¯¢æå", { icon: 1 });
			} else {
			//option.data = [[]]
			//table.render(option);
			layer.close(ajaxLoad);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.close(ajaxLoad);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}
			//#endregion

			@@ -1101,31 +834,6 @@
			}
			//#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

			//#region å¤è¡ä¸æ¨ï¼éè´å¥åºåï¼
			function set_ProcPriceRequestBills() {
			var checkStatus = table.checkStatus('mainTable')
			@@ -1198,7 +906,7 @@
			//#region å·æ°
			function get_Refresh() {
			set_ClearQuery();
			get_DisplayPage(sWhere);
			get_FastQuery();
			}

			//å¯ç¨é»è®¤