MES-WEB-LayUI.git

			@@ -67,93 +67,34 @@
			<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-row" style="margin-top:10px;margin-left:5%;">

			</div>
			<div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator" id="Comparator" 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>
			<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="HBatchWork" id="HBatchWork" lay-verify="HBatchWork">
			<option value="">è¯·éæ©</option>
			<option value="1">éäº§</option>
			<option value="0">ééäº§</option>
			</select>
			</div>
			<div class="layui-inline">
			<input type="text" class="layui-input" 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>
			<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>
			<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>
			<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="HDivisionName" id="HDivisionName" class=" ForFilteringSchemes" lay-verify="HDivisionName">
			<!--å¨ææ¸²æç»ç»-->
			</select>
			</div>
			<div class="layui-inline">
			<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">
			@@ -165,6 +106,7 @@
			</div>
			<script type="text/html" id="toolbarDemo1">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>å¯¼åº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			</div>
			</script>
			@@ -194,7 +136,8 @@
			, soulTable = layui.soulTable
			var sWhere = "";
			var option = [];
			var HModName = "QC_QualityStatisticsDailyReport";
			var ins; //ç¨äºå¯¼åºexcel
			var HModName = "QC_MoistureContentDataLedger";
			var titleData = ["HInterID", "HEntryID", "HBadReasonID", "HSourceInterID", "HSourceEntryID"];//åè¡¨ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±

			//#endregion
			@@ -215,6 +158,9 @@
			switch (obj.event) {
			//åè®¾ç½®
			case 'set_HideColumn': get_HideColumn();
			break;
			//å¯¼åºæé®
			case 'btn_Export': btn_Export();
			break;
			};
			});
			@@ -243,7 +189,8 @@
			function set_ClearBill() {
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
			//set_InitGrid();
			Get_HProject(); //è·åé¡¹ç®å·
			GetGy_Division();//è·åäºä¸é¨
			//æ¥è¯¢
			get_FastQuery();
			}
			@@ -280,24 +227,20 @@
			columns.push({ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' });
			columns.push({ field: 'æ¥æ', title: 'æ¥æ', sort: true, width: 180});
			columns.push({ field: 'æºå°å·', title: 'æºå°å·', sort: true, width: 110 });
			columns.push({ field: 'åæ ·éé', title: 'åæ ·éé', sort: true, width: 110 });
			columns.push({ field: 'æµéç»æ', title: 'æµéç»æ', sort: true, totalRow: true, width: 110});
			columns.push({ field: 'å¤å®ç»æ', title: 'å¤å®ç»æ', sort: true, totalRow: true, width: 110});
			columns.push({ field: 'æ£æµäºº', title: 'æ£æµäºº', sort: true, totalRow: true, width: 110});
			columns.push({ field: 'å¤æ³¨', title: 'å¤æ³¨', sort: true, totalRow: true, width: 110});
			columns.push({ field: 'åæ ·éé', title: 'åæ ·éé', sort: true, totalRow: true, width: 110 });
			columns.push({ field: 'æµéç»æ', title: 'æµéç»æ', sort: true, width: 110});
			columns.push({ field: 'å¤å®ç»æ', title: 'å¤å®ç»æ', sort: true, width: 110});
			columns.push({ field: 'æ£æµäºº', title: 'æ£æµäºº', sort: true, width: 110});
			columns.push({ field: 'å¤æ³¨', title: 'å¤æ³¨', sort: true, width: 110});
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo1'
			, height: 'full-50'
			, page: true
			//, cellMinWidth: 'auto'
			, totalRow: true
			, limit: 500
			, data:[]
			, limits: [50, 500, 5000, 20000]
			//, done: function (res, curr, count) {
			// soulTable.render(this);
			//}
			, limits: [50, 500, 5000, 20000]
			, cols: [columns]
			};
			table.render(option);
			@@ -315,16 +258,58 @@
			success: function (data1) {
			if (data1.count == 1) {

			option.data=data1.data
			table.render(option);
			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 });
			}
			//å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
			col.push({ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡è¡' });
			for (var i = 0; i < data.length; i++) {
			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')}}</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: 140, totalRow: true });
			break;
			default:
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
			}
			}
			}

			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo1'
			, height: 'full-50'
			, page: true
			, totalRow: true
			, limit: 500
			, data: data1.data
			, limits: [50, 500, 5000, 20000]
			, cols: [col]
			};
			} else {
			set_InitGrid();
			option.data = data1.data
			}

			table.render(option);
			ins = table.render(option);
			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();

			//if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
			// ColFilter();
			//}

			layer.close(ajaxLoad);
			} else {
			layer.close(ajaxLoad);
			@@ -343,111 +328,93 @@
			var HEndDate = $("#HEndDate").val();
			var HResult = $("#HResult").val();
			var HSourceID = $("#HSourceID").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;
			}


			var HProject = $("#HProject").val();//é¡¹ç®å·
			var HBatchWork = $("#HBatchWork").val();//æ¯å¦éäº§
			var HDivisionName = $("#HDivisionName").val();//äºä¸é¨

			sWhere = {
			HBeginDate: HBeginDate
			,HEndDate: HEndDate
			, HResult: HResult
			, HSourceID: HSourceID
			, HProject: HProject
			, HBatchWork: HBatchWork
			, HDivisionName: HDivisionName
			}
			set_InitGrid();
			//set_InitGrid();
			get_Display(JSON.stringify(sWhere));
			sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			}

			function set_ClearQuery() {
			$("#HICMOBillNo").val("");
			$("#HBardCode").val("");
			$("#HProcExchBillNo").val("");
			$("#ColContent1").val("");
			$("#ColName1").val("0");
			$("#Comparator1").val("0");
			$("#ColContent2").val("");
			$("#ColName2").val("0");
			$("#Comparator2").val("0");
			$("#ColContent").val("");
			$("#ColName").val("0");
			$("#Comparator").val("0");
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
			$("#HResult").val("");
			$("#HSourceID").val("");
			$("#HProject").val("");
			$("#HBatchWork").val("");
			$("#HDivisionName").val("");
			form.render('select');

			sWhere = "";
			}

			//#region è·åé¡¹ç®å·
			function Get_HProject() {
			//è·åé¡¹ç®å·
			var HProjectList = '<option value="" 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 GetGy_Division() {
			//è·åäºä¸é¨
			var HDivisionList = '<option value="" style="color:red;" selected></option>';
			$.ajax({
			type: "get",
			url: GetWEBURL() + "/Gy_Material/Get_Gy_Division",
			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++) {
			HDivisionList += '<option style="color:blue;" value="' + data[i].HName + '" >' + data[i].HName + '</option>';
			}
			$("#HDivisionName").append(HDivisionList);
			form.render('select');

			}
			layer.closeAll("loading");
			}
			})
			}
			//#endregion

			//#region å¯¼åºExecel
			function btn_Export() {
			table.exportFile(ins.config.id, option.data, "xls");
			}
			//#endregion

			//éèåè®¾ç½®
			function get_HideColumn() {
			var colName = "";