MES-WEB-LayUI.git

			@@ -1,7 +1,7 @@
			ï»¿<!DOCTYPE html>
			<html xmlns="http://www.w3.org/1999/xhtml">
			<head>
			<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
			<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
			<title>çäº§ä¸æååè¡¨</title>
			<meta name="renderer" content="webkit">
			<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
			@@ -9,7 +9,8 @@
			<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/soulTable.slim.js"></script>

			</head>
			<body>
			<div class="layui-fluid">
			@@ -22,6 +23,13 @@
			<div class="layui-colla-title layui-inline">
			<div class="layui-inline">
			<span>æ´å¤</span>
			</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">
			@@ -54,9 +62,116 @@
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">åæ®å·</label>
			<label class="layui-form-label">ä»»å¡åå·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="WorkCenter" id="WorkCenter">
			<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">
			<input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">çäº§èµæº</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HSourceName" id="HSourceName">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">äº§åä»£ç </label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ç©ææ¹æ¬¡</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HBatchNo" id="HBatchNo">
			</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="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator" id="Comparator" class="ForFilteringSchemes" 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 ForFilteringSchemes" 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>
			@@ -72,7 +187,9 @@
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>å®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>åå®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_LookDown"><i class="layui-icon layui-icon-export"></i>å¯¼åº</button>

			</div>
			</script>
			@@ -87,6 +204,7 @@
			<script src="../../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../../layuiadmin/PubCustom.js"></script>
			<script src="../../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
			<script src="../../../../layuiadmin/HideButton.js"></script>
			<script>
			//è·åé¡µé¢è·³è½¬åæ° //åæ®ç¼è¾ç¶æï¼ 1.æ æºåæ°å¢Â Â 2.ææºåæ°å¢Â Â 3.ç¼è¾Â 4.æµè§Â 5.åæ´
			var params = get_UrlVars();
			@@ -98,7 +216,7 @@
			base: '../../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			}).extend({
			index: 'lib/index', //ä¸»å¥å£æ¨¡å
			}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
			}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {

			//#region å¬å±åé
			var $ = layui.$
			@@ -109,10 +227,15 @@
			, element = layui.element
			, laypage = layui.laypage
			, laydate = layui.laydate
			, soulTable = layui.soulTable
			//æ¥è¯¢æ¡ä»¶
			var sWhere = "";
			var option = [];
			var ins;
			//#endregion

			var titleData = ["HMaterID", "HUnitID", "HICMOEmpID"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			var HModName = "Sc_MaterToSourceStepBillList";

			//#region è¿å¥é¡µé¢å³å è½½
			//å¤ææä½ç±»å
			@@ -157,6 +280,13 @@
			//éåº
			case 'get_Exit': Pub_Close(2);
			break;
			//å¯¼åº
			case 'btn_LookDown': get_Export();
			break;
			//åè®¾ç½®
			case 'set_HideColumn': get_HideColumn();
			break;

			};
			});

			@@ -167,81 +297,164 @@

			//éç½®æé®
			form.on('submit(btnReSearch)', function (data) {
			$("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
			var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
			$("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
			$("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
			$("#WorkCenter").val("");//åæ®å·
			$("#HICMOBillNo").val("");//ä»»å¡åå·
			$("#HProcExchBillNo").val("");//å·¥åºæµè½¬å¡å·
			$("#HSourceName").val("");//çäº§èµæº
			$("#HMaterNumber").val("");//äº§åä»£ç
			$("#HBatchNo").val("");//ç©ææ¹æ¬¡
			$("#btnSearch").click();
			$("#ColContent").val("");
			$("#ColName").val("");
			$("#Comparator").val("");
			$("#ColContent1").val("");
			$("#ColName1").val("");
			$("#Comparator1").val("");
			$("#ColContent2").val("");
			$("#ColName2").val("");
			$("#Comparator2").val("");
			form.render('select');
			});
			//#endregion


			//æ¥æé´éä¸æåè¡¨çå¬
			form.on('select(HInitTimeCycle)', function (data) {
			var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
			//è¥æ¥æé´éä¸ä¸º ä»»æé´éï¼åç¦ç¨å¼å§æ¥æä¸ç»ææ¥æçéæ©
			if (HInitTimeCycle != -1) {
			$('#HDate').prop('disabled', true);
			$('#HDate1').prop('disabled', true);

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

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

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

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

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

			}


			//åå§åè¡¨æ ¼
			function set_InitGrid() {
			$("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
			$("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, height: 'full-50'
			, page: true
			, cellMinWidth: 120
			, totalRow: true
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			, done: function (res, curr, count) {
			soulTable.render(this);
			}
			, cols: [[
			{ type: 'checkbox', fixed: 'left' }
			, { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
			, { field: 'æ¥æ', title: 'æ¥æ', templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'åæ®å·', title: 'åæ®å·' }
			, { field: 'ä»»å¡åå·', title: 'ä»»å¡åå·' }
			, { field: 'HBillType', title: 'HBillType', hide: true }
			, { field: 'HBillStatus', title: 'åæ®ç¶æ', hide: true }
			, { field: 'å·¥åºæµè½¬å¡å·', title: 'å·¥åºæµè½¬å¡å·' }
			, { field: 'HSourceID', title: 'HSourceID', hide: true }
			, { field: 'çäº§èµæºä»£ç ', title: 'çäº§èµæºä»£ç ' }
			, { field: 'çäº§èµæº', title: 'çäº§èµæº' }
			, { field: 'HEquipID', title: 'HEquipID', hide: true }
			, { field: 'çäº§è®¾å¤ä»£ç ', title: 'çäº§è®¾å¤ä»£ç ' }
			, { field: 'çäº§è®¾å¤', title: 'çäº§è®¾å¤' }
			, { field: 'HWorkerID', title: 'HWorkerID', hide: true }
			, { field: 'æä½å·¥ä»£ç ', title: 'æä½å·¥ä»£ç ' }
			, { field: 'æä½å·¥', title: 'æä½å·¥' }
			, { field: 'æä½å·¥æ¡ç ', title: 'æä½å·¥æ¡ç ' }
			, { field: 'HGroupID', title: 'HGroupID', hide: true }
			, { 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: 'å¶åæ¥æ', title: 'å¶åæ¥æ', templet: "<div>{{d.å¶åæ¥æ ==null ?'':layui.util.toDateString(d.å¶åæ¥æ, 'yyyy-MM-dd')}}</div>"}
			, { field: 'å®¡æ ¸äºº', title: 'å®¡æ ¸äºº' }
			, { field: 'å®¡æ ¸æ¥æ', title: 'å®¡æ ¸æ¥æ', templet: "<div>{{d.å®¡æ ¸æ¥æ ==null ?'':layui.util.toDateString(d.å®¡æ ¸æ¥æ, 'yyyy-MM-dd')}}</div>"}
			, { field: 'ä¿®æ¹äºº', title: 'ä¿®æ¹äºº' }
			, { field: 'ä¿®æ¹æ¥æ', title: 'ä¿®æ¹æ¥æ', templet: "<div>{{d.ä¿®æ¹æ¥æ ==null ?'':layui.util.toDateString(d.ä¿®æ¹æ¥æ, 'yyyy-MM-dd')}}</div>"}
			, { field: 'å³éäºº', title: 'å³éäºº' }
			, { field: 'å³éæ¥æ', title: 'å³éæ¥æ', templet: "<div>{{d.å³éæ¥æ ==null ?'':layui.util.toDateString(d.å³éæ¥æ, 'yyyy-MM-dd')}}</div>"}
			, { field: 'ä½åºäºº', title: 'ä½åºäºº' }
			, { field: 'ä½åºæ¥æ', title: 'ä½åºæ¥æ', templet: "<div>{{d.ä½åºæ¥æ ==null ?'':layui.util.toDateString(d.ä½åºæ¥æ, 'yyyy-MM-dd')}}</div>"}
			, { field: 'æ¥æ', title: 'æ¥æ', templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>", sort: true }
			, { field: 'åæ®å·', title: 'åæ®å·', sort: true }
			, { field: 'ä»»å¡åå·', title: 'ä»»å¡åå·', sort: true }
			, { field: 'HBillType', title: 'HBillType', hide: true, sort: true }
			, { field: 'HBillStatus', title: 'åæ®ç¶æ', hide: true, sort: true }
			, { field: 'å·¥åºæµè½¬å¡å·', title: 'å·¥åºæµè½¬å¡å·', sort: true }
			, { field: 'HSourceID', title: 'HSourceID', hide: true, sort: true }
			, { field: 'çäº§èµæºä»£ç ', title: 'çäº§èµæºä»£ç ', sort: true }
			, { field: 'çäº§èµæº', title: 'çäº§èµæº', sort: true }
			, { field: 'HEquipID', title: 'HEquipID', hide: true, sort: true }
			, { field: 'çäº§ä¸»è®¾å¤ä»£ç ', title: 'çäº§ä¸»è®¾å¤ä»£ç ', sort: true }
			, { field: 'çäº§ä¸»è®¾å¤', title: 'çäº§ä¸»è®¾å¤', sort: true }
			, { field: 'è¾å©è®¾å¤ä»£ç ', title: 'è¾å©è®¾å¤ä»£ç ', sort: true }
			, { field: 'è¾å©è®¾å¤', title: 'è¾å©è®¾å¤', sort: true }
			, { field: 'HWorkerID', title: 'HWorkerID', hide: true, sort: true }
			, { field: 'æä½å·¥ä»£ç ', title: 'æä½å·¥ä»£ç ', sort: true }
			, { field: 'æä½å·¥', title: 'æä½å·¥', sort: true }
			, { field: 'æä½å·¥æ¡ç ', title: 'æä½å·¥æ¡ç ', sort: true }
			, { field: 'HGroupID', title: 'HGroupID', hide: true, sort: true }
			, { field: 'çäº§çç»ä»£ç ', title: 'çäº§çç»ä»£ç ', sort: true }
			, { field: 'çäº§çç»', title: 'çäº§çç»', sort: true }
			, { field: 'è¡¨å¤´å¤æ³¨', title: 'è¡¨å¤´å¤æ³¨', sort: true }
			, { field: 'hsubid', title: 'hsubid', hide: true, sort: true }
			, { field: 'HMaterID', title: 'HMaterID', hide: true, sort: true }
			, { field: 'äº§åä»£ç ', title: 'äº§åä»£ç ', sort: true }
			, { field: 'äº§ååç§°', title: 'äº§ååç§°', sort: true }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', sort: true }
			, { field: 'ç©ææ¹æ¬¡', title: 'ç©ææ¹æ¬¡', sort: true }
			, { field: 'æµè½¬å¡æ¹æ¬¡', title: 'æµè½¬å¡æ¹æ¬¡', sort: true }
			, { field: 'æ°é', title: 'æ°é', sort: true, totalRow: true }
			, { field: 'å¶åäºº', title: 'å¶åäºº', sort: true }
			, { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ', templet: "<div>{{d.å¶åæ¥æ ==null ?'':layui.util.toDateString(d.å¶åæ¥æ, 'yyyy-MM-dd')}}</div>", sort: true }
			, { field: 'å®¡æ ¸äºº', title: 'å®¡æ ¸äºº', sort: true }
			, { field: 'å®¡æ ¸æ¥æ', title: 'å®¡æ ¸æ¥æ', templet: "<div>{{d.å®¡æ ¸æ¥æ ==null ?'':layui.util.toDateString(d.å®¡æ ¸æ¥æ, 'yyyy-MM-dd')}}</div>", sort: true }
			, { field: 'ä¿®æ¹äºº', title: 'ä¿®æ¹äºº', sort: true }
			, { field: 'ä¿®æ¹æ¥æ', title: 'ä¿®æ¹æ¥æ', templet: "<div>{{d.ä¿®æ¹æ¥æ ==null ?'':layui.util.toDateString(d.ä¿®æ¹æ¥æ, 'yyyy-MM-dd')}}</div>", sort: true }
			, { field: 'å³éäºº', title: 'å³éäºº', sort: true }
			, { field: 'å³éæ¥æ', title: 'å³éæ¥æ', templet: "<div>{{d.å³éæ¥æ ==null ?'':layui.util.toDateString(d.å³éæ¥æ, 'yyyy-MM-dd')}}</div>", sort: true }
			, { field: 'ä½åºäºº', title: 'ä½åºäºº', sort: true }
			, { field: 'ä½åºæ¥æ', title: 'ä½åºæ¥æ', templet: "<div>{{d.ä½åºæ¥æ ==null ?'':layui.util.toDateString(d.ä½åºæ¥æ, 'yyyy-MM-dd')}}</div>", sort: true }
			]]
			};
			}
			//#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: '../é²é/Sc_Add_MaterToSourceStepBillList.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=' //è®¾ç½® iframe ç URLï¼URL ä¸åå«äºæ¥è¯¢åæ°ï¼æ¥è°ç¨æéè¦çå¼

			, resize: false, //æ¯å¦åè®¸ç¨æ·è°æ´å¼¹åºå¤§å°
			end: function () { //å½å³éæ¶è°ç¨
			get_FastQuery(table, option);
			}
			, cancel: function () { //ç¹å»åæ¶æ¶ä½¿ç¨åè°
			//$(".layui-btn").removeClass("layui-btn-disabled");
			}
			})
			}
			});
			//#endregion
			//æ¥è¯¢
			function get_Display() {
			var ajaxLoad = layer.load();
			@@ -251,10 +464,16 @@
			type: "GET",
			data: { "sWhere": sWhere,"user": sessionStorage["HUserName"]},
			success: function (data1) {
			if (data1.count == 1) {
			if (data1.count == 1) {

			option.data = data1.data;
			table.render(option);
			layer.close(ajaxLoad);
			ins = table.render(option);
			layer.close(ajaxLoad);

			if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
			ColFilter();
			}
			} else {
			layer.close(ajaxLoad);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			@@ -264,29 +483,274 @@
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			DisPlay_HideColumn();
			}


			//éèåè®¾ç½®
			function get_HideColumn() {
			var colName = "";
			for (var i = 1; i < option.cols[0].length - 1; i++) {
			colName += option.cols[0][i]["title"] + ",";
			}

			colName = encodeURI(colName.substring(0, colName.length - 1));//å¯¹ URI è¿è¡ç¼ç
			layer.open({
			type: 2
			, skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			, title: "éèåè®¾ç½®" //æ é¢
			, closeBtn: 1 //çªä½å³ä¸è§å³é ç æ ·å¼
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["50%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ['../../../åºç¡èµæ/éèåè®¾ç½®/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			layer.close(index);//å³éå¼¹çª
			}
			})
			}

			//æ¾ç¤ºåæ°æ®
			function DisPlay_HideColumn() {
			$.ajax({
			url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
			type: "GET",
			data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.data.length != 0) {


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

			dataCol = data1.data[0].HGridString.split(',');

			for (var i = 0; i < option.cols[0].length - 2; i++) {
			var dataCols = dataCol[i].split('\|');
			//éèå
			if (dataCols[1] == 1) {
			option.cols[0][i + 1]["hide"] = true;
			}
			//è®¾ç½®åå®½
			if (dataCols[3] > 0) {
			option.cols[0][i + 1]["width"] = dataCols[3];
			}
			//è®¾ç½®åå®¹åä½å¤§å°
			if (data1.data[0].HFontSize != 0) {
			option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
			} else {
			option.cols[0][i + 1]["style"] = "font-size:100%";
			}
			//è®¾ç½®åå®½
			//if (data1.data[0].HColumnWidth != 0) {
			// option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
			//} else {
			// option.cols[0][i + 1]["width"] = "";
			//}
			//æ¾ç¤ºå
			if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
			option.cols[0][i + 1]["hide"] = false;
			}
			//åä½æå¨ä½ç½®(å·¦ å±ä¸ å³)
			switch (dataCols[2]) {
			case "L":
			option.cols[0][i + 1]["align"] = "left";
			break;
			case "M":
			option.cols[0][i + 1]["align"] = "center";
			break;
			case "R":
			option.cols[0][i + 1]["align"] = "right";
			break;
			}
			}

			//åæ¶å»ç»å
			for (var i = 1; i < option.cols[0].length - 1; i++) {
			if (option.cols[0][i]["fixed"] != null) {
			option.cols[0][i]["fixed"] = null;
			}
			else {
			break;
			}
			}
			//å»ç»å
			if (data1.data[0].HFixCols != 0) {
			for (var i = 0; i < data1.data[0].HFixCols; i++) {
			if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
			data1.data[0].HFixCols += 1;
			}
			option.cols[0][i + 1]["fixed"] = "left";
			}
			}
			table.render(option);
			} else {
			table.render(option);
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			})
			}

			//#region å¯¼åºExecel
			function get_Export() {
			var data = option.data

			table.exportFile(ins.config.id, data, "xls");
			}
			//#endregion

			// å¿«éè¿æ»¤
			function get_FastQuery() {
			var HDate = $("#HDate").val();//å¼å§æ¥æ
			var HDate1 = $("#HDate1").val();//ç»ææ¥æ
			var HOrderProcNO = $("#HOrderProcNO").val();//è®¢åè·è¸ªå·
			var WorkCenter = $("#WorkCenter").val();//åæ®å·
			var HICMOBillNo = $("#HICMOBillNo").val();//ä»»å¡åå·
			var HProcExchBillNo = $("#HProcExchBillNo").val();//æµè½¬å¡å·
			var HSourceName = $("#HSourceName").val();//çäº§èµæº
			var HMaterNumber = $("#HMaterNumber").val();//äº§åä»£ç
			var HBatchNo = $("#HBatchNo").val();//ç©ææ¹æ¬¡
			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 = "";
			switch (Comparator) {
			case "7":
			com = "like'%" + ColContent + "%'";
			break;
			case "8":
			com = "like'%" + ColContent + "'";
			break;
			case "9":
			com = "like'" + ColContent + "%'";
			break;
			case "10":
			com = "not like'%" + ColContent + "%'";
			break;
			default:
			com = "" + Comparator + "'" + ColContent + "'";
			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 = "" + Comparator + "'" + ColContent + "'";
			break;
			}
			sWhere += " and " + ColName2 + " " + com2;
			}
			if (HDate) {
			sWhere += " and æ¥æ >= '" + HDate + "'";
			}
			if (HDate1) {
			sWhere += " and æ¥æ <= '" + HDate1 + "'";
			}
			if (WorkCenter) {
			sWhere += " and åæ®å· like '%" + WorkCenter + "%'";
			if (HICMOBillNo) {
			sWhere += " and ä»»å¡åå· like '%" + HICMOBillNo + "%'";
			}
			if (HProcExchBillNo) {
			sWhere += " and å·¥åºæµè½¬å¡å· like '%" + HProcExchBillNo + "%'";
			}
			if (HSourceName) {
			sWhere += " and çäº§èµæº like '%" + HSourceName + "%'";
			}
			if (HMaterNumber) {
			sWhere += " and äº§åä»£ç like '%" + HMaterNumber + "%'";
			}
			if (HBatchNo) {
			sWhere += " and ç©ææ¹æ¬¡ like '%" + HBatchNo + "%'";
			}


			get_Display(sWhere);
			//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			sWhere = "";
			}


			//#region åå§æ¥æé´é ä¸æåè¡¨
			function setSelect_HInitTimeCycle() {
			var valueList = [0, 1, 2, 3, 4, 5, 6, 29]; //valuelistæ°ç»åå«ä¸æ¶é´ç¸å³çæ´æ°å¼
			var titleList = ["ä»å¤©", "è¿ä¸¤å¤©", "è¿ä¸å¤©", "è¿åå¤©", "è¿äºå¤©", "è¿åå¤©", "è¿ä¸å¤©", "è¿30å¤©"]; //itilelistä¸valuelistå¼ç¸å¯¹äºçè¡¨ï¼ä¸ä½ä¸ºä¸ææ¡ææ¬æ¾ç¤º

			var HInitTimeCycle_ArrayList = '<option value="-1" selected="selected" >ä»»æé´é</option>';//å®ä¹åç¬¦ä¸²HInitTimeCycle_ArrayList ä½ç¨äºä¸æåçhtmlåå®¹ åå«optionåç´ ï¼å¼ä¸ºâ1ï¼ä¸å¨ä¸ææ¡æ¾ç¤ºä»»æé´é
			for (var i = 0; i < valueList.length; i++) { // éåvalueList æ°ç» ä½¿æ¯ä¸ä¸ªå¼çæä¸ä¸ªå¯¹åºoptionåç´
			HInitTimeCycle_ArrayList += '<option style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';// æçæçoptionåç´ æ·»å å¥HInitTimeCycle_ArrayListåç¬¦ä¸²ä¸
			}

			$("#HInitTimeCycle").empty(); //ä½¿ç¨jqueryçemptyæ¹æ³æ¸ç©ºHInitTimeCycle_ArrayList <select>åç´ çå¼
			$("#HInitTimeCycle").append(HInitTimeCycle_ArrayList); //ä½¿ç¨appendæ¹æ³æå»ºä¹åHInitTimeCycle_ArrayListåç¬¦ä¸² çåå®¹ä¼ å¥HInitTimeCycle
			form.render('select'); //è°ç¨ éæ°æ¸²æselectåç´

			$("#HInitTimeCycle").val("29"); //ä½¿ç¨jQueryçval()æ¹æ³å°ä¸æåè¡¨çéä¸å¼è®¾ç½®ä¸º"29 ï¼ä¸æ¾ç¤ºãè¿ä¸æå¤©ã
			}
			//#endregion
			//åææ¾ç¤ºä¸ææ¡
			function ColFilter() {
			var Organization = '<option value="0" selected="selected" ></option>';
			for (var i = 1; i < option.cols[0].length; i++) {
			if (option.cols[0][i].hide != true) {
			Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
			}
			}
			$("#ColName").empty();
			$("#ColName").append(Organization);
			$("#ColName1").empty();
			$("#ColName1").append(Organization);
			$("#ColName2").empty();
			$("#ColName2").append(Organization);
			form.render('select');
			}
			//æ°å¢
			function set_AddNew() {
			//é¡µé¢å±-èªå®ä¹
			@@ -464,6 +928,28 @@

			}

			//#region ç¹å»è¡éä¸é«äº®
			table.on('row(mainTablemainTable)', function (obj) {
			//éä¸è¡æ¹åé¢è²
			var flag = !obj.tr.find(':checkbox:first').prop('checked');
			obj.tr.find(':checkbox').prop('checked', flag);
			if (flag) {
			obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //è®¾ç½®å¤éæ¡éä¸æ ·å¼
			$(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//æ¹åå½åtrèæ¯é¢è²ååä½é¢è²
			} else {
			obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//åæ¶å¤éæ¡éä¸æ ·å¼
			$(obj.tr.selector).attr({ "style": "background:" });//åæ¶å½åtré¢è²
			}
			//mainTable ä¸ºè¡¨æ ¼ID æ³¨ææ¤å¤å¦æIDä¸æ£ç¡®å°å¯¼è´ä½ å¨çå¬å¤éæ¡æ¶è·åä¸å°ä½ éæ©çæ°æ®ï¼åé¢çåªæ¯æ·»å æå é¤éä¸æªéä¸æ ·å¼ä»¥åè®¾ç½®èæ¯è²ï¼åä½é¢è²
			layui.each(table.cache.mainTable, function (i, l) {
			if (obj.tr.index() == l.LAY_TABLE_INDEX) {
			l.LAY_CHECKED = flag;
			}
			});
			})
			//#endregion



			//#endregion