MES-WEB-LayUI.git

			@@ -39,6 +39,13 @@
			</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" id="HBeginDate" style="width:190px;">
			@@ -123,6 +130,62 @@
			<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
			</div>
			</div>

			<div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" 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 ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
			</div>
			</div>

			<div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" 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 ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
			</div>
			</div>
			</div>
			</div>
			</div>
			@@ -155,9 +218,9 @@
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>å¯¼åº</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="HideColumn" id="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="set_QueryCondition" id="set_QueryCondition"><i class="layui-icon layui-icon-set"></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="set_QueryCondition" id="set_QueryCondition"><i class="layui-icon layui-icon-set"></i>é«çº§è¿æ»¤</button>-->
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>
			</div>
			</script>
			@@ -191,7 +254,7 @@
			//æ¥è¯¢æ¡ä»¶
			var sWhere = "";
			var option = [];
			var HModName = "Xs_SeOrderBill";
			var HModName = "Xs_SeOrderBillList";
			var HBillType = "1401";


			@@ -457,6 +520,30 @@
			})
			});
			//#endregion

			//#region æ¥æé´éä¸æåè¡¨çå¬
			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"));

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

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


			@@ -464,7 +551,20 @@

			//#region åå§åçé¢
			function set_ClearBill() {
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "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();
			@@ -498,6 +598,7 @@
			, { field: 'ç¶æ', title: 'ç¶æ', width: 125, sort: true }
			, { field: 'è¡ç¶æ', title: 'è¡ç¶æ', width: 125, sort: true }
			, { field: 'æ¯å¦ä¸æ¨çäº§è®¢å', title: 'æ¯å¦ä¸æ¨çäº§è®¢å', width: 125, sort: true }
			, { field: 'å®éæ¯ä¾', title: 'å®éæ¯ä¾', sort: true }
			, { field: 'æ¯å¦ååºå', title: 'æ¯å¦ååºå', width: 125, sort: true }
			, { field: 'HMaterID', title: 'HMaterID', hide: true, sort: true }
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', sort: true }
			@@ -506,8 +607,8 @@
			, { field: 'æ°é', title: 'æ°é', sort: true, totalRow: true }
			, { field: 'çäº§å¥åºæ°é', title: 'çäº§å¥åºæ°é', sort: true, totalRow: true }
			, { field: 'æ¥åºæ°é', title: 'æ¥åºæ°é', sort: true, totalRow: true }
			, { field: 'ææ', title: 'ææ', sort: true }
			, { field: 'æ·±å å·¥', title: 'æ·±å å·¥', sort: true }
			, { field: 'å©ä½è®¢é', title: 'å©ä½è®¢é', sort: true, totalRow: true }
			, { field: 'å³èæ°é', title: 'éå®åºåºå³èæ°é', sort: true, totalRow: true }
			, { field: 'HUnitID', title: 'HUnitID', hide: true, sort: true }
			//, { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ', sort: true }
			, { field: 'è®¡éåä½', title: 'è®¡éåä½', sort: true }
			@@ -523,8 +624,8 @@
			, { field: 'éé¢', title: 'éé¢', sort: true, totalRow: true }
			, { field: 'ä»·ç¨åè®¡', title: 'ä»·ç¨åè®¡', sort: true, totalRow: true }
			, { field: 'è¡¨å¤´å¤æ³¨', title: 'è¡¨å¤´å¤æ³¨', sort: true }
			, { field: 'å©ä½è®¢é', title: 'å©ä½è®¢é', sort: true, totalRow: true }
			, { field: 'å³èæ°é', title: 'éå®åºåºå³èæ°é', sort: true, totalRow: true }
			, { field: 'ææ', title: 'ææ', sort: true }
			, { field: 'æ·±å å·¥', title: 'æ·±å å·¥', sort: true }
			, { field: 'æªå³èæ°é', title: 'éå®åºåºæªå³èæ°é', sort: true, totalRow: true }
			, { field: 'çäº§å³èæ°é', title: 'çäº§å³èæ°é', sort: true, totalRow: true }
			, { field: 'çäº§æªå³èæ°é', title: 'çäº§æªå³èæ°é', sort: true, totalRow: true }
			@@ -540,7 +641,9 @@
			, { field: 'å³éæ¥æ', title: 'å³éæ¥æ', width: 200, templet: "<div>{{d.å³éæ¥æ ==null ?'':layui.util.toDateString(d.å³éæ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
			, { field: 'ä½åºäºº', title: 'ä½åºäºº', width: 125, sort: true }
			, { field: 'ä½åºæ¥æ', title: 'ä½åºæ¥æ', width: 200, templet: "<div>{{d.ä½åºæ¥æ ==null ?'':layui.util.toDateString(d.ä½åºæ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }

			, { field: 'HWhID', title: 'HWhID', hide: true, sort: true }
			, { field: 'åä»åº', title: 'åä»åº', hide: true, sort: true }
			, { field: 'ç©æåç±»', title: 'ç©æåç±»', sort: true }

			//, { field: 'HBillType', title: 'HBillType', hide: true, sort: true }
			//, { field: 'äº¤è´§å°å', title: 'äº¤è´§å°å', width: 125, sort: true }
			@@ -549,16 +652,18 @@
			//, { field: 'ç»ç®æ¹å¼', title: 'ç»ç®æ¹å¼', width: 125, sort: true }
			//, { field: 'ç»ç®æ¥æ', title: 'ç»ç®æ¥æ', width: 170, sort: true }
			//, { field: 'HCurID', title: 'HCurID', hide: true, sort: true }
			//, { field: 'å¸å«ä»£ç ', title: 'å¸å«ä»£ç ', sort: true }
			//, { field: 'å¸å«', title: 'å¸å«', sort: true }
			//, { field: 'æ±ç', title: 'æ±ç', sort: true }
			////, { field: 'å¸å«ä»£ç ', title: 'å¸å«ä»£ç ', sort: true }
			//, { field: 'å¸å«', title: 'å¸å«', hide: true, sort: true }
			//, { field: 'æ±ç', title: 'æ±ç', hide: true, sort: true }
			//, { field: 'HDeptID', title: 'HDeptID', hide: true, sort: true }
			//, { field: 'é¨é¨ä»£ç ', title: 'é¨é¨ä»£ç ', width: 125, sort: true }
			//, { field: 'é¨é¨', title: 'é¨é¨', width: 125, sort: true }
			//, { field: 'éå®æ¹å¼', title: 'éå®æ¹å¼', sort: true }
			////, { field: 'é¨é¨ä»£ç ', title: 'é¨é¨ä»£ç ', width: 125, sort: true }
			//, { field: 'é¨é¨', title: 'é¨é¨', width: 125, hide: true,sort: true }
			////, { field: 'éå®æ¹å¼', title: 'éå®æ¹å¼', sort: true }
			//, { field: 'HManagerID', title: 'HManagerID', hide: true, sort: true }
			//, { field: 'ä¸»ç®¡ä»£ç ', title: 'ä¸»ç®¡ä»£ç ', sort: true }
			//, { field: 'ä¸»ç®¡', title: 'ä¸»ç®¡', sort: true }
			////, { field: 'ä¸»ç®¡ä»£ç ', title: 'ä¸»ç®¡ä»£ç ', sort: true }
			//, { field: 'ä¸»ç®¡', title: 'ä¸»ç®¡', hide: true, sort: true }
			//, { field: 'ä¸»ä»åºid', title: 'ä¸»ä»åºid', hide: true, sort: true }
			//, { field: 'ä¸»ä»åº', title: 'ä¸»ä»åº', hide: true, sort: true }
			//, { field: 'æè¦', title: 'æè¦', sort: true }
			//, { field: 'æ¹å·', title: 'æ¹å·', sort: true }
			//, { field: 'ç¨é¢', title: 'ç¨é¢', sort: true }
			@@ -662,6 +767,14 @@
			var Comparator = $("#Comparator").val()
			var ColContent = $("#ColContent").val();

			var ColName1 = $("#ColName1").val();//å¤éæ¡
			var Comparator1 = $("#Comparator1").val()
			var ColContent1 = $("#ColContent1").val();

			var ColName2 = $("#ColName2").val();//å¤éæ¡
			var Comparator2 = $("#Comparator2").val()
			var ColContent2 = $("#ColContent2").val();

			if (ColName != 0 && Comparator != 0) {
			var com = "";
			switch (Comparator) {
			@@ -683,6 +796,51 @@
			}
			sWhere += " and " + ColName + " " + com;
			}

			if (ColName1 != 0 && Comparator1 != 0) {
			var com1 = "";
			switch (Comparator1) {
			case "7":
			com1 = "like'%" + ColContent1 + "%'";
			break;
			case "8":
			com1 = "like'%" + ColContent1 + "'";
			break;
			case "9":
			com1 = "like'" + ColContent1 + "%'";
			break;
			case "10":
			com1 = "not like'%" + ColContent1 + "%'";
			break;
			default:
			com1 = "" + Comparator1 + "'" + ColContent1 + "'";
			break;
			}
			sWhere += " and " + ColName1 + " " + com1;
			}

			if (ColName2 != 0 && Comparator2 != 0) {
			var com2 = "";
			switch (Comparator2) {
			case "7":
			com2 = "like'%" + ColContent2 + "%'";
			break;
			case "8":
			com2 = "like'%" + ColContent2 + "'";
			break;
			case "9":
			com2 = "like'" + ColContent2 + "%'";
			break;
			case "10":
			com2 = "not like'%" + ColContent2 + "%'";
			break;
			default:
			com2 = "" + Comparator2 + "'" + ColContent2 + "'";
			break;
			}
			sWhere += " and " + ColName2 + " " + com2;
			}

			if (HDate) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + HDate + "'";
			}
			@@ -720,8 +878,9 @@

			//#region éç½®è¿æ»¤æ¡ä»¶
			function set_ClearQuery() {
			$("#HDate").val("");//å¼å§æ¥æ
			$("#HDate1").val("");//ç»ææ¥æ
			var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //å¼å§æ¥æ
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); //ç»ææ¥æ
			$("#HBillNo").val("");//
			$("#HCusID").val("");
			$("#HMaterNumber").val("");
			@@ -729,6 +888,15 @@
			$("#ColContent").val("");
			$("#ColName").val("0");
			$("#Comparator").val("0");

			$("#ColContent1").val("");
			$("#ColName1").val("0");
			$("#Comparator1").val("0");

			$("#ColContent2").val("");
			$("#ColName2").val("0");
			$("#Comparator2").val("0");

			form.render('select');
			sWhere = "";
			}
			@@ -1269,7 +1437,7 @@
			get_needClose_Bar = 1;

			//ä¸ºè¿æ»¤æ¡ä»¶å¢å æåº
			sWhere_Bak += " and å©ä½è®¢é>0 and å©ä½è®¢é<=500 and å³éäºº='' and è¡å³éäºº='' and ç¶æ = 'å·²å®¡æ ¸' order by åæ®å· desc";
			sWhere_Bak += " and å©ä½è®¢é>0 and å©ä½è®¢é<=1000 and å³éäºº='' and è¡å³éäºº='' and ç¶æ = 'å·²å®¡æ ¸' order by åæ®å· desc";

			//è·åæåºåçæ°æ®å¹¶éæ°æ¸²æ
			var ajaxLoad = layer.load();
			@@ -1702,6 +1870,30 @@
			$("#" + 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"));

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

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



			//æ§è¡æ¥è¯¢æ¹æ³
			get_FastQuery()
			form.render("select");
			@@ -1948,6 +2140,32 @@
			$("#ColName").empty();
			$("#ColName").append(Organization);
			form.render('select');

			$("#ColName1").empty();
			$("#ColName1").append(Organization);
			form.render('select');

			$("#ColName2").empty();
			$("#ColName2").append(Organization);
			form.render('select');
			}
			//#endregion

			//#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>';
			}

			$("#HInitTimeCycle").empty();
			$("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
			form.render('select');

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