MES-WEB-LayUI.git

			@@ -96,6 +96,14 @@
			<input type="text" class="layui-input ForFilteringSchemes" name="HName1" id="HName1">
			</div>
			</div>
			<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>
			</div>
			<div class="layui-row" style="margin-top:5px">
			<div class="layui-inline">
			@@ -399,7 +407,11 @@

			//#region æ¥è¯¢æé®
			form.on('submit(btnSearch)', function (data) {
			get_FastQuery();
			if ($("#HProject").val() == 0) {
			get_FastQuery();
			} else {
			get_FastQuery(2);
			}
			});
			//#endregion

			@@ -449,8 +461,8 @@
			$("#HDate2").val(Format(new Date(), "yyyy-MM-dd"));
			//åå§åè¡¨æ ¼
			set_InitGrid();
			//æ¥è¯¢
			get_Display(sWhere);
			//è·åé¡¹ç®å·
			Get_HProject();
			//æ¥è¯¢å½åç»å½ç¨æ·ææ²¡æå¨å½åæ¨¡åè®¾ç½®é»è®¤è¿æ»¤æ¹æ¡
			get_DefaultModule();

			@@ -590,9 +602,10 @@


			//#region å¿«éè¿æ»¤
			function get_FastQuery() {
			function get_FastQuery(number) {
			var sqlWhere = " and 1=1 ";
			var HBillNo = $("#HBillNo").val();//åæ®å·
			var HProject = $("#HProject").val();//é¡¹ç®å·
			var HNumber = $("#HNumber").val();//ç©æç¼ç
			var HName = $("#HName").val();//ç©æåç§°
			var HModel = $("#HModel").val();//è§æ ¼åå·
			@@ -701,6 +714,11 @@
			if (HDate2) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) <= '" + HDate2 + "'";
			}
			if (number == 2) {
			if (HProject) {
			sqlWhere += " and é¡¹ç®å· like '%" + HProject + "%'";
			}
			}
			get_Display(sqlWhere);
			}
			//#endregion
			@@ -713,7 +731,7 @@
			$("#HBillNo").val("");
			$("#HProNumber").val("");
			$("#HName").val("");

			$("#HProject").val("");
			$("#HNumber").val("");
			$("#HModel").val("");
			$("#HName1").val("");
			@@ -947,7 +965,7 @@
			var colName = "";
			var contentUrl = "";
			for (var i = 1; i < option.cols[0].length; i++) {
			colName += option.cols[0][i]["title"] + ",";
			colName += option.cols[0][i]["field"] + ",";
			}
			var urlStr = window.document.location.pathname;//è·åæä»¶è·¯å¾
			var urlLen = urlStr.split('/');
			@@ -956,7 +974,7 @@
			}
			colName = encodeURI(colName.substring(0, colName.length - 1));//å¯¹ URI è¿è¡ç¼ç

			contentUrl += 'åºç¡èµæ/éèåè®¾ç½®/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
			contentUrl += 'åºç¡èµæ/éèåè®¾ç½®/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName;

			layer.open({
			type: 2
			@@ -978,85 +996,190 @@
			}
			//#endregion
			//#region æ¾ç¤ºåæ°æ®
			//function DisPlay_HideColumn() {
			// $.ajax({
			// url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
			// type: "GET",
			// data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
			// success: function (data1) {
			// if (data1.data.length != 0) {

			// var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
			// //var titleData = ["åæ®ID", "HMouldID", "hsubid", "HManagerID", "æºåä¸»åç ", "æºåååç "];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			// //ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			// var titleData = ["hmainid", "hentryid", "HEntryID", "HSourceID", "HMaterID", "HFirstCheckEmp", "HQCCheckItemID", "HUnitID", "HSampleSchemeID"];
			// dataCol = data1.data[0].HGridString.split(',');

			// for (var i = 0; i < option.cols[0].length - 1; i++) {
			// if (dataCol[i]) {
			// var dataCols = dataCol[i].split('\|');
			// }
			// //éèå
			// if (dataCols[1] == 1) {
			// option.cols[0][i + 1]["hide"] = true;
			// }
			// //è®¾ç½®åå®½
			// if (dataCols[3] > 0) {
			// option.cols[0][i + 1]["width"] = dataCols[3];
			// }
			// //è®¾ç½®åå®¹åä½å¤§å°
			// if (data1.data[0].HFontSize != 0) {
			// option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
			// } else {
			// option.cols[0][i + 1]["style"] = "font-size:100%";
			// }
			// //è®¾ç½®åå®½
			// //if (data1.data[0].HColumnWidth != 0) {
			// // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
			// //} else {
			// // option.cols[0][i + 1]["width"] = "";
			// //}
			// //æ¾ç¤ºå
			// if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
			// option.cols[0][i + 1]["hide"] = false;
			// }
			// //åä½æå¨ä½ç½®(å·¦ å±ä¸ å³)
			// switch (dataCols[2]) {
			// case "L":
			// option.cols[0][i + 1]["align"] = "left";
			// break;
			// case "M":
			// option.cols[0][i + 1]["align"] = "center";
			// break;
			// case "R":
			// option.cols[0][i + 1]["align"] = "right";
			// break;
			// }
			// }

			// //åæ¶å»ç»å
			// for (var i = 1; i < option.cols[0].length - 1; i++) {
			// if (option.cols[0][i]["fixed"] != null) {
			// option.cols[0][i]["fixed"] = null;
			// }
			// else {
			// break;
			// }
			// }
			// //å»ç»å
			// if (data1.data[0].HFixCols != 0) {
			// for (var i = 0; i < data1.data[0].HFixCols; i++) {
			// if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
			// data1.data[0].HFixCols += 1;
			// }
			// option.cols[0][i + 1]["fixed"] = "left";
			// }
			// }
			// table.render(option);
			// } else {
			// table.render(option);
			// }

			// //å·æ°æé®æ¾ç¤º
			// var btns = document.getElementsByTagName("button"); //è·åæ¬é¡µæææé®å¯¹è±¡
			// var HBillType = "7507";
			// Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
			// }, error: function () {
			// layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			// }
			// })
			//}
			//#endregion

			//#region æ¾ç¤ºåæ°æ®
			function DisPlay_HideColumn() {
			$.ajax({
			url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
			type: "GET",
			async: false,
			data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.data.length != 0) {

			var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
			//var titleData = ["åæ®ID", "HMouldID", "hsubid", "HManagerID", "æºåä¸»åç ", "æºåååç "];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			var titleData = ["hmainid", "hentryid", "HEntryID", "HSourceID", "HMaterID", "HFirstCheckEmp", "HQCCheckItemID", "HUnitID", "HSampleSchemeID"];
			var newCols = [[]];//å¯¹åºæ°æ®åºåé¡ºåºcol
			newCols[0].push(option.cols[0][0]);//æ¾å¥ç¬¬ä¸ä¸ªcheckbox
			dataCol = data1.data[0].HGridString.split(',');

			for (var i = 0; i < option.cols[0].length - 1; i++) {
			if (dataCol[i]) {
			var dataCols = dataCol[i].split('\|');
			}
			//éèå
			if (dataCols[1] == 1) {
			option.cols[0][i + 1]["hide"] = true;
			}
			//è®¾ç½®åå®½
			if (dataCols[3] > 0) {
			option.cols[0][i + 1]["width"] = dataCols[3];
			}
			//è®¾ç½®åå®¹åä½å¤§å°
			if (data1.data[0].HFontSize != 0) {
			option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
			} else {
			option.cols[0][i + 1]["style"] = "font-size:100%";
			}
			//è®¾ç½®åå®½
			//if (data1.data[0].HColumnWidth != 0) {
			// option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
			//} else {
			// option.cols[0][i + 1]["width"] = "";
			//}
			//æ¾ç¤ºå
			if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
			option.cols[0][i + 1]["hide"] = false;
			}
			//åä½æå¨ä½ç½®(å·¦ å±ä¸ å³)
			switch (dataCols[2]) {
			case "L":
			option.cols[0][i + 1]["align"] = "left";
			break;
			case "M":
			option.cols[0][i + 1]["align"] = "center";
			break;
			case "R":
			option.cols[0][i + 1]["align"] = "right";
			break;
			}
			}

			//åæ¶å»ç»å
			for (var i = 1; i < option.cols[0].length - 1; i++) {
			if (option.cols[0][i]["fixed"] != null) {
			option.cols[0][i]["fixed"] = null;
			}
			else {
			break;
			}
			}
			//å»ç»å
			if (data1.data[0].HFixCols != 0) {
			for (var i = 0; i < data1.data[0].HFixCols; i++) {
			if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
			data1.data[0].HFixCols += 1;
			//åè®¾ç½®åæ°ä¸é¡µé¢åæ°æ¯å¦ä¸è´
			if (dataCol.length == option.cols[0].length - 1) {
			//éåå¯»æ¾åè®¾ç½®å¯¹åºåæé¡ºåºæå¥
			for (var j = 0; j < option.cols[0].length - 1; j++) {
			for (var i = 0; i < option.cols[0].length - 1; i++) {
			var dataCols = dataCol[j].split('\|');
			//éæ©ä¸datacolsç¸åºåè¿è¡ä¿®æ¹
			if (option.cols[0][i + 1]["field"] == dataCols[5]) {
			//éèå
			if (dataCols[1] == 1) {
			option.cols[0][i + 1]["hide"] = true;
			}
			//è®¾ç½®åå®½
			if (dataCols[3] > 0) {
			option.cols[0][i + 1]["width"] = dataCols[3];
			}
			//è®¾ç½®åå®¹åä½å¤§å°
			if (data1.data[0].HFontSize != 0) {
			option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
			} else {
			option.cols[0][i + 1]["style"] = "font-size:100%";
			}
			//æ¾ç¤ºå
			if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
			option.cols[0][i + 1]["hide"] = false;
			}
			//ç»è®¡å
			if (dataCols[6] == 1) {
			option.cols[0][i + 1]["totalRow"] = true;
			}
			//åä½æå¨ä½ç½®(å·¦ å±ä¸ å³)
			switch (dataCols[2]) {
			case "L":
			option.cols[0][i + 1]["align"] = "left";
			break;
			case "M":
			option.cols[0][i + 1]["align"] = "center";
			break;
			case "R":
			option.cols[0][i + 1]["align"] = "right";
			break;
			}
			//è®¾ç½®è¡¨æ ¼titleå±æ§æ¾ç¤ºå«å
			if (dataCols[4] != null && dataCols[4] != "") {
			option.cols[0][i + 1]["title"] = dataCols[4];
			}
			newCols[0].push(option.cols[0][i + 1]);
			}
			}
			option.cols[0][i + 1]["fixed"] = "left";
			}
			//éåå¾ªç¯åå¤æå¯¹åºåæ°æ¯å¦ä¸è´
			if (dataCol.length == newCols[0].length - 1) {
			option.cols = newCols;
			//åæ¶å»ç»å
			for (var i = 1; i < option.cols[0].length - 1; i++) {
			if (option.cols[0][i]["fixed"] != null) {
			option.cols[0][i]["fixed"] = null;
			}
			else {
			break;
			}
			}
			//å»ç»å
			if (data1.data[0].HFixCols != 0) {
			for (var i = 0; i < data1.data[0].HFixCols; i++) {
			if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
			data1.data[0].HFixCols += 1;
			}
			option.cols[0][i + 1]["fixed"] = "left";
			}
			}
			}
			}
			table.render(option);

			} else {
			table.render(option);

			}

			//å·æ°æé®æ¾ç¤º
			var btns = document.getElementsByTagName("button"); //è·åæ¬é¡µæææé®å¯¹è±¡
			var HBillType = "7507";
			@@ -1067,6 +1190,7 @@
			})
			}
			//#endregion


			//#region ä»»æåæ®µè¿æ»¤ï¼ååæ¾ç¤ºä¸ææ¡
			function ColFilter() {
			@@ -1083,7 +1207,7 @@

			for (var i = 1; i < option.cols[0].length; i++) {
			if (option.cols[0][i].hide != true && option.cols[0][i].field != HSelectedVal) {
			Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
			Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].title + '</option>';
			}
			}
			$("#ColName1").empty();
			@@ -1123,6 +1247,31 @@
			vars[hash[0]] = hash[1];
			}
			return vars;
			}
			//#endregion

			//#region è·åé¡¹ç®å·
			function Get_HProject() {
			//è·åé¡¹ç®å·
			var HProjectList = '<option value="0" 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

			@@ -1169,7 +1318,7 @@
			document.getElementById("HFilterScheme_Now").style.display = "none";
			//æ§è¡æ¥è¯¢æ¹æ³
			//æ¥è¯¢
			//get_FastQuery();
			get_FastQuery();

			form.render("select");
			}