MES-WEB-LayUI.git

			@@ -30,38 +30,51 @@
			<form class="layui-form" action="" lay-filter="component-form-group">
			<div class="layui-collapse">
			<div class="layui-colla-item">
			<div class="layui-inline">
			<label class="layui-form-label">å¼å§æ¥æ</label>
			<div class="layui-input-block">
			<input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
			<div class="layui-inline" style="width:200px;">
			<label class="layui-form-label" style="width:35px;">æ¥æ</label>
			<div class="layui-input-block" style="position:relative; left:-45px;">
			<input type="date" class="layui-input" id="HBeginDate" style="width:140px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ç»ææ¥æ</label>
			<div class="layui-input-block">
			<input type="date" class="layui-input" id="HEndDate" style="width:190px;">
			<div class="layui-inline" style="width:200px;">
			<label class="layui-form-label" style="width:5px;">-</label>
			<div class="layui-input-block" style="position:relative; left:-70px;">
			<input type="date" class="layui-input" id="HEndDate" style="width:140px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ç©æä»£ç </label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="width:190px;">
			<input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="width:140px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ç©æåç§°</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="width:190px;">
			<input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="width:140px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ç»ç»</label>
			<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
			<select name="HStockOrgID" id="HStockOrgID" lay-verify="HStockOrgID">
			<!--å¨ææ¸²æç»ç»-->
			</select>
			<label class="layui-form-label">æææ»é</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HSumRLQty" id="HSumRLQty" style="width:120px;" readonly>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width:30px;">å¬æ¤</label>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">å©åæ»é</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HSumZJQty" id="HSumZJQty" style="width:120px;" readonly>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width:10px;">å¨</label>
			</div>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
			<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>
			</div>
			@@ -69,7 +82,7 @@
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="Export"><i class="layui-icon layui-icon-export"></i>å¯¼åº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Query" id="Query"><i class="layui-icon layui-icon-search"></i>æ¥è¯¢</button>
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Query" id="Query"><i class="layui-icon layui-icon-search"></i>æ¥è¯¢</button>-->
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Cell" id="Cell"><i class="layui-icon layui-icon-slider"></i>ä¿ååå®½</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-RefreshCell" id="RefreshCell"><i class="layui-icon layui-icon-cols"></i>é»è®¤åå®½</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			@@ -117,37 +130,10 @@
			//è·åå¼å§æ¥æãç»ææ¥æ
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
			//è·åç»ç»
			Organ();
			//åå§åè¡¨æ ¼
			set_InitGrid();
			//æ¥è¯¢
			get_Display(sWhere);
			}
			//#endregion

			//#region è·åç»ç»
			function Organ() {
			//è·åç»å½é¡µç»ç»å
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Web/GetOrganizations",
			async: false, //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ±
			success: function (result) {
			var Organization = "";
			Organization += '<option style="color:blue;" value="å¨é¨">å¨é¨</option>';
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			var data = result.data;
			for (var i = 0; i < data.length; i++) {
			Organization += '<option style="color:blue;" value="' + data[i].Name + '">' + data[i].Name + '</option>';
			}
			$("#HStockOrgID").append(Organization);
			$("#HStockOrgID").val(sessionStorage["Organization"])
			form.render('select');
			}
			layer.closeAll("loading");
			}
			})
			}
			//#endregion

			@@ -307,6 +293,11 @@
			}
			//#endregion

			//æ¥è¯¢æé®
			form.on('submit(btnSearch)', function (data) {
			get_Display();
			});

			//#region æ¥è¯¢
			function get_Display() {
			var HBeginDate = $("#HBeginDate").val(); //å¼å§æ¥æ
			@@ -338,7 +329,7 @@
			}

			//å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
			col.push({ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' });
			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å
			@@ -350,11 +341,12 @@
			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:
			if (data[i].name == 'åé') {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true });
			} else {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
			}
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
			//if (data[i].name == 'åé') {
			// col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true });
			//} else {
			// col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
			//}
			}
			}
			}
			@@ -376,6 +368,10 @@
			option.totalRow = true;
			table.render(option);
			ins = table.render(option);


			$("#HSumRLQty").val(data1.data[0].HSumRLQty);
			$("#HSumZJQty").val(data1.data[0].HSumZJQty);
			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();
			layer.close(ajaxLoad);