MES-WEB-LayUI.git

			@@ -13,6 +13,8 @@
			<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/PubCustom.js"></script>
			<script src="../../../layuiadmin/HideButton.js"></script>
			<script src="../../../layuiadmin/soulTable.slim.js"></script>
			</head>
			<body>
			<div class="layui-fluid">
			@@ -27,12 +29,26 @@
			<span>æ´å¤</span>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">æ¥æ</label>
			<!--<div class="layui-inline">
			<label class="layui-form-label">æ¥æé´é</label>
			<div class="layui-input-block">
			<input type="date" class="layui-input" id="HDate">
			<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>-->

			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch" style="margin-left:10px">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			@@ -66,19 +82,78 @@
			<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>
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>æ°å¢</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Edit"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_AddNew" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>æ°å¢</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_Edit" lay-event="set_Edit"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button>

			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>å é¤</button>
			<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="get_Exit"><i class="layui-icon layui-icon-logout"></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" style="display:none;" id="set_DeleteBill" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>å é¤</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="get_Refresh" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="get_Exit" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_HideColumn" lay-event="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="HideButton"><i class="layui-icon layui-icon-form"></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>
			</div>
			</script>
			</form>
			@@ -96,7 +171,7 @@
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			}).extend({
			index: 'lib/index', //ä¸»å¥å£æ¨¡å
			}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
			}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
			var $ = layui.$
			, admin = layui.admin
			, layer = layui.layer
			@@ -105,14 +180,15 @@
			, element = layui.element
			, laypage = layui.laypage
			, laydate = layui.laydate
			, soulTable = layui.soulTable

			var sWhere = "";
			var HModName = "Gy_BarCodeBill_OutList";

			var ins;
			var params = getUrlVars();

			//å¤ææ¯å¦æåæ°ä¼ é

			var titleData = ["HMainID"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±

			//åå§åè¡¨æ ¼
			DisPlay_HideColumn();
			@@ -139,8 +215,18 @@
			//éåºæé®
			case 'get_Exit': Pub_Close(2);
			break;
			//å¯¼åºexcel
			case 'get_export':
			get_Export();
			break;
			//åè®¾ç½®
			case 'set_HideColumn': get_HideColumn();
			break;
			//æé®è®¾ç½®
			case 'set_HideButton':
			var btns = document.getElementsByTagName("button"); //è·åæ¬é¡µæææé®å¯¹è±¡
			var HBillType = "æ¡ç å½æ¡£";
			get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
			break;
			};
			});
			@@ -155,9 +241,44 @@
			get_FastQuery();
			});

			//æ¥æé´éä¸æåè¡¨çå¬
			//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);
			// }
			//});

			//#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();
			//æ¥è¯¢
			get_FastQuery();
			@@ -172,52 +293,83 @@
			, toolbar: '#toolbarDemo'
			, height: 'full-50'
			, 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: 'åæ®ID', hide: true }
			, { field: 'æ¡å½¢ç ', title: 'æ¡å½¢ç ', width: 160 }
			, { field: 'HProcID', title: 'HProcID', width: 160, hide: true }
			, { field: 'å·¥åº', title: 'å·¥åº', width: 160 }
			, { field: 'HMaterID', title: 'HMaterID', width: 200, hide: true}
			, { field: 'ç©æ', title: 'ç©æ', width: 250 }
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 250 }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 200 }
			, { field: 'HUnitID', title: 'HUnitID', hide: true }
			, { field: 'è®¡éåä½', title: 'è®¡éåä½', width: 200 }
			, { field: 'ä»¶æ°', title: 'ä»¶æ°', width: 200 }
			, { field: 'æ°é', title: 'æ°é', width: 160 }
			, { field: 'æ¹æ¬¡å·', title: 'æ¹æ¬¡å·', width: 160 }
			, { field: 'HSupID', title: 'HSupID', width: 160, hide: true }
			, { field: 'å¾æ¥åä½', title: 'å¾æ¥åä½', width: 200 }
			, { field: 'HGroupID', title: 'HGroupID', width: 200, hide: true }
			, { field: 'çäº§çç»', title: 'çäº§çç»', width: 200 }
			, { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
			, { field: 'é¨é¨', title: 'é¨é¨', width: 200 }
			, { field: 'HEmpID', title: 'HEmpID', width: 200, hide: true }
			, { field: 'ä¸å¡å', title: 'ä¸å¡å', width: 200 }
			, { field: 'å¤æ³¨', title: 'å¤æ³¨', width: 115 }
			, { field: 'HWhID', title: 'HWhID', width: 115, hide: true }
			, { field: 'é»è®¤ä»åº', title: 'é»è®¤ä»åº', width: 200 }
			, { field: 'HSPID', title: 'HSPID', width: 200, hide: true }
			, { field: 'é»è®¤ä»ä½', title: 'é»è®¤ä»ä½', width: 115 }
			, { field: 'HAuxPropID', title: 'HAuxPropID', width: 200, hide: true }
			, { field: 'ç©æè¾å©å±æ§', title: 'ç©æè¾å©å±æ§', width: 200 }
			, { field: 'HCusID', title: 'HCusID', width: 200, hide: true }
			, { field: 'å®¢æ·', title: 'å®¢æ·', width: 200 }
			, { field: 'HSTOCKORGID', title: 'HSTOCKORGID', width: 115, hide: true }
			, { field: 'åºåç»ç»', title: 'åºåç»ç»', width: 200, }
			, { field: 'æå°æ¬¡æ°', title: 'æå°æ¬¡æ°', width: 200 }
			, { field: 'ä½åºæ è®°', title: 'ä½åºæ è®°', width: 200 }
			, { field: 'ä½åºäºº', title: 'ä½åºäºº', width: 115 }
			, { field: 'çäº§å¥åºæ¥æ', title: 'çäº§å¥åºæ¥æ', width: 200, templet: "<div>{{d.çäº§å¥åºæ¥æ ==null ?'':layui.util.toDateString(d.çäº§å¥åºæ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
			, { field: 'éå®åºåºæ¥æ', title: 'éå®åºåºæ¥æ', width: 200, templet: "<div>{{d.éå®åºåºæ¥æ ==null ?'':layui.util.toDateString(d.éå®åºåºæ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
			, { field: 'hmainid', title: 'åæ®ID', hide: true, sort: true }
			, { field: 'æ¡å½¢ç ', title: 'æ¡å½¢ç ', width: 160, sort: true }
			, { field: 'HProcID', title: 'HProcID', width: 160, hide: true, sort: true }
			, { field: 'å·¥åº', title: 'å·¥åº', width: 160, sort: true }
			, { field: 'HMaterID', title: 'HMaterID', width: 200, hide: true, sort: true }
			, { field: 'ç©æ', title: 'ç©æ', width: 250, sort: true }
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 250, sort: true }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 200, sort: true }
			, { field: 'HUnitID', title: 'HUnitID', hide: true, sort: true }
			, { field: 'è®¡éåä½', title: 'è®¡éåä½', width: 200, sort: true }
			, { field: 'ä»¶æ°', title: 'ä»¶æ°', width: 200, sort: true, totalRow: true}
			, { field: 'æ°é', title: 'æ°é', width: 160, sort: true, totalRow: true}
			, { field: 'æ¹æ¬¡å·', title: 'æ¹æ¬¡å·', width: 160, sort: true }
			, { field: 'HSupID', title: 'HSupID', width: 160, hide: true, sort: true }
			, { field: 'å¾æ¥åä½', title: 'å¾æ¥åä½', width: 200, sort: true }
			, { field: 'HGroupID', title: 'HGroupID', width: 200, hide: true, sort: true }
			, { field: 'çäº§çç»', title: 'çäº§çç»', width: 200, sort: true }
			, { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true, sort: true }
			, { field: 'é¨é¨', title: 'é¨é¨', width: 200, sort: true }
			, { field: 'HEmpID', title: 'HEmpID', width: 200, hide: true, sort: true }
			, { field: 'ä¸å¡å', title: 'ä¸å¡å', width: 200, sort: true }
			, { field: 'å¤æ³¨', title: 'å¤æ³¨', width: 115, sort: true }
			, { field: 'HWhID', title: 'HWhID', width: 115, hide: true, sort: true }
			, { field: 'é»è®¤ä»åº', title: 'é»è®¤ä»åº', width: 200, sort: true }
			, { field: 'HSPID', title: 'HSPID', width: 200, hide: true, sort: true }
			, { field: 'é»è®¤ä»ä½', title: 'é»è®¤ä»ä½', width: 115, sort: true }
			, { field: 'HAuxPropID', title: 'HAuxPropID', width: 200, hide: true, sort: true }
			, { field: 'ç©æè¾å©å±æ§', title: 'ç©æè¾å©å±æ§', width: 200, sort: true }
			, { field: 'HCusID', title: 'HCusID', width: 200, hide: true, sort: true }
			, { field: 'å®¢æ·', title: 'å®¢æ·', width: 200, sort: true }
			, { field: 'HSTOCKORGID', title: 'HSTOCKORGID', width: 115, hide: true, sort: true }
			, { field: 'åºåç»ç»', title: 'åºåç»ç»', width: 200, sort: true}
			, { field: 'æå°æ¬¡æ°', title: 'æå°æ¬¡æ°', width: 200, sort: true }
			, { field: 'ä½åºæ è®°', title: 'ä½åºæ è®°', width: 200, sort: true }
			, { field: 'ä½åºäºº', title: 'ä½åºäºº', width: 115, sort: true }
			, { field: 'çäº§å¥åºæ¥æ', title: 'çäº§å¥åºæ¥æ', width: 200, templet: "<div>{{d.çäº§å¥åºæ¥æ ==null ?'':layui.util.toDateString(d.çäº§å¥åºæ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
			, { field: 'éå®åºåºæ¥æ', title: 'éå®åºåºæ¥æ', width: 200, templet: "<div>{{d.éå®åºåºæ¥æ ==null ?'':layui.util.toDateString(d.éå®åºåºæ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</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: 'ç¼è¾' + HPageTitle //è®¾ç½®å¼¹åºå±çååååé
			, closeBtn: 1//æ¾ç¤ºå³éæé®
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: './Gy_BarCodeBill_Out.html?OperationType=3&linterid=' + linterid + '' //è®¾ç½® iframe ç URLï¼URL ä¸åå«äºæ¥è¯¢åæ°ï¼æ¥è°ç¨æéè¦çå¼

			, resize: false, //æ¯å¦åè®¸ç¨æ·è°æ´å¼¹åºå¤§å°
			end: function () { //å½å³éæ¶è°ç¨
			get_FastQuery(table, option);
			}
			, cancel: function () { //ç¹å»åæ¶æ¶ä½¿ç¨åè°
			//$(".layui-btn").removeClass("layui-btn-disabled");
			}
			})
			}
			});
			//#region æ¥è¯¢
			function get_Display(sWhere) {
			var ajaxLoad = layer.load();
			@@ -227,13 +379,66 @@
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			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 });//ä»æ¯ä¸ªå¯¹è±¡ä¸æåæ°æ®
			}
			//å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
			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 ($.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: 'åæ®å·', templet: function (d) {
			return '<span style="color: blue;">' + d.åæ®å· + '</span>'
			}, style: 'cursor: pointer;' });
			} 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 = {
			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.data = data1.data;
			table.render(option);
			ins = table.render(option);
			layer.close(ajaxLoad);

			if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
			ColFilter();
			}
			DisPlay_HideColumn();
			//å·æ°æé®æ¾ç¤º
			var btns = document.getElementsByTagName("button"); //è·åæ¬é¡µæææé®å¯¹è±¡
			var HBillType = "æ¡ç å½æ¡£";
			Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
			//layer.alert("æ¥è¯¢æå", { icon: 1 });
			} else {
			layer.close(ajaxLoad);
			@@ -250,10 +455,17 @@

			//#region å¿«éè¿æ»¤
			function get_FastQuery() {
			var HDate = $("#HDate").val();;//å¼å§æ¥æ
			//var HBeginDate = $("#HBeginDate").val();//å¼å§æ¥æ
			//var HEndDate = $("#HEndDate").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 = "";
			@@ -276,22 +488,92 @@
			}
			sWhere += " and " + ColName + " " + com;
			}

			//if (HDate) {
			// sWhere += " and æ¥æ = '" + HDate + "'";
			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 (HBeginDate) {
			// sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + HBeginDate + "'";
			//}
			//if (HEndDate) {
			// sWhere += " and CONVERT(varchar(100),æ¥æ, 23) <= '" + HEndDate + "'";
			//}
			get_Display(sWhere);
			sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			}
			//#endregion
			//#region ç¹å»è¡éä¸é«äº®
			table.on('row(mainTable)', 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

			//#region éç½®è¿æ»¤æ¡ä»¶æ¹æ³
			function set_ClearQuery() {
			$("#HDate").val(Format(new Date(), "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")); //ç»ææ¥æ
			$("#btnSearch").click();
			$("#ColContent").val("");
			$("#ColName").val("0");
			$("#Comparator").val("0");
			$("#Comparator").val("0"); $("#ColContent1").val("");
			$("#ColName1").val("0");
			$("#Comparator1").val("0"); $("#ColContent2").val("");
			$("#ColName2").val("0");
			$("#Comparator2").val("0");
			form.render('select');
			sWhere = "";
			}
			@@ -381,6 +663,28 @@
			function get_Refresh() {
			set_ClearQuery();
			get_Display(sWhere);
			}
			//#endregion

			//#region å¯¼åºExecel
			function get_Export() {
			var ModRightNameCheck = "Gy_BarCodeBill_OutList_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

			@@ -496,6 +800,11 @@
			} else {
			table.render(option);
			}

			//å·æ°æé®æ¾ç¤º
			var btns = document.getElementsByTagName("button"); //è·åæ¬é¡µæææé®å¯¹è±¡
			var HBillType = "æ¡ç å½æ¡£";
			Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			@@ -511,10 +820,27 @@
			}
			}
			$("#ColName").empty();
			$("#ColName").append(Organization);
			$("#ColName").append(Organization); $("#ColName1").empty();
			$("#ColName1").append(Organization); $("#ColName2").empty();
			$("#ColName2").append(Organization);
			form.render('select');
			}
			//#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");
			//}

			//è·ååæ°
			function getUrlVars() {