MES-WEB-LayUI.git

			@@ -9,9 +9,10 @@
			<link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
			<link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
			<script src="../../layuiadmin/layui/layui.js"></script>
			<script src="../../layuiadmin/HideButton.js"></script>
			<script src="../../layuiadmin/soulTable.slim.js"></script>
			<script src="../../layuiadmin/PageTitle.js"></script>
			<script src="../../../layuiadmin/SetColumn.js"></script>
			<script src="../../../layuiadmin/HideButton_New.js"></script>

			<style type="text/css">
			input.layui-input.layui-unselect {
			@@ -45,15 +46,22 @@
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">æ¥æé´é</label>
			<div class="layui-input-block">
			<select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">å¼å§æ¶é´</label>
			<div class="layui-input-block">
			<input type="date" class="layui-input ForFilteringSchemes" name="BenginHCreateDate" id="BenginHCreateDate">
			<input type="date" class="layui-input ForFilteringSchemes" name="HBeginDate" id="HBeginDate">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ç»ææ¶é´</label>
			<div class="layui-input-block">
			<input type="date" class="layui-input ForFilteringSchemes" name="EndHCreateDate" id="EndHCreateDate">
			<input type="date" class="layui-input ForFilteringSchemes" name="HEndDate" id="HEndDate">
			</div>
			</div>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
			@@ -175,7 +183,7 @@
			</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" lay-event="btn-Add" id="Add"><i class="layui-icon layui-icon-add-1"></i>æ°å¢</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="Edit"><i class="layui-icon layui-icon-edit"></i>ç¼è¾</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="Delete"><i class="layui-icon layui-icon-delete"></i>å é¤</button>
			@@ -241,11 +249,14 @@
			var option2 = [];
			var HModName = "Sb_EquipMaintainBillList";

			var HBillType = "3901";
			var set_HideButton_ID = "toolbarDemo_ButtonSet";//éè¦è®¾ç½®çæé®çç¶çº§èç¹çid

			//#region ãå¨æè·åæ¨¡ååç§°ã
			var HModuleType = "3901";
			//éè¿åæ®ç±»åï¼ä»æ°æ®åºå¨æè·ååæ®æ¨¡åå½å,å¼ç¨jsæä»¶ PageTitle.js
			var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
			//#endregion
			//#endregion

			var titleData = ["hmainid", "åæ®ç±»å", "è¡¨å¤´å¤æ³¨", "éä»¶ä»£ç ", "hsubid", "è¡å³éäºº", "è¡¨ä½å¤æ³¨", "ä½åºæ¥æ", "æºåä¸»åç ", "æºåååç ", "HEquipID", "åé¨åæ®å·", "HMaterID", "åä½ID", "è´è´£äººID", "HBillType", "sorderid"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			//#region ãè¿æ»¤æ¹æ¡ã
			@@ -299,18 +310,14 @@
			break;
			//æé®è®¾ç½®
			case 'set_HideButton':
			var btns = document.getElementsByTagName("button"); //è·åæ¬é¡µæææé®å¯¹è±¡
			var HBillType = "3901";
			get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
			get_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
			break;

			//éåº
			case 'get_Exit':
			Pub_Close(2);
			break;
			//åè®¾ç½®
			case 'set_HideColumn':
			get_HideColumn();
			case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
			break;
			//å®¡æ ¸
			case 'set_CheckBill': set_CheckBill(1);
			@@ -346,13 +353,42 @@
			}

			});
			//æ¥æé´éä¸æåè¡¨çå¬
			form.on('select(HInitTimeCycle)', function (data) {
			var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
			//è¥æ¥æé´éä¸ä¸º ä»»æé´éï¼åç¦ç¨å¼å§æ¥æä¸ç»ææ¥æçéæ©
			if (HInitTimeCycle != -1) {
			$('#HBeginDate').prop('disabled', true);
			$('#HEndDate').prop('disabled', true);

			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));

			//æ§è¡æ¥è¯¢æ¹æ³
			get_FastQuery();
			} else {
			$('#HBeginDate').prop('disabled', false);
			$('#HEndDate').prop('disabled', false);
			}
			});


			//#region æ¤é¡µé¢æææ¹æ³
			function set_ClearBill() {
			//åå§åæ¥æ
			$("#BenginHCreateDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//å¼å§æ¥æ
			$("#EndHCreateDate").val(Format(new Date(), "yyyy-MM-dd"));//ç»ææ¥æ
			//åå§åæ¥æé´éãå¼å§æ¥æãç»ææ¥æ
			setSelect_HInitTimeCycle();
			//è¥æ¥æé´éä¸ä¸º ä»»æé´éï¼åç¦ç¨å¼å§æ¥æä¸ç»ææ¥æçéæ©
			var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
			if (HInitTimeCycle != -1) {
			$('#HBeginDate').prop('disabled', true);
			$('#HEndDate').prop('disabled', true);
			} else {
			$('#HBeginDate').prop('disabled', false);
			$('#HEndDate').prop('disabled', false);
			}

			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
			//åå§åè¡¨æ ¼(ä¸»è¡¨)
			set_InitGrid();
			//åå§åè¡¨æ ¼(åè¡¨1)
			@@ -638,7 +674,7 @@
			function get_DisplayPage(sWhere) {
			var ajaxLoad = layer.load();
			$.ajax({
			url: GetWEBURL() + '/Sb_EquipRepairSendWorkBill/GetEquipRepairSendWorkBillListPage',
			url: GetWEBURL() + '/Sb_EquipMaintainBill/GetEquipMaintainBillListPage',
			type: "GET",
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size },
			success: function (data1) {
			@@ -686,14 +722,18 @@
			option.data = data1.data;
			option.totalRow = true;
			laypage.render(optionPage);
			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();
			//åè®¾ç½®
			DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData);

			////å·æ°è¡¨æ ¼æ°æ®
			ins = table.render(option);

			layer.close(ajaxLoad);
			if ($("#ColName option").length < 1) {
			ColFilter();
			}

			//å·æ°æé®æ¾ç¤º
			Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
			} else {
			layer.close(ajaxLoad);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			@@ -895,8 +935,8 @@
			//var HBillType = $("#HBillType").val();//åæ®ç±»å
			var HBillNo = $("#HBillNo").val();//åæ®å·
			var HCreateBy = $("#HCreateBy").val();//å¶åäºº
			var BenginHCreateDate = $("#BenginHCreateDate").val();//å¼å§å¶åæ¶é´
			var EndHCreateDate = $("#EndHCreateDate").val();//ç»æå¶åæ¶é´
			var HBeginDate = $("#HBeginDate").val();//å¼å§å¶åæ¶é´
			var HEndDate = $("#HEndDate").val();//ç»æå¶åæ¶é´
			var ColName = $("#ColName").val();//å¤éæ¡
			var Comparator = $("#Comparator").val()
			var ColContent = $("#ColContent").val();
			@@ -966,7 +1006,7 @@
			com2 = "not like'%" + ColContent2 + "%'";
			break;
			default:
			com2 = "" + Comparator + "'" + ColContent + "'";
			com2 = "" + Comparator2 + "'" + ColContent2 + "'";
			break;
			}
			sWhere += " and " + ColName2 + " " + com2;
			@@ -977,11 +1017,11 @@
			if (HCreateBy) {
			sWhere += " and å¶åäºº like '%" + HCreateBy + "%'";
			}
			if (BenginHCreateDate) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + BenginHCreateDate + "'";
			if (HBeginDate) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + HBeginDate + "'";
			}
			if (EndHCreateDate) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) <= '" + EndHCreateDate + "'";
			if (HEndDate) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) <= '" + HEndDate + "'";
			}
			//get_Display(sWhere);
			//æ°æ®åºåé¡µ
			@@ -991,11 +1031,12 @@
			//éç½®è¿æ»¤æ¡ä»¶
			function set_ClearQuery() {
			//$("#HBillType").val("");//åæ®ç±»å
			var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
			$("#HBillNo").val("");//åæ®å·
			$("#HSourceBillNo").val("");//æºåå·
			$("#HCreateBy").val("");//å¶åäºº
			$("#BenginHCreateDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//å¼å§æ¥æ
			$("#EndHCreateDate").val(Format(new Date(), "yyyy-MM-dd"));//ç»ææ¥æ
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));//å¼å§æ¥æ
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));//ç»ææ¥æ
			$("#ColContent").val("");
			$("#ColName").val("0");
			$("#Comparator").val("0");
			@@ -1028,121 +1069,24 @@
			}
			//#endregion

			//éèåè®¾ç½®
			function get_HideColumn() {
			var colName = "";
			for (var i = 1; i < option.cols[0].length - 1; i++) {
			colName += option.cols[0][i]["title"] + ",";
			//#region åå§æ¥æé´é ä¸æåè¡¨
			function setSelect_HInitTimeCycle() {
			var valueList = [0, 1, 2, 3, 4, 5, 6, 29];
			var titleList = ["ä»å¤©", "è¿ä¸¤å¤©", "è¿ä¸å¤©", "è¿åå¤©", "è¿äºå¤©", "è¿åå¤©", "è¿ä¸å¤©", "è¿30å¤©"];

			var HInitTimeCycle_ArrayList = '<option value="-1" selected="selected" >ä»»æé´é</option>';
			for (var i = 0; i < valueList.length; i++) {
			HInitTimeCycle_ArrayList += '<option style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';
			}

			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);//å³éå¼¹çª
			}
			})
			$("#HInitTimeCycle").empty();
			$("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
			form.render('select');

			$("#HInitTimeCycle").val("29");
			}
			//#endregion

			//æ¾ç¤ºåæ°æ®
			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", "åæ®ç±»å", "è¡¨å¤´å¤æ³¨", "éä»¶ä»£ç ", "hsubid", "è¡å³éäºº", "è¡¨ä½å¤æ³¨", "å¶åäºº", "ä¿®æ¹äºº", "ä½åºæ¥æ", "æºåä¸»åç ","æºåååç "];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±/

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

			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			})
			}
			layer.close(index);

			//#region ãè¿æ»¤æ¹æ¡ã
			@@ -1175,6 +1119,24 @@
			$("#" + data[i].è¿æ»¤åæ®µID).find("option[value='" + data[i].è¿æ»¤å¼ + "']").attr("selected", true);
			}
			}

			var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
			//è¥æ¥æé´éä¸ä¸º ä»»æé´éï¼åç¦ç¨å¼å§æ¥æä¸ç»ææ¥æçéæ©
			if (HInitTimeCycle != -1) {
			$('#HBeginDate').prop('disabled', true);
			$('#HEndDate').prop('disabled', true);

			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));


			//æ§è¡æ¥è¯¢æ¹æ³
			get_FastQuery();
			} else {
			$('#HBeginDate').prop('disabled', false);
			$('#HEndDate').prop('disabled', false);
			}

			//æ§è¡æ¥è¯¢æ¹æ³
			get_FastQuery()
			form.render("select");