MES-WEB-LayUI.git

			@@ -67,9 +67,38 @@
			</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-inline">
			<div class="layui-row">
			<div class="layui-inline">
			<span>å¶ä»æ¡ä»¶></span>
			<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>
			@@ -147,14 +176,13 @@
			var option1 = [];
			var option2 = [];
			var HModName = "Sb_EquipMaintainBillList";
			var titleData = ["hmainid", "åæ®ç±»å", "è¡¨å¤´å¤æ³¨", "éä»¶ä»£ç ", "hsubid", "è¡å³éäºº", "è¡¨ä½å¤æ³¨", "å¶åäºº", "ä¿®æ¹äºº", "ä½åºæ¥æ", "æºåä¸»åç ", "æºåååç ","HEquipID","åé¨åæ®å·","HMaterID","åä½ID","è´è´£äººID","HBillType"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			//#endregion


			//#region è¿å¥é¡µé¢å³å è½½
			//åå§åçé¢
			set_ClearBill();
			//åå§åè¡¨æ ¼
			DisPlay_HideColumn();
			//#endregion

			//å¤´å·¥å·æ äºä»¶
			@@ -233,6 +261,9 @@

			//#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();
			//åå§åè¡¨æ ¼(åè¡¨1)
			@@ -347,9 +378,9 @@
			, { field: 'HUnitID', title: 'åä½ID', width: 200, hide: true }
			, { field: 'HUnitNumber', title: 'åä½ä»£ç ', width: 200 }
			, { field: 'HUnitName', title: 'åä½åç§°', width: 200 }
			, { field: 'HManagerID', title: 'è´è´£äººID', width: 200, hide: true }
			, { field: 'HManagerNumber', title: 'è´è´£äººä»£ç ', width: 200 }
			, { field: 'HManagerName', title: 'è´è´£äºº', width: 200 }
			//, { field: 'HManagerID', title: 'è´è´£äººID', width: 200, hide: true }
			//, { field: 'HManagerNumber', title: 'è´è´£äººä»£ç ', width: 200 }
			//, { field: 'HManagerName', title: 'è´è´£äºº', width: 200 }
			, { field: 'HQty', title: 'å®éç¨é', width: 200 }
			, { field: 'HQtyMust', title: 'æ åç¨é', width: 200 }
			, { field: 'HRemark', title: 'å¤æ³¨', width: 200 }
			@@ -361,6 +392,7 @@
			}
			//å è½½ç½æ ¼
			function get_Display(sWhere) {
			var ajaxLoad = layer.load();
			//è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
			$.ajax({
			//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
			@@ -369,15 +401,58 @@
			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: 550
			, page: true
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			}
			table.render(option);
			layer.close(index);

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

			layer.close(ajaxLoad);
			if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
			ColFilter();
			}
			//layer.alert("æ¥è¯¢æå", { icon: 1 });
			} else {
			layer.close(index);
			layer.alert("æ²¡ææ°æ®è®°å½!", { icon: 5 });
			layer.close(ajaxLoad);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.close(index);
			layer.close(ajaxLoad);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			})
			@@ -506,6 +581,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 + "%'";
			}
			@@ -516,7 +616,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ç¼å
			@@ -527,10 +627,27 @@
			$("#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();
			}

			//åææ¾ç¤ºä¸ææ¡
			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');
			}

			//éèåè®¾ç½®
			@@ -571,7 +688,7 @@


			var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
			var titleData = ["hmainid", "åæ®ç±»å", "è¡¨å¤´å¤æ³¨", "éä»¶ä»£ç ", "hsubid", "è¡å³éäºº", "è¡¨ä½å¤æ³¨", "å¶åäºº", "ä¿®æ¹äºº", "ä½åºæ¥æ", "æºåä¸»åç ","æºåååç "];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			/var titleData = ["hmainid", "åæ®ç±»å", "è¡¨å¤´å¤æ³¨", "éä»¶ä»£ç ", "hsubid", "è¡å³éäºº", "è¡¨ä½å¤æ³¨", "å¶åäºº", "ä¿®æ¹äºº", "ä½åºæ¥æ", "æºåä¸»åç ","æºåååç "];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±/

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

			@@ -642,7 +759,7 @@
			}
			})
			}

			layer.close(index);
			//#endregion
			});