MES-WEB-LayUI.git

			@@ -39,14 +39,9 @@
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ç¶æ</label>
			<label class="layui-form-label">åæ®å·</label>
			<div class="layui-input-block">
			<select name="HStatus" lay-filter="HStatus" style="width:190px;">
			<option value="-1" selected="selected">å¨é¨</option>
			<option value="0">æªå®¡æ ¸</option>
			<option value="1">å·²å®¡æ ¸</option>
			<option value="2">å·²å³é</option>
			</select>
			<input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			@@ -61,6 +56,12 @@
			<input type="date" class="layui-input" id="HEndDate" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ç»ç»åç§°</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HStockOrgName" id="HStockOrgName" style="width:190px;">
			</div>
			</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>
			@@ -73,34 +74,52 @@
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">åæ®å·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">é¨é¨ä¿¡æ¯</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HDept" id="HDept" style="width:190px;">
			</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;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">å¨å·ä»£ç </label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HModelNumber" id="HModelNumber" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ä»åº</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HWhName" id="HWhName" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">å¾æ¥åä½</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HSupName" id="HSupName" style="width:190px;">
			</div>
			</div>
			</div>
			</div>
			</div>
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>æ°å¢</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>é¢è§</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>æå°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit"><i class="layui-icon layui-icon-repeat"></i>å®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit"><i class="layui-icon layui-icon-refresh"></i>åå®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>å é¤</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>
			</div>
			</script>
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>æ°å¢</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>é¢è§</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>æå°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit"><i class="layui-icon layui-icon-repeat"></i>å®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit"><i class="layui-icon layui-icon-refresh"></i>åå®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>å é¤</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>
			</div>
			</script>
			</div>
			</form>
			</div>
			</div>
			@@ -207,6 +226,7 @@
			, { field: 'HKeeperID', title: 'HKeeperID', width: 200, hide: true }
			, { field: 'ä¿ç®¡åä»£ç ', title: 'ä¿ç®¡åä»£ç ', width: 200 }
			, { field: 'ä¿ç®¡ååç§°', title: 'ä¿ç®¡ååç§°', width: 200 }
			, { field: 'åºåç»ç»', title: 'åºåç»ç»', width: 125 }
			, { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
			, { field: 'é¨é¨ä»£ç ', title: 'é¨é¨ä»£ç ', width: 200 }
			, { field: 'é¨é¨åç§°', title: 'é¨é¨åç§°', width: 200 }
			@@ -514,40 +534,43 @@
			}

			function get_FastQuery(table, option) {
			var HStatus = $("select[name='HStatus']").val();//ç¶æ
			var HBeginDate = $("#HBeginDate").val();//å¼å§æ¥æ
			var HEndDate = $("#HEndDate").val();//ç»ææ¥æ
			var HBillNo = $("#HBillNo").val(); //åæ®å·
			var HDept = $("#HDept").val(); //é¨é¨ä¿¡æ¯
			if (HStatus) {
			switch (HStatus) {
			case '-1': //å¨é¨
			sWhere += "";
			break;
			case '0': //æªå®¡æ ¸
			sWhere += " and å®¡æ ¸äºº=''";
			break;
			case '1': //å·²å®¡æ ¸
			sWhere += " and å®¡æ ¸äºº<>''";
			break;
			case '2': //å·²å³é
			sWhere += " and å³éäºº<>''";
			default:

			var HBeginDate = $("#HBeginDate").val();//å¼å§æ¥æ
			var HEndDate = $("#HEndDate").val();//ç»ææ¥æ
			var HStockOrgName = $("#HStockOrgName").val(); //ç»ç»
			var HBillNo = $("#HBillNo").val(); //åæ®å·
			var HDept = $("#HDept").val(); //é¨é¨ä¿¡æ¯
			var HMaterNumber = $("#HMaterNumber").val(); //ç©æä»£ç
			var HModelNumber = $("#HModelNumber").val(); //å¨å·ä»£ç
			var HWhName = $("#HWhName").val(); //ä»åºåç§°
			var HSupName = $("#HSupName").val(); //å¾æ¥åä½

			if (HBeginDate) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + HBeginDate + "'";
			}
			}
			if (HBeginDate) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + HBeginDate + "'";
			}
			if (HEndDate) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) <= '" + HEndDate + "'";
			}
			if (HBillNo) {
			sWhere += " and åæ®å· like '%" + HBillNo + "%'";
			}
			if (HDept) {
			sWhere += " and é¨é¨åç§° like '%" + HDept + "%'";
			}
			if (HEndDate) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) <= '" + HEndDate + "'";
			}
			if (HStockOrgName) {
			sWhere += " and åºåç»ç» like '%" + HStockOrgName + "%'";
			}
			if (HBillNo) {
			sWhere += " and åæ®å· like '%" + HBillNo + "%'";
			}
			if (HDept) {
			sWhere += " and é¨é¨åç§° like '%" + HDept + "%'";
			}
			if (HMaterNumber) {
			sWhere += " and ç©æä»£ç like '%" + HMaterNumber + "%'";
			}
			if (HModelNumber) {
			sWhere += " and æ¨¡å·ä»£ç like '%" + HModelNumber + "%'";
			}
			if (HWhName) {
			sWhere += " and ä»åºåç§° like '%" + HWhName + "%'";
			}
			if (HSupName) {
			sWhere += " and å¾æ¥åä½ like '%" + HSupName + "%'";
			}
			var index = layer.load(0);
			get_Display(sWhere);
			//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			@@ -555,11 +578,15 @@
			}
			//éç½®è¿æ»¤æ¡ä»¶
			function set_ClearQuery() {
			$('#HStatus').find("option[value='-1']").attr("selected", true);
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
			$("#HBillNo").val("");
			$("#HDept").val("");
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
			$("#HBillNo").val("");
			$("#HDept").val("");
			$("#HMaterNumber").val("");
			$("#HModelNumber").val("");
			$("#HWhName").val("");
			$("#HSupName").val("");
			$("#HStockOrgName").val("");
			sWhere = "";
			get_Display(sWhere);
			}