MES-WEB-LayUI.git

			@@ -157,7 +157,7 @@
			</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">
			@@ -183,7 +183,7 @@
			<div class="layui-inline">
			<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
			</div>
			</div>-->
			</div>
			</div>
			</div>
			</div>
			@@ -375,209 +375,35 @@

			//åå§åè¡¨æ ¼
			function set_InitGrid() {
			var HBeginDate = $("#HBeginDate").val();//ä¸è¾¾æ¥æ å¼å§æ¥æ
			var HEndDate = $("#HEndDate").val();//ç»ææ¥æ
			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();

			//æ¼æ¥ä»»ä¸åæ®µè¿æ»¤æ¥è¯¢æ¡ä»¶
			var com = "";
			if (ColName != 0 && Comparator != 0) {
			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: 'çäº§ä»»å¡åæ°é', width: 160 }
			, { 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: 200 }
			, { field: 'ç½å¯åå¸', title: 'ç½å¯åå¸', width: 160, totalRow: true }
			, { field: 'æ¯å¦ååºå', title: 'æ¯å¦ååºå', width: 160 }
			]]
			, done: function (res) {
			}
			com = " 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;
			//}

			com = com + com1;

			//æ ¹æ®ç¨æ·è¿æ»¤ç¨æ·å³èå®¢æ·çè®°å½
			var OtherSearch = getSWhereByHUser();


			sWhere = {
			HBeginDate: HBeginDate
			, HEndDate: HEndDate
			, HMaterNumber: HMaterNumber
			, HBillNo: HBillNo
			, HProductName: HProductName
			, HProductModel: HProductModel
			, RandomSearch: com
			, OtherSearch: (OtherSearch == null \|\| OtherSearch == "undefine") ? " and 1=1 " : OtherSearch
			}

			sWhere = JSON.stringify(sWhere);


			//å¨æå-ç¼ååè¡¨
			$.ajax({
			url: GetWEBURL() + "/MaterOutSumReport/MaterOutSumReport_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) {
			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, titleData) > -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: 'çäº§ä»»å¡åæ°é', width: 160 }
			, { 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: 200 }
			, { field: 'ç½å¯åå¸', title: 'ç½å¯åå¸', width: 160, totalRow: true }
			, { field: 'æ¯å¦ååºå', title: 'æ¯å¦ååºå', width: 160 }
			]]
			, done: function (res) {
			}
			};
			ins = table.render(option);
			}
			},
			error: function (err) {
			layer.msg('éè¯¯' + err, {
			icon: 5,
			time: 20000
			}, function () {
			//do something
			});
			}
			})
			};
			}

			//åææ¾ç¤ºä¸ææ¡
			@@ -596,9 +422,9 @@
			$("#ColName1").append(Organization);
			form.render('select');

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


			@@ -607,6 +433,7 @@
			var wait = layer.load();//é®ç½©
			$.ajax({
			url: GetWEBURL() + '/MaterOutSumReport/MaterOutSumReport_Cloth',
			async:false,
			type: "GET",
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
			success: function (data1) {
			@@ -617,6 +444,40 @@
			data1.data[i].æ¥æ = data1.data[i]["æ¥æ"].split("T")[0];
			}
			}

			var totalArray = ["çäº§æ°é", "ç½å¯åå¸"];

			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' });
			for (var i = 0; i < data.length; i++) {
			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.cols = [col];
			option.data = data1.data;

			option.data = data1.data;
			//var num = 0;
			@@ -672,14 +533,12 @@
			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();

			//æ¼æ¥ä»»ä¸åæ®µè¿æ»¤æ¥è¯¢æ¡ä»¶
			var com = "";
			var com = "";
			if (ColName != 0 && Comparator != 0) {
			switch (Comparator) {
			case "7":
			@@ -698,10 +557,57 @@
			com = "" + Comparator + " ''" + ColContent + "''";
			break;
			}
			com = " and (" + ColName + " " + com + ")";
			com = " and ([" + ColName + "] " + com + ")";
			}
			var com1 = "";
			if (ColName1 != 0 && Comparator1 != 0) {

			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 + ")";
			}

			var com2 = "";
			if (ColName2 != 0 && Comparator2 != 0) {

			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;
			}
			//æ ¹æ®ç¨æ·è¿æ»¤ç¨æ·å³èå®¢æ·çè®°å½
			var OtherSearch = getSWhereByHUser();
			var OtherSearch = com + com1 + com2 + getSWhereByHUser();

			sWhere = {
			HBeginDate: HBeginDate
			@@ -735,10 +641,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 = "";
			}
			@@ -776,6 +682,7 @@
			ColFilter();
			$.ajax({
			url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
			async:false,
			type: "GET",
			data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
			success: function (data1) {