MES-WEB-LayUI.git

			@@ -71,7 +71,42 @@
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>

			<div class="layui-colla-content">
			<div class="layui-row">
			<div class="layui-inline">
			<div class="layui-inline">
			<span>å¶ä»æ¡ä»¶></span>
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
			<option value="0" selected="selected"></option>
			<option value="=">=</option>
			<option value=">=">>=</option>
			<option value=">">></option>
			<option value="<="><=</option>
			<option value="<"><</option>
			<option value="<>"><></option>
			<option value="7">åå«</option>
			<option value="8">å·¦åå«</option>
			<option value="9">å³åå«</option>
			<option value="10">ä¸åå«</option>
			</select>
			</div>
			<div class="layui-inline">
			<input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
			</div>
			</div>
			</div>
			</div>
			</div>
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			@@ -87,7 +122,7 @@
			<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="btn-exit"><i class="layui-icon layui-icon-return"></i>éåº</button>

			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			</div>
			</script>
			</form>
			@@ -100,6 +135,7 @@
			<script src="../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
			<script src="../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../layuiadmin/PubCustom.js"></script>
			<script src="../../layuiadmin/zgqCustom/zgqCustom.js"></script>
			<script>
			layui.config({
			base: '../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			@@ -119,6 +155,8 @@
			//æ¥è¯¢æ¡ä»¶
			var sWhere = "";
			var option = [];
			var HModName = "Sb_EquipDotCheckBillList";
			var titleData = ["hmainid", "hsubid","è®¾å¤ID","åé¨åæ®å·","ç¹æ£é¡¹ç®ID","è´è´£äººID","è®¾å¤ç¹æ£è§ç¨ID","HBillType"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			//#endregion

			//#region è¿å¥é¡µé¢å³å è½½
			@@ -150,6 +188,9 @@
			//éåºæé®
			case 'btn-exit': Pub_Close(2);
			break;
			//åè®¾ç½®
			case 'set_HideColumn': get_HideColumn();
			break;
			};
			});
			//æ¥è¯¢æé®
			@@ -165,6 +206,8 @@
			//#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"));//ç»ææ¥æ
			//åå§åè¡¨æ ¼
			set_InitGrid();
			//æ¥è¯¢
			@@ -188,6 +231,7 @@
			, { field: 'HBillType', title: 'åæ®ç±»å', width: 160 }
			, { field: 'è®¾å¤ä»£ç ', title: 'è®¾å¤ä»£ç ', width: 200 }
			, { field: 'è®¾å¤åç§°', title: 'è®¾å¤åç§°', width: 200 }
			, { field: 'è®¾å¤ç¹æ£è§ç¨', title: 'è®¾å¤ç¹æ£è§ç¨', width: 200 }
			, { field: 'è¡¨å¤´å¤æ³¨', title: 'è¡¨å¤´å¤æ³¨', width: 200}
			, { field: 'å¼å§æ¥æ', title: 'å¼å§æ¥æ', width: 200, templet: "<div>{{d.å¼å§æ¥æ ==null ?'':layui.util.toDateString(d.å¼å§æ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>"}
			, { field: 'ç»ææ¥æ', title: 'ç»ææ¥æ', width: 200, templet: "<div>{{d.ç»ææ¥æ ==null ?'':layui.util.toDateString(d.ç»ææ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>"}
			@@ -200,7 +244,7 @@
			, { field: 'è´è´£äºº', title: 'è´è´£äºº', width: 200 }
			, { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
			, { field: 'è¡¨ä½å¤æ³¨', title: 'è¡¨ä½å¤æ³¨', width: 200 }
			, { field: 'å¶åäºº', title: 'å¶åäºº', width: 200 }
			// , { field: 'å¶åäºº', title: 'å¶åäºº', width: 200 }
			, { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ', width: 200, templet: "<div>{{d.å¶åæ¥æ ==null ?'':layui.util.toDateString(d.å¶åæ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
			, { field: 'å®¡æ ¸äºº', title: 'å®¡æ ¸äºº', width: 200 }
			, { field: 'å®¡æ ¸æ¥æ', title: 'å®¡æ ¸æ¥æ', width: 200, templet: "<div>{{d.å®¡æ ¸æ¥æ ==null ? '':layui.util.toDateString(d.å®¡æ ¸æ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
			@@ -231,9 +275,52 @@
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.count == 1) {
			option.data = data1.data;
			var data = [];
			var col = [];
			//ç»ç©ºçæ°ç»èµå¼
			for (var key in data1.list) {
			data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
			}
			//å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
			col.push({ type: 'checkbox', fixed: 'left' });
			for (var i = 0; i < data.length; i++) {
			if ($.inArray(data[i].name, titleData) > -1 ) {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
			}
			else {
			switch (data[i].Type) {
			//int
			case 'DateTime':
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
			break;
			default:
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
			}
			}
			}

			//å¨ææ¾ç¤ºåå
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, cols: [col]
			, data: data1.data
			, height: 800
			, page: true
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			}
			table.render(option);

			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();

			layer.close(ajaxLoad);
			if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
			ColFilter();
			}
			//layer.alert("æ¥è¯¢æå", { icon: 1 });
			} else {
			layer.close(ajaxLoad);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			@@ -338,6 +425,31 @@
			var HCreateBy = $("#HCreateBy").val();//å¶åäºº
			var BenginHCreateDate = $("#BenginHCreateDate").val();//å¼å§å¶åæ¶é´
			var EndHCreateDate = $("#EndHCreateDate").val();//ç»æå¶åæ¶é´
			var ColName = $("#ColName").val();//å¤éæ¡
			var Comparator = $("#Comparator").val()
			var ColContent = $("#ColContent").val();

			if (ColName != 0 && Comparator != 0) {
			var com = "";
			switch (Comparator) {
			case "7":
			com = "like'%" + ColContent + "%'";
			break;
			case "8":
			com = "like'%" + ColContent + "'";
			break;
			case "9":
			com = "like'" + ColContent + "%'";
			break;
			case "10":
			com = "not like'%" + ColContent + "%'";
			break;
			default:
			com = "" + Comparator + "'" + ColContent + "'";
			break;
			}
			sWhere += " and " + ColName + " " + com;
			}
			if (HBillNo) {
			sWhere += " and åæ®å· like '%" + HBillNo + "%'";
			}
			@@ -348,7 +460,7 @@
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + BenginHCreateDate + "'";
			}
			if (EndHCreateDate) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + EndHCreateDate + "'";
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) <= '" + EndHCreateDate + "'";
			}
			get_Display(sWhere);
			sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			@@ -359,8 +471,13 @@
			$("#HBillNo").val("");//åæ®å·
			$("#HSourceBillNo").val("");//æºåå·
			$("#HCreateBy").val("");//å¶åäºº
			$("#BenginHCreateDate").val("");//å¼å§å¶åæ¶é´
			$("#EndHCreateDate").val("");//ç»æå¶åæ¶é´
			$("#BenginHCreateDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//å¼å§æ¥æ
			$("#EndHCreateDate").val(Format(new Date(), "yyyy-MM-dd"));//ç»ææ¥æ
			$("#ColContent").val("");
			$("#ColName").val("0");
			$("#Comparator").val("0");
			form.render('select');

			sWhere = "";
			$("#btnSearch").click();
			}
			@@ -369,6 +486,137 @@
			set_ClearQuery();
			get_Display(sWhere);
			}

			//éèåè®¾ç½®
			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","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);
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			})
			}

			//åææ¾ç¤ºä¸ææ¡
			function ColFilter() {
			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) {
			Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
			}
			}
			$("#ColName").empty();
			$("#ColName").append(Organization);
			form.render('select');
			}
			//#endregion

			//#endregion