MES-WEB-LayUI.git

			@@ -15,9 +15,9 @@
			<script src="../../../layuiadmin/PubCustom.js"></script>
			<script src="../../../layuiadmin/soulTable.slim.js"></script>
			<script src="../../../layuiadmin/PageTitle.js"></script>
			<script src="../../../layuiadmin/HideButton.js"></script>
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>

			<script src="../../../layuiadmin/HideButton_New.js"></script>
			<script src="../../../layuiadmin/SetColumn.js"></script>

			</head>
			<body>
			@@ -220,22 +220,22 @@
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			<div id="page" style="position: relative; bottom: 0;"></div>
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<div class="layui-btn-container" id="toolbarDemo_ButtonSet">
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Add" lay-event="btn-Add"><i class="layui-icon layui-icon-form"></i>æ°å¢</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Edit" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Delete" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>å é¤</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Refresh" id="RefreshButton"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Audit" id="AuditButton"><i class="layui-icon layui-icon-radio"></i>å®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-DeAudit" id="DeAuditButton"><i class="layui-icon layui-icon-circle"></i>åå®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Close" id="btn-Close"><i class="layui-icon layui-icon-radio"></i>å³é</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-DeClose" id="btn-DeClose"><i class="layui-icon layui-icon-radio"></i>åå³é</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Drop" id="btn-Drop"><i class="layui-icon layui-icon-radio"></i>ä½åº</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-DeDrop" id="btn-DeDrop"><i class="layui-icon layui-icon-radio"></i>åä½åº</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Exit" id="ExitButton"><i class="layui-icon layui-icon-logout"></i>éåº</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_HideColumn" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>æé®è®¾ç½®</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>ä¿åæ¹æ¡</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>è¯»åæ¹æ¡</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Refresh" id="RefreshButton"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Exit" id="ExitButton"><i class="layui-icon layui-icon-logout"></i>éåº</button>
			</div>
			</script>
			</form>
			@@ -266,7 +266,8 @@
			var page = 1;//åé¡µæ°æ®
			var size = 50;
			var HModName = "QC_StockCheckBillList";

			var HBillType = "QC_StockCheckBillList";
			var set_HideButton_ID = "toolbarDemo_ButtonSet";//éè¦è®¾ç½®çæé®çç¶çº§èç¹çid
			//#region ãå¨æè·åæ¨¡ååç§°ã
			var HModuleType = "7519";
			//éè¿åæ®ç±»åï¼ä»æ°æ®åºå¨æè·ååæ®æ¨¡åå½å,å¼ç¨jsæä»¶ PageTitle.js
			@@ -276,7 +277,6 @@
			//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			var titleData = ["hmainid", "hentryid", "HEntryID", "HSourceID", "HMaterID", "HFirstCheckEmp", "HQCCheckItemID", "HUnitID", "HSampleSchemeID", "HInspectinstruMentlD", "HShiftslD", "æ£æµå¼åºç¡èµæ", "ç®æ å¼åºç¡èµæ", "sorderid"];

			var sql = " ";
			//#endregion

			//#region ãè¿æ»¤æ¹æ¡ã
			@@ -375,17 +375,7 @@
			else {
			layer.msg('è¯·éæ©ä¸è¡æ°æ®å é¤ï¼');
			}
			break;
			//åè®¾ç½®
			case 'set_HideColumn':
			get_HideColumn();
			break;
			//æé®è®¾ç½®
			case 'set_HideButton':
			var btns = document.getElementsByTagName("button"); //è·åæ¬é¡µæææé®å¯¹è±¡
			var HBillType = "7519";
			get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
			break;
			break;
			//å·æ°
			case 'get_Refresh': get_Refresh();
			break;
			@@ -415,6 +405,13 @@
			//åä½åºæé®
			case 'btn-DeDrop':
			set_DropBill(2);
			break;
			//åè®¾ç½®
			case 'set_HideColumn': get_HideColumn(HModName, sessionStorage["HUserName"], option, optionPage, get_FastQuery);
			break;
			//æé®è®¾ç½®
			case 'set_HideButton':
			get_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
			break;
			//ä¿åæ¹æ¡
			case 'set_SaveScheme': set_SaveScheme();
			@@ -461,6 +458,11 @@
			//#region éç½®æé®
			form.on('submit(btnReSearch)', function (data) {
			set_ClearQuery();
			if (page != 1) {
			$("#page a:eq(1)").get(0).click();//ç¹å»åé¡µæ ç¬¬ä¸é¡µ
			} else {
			get_FastQuery();
			}
			});
			//#endregion

			@@ -664,19 +666,16 @@
			soulTable.render(this);
			}
			};
			table.render(option);
			//åå§åè¡¨æ ¼
			DisPlay_HideColumn();
			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData)
			laypage.render(optionPage);
			ins = table.render(option);
			//å·æ°æé®æ¾ç¤º
			Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
			layer.close(ajaxLoad);

			ColFilter();

			if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
			}
			//å·æ°æé®æ¾ç¤º
			var btns = document.getElementsByTagName("button"); //è·åæ¬é¡µæææé®å¯¹è±¡
			var HBillType = "7505";
			Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);

			} else {
			layer.close(ajaxLoad);
			layer.msg(data1.code + data1.Message, { icon: 5 });
			@@ -741,10 +740,12 @@
			option.cols = [col];
			option.data = data1.data;
			option.totalRow = true;
			laypage.render(optionPage);
			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();

			DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData)
			laypage.render(optionPage);
			ins = table.render(option);
			//å·æ°æé®æ¾ç¤º
			Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
			layer.close(ajaxLoad);
			if ($("#ColName option").length < 1) {
			ColFilter();
			@@ -845,7 +846,7 @@
			com2 = "not like'%" + ColContent2 + "%'";
			break;
			default:
			com2 = "" + Comparator + "'" + ColContent + "'";
			com2 = "" + Comparator2 + "'" + ColContent2 + "'";
			break;
			}
			sWhere += " and " + ColName2 + " " + com2;
			@@ -1086,156 +1087,21 @@
			}
			//#endregion

			//#region éèåè®¾ç½®
			function get_HideColumn() {
			var colName = "";
			var contentUrl = "";
			for (var i = 1; i < option.cols[0].length; i++) {
			colName += option.cols[0][i]["title"] + ",";
			}
			var urlStr = window.document.location.pathname;//è·åæä»¶è·¯å¾
			var urlLen = urlStr.split('/');
			for (var i = 0; i < urlLen.length - 4; i++) {
			contentUrl += "../";
			}
			colName = encodeURI(colName.substring(0, colName.length - 1));//å¯¹ URI è¿è¡ç¼ç

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

			layer.open({
			type: 2
			, skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			, title: "éèåè®¾ç½®" //æ é¢
			, closeBtn: 1 //çªä½å³ä¸è§å³é ç æ ·å¼
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["50%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: [contentUrl, "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			layer.close(index);//å³éå¼¹çª
			}
			})
			}
			//#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", "HInspectinstruMentlD", "HShiftslD", "æ£æµå¼åºç¡èµæ", "ç®æ å¼åºç¡èµæ"];
			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 = "7505";
			Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			})
			}
			//#endregion

			//#region ä»»æåæ®µè¿æ»¤ï¼ååæ¾ç¤ºä¸ææ¡
			function ColFilter() {
			var HIsSelected = document.getElementById("ColName").selectedIndex;//éä¸ç´¢å¼
			var HSelectedVal = "";//éä¸å¼
			var Organization = "";
			if (HIsSelected == -1) {
			Organization = '<option value="0" selected="selected" ></option>';
			} else {
			HSelectedVal = $("#ColName").val();
			Organization = '<option style="color:blue;" value="' + HSelectedVal + '" selected="selected">' + HSelectedVal + '</option>';
			Organization += '<option value="0" ></option>';
			}

			var Organization = '<option value="0" selected="selected" ></option>';
			for (var i = 1; i < option.cols[0].length; i++) {
			if (option.cols[0][i].hide != true && option.cols[0][i].field != HSelectedVal) {
			if (option.cols[0][i].hide != true) {
			Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
			}
			}
			$("#ColName").empty();
			$("#ColName").append(Organization);
			$("#ColName1").empty();
			$("#ColName1").append(Organization);
			$("#ColName2").empty();
			$("#ColName2").append(Organization);
			$("#ColName").empty();
			$("#ColName").append(Organization);
			form.render('select');
			}
			//#endregion