MES-WEB-LayUI.git

			@@ -98,7 +98,7 @@
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>å®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>

			<button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>éèåè®¾ç½®</button>
			</div>
			</script>
			</form>
			@@ -136,6 +136,7 @@
			//æ¥è¯¢æ¡ä»¶
			var sWhere = "";
			var option = [];
			var HModName = "Sc_MESBeginStepWorkBill";
			//#endregion

			//#region è¿å¥é¡µé¢å³å è½½
			@@ -171,6 +172,10 @@
			//éåº
			case 'get_Exit': Pub_Close(2);
			break;
			//éèåè®¾ç½®
			case 'HideColumn':
			get_HideColumn();
			break;
			};
			});

			@@ -196,7 +201,7 @@
			$.ajax({
			url: GetWEBURL() + '/Sc_MESBeginStepWorkBill/GetMESBeginStepWorkBill',
			type: "GET",
			data: { "sWhere": sWhere },
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.count == 1) {
			option.data = data1.data;
			@@ -240,6 +245,7 @@
			set_InitGrid();
			//æ¥è¯¢
			get_Display();
			DisPlay_HideColumn();

			}

			@@ -248,23 +254,89 @@
			function set_InitGrid() {
			$("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
			$("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
			option = {
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, height: 'full-50'
			, page: true
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			, cols: [[
			{ type: 'checkbox', fixed: 'left' }
			, { field: 'hmainid', title: 'åæ®ID', hide: true }
			, { field: 'æ¥æ', title: 'æ¥æ', width: 160, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'åæ®å·', title: 'åæ®å·', width: 160 }
			, { field: 'åæ®ç±»å', title: 'åæ®ç±»å', width: 160 }
			, { field: 'HBillStatus', title: 'åæ®ç¶æ', width: 160 }
			, {
			field: 'åæ®ç±»å', title: 'åæ®ç±»å', width: 160, templet: function (d) {
			if (d.åæ®ç±»å == "3787") {
			return "å¼çå";
			}
			}
			}
			, {
			field: 'HBillStatus', title: 'åæ®ç¶æ', width: 160, templet: function (d) {
			switch (d.HBillStatus) {
			case 0:
			return "åå»º"
			break;
			case 1:
			return "æªå®¡"
			break;
			case 2:
			return "å·²å®¡"
			break;
			case 3:
			return "å³é"
			break;
			case 4:
			return "ä½åº"
			break;
			case 5:
			return "å®¡æ ¸éå"
			break;
			case 6:
			return "å®¡æ ¸ä¸"
			break;
			case 7:
			return "å·²é"
			break;
			case 8:
			return "å·²åå¤"
			break;
			case 9:
			return "ç»æ¡"
			break;
			case 10:
			return "éªè¯"
			break;
			case 11:
			return "ä¸è¾¾"
			break;
			case 12:
			return "å¼å·¥"
			break;
			case 13:
			return "ç³è¯·å®¡æ¹"
			break;
			case 15:
			return "ç³è¯·æ£éª"
			break;
			case 16:
			return "å¤å®åæ ¼"
			break;
			case 17:
			return "å¤å®ä¸åæ ¼"
			break;
			default:
			return d.HBillStatus
			}
			}
			}
			, { field: 'äº§åä»£ç ', title: 'äº§åä»£ç ', width: 160 }
			, { field: 'äº§ååç§°', title: 'äº§ååç§°', width: 160 }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 160 }
			, { field: 'HProcID', title: 'HProcID', width: 160, hide: true}
			, { field: 'HProcID', title: 'HProcID', width: 160, hide: true }
			, { field: 'å·¥åºä»£ç ', title: 'å·¥åºä»£ç ', width: 160 }
			, { field: 'å·¥åºåç§°', title: 'å·¥åºåç§°', width: 160 }
			, { field: 'é¨é¨ä»£ç ', title: 'é¨é¨ä»£ç ', width: 115 }
			@@ -305,7 +377,7 @@
			$.ajax({
			url: GetWEBURL() + '/Sc_MESBeginStepWorkBill/GetMESBeginStepWorkBill',
			type: "GET",
			data: { "sWhere": sWhere },
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.count == 1) {
			option.data = data1.data;
			@@ -504,7 +576,108 @@

			}

			//éèåè®¾ç½®
			function get_HideColumn() {
			var colName = "";
			for (var i = 1; i < option.cols[0].length - 1; i++) {
			colName += option.cols[0][i]["title"] + ",";
			}

			colName = encodeURI(colName.substring(0, colName.length - 1));//å¯¹ URI è¿è¡ç¼ç
			layer.open({
			type: 2
			, skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			, title: "éèåè®¾ç½®" //æ é¢
			, closeBtn: 1 //çªä½å³ä¸è§å³é ç æ ·å¼
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["50%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ['../../../åºç¡èµæ/éèåè®¾ç½®/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			layer.close(index);//å³éå¼¹çª
			}
			})
			}

			//æ¾ç¤ºåæ°æ®
			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 = ["hmainid","HProcID"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±

			dataCol = data1.data[0].HGridString.split(',');

			for (var i = 0; i < option.cols[0].length - 2; i++) {
			var dataCols = dataCol[i].split('\|');
			//éèå
			if (dataCols[1] == 1) {
			option.cols[0][i + 1]["hide"] = true;
			}
			//è®¾ç½®åå®¹åä½å¤§å°
			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[3] > 0) {
			option.cols[0][i + 1]["width"] = dataCols[3];
			}
			//æ¾ç¤ºå
			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);
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			})
			}
			//#endregion

			//ä»¥ä¸æ¯layuiæ¨¡å