MES-WEB-LayUI.git

			@@ -9,6 +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>

			<style type="text/css">
			input.layui-input.layui-unselect {
			padding-right: 0;
			@@ -56,10 +58,87 @@
			<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">éç½®</button>
			<div class="layui-colla-content">
			<div class="layui-inline">
			<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
			<!--èªå®ä¹è¿æ»¤-->
			<div class="layui-row" style="margin-top:5px">
			<div class="layui-inline">
			<span>å¶ä»æ¡ä»¶></span>
			<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;">
			<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; ">
			<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>
			@@ -67,11 +146,12 @@
			</div>

			<table class="" id="mainTable" lay-filter="mainTable"></table>


			<div class="layui-tab layui-tab-card">
			<ul class="layui-tab-title">
			<li class="layui-this">æ¥å¸¸è®°å½</li>
			<li>ç»´ä¿®è®°å½</li>
			<li>éä»¶æ´æ¢æ¸å</li>
			</ul>
			<div class="layui-tab-content">
			<div class="layui-tab-item layui-show">
			@@ -79,6 +159,9 @@
			</div>
			<div class="layui-tab-item">
			<table class="layui-hide" id="mainTable2" lay-filter="mainTable2"></table>
			</div>
			<div class="layui-tab-item">
			<table class="layui-hide" id="mainTable3" lay-filter="mainTable3"></table>
			</div>
			</div>
			</div>
			@@ -95,6 +178,9 @@
			{{d.LAY_TABLE_INDEX+1}}
			</script>
			<script type="text/html" id="xuhao1">
			{{d.LAY_TABLE_INDEX+1}}
			</script>
			<script type="text/html" id="xuhao2">
			{{d.LAY_TABLE_INDEX+1}}
			</script>

			@@ -116,7 +202,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.$
			, admin = layui.admin
			@@ -124,16 +210,20 @@
			, table = layui.table
			, table1 = layui.table
			, table2 = layui.table
			, table3 = layui.table
			, form = layui.form
			, element = layui.element
			, laypage = layui.laypage
			, laydate = layui.laydate
			, util = layui.util
			, soulTable = layui.soulTable

			//æ¥è¯¢æ¡ä»¶
			var sWhere = "";
			var option = [];
			var option1 = [];
			var option2 = [];
			var option3 = [];
			//#endregion


			@@ -177,6 +267,8 @@
			table1.render(option1);
			option2.data = data1.list[1];
			table2.render(option2);
			option3.data = data1.list[2];
			table3.render(option3);
			} else {
			layer.alert("è·åå¤±è´¥", { icon: 5 });
			}
			@@ -185,6 +277,27 @@
			}
			});
			});
			//#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


			//éç½®æé®
			form.on('submit(btnReSearch)', function (data) {
			@@ -206,6 +319,8 @@
			set_InitGrid1();
			//åå§åè¡¨æ ¼(åè¡¨2)
			set_InitGrid2();
			//åå§åè¡¨æ ¼(åè¡¨3)
			set_InitGrid3();
			//æ¥è¯¢
			get_Display(sWhere);
			}
			@@ -216,57 +331,61 @@
			, toolbar: '#toolbarDemo'
			, height: '400'
			, 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' }
			{ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡è¡'}
			, { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
			, { field: 'åæ®å·', title: 'åæ®å·' }
			, { field: 'æ¥æ', title: 'æ¥æ', templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'æ¡å½¢ç ', title: 'æ¡ç ç¼å·' }
			, { field: 'HMaterID', title: 'HMaterID', hide: true }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°' }
			, { field: 'è®¾å¤ç±»å', title: 'è®¾å¤åç±»' }
			, { field: 'è®¾å¤ä»£ç ', title: 'è®¾å¤ä»£ç ' }
			, { field: 'è®¾å¤ç¼ç ', title: 'è®¾å¤ç¼ç ' }
			, { field: 'è®¾å¤åç§°', title: 'è®¾å¤åç§°' }
			, { field: 'è®¾å¤è§æ ¼', title: 'è®¾å¤è§æ ¼' }
			, { field: 'è®¾å¤åå·', title: 'è®¾å¤åå·' }
			, { field: 'HUnitID', title: 'HUnitID', hide: true }
			, { field: 'åä½', title: 'åä½' }
			, { field: 'è®¾å¤åºåæ¥æ', title: 'è®¾å¤åºåæ¥æ', templet: "<div>{{d.è®¾å¤åºåæ¥æ ==null ?'':layui.util.toDateString(d.è®¾å¤åºåæ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'è®¾å¤åºåç¼å·', title: 'è®¾å¤åºåç¼å·' }
			, { field: 'HDeptID', title: 'HDeptID', hide: true }
			, { field: 'ä½¿ç¨é¨é¨', title: 'ä½¿ç¨é¨é¨' }
			, { field: 'HUseEmpID', title: 'HUseEmpID', hide: true }
			, { field: 'ä½¿ç¨è´è´£äºº', title: 'ä½¿ç¨è´è´£äºº' }
			, { field: 'HRepairEmpID', title: 'HRepairEmpID', hide: true }
			, { field: 'ç»´æ¤è´è´£äºº', title: 'ç»´æ¤è´è´£äºº' }
			, { 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>" }
			, { field: 'å½åç¶æ', title: 'å½åç¶æ' }
			, { field: 'HEquipFileTypeID', title: 'HEquipFileTypeID', hide: true }
			, { field: 'å·¥ç¨ç¼ç ', title: 'å·¥ç¨ç¼ç ' }
			, { field: 'äº§å', title: 'äº§å' }
			, { field: 'åç', title: 'åç' }
			, { field: 'HSellSupID', title: 'HSellSupID', hide: true }
			, { field: 'ä¾åºå', title: 'ä¾åºå' }
			, { field: 'HMakeSupID', title: 'HMakeSupID', hide: true }
			, { 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: 'hbilltype', title: 'hbilltype', hide: true }
			, { field: 'åæ®ç±»å', title: 'åæ®ç±»å' }
			, { field: 'HMoudType', title: 'HMoudType', hide: true }
			, { field: 'hsubid', title: 'hsubid', hide: 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: '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 }
			, { field: 'è®¾å¤åå·', title: 'è®¾å¤åå·', sort: true }
			, { field: 'HUnitID', title: 'HUnitID', hide: true, 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: 'HDeptID', title: 'HDeptID', hide: true, sort: true }
			, { field: 'ä½¿ç¨é¨é¨', title: 'ä½¿ç¨é¨é¨', sort: true }
			, { field: 'HUseEmpID', title: 'HUseEmpID', hide: true, sort: true }
			, { field: 'ä½¿ç¨è´è´£äºº', title: 'ä½¿ç¨è´è´£äºº', sort: true }
			, { field: 'HRepairEmpID', title: 'HRepairEmpID', hide: true, sort: true }
			, { field: 'ç»´æ¤è´è´£äºº', title: 'ç»´æ¤è´è´£äºº', sort: true }
			, { field: 'å®è£å°ç¹', title: 'å®è£å°ç¹', sort: true }
			, { field: 'å®è£æ¥æ', title: 'å®è£æ¥æ', templet: "<div>{{d.å®è£æ¥æ ==null ?'':layui.util.toDateString(d.å®è£æ¥æ, 'yyyy-MM-dd')}}</div>", sort: true }
			, { field: 'è¿è¡å¼å§æ¥æ', title: 'è¿è¡å¼å§æ¥æ', templet: "<div>{{d.è¿è¡å¼å§æ¥æ ==null ?'':layui.util.toDateString(d.è¿è¡å¼å§æ¥æ, 'yyyy-MM-dd')}}</div>", sort: true }
			, { field: 'å½åç¶æ', title: 'å½åç¶æ', sort: true }
			, { field: 'HEquipFileTypeID', title: 'HEquipFileTypeID', hide: true, sort: true }
			, { field: 'å·¥ç¨ç¼ç ', title: 'å·¥ç¨ç¼ç ', sort: true }
			, { field: 'äº§å', title: 'äº§å', sort: true }
			, { field: 'åç', title: 'åç', sort: true }
			, { field: 'HSellSupID', title: 'HSellSupID', hide: true, sort: true }
			, { field: 'ä¾åºå', title: 'ä¾åºå', sort: true }
			, { field: 'HMakeSupID', title: 'HMakeSupID', hide: true, sort: true }
			, { field: 'å¶é å', title: 'å¶é å', 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 }
			, { field: 'hbilltype', title: 'hbilltype', hide: true, sort: true }
			, { field: 'åæ®ç±»å', title: 'åæ®ç±»å', sort: true }
			, { field: 'HMoudType', title: 'HMoudType', hide: true, sort: true }
			, { field: 'hsubid', title: 'hsubid', hide: true, sort: true }
			]]
			}
			}
			@@ -278,6 +397,7 @@
			//, toolbar: '#toolbarDemo'
			, height: '350'
			, page: true
			, totalRow: true
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			@@ -312,6 +432,7 @@
			//, toolbar: '#toolbarDemo'
			, height: '350'
			, page: true
			, totalRow: true
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			@@ -338,6 +459,43 @@
			table2.render(option2);
			layer.close(ajaxLoad);
			}
			//åå§åè¡¨æ ¼(åè¡¨3)
			function set_InitGrid3() {
			var ajaxLoad = layer.load();
			option3 = {
			elem: '#mainTable3'
			//, toolbar: '#toolbarDemo'
			, height: '350'
			, page: true
			, totalRow: true
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			, cols: [[
			//{ type: 'checkbox', fixed: 'left' }
			, { templet: '#xuhao2', title: 'åºå·', sort: true, fixed: 'left', event: "qwe" }
			, { field: 'æ¥æ', title: 'æ¥æ', width: 200 }
			, { field: 'åæ®ç±»å', title: 'åæ®ç±»å', width: 200 }
			, { field: 'åæ®å·', title: 'åæ®å·', width: 200 }
			, { field: 'è®¾å¤åç±»', title: 'è®¾å¤åç±»', width: 200 }
			, { field: 'è®¾å¤æ¡ç ', title: 'è®¾å¤æ¡ç ', width: 200 }
			, { field: 'è®¾å¤ç¼ç ', title: 'è®¾å¤ç¼ç ', width: 200, hide: true }
			, { field: 'è®¾å¤åç§°', title: 'è®¾å¤åç§°', width: 200 }
			, { field: 'è®¾å¤è§æ ¼', title: 'è®¾å¤è§æ ¼', width: 200 }
			, { field: 'è®¾å¤åå·', title: 'è®¾å¤åå·', width: 200 }
			, { field: 'éä»¶ä»£ç ', title: 'éä»¶ä»£ç ', width: 200 }
			, { field: 'éä»¶åç§°', title: 'éä»¶åç§°', width: 200 }
			, { 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>" }

			]]
			};
			option3.data = [];
			table3.render(option3);
			layer.close(ajaxLoad);
			}
			//å è½½ç½æ ¼
			function get_Display(sWhere) {
			//è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
			@@ -350,6 +508,9 @@
			option.data = data1.data;
			table.render(option);
			layer.close(index);
			if ($("#ColName option").length < 1) {
			ColFilter();
			}
			} else {
			layer.close(index);
			layer.alert("æ²¡ææ°æ®è®°å½!", { icon: 5 });
			@@ -386,7 +547,83 @@
			var HBillNo = $("#HBillNo").val();//åæ®å·
			var HEquipType = $("#HEquipType").val();//å¶åäºº
			var BenginHCreateDate = $("#BenginHCreateDate").val();//å¼å§å¶åæ¶é´
			var EndHCreateDate = $("#EndHCreateDate").val();//ç»æå¶åæ¶é´
			var EndHCreateDate = $("#EndHCreateDate").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 = "" + Comparator2 + "'" + ColContent2 + "'";
			break;
			}
			sWhere += " and " + ColName2 + " " + com2;
			}

			if (HBillNo) {
			sWhere += " and åæ®å· like '%" + HBillNo + "%'";
			}
			@@ -409,11 +646,38 @@
			$("#HEquipType").val("");//è®¾å¤ç±»å
			$("#BenginHCreateDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//å¼å§æ¥æ
			$("#EndHCreateDate").val(Format(new Date(), "yyyy-MM-dd"));//ç»ææ¥æ
			$("#ColContent").val("");
			$("#ColName").val("0");
			$("#Comparator").val("0");
			$("#ColContent1").val("");
			$("#ColName1").val("0");
			$("#Comparator1").val("0");
			$("#ColContent2").val("");
			$("#ColName2").val("0");
			$("#Comparator2").val("0");
			form.render('select');

			sWhere = "";
			$("#btnSearch").click();
			}


			//#region ä»»æåæ®µè¿æ»¤ï¼ååæ¾ç¤ºä¸ææ¡
			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');
			}
			//#endregion
			//#endregion
			});