MES-WEB-LayUI.git

			@@ -15,6 +15,7 @@
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/PubCustom.js"></script>
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
			<script src="../../../layuiadmin/HideButton.js"></script>

			</head>
			<body>
			@@ -141,6 +142,7 @@
			<label class="layui-form-label">å®æç¶æ</label>
			<div class="layui-input-block" style="width:190px;">
			<select name="HFinishStatus" lay-filter="HFinishStatus">
			<option value="" selected>å¨é¨</option>
			<option value="æªå®æ" selected>æªå®æ</option>
			<option value="å·²å®æ">å·²å®æ</option>
			</select>
			@@ -152,17 +154,19 @@
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>é¢è§</button>-->
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-fp"><i class="layui-icon layui-icon-tips"></i>åé</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-fb"><i class="layui-icon layui-icon-tips"></i>åå¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back"><i class="layui-icon layui-icon-close-fill"></i>æ¤é</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-yxj"><i class="layui-icon layui-icon-tips"></i>ä¼åçº§</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh"></i>å·æ°</button>
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>ç¡®è®¤</button>
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData" id="getCheckData"><i class="layui-icon layui-icon-tips"></i>é¢è§</button>-->
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-fp" id="fp"><i class="layui-icon layui-icon-tips"></i>åé</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-fb" id="fb"><i class="layui-icon layui-icon-tips"></i>åå¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="back"><i class="layui-icon layui-icon-close-fill"></i>æ¤é</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-yxj" id="yxj"><i class="layui-icon layui-icon-tips"></i>ä¼åçº§</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="Refresh"><i class="layui-icon layui-icon-refresh"></i>å·æ°</button>
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm" id="HideButton"><i class="layui-icon layui-icon-ok-circle"></i>ç¡®è®¤</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>é©³å</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>è¯¦æ</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>çæéè´§å</button>-->
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-return"></i>éåº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details" id="details"><i class="layui-icon layui-icon-form"></i>è¯¦æ</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate" id="generate"><i class="layui-icon layui-icon-file"></i>çæéè´§å</button>-->
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>æé®è®¾ç½®</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="Exit"><i class="layui-icon layui-icon-return"></i>éåº</button>
			<!--<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">éæ°åæ¥</button>-->

			</div>
			@@ -192,6 +196,7 @@
			var sWhere = "";
			var option = [];
			var Name = "MouldProdInHouseCellWidth";
			var HModName = "WW_EntrustOrderBillList";
			//#endregion

			//#region è¿å¥é¡µé¢æ¢å è½½
			@@ -235,6 +240,15 @@
			case 'btn-yxj': set_Yxj();
			break;
			case 'btn-back': set_Back();
			break;
			//åè®¾ç½®
			case 'set_HideColumn': get_HideColumn();
			break;
			//æé®è®¾ç½®
			case 'set_HideButton':
			var btns = document.getElementsByTagName("button"); //è·åæ¬é¡µæææé®å¯¹è±¡
			var HBillType = "1601";
			get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
			break;
			};
			});
			@@ -297,6 +311,8 @@
			get_FastQuery(table, option)
			//å è½½ä¸å¡å
			get_HEmpName();
			//éèå¾éåæ®µ
			DisPlay_HideColumn();
			}
			//åå§åè¡¨æ ¼
			function set_InitGrid() {
			@@ -330,33 +346,33 @@
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 100 }
			, { field: 'æ¹å·', title: 'æ¹å·', width: 100 }
			, { field: 'æºååå·', title: 'æºååå·', width: 100 }
			, { field: 'ä¾åºåä»£ç ', title: 'ä¾åºåä»£ç ', width: 120, hide: true}
			, { field: 'ä¸å¡åä»£ç ', title: 'ä¸å¡åä»£ç ', width: 100, hide: true }
			, { field: 'HPriority', title: 'HPriority', width: 100, hide: true }
			//, { field: 'ä¾åºåä»£ç ', title: 'ä¾åºåä»£ç ', width: 120, hide: true}
			//, { field: 'ä¸å¡åä»£ç ', title: 'ä¸å¡åä»£ç ', width: 100, hide: true }
			//, { field: 'HPriority', title: 'HPriority', width: 100, hide: true }
			, { field: 'ä¼åçº§', title: 'ä¼åçº§', width: 100 }
			, { field: 'äº¤è´§å°ç¹', title: 'äº¤è´§å°ç¹', width: 100 }
			, { field: 'HPSStyleID', title: 'HPSStyleID', hide: true }
			//, { field: 'HPSStyleID', title: 'HPSStyleID', hide: true }
			, { field: 'éè´æ¹å¼ä»£ç ', title: 'éè´æ¹å¼ä»£ç ', width: 120 }
			, { field: 'éè´æ¹å¼', title: 'éè´æ¹å¼', width: 100 }
			, { field: 'HSSID', title: 'HSSID', hide: true }
			//, { field: 'HSSID', title: 'HSSID', hide: true }
			, { field: 'ç»ç®æ¹å¼ä»£ç ', title: 'ç»ç®æ¹å¼ä»£ç ', width: 120 }
			, { field: 'ç»ç®æ¹å¼', title: 'ç»ç®æ¹å¼', width: 100 }
			, { field: 'ç»ç®æ¥æ', title: 'ç»ç®æ¥æ', width: 120, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.ç»ç®æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'HCurID', title: 'HCurID', hide: true }
			//, { field: 'HCurID', title: 'HCurID', hide: true }
			, { field: 'å¸å«ä»£ç ', title: 'å¸å«ä»£ç ', width: 100 }
			, { field: 'å¸å«', title: 'å¸å«', width: 100 }
			, { field: 'æ±ç', title: 'æ±ç', width: 100 }
			, { field: 'HDeptID', title: 'HDeptID', hide: true }
			//, { field: 'HDeptID', title: 'HDeptID', hide: true }
			, { field: 'é¨é¨ä»£ç ', title: 'é¨é¨ä»£ç ', width: 100 }
			, { field: 'é¨é¨', title: 'é¨é¨', width: 100 }
			, { field: 'HManagerID', title: 'HManagerID', hide: true }
			//, { field: 'HManagerID', title: 'HManagerID', hide: true }
			, { field: 'ä¸»ç®¡ä»£ç ', title: 'ä¸»ç®¡ä»£ç ', width: 100 }
			, { field: 'ä¸»ç®¡', title: 'ä¸»ç®¡', width: 100 }
			, { field: 'HEmpID', title: 'HEmpID', hide: true }
			//, { field: 'HEmpID', title: 'HEmpID', hide: true }
			, { field: 'æè¦', title: 'æè¦', width: 100 }
			, { field: 'è¡¨å¤´å¤æ³¨', title: 'è¡¨å¤´å¤æ³¨', width: 100 }
			, { field: 'hsubid', title: 'hsubid', hide: true }
			, { field: 'HMaterID', title: 'HMaterID', hide: true }
			//, { field: 'hsubid', title: 'hsubid', hide: true }
			//, { field: 'HMaterID', title: 'HMaterID', hide: true }
			, { field: 'åä»·', title: 'åä»·', width: 100 }
			, { field: 'éé¢', title: 'éé¢', width: 100 }
			, { field: 'ç¨ç', title: 'ç¨ç', width: 100 }
			@@ -426,6 +442,12 @@
			DataList = data1.data;
			option.data = data1.data;
			table.render(option);

			//å·æ°æé®æ¾ç¤º
			var btns = document.getElementsByTagName("button"); //è·åæ¬é¡µæææé®å¯¹è±¡
			var HBillType = "1601";
			Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);

			layer.close(wait);
			} else {
			layer.close(wait);
			@@ -1102,6 +1124,129 @@
			}
			})
			}

			//éèåè®¾ç½®
			function get_HideColumn() {
			var colName = "";
			var contentUrl = "";
			for (var i = 1; i < option.cols[0].length - 1; 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);//å³éå¼¹çª
			}
			})
			}

			//æ¾ç¤ºåæ°æ®
			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", "HBillType", "HSupID", "ä¸å¡ç¶æ", "HUnitID", "ä¾åºåä»£ç ", "ä¸å¡åä»£ç ", "HPriority", "HPSStyleID", "HSSID", "HCurID", "HDeptID", "HManagerID", "HEmpID", "hsubid","HMaterID"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±

			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 (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 = "1601";
			Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);

			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			})
			}
			//ä»¥ä¸æ¯layuiæ¨¡å
			});
			</script>