MES-WEB-LayUI.git

			@@ -147,7 +147,6 @@
			<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
			</div>
			</div>

			<div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			@@ -175,8 +174,7 @@
			<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
			</div>
			</div>

			<!--<div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
			<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">
			@@ -202,7 +200,7 @@
			<div class="layui-inline">
			<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
			</div>
			</div>-->
			</div>
			</div>
			</div>
			</div>
			@@ -358,222 +356,45 @@

			//åå§åè¡¨æ ¼
			function set_InitGrid() {
			var HBeginDate = Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1).setHours(7, 0, 0, 0), "yyyy-MM-dd hh") + ":00:00";//ä¸è¾¾æ¥æ å¼å§æ¥æ
			var HEndDate = Format(new Date(new Date()).setHours(7, 0, 0, 0), "yyyy-MM-dd hh") + ":00:00";//ç»ææ¥æ

			//var HBeginDate = $("#HBeginDate").val() + ":00:00" ;//ä¸è¾¾æ¥æ å¼å§æ¥æ
			//var HEndDate = $("#HEndDate").val()+":00:00";//ç»ææ¥æ
			var HMaterNumber = $("#HMaterNumber").val();//ç©æä»£ç
			var HBillNo = $("#HBillNo").val(); //åæ®å·
			var HProductName = $("#HProductName").val();//äº§ååç§°
			var HProductModel = $("#HProductModel").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;
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, cellMinWidth: 120
			, limit: Number.MAX_VALUE // æ°æ®è¡¨æ ¼é»è®¤å¨é¨æ¾ç¤º
			, totalRow: true
			, height: 'full-70'
			, cols: [[
			{ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' }
			, { field: 'æ¥æ', title: 'æ¥æ', width: 160 }
			, { field: 'ä»»å¡å', title: 'ä»»å¡å', width: 160 }
			, { field: 'å·¥åºæµè½¬å¡å·', title: 'å·¥åºæµè½¬å¡å·', width: 160 }
			, { field: 'äº§ååç§°', title: 'äº§ååç§°', width: 160 }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 160 }
			, { field: 'å½åå·¥åº', title: 'å½åå·¥åº', width: 160 }
			, { field: 'ä»»å¡æ°é', title: 'ä»»å¡æ°é', totalRow: true, width: 160 }
			, { field: 'å¶åäºº', title: 'å¶åäºº', width: 200 }
			, { field: 'æµè½¬å¡æ°é', title: 'æµè½¬å¡æ°é', width: 160, totalRow: true }
			]]
			, done: function (res) {
			//var count = 0;
			//var OnlyID = -1;
			//for (var i = 0; i < res.data.length; i++) {
			// if (res.data[i]["å¯ä¸ID"] != OnlyID) {
			// count += res.data[i]["æ´æ¹"];
			// OnlyID = res.data[i]["å¯ä¸ID"];
			// }
			//}
			//var divArr = $(".layui-table-total div.layui-table-cell");
			//$.each(divArr, function (index, item) {
			// var _div = $(item);
			// var content = _div.html();
			// if (index == 9) {
			// content = count;
			// }
			// _div.html(content);
			//});
			}
			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;
			// com1 = " 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;
			// }
			// // com2 = " and (" + ColName2 + " " + com2 + ")";
			// sWhere += " and " + ColName2 + " " + com2;
			//}



			sWhere = {
			HBeginDate: HBeginDate
			, HEndDate: HEndDate
			, HMaterNumber: HMaterNumber
			, HBillNo: HBillNo
			, HProductName: HProductName
			, HProductModel: HProductModel
			, RandomSearch: com
			}
			sWhere = JSON.stringify(sWhere);


			//å¨æå-ç¼ååè¡¨
			$.ajax({
			url: GetWEBURL() + "/MaterOutEntryReport/MaterOutEntryReport_Cloth",
			type: "GET",
			async: false,
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
			//async: false,
			success: function (data1) {

			if (data1.count == 1) {
			var totalArray = ["ä»»å¡æ°é","ç½å¯åå¸", "æµè½¬å¡æ°é"];
			var data = [];
			var col = [];
			//ç»ç©ºçæ°ç»èµå¼
			for (var key in data1.list) {
			var width = data1.list[key].width * 23;
			if (width < 150) {
			width = 150;
			} else if (width > 300) {
			width = 300;
			}
			data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType});
			}

			//å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
			col.push({ type: 'checkbox', fixed: 'left' });
			for (var i = 0; i < data.length; i++) {
			if ($.inArray(data[i].name, "") > -1) {
			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].ColName == 'ç½å¯åå¸') {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow:true });
			}
			else {
			switch (data[i].Type) {
			//int
			case 'DateTime':
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
			break;
			default:
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
			}
			}
			}
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, cellMinWidth: 120
			, limit: Number.MAX_VALUE // æ°æ®è¡¨æ ¼é»è®¤å¨é¨æ¾ç¤º
			, totalRow: true
			, height: 'full-70'
			, cols: [col]
			, data: data1.data
			};
			ins = table.render(option);
			} else {
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, cellMinWidth: 120
			, limit: Number.MAX_VALUE // æ°æ®è¡¨æ ¼é»è®¤å¨é¨æ¾ç¤º
			, totalRow: true
			, height: 'full-70'
			, cols: [[
			{ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' }
			, { field: 'æ¥æ', title: 'æ¥æ', width: 160 }
			, { field: 'ä»»å¡å', title: 'ä»»å¡å', width: 160 }
			, { field: 'å·¥åºæµè½¬å¡å·', title: 'å·¥åºæµè½¬å¡å·', width: 160 }
			, { field: 'äº§ååç§°', title: 'äº§ååç§°', width: 160 }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 160 }
			, { field: 'å½åå·¥åº', title: 'å½åå·¥åº', width: 160 }
			, { field: 'ä»»å¡æ°é', title: 'ä»»å¡æ°é', totalRow: true,width: 160 }
			, { field: 'å¶åäºº', title: 'å¶åäºº', width: 200 }
			, { field: 'æµè½¬å¡æ°é', title: 'æµè½¬å¡æ°é', width: 160, totalRow: true }
			]]
			, done: function (res) {
			//var count = 0;
			//var OnlyID = -1;
			//for (var i = 0; i < res.data.length; i++) {
			// if (res.data[i]["å¯ä¸ID"] != OnlyID) {
			// count += res.data[i]["æ´æ¹"];
			// OnlyID = res.data[i]["å¯ä¸ID"];
			// }
			//}
			//var divArr = $(".layui-table-total div.layui-table-cell");
			//$.each(divArr, function (index, item) {
			// var _div = $(item);
			// var content = _div.html();
			// if (index == 9) {
			// content = count;
			// }
			// _div.html(content);
			//});
			}
			};
			ins = table.render(option);
			}
			},
			error: function (err) {
			layer.msg('éè¯¯' + err, {
			icon: 5,
			time: 20000
			}, function () {
			//do something
			});
			}
			})
			};
			}

			//åææ¾ç¤ºä¸ææ¡
			@@ -586,14 +407,13 @@
			}
			$("#ColName").empty();
			$("#ColName").append(Organization);
			form.render('select');

			$("#ColName1").empty();
			$("#ColName1").append(Organization);

			$("#ColName2").empty();
			$("#ColName2").append(Organization);
			form.render('select');

			//$("#ColName2").empty();
			//$("#ColName2").append(Organization);
			//form.render('select');
			}


			@@ -606,6 +426,45 @@
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.count == 1) {
			var totalArray = ["ä»»å¡æ°é", "ç½å¯åå¸", "æµè½¬å¡æ°é"];
			var data = [];
			var col = [];
			//ç»ç©ºçæ°ç»èµå¼
			for (var key in data1.list) {
			var width = data1.list[key].width * 23;
			if (width < 150) {
			width = 150;
			} else if (width > 300) {
			width = 300;
			}
			data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
			}

			//å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
			col.push({ type: 'checkbox', fixed: 'left' });
			for (var i = 0; i < data.length; i++) {
			if ($.inArray(data[i].name, "") > -1) {
			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].ColName == 'ç½å¯åå¸') {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true });
			}
			else {
			switch (data[i].Type) {
			//int
			case 'DateTime':
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
			break;
			default:
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
			}
			}
			}


			//è°æ´æ¥ææ ¼å¼ï¼æ¾ç¤º å¹´ææ¥ å æ¶ å
			for (var i = 0; i < data1.data.length; i++) {
			if (data1.data[i].æ¥æ != null) {
			@@ -682,9 +541,9 @@
			var Comparator1 = $("#Comparator1").val()
			var ColContent1 = $("#ColContent1").val();

			//var ColName2 = $("#ColName2").val();//å¤éæ¡
			//var Comparator2 = $("#Comparator2").val()
			//var ColContent2 = $("#ColContent2").val();
			var ColName2 = $("#ColName2").val();//å¤éæ¡
			var Comparator2 = $("#Comparator2").val()
			var ColContent2 = $("#ColContent2").val();



			@@ -736,28 +595,28 @@
			coms += " and (" + ColName1 + " " + com1 + ")";
			}

			//if (ColName2 != 0 && Comparator2 != 0) {
			// ColName2 = "[" + ColName2 + "]";
			// 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;
			// }
			// coms += " and (" + ColName2 + " " + com2 + ")";
			//}
			if (ColName2 != 0 && Comparator2 != 0) {
			ColName2 = "[" + ColName2 + "]";
			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;
			}
			coms += " and (" + ColName2 + " " + com2 + ")";
			}

			var params = get_UrlVars();
			if (params[params[0]] != null && detailBar == 0) {
			@@ -825,10 +684,10 @@
			$("#ColName1").val("0");
			$("#Comparator1").val("0");

			//$("#ColContent2").val("");
			//$("#ColName2").val("0");
			//$("#Comparator2").val("0");
			//form.render()
			$("#ColContent2").val("");
			$("#ColName2").val("0");
			$("#Comparator2").val("0");
			form.render()
			ColFilter();
			sWhere = "";
			}