MES-WEB-LayUI.git

			@@ -31,28 +31,16 @@
			</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="HICMOBillNo" id="HICMOBillNo" value="">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 76px;">äº§åæ¡ç </label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HBardCode" id="HBardCode" value="">
			</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">
			<input type="text" class="layui-input" name="HBatchNo" id="HBatchNo" value="">
			</div>
			</div>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>
			<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
			<!--<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
			<div class="layui-row" style="margin-top:10px;margin-left:5%;">

			</div>
			@@ -138,13 +126,12 @@
			<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
			</div>
			</div>
			</div>
			</div>-->
			</div>
			</div>
			<div class="layui-tab layui-tab-card">
			<div class="layui-tab-content">
			<div class="layui-tab-item layui-show">
			<!--è¿åºç«è®°å½-->
			<table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
			</div>
			</div>
			@@ -221,9 +208,9 @@

			// åå§åçé¢
			function set_ClearBill() {
			set_InitGrid();

			//æ¥è¯¢
			//get_FastQuery();
			get_FastQuery();
			}

			function set_InitGrid() {
			@@ -255,7 +242,6 @@
			, { field: 'å¤æ³¨', title: 'å¤æ³¨', sort: true }
			]]
			};
			table.render(option);
			}

			// æ¥è¯¢
			@@ -263,62 +249,68 @@

			var ajaxLoad = layer.load();
			$.ajax({
			url: GetWEBURL() + '/Cj_SingleStation/EntryAndExitRecords',
			url: GetWEBURL() + '/LEMS/Sc_NutInspectionCCDPassRate',
			type: "GET",
			async: false,
			data: { "HBardCode": $("#HBardCode").val(), "HProcExchBillNo": $("#HProcExchBillNo").val(), "HICMOBillNo": $("#HICMOBillNo").val(), "sWhere": sWhere, "user": sessionStorage["HUserName"] },
			data: { "HBatchNo": $("#HBatchNo").val(), "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.count == 1) {
			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' });
			col.push({ type: 'numbers', title: 'åºå·' });
			for (var i = 0; i < data.length; i++) {
			// if (data[i].name == 'HInterID' \|\| data[i].name == 'HBillType' \|\| data[i].name == 'hmainid') {
			if ($.inArray(data[i].name, titleData) > -1) {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
			if (data1.list.length>0) {
			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 });
			}
			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 + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 180 });
			break;
			case 'long':
			case 'Int32':
			case 'Int64':
			case 'double':
			case 'Decimal':
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
			break;
			default:
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 150 });
			//å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
			col.push({ type: 'checkbox', fixed: 'left' });
			col.push({ type: 'numbers', title: 'åºå·' });
			for (var i = 0; i < data.length; i++) {
			// if (data[i].name == 'HInterID' \|\| data[i].name == 'HBillType' \|\| data[i].name == 'hmainid') {
			if ($.inArray(data[i].name, titleData) > -1) {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
			}
			else {
			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 + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
			break;
			case 'long':
			case 'Int32':
			case 'Int64':
			case 'double':
			case 'Decimal':
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
			break;
			default:
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 180 });
			}
			}
			}
			}

			//å¨ææ¾ç¤ºåå
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo1'
			, 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 = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo1'
			, 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);
			}
			}
			} else {
			set_InitGrid();
			}

			table.render(option);

			//å·æ°è¡¨æ ¼æ°æ®