MES-WEB-LayUI.git

			@@ -16,6 +16,7 @@
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/PubCustom.js"></script>
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
			<script src="../../../layuiadmin/soulTable.slim.js"></script>

			<style type="text/css">
			input.layui-input.layui-unselect {
			@@ -31,11 +32,11 @@
			<form class="layui-form" action="" lay-filter="component-form-group">
			<div class="layui-collapse">
			<div class="layui-colla-item">
			<!--<div class="layui-colla-title layui-inline">
			<div class="layui-colla-title layui-inline">
			<div class="layui-inline">
			<span>æ´å¤</span>
			</div>
			</div>-->
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">åæ®å·</label>
			<div class="layui-input-block">
			@@ -54,18 +55,54 @@
			<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>
			</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-colla-content">
			<div class="layui-inline">
			<div class="layui-inline">
			<span>å¶ä»æ¡ä»¶></span>
			</div>
			</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>
			@@ -85,6 +122,7 @@
			</div>
			</div>
			</div>

			<!--<script src="../../../layuiadmin/layui/layui.js"></script>
			<script src="../../../layuiadmin/Scripts/json2.js"></script>
			<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
			@@ -94,7 +132,7 @@
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			}).extend({
			index: 'lib/index', //ä¸»å¥å£æ¨¡å
			}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
			}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
			var $ = layui.$
			, admin = layui.admin
			, layer = layui.layer
			@@ -104,6 +142,7 @@
			, laypage = layui.laypage
			, laydate = layui.laydate
			, util = layui.util
			, soulTable = layui.soulTable
			//æ¥è¯¢æ¡ä»¶
			var sWhere = "";
			var option = [];
			@@ -134,6 +173,7 @@
			get_Display(sWhere);
			}
			//#endregion

			//#region åå§åè¡¨æ ¼æ¹æ³
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
			@@ -144,69 +184,77 @@
			, height: 'full-50'
			, page: true
			, cellMinWidth: 90
			, limits: [50, 500, 1000, 5000, 10000]
			, limits: [50, 500, 5000, 20000]
			, limit: 50
			, done: function (res, curr, count) {
			soulTable.render(this);
			}
			, cols: [[
			{ type: 'checkbox', fixed: 'left' }
			, { field: 'hmainid', title: 'åæ®ID', hide: true }
			, { field: 'æ¥æ', title: 'æ¥æ', width: 125, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'åæ®å·', title: 'åæ®å·', width: 195 }
			, { field: 'åæ®ç±»å', title: 'åæ®ç±»å', width: 110 }
			, { field: 'HWHID', title: 'HWHID', width: 200, hide: true }
			, { field: 'ä»åºä»£ç ', title: 'ä»åºä»£ç ', width: 125 }
			, { field: 'ä»åº', title: 'ä»åº', width: 125 }
			, { field: 'HSecManagerID', title: 'HSecManagerID', width: 200, hide: true }
			, { field: 'é¢æäººä»£ç ', title: 'é¢æäººä»£ç ', width: 180 }
			, { field: 'é¢æäºº', title: 'é¢æäºº', width: 125 }
			, { field: 'HKeeperID', title: 'HKeeperID', width: 200, hide: true }
			, { field: 'åæäººä»£ç ', title: 'åæäººä»£ç ', width: 180 }
			, { field: 'åæäºº', title: 'åæäºº', width: 125 }
			, { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
			, { field: 'é¨é¨ä»£ç ', title: 'é¨é¨ä»£ç ', width: 115 }
			, { field: 'é¨é¨', title: 'é¨é¨', width: 125 }
			, { field: 'æè¦', title: 'æè¦', width: 125 }
			, { field: 'è¡¨å¤´å¤æ³¨', title: 'è¡¨å¤´å¤æ³¨', width: 125 }
			, { field: 'åé¨åæ®å·', title: 'åé¨åæ®å·', width: 115 }
			, { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
			, { field: 'HMaterID', title: 'HMaterID', width: 200, hide: true }
			, { field: 'æ¨¡å·ä»£ç ', title: 'æ¨¡å·ä»£ç ', width: 125 }
			, { field: 'æ¨¡å·åç§°', title: 'æ¨¡å·åç§°', width: 125 }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 125 }
			, { field: 'Hunitid', title: 'Hunitid', width: 200, hide: true }
			//, { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ', width: 125 }
			//, { field: 'è®¡éåä½', title: 'è®¡éåä½', width: 125 }
			, { field: 'HWHSonID', title: 'HWHSonID', width: 200, hide: true }
			, { field: 'åæä»åºä»£ç ', title: 'åæä»åºä»£ç ', width: 125 }
			, { field: 'åæä»åº', title: 'åæä»åº', width: 125 }
			, { field: 'HSPID', title: 'HSPID', width: 200, hide: true }
			, { field: 'ä»ä½ä»£ç ', title: 'ä»ä½ä»£ç ', width: 125 }
			, { field: 'ä»ä½', title: 'ä»ä½', width: 125 }
			, { field: 'åºåæ°é', title: 'åºåæ°é', width: 125 }
			, { field: 'å®åæ°é', title: 'å®åæ°é', width: 125 }
			, { field: 'åä»·', title: 'åä»·', width: 125 }
			, { field: 'éé¢', title: 'éé¢', width: 125 }
			, { field: 'è®¾è®¡å¯¿å½', title: 'è®¾è®¡å¯¿å½', width: 125 }
			, { field: 'ç´¯ç§¯ä½¿ç¨å¯¿å½', title: 'ç´¯ç§¯ä½¿ç¨å¯¿å½', width: 125 }
			, { field: 'å©ä½å¯¿å½', title: 'å©ä½å¯¿å½', width: 125 }
			, { field: 'å³èæ°é', title: 'å³èæ°é', width: 125 }
			, { field: 'è¡¨ä½å¤æ³¨', title: 'è¡¨ä½å¤æ³¨', width: 125 }
			, { field: 'çº¢èåæ è®°', title: 'çº¢èåæ è®°', width: 125 }
			, { field: 'å¶åäºº', title: 'å¶åäºº', width: 125 }
			, { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ', width: 200, templet: "<div>{{d.å¶åæ¥æ ==null ?'':layui.util.toDateString(d.å¶åæ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
			, { field: 'å®¡æ ¸äºº', title: 'å®¡æ ¸äºº', width: 125 }
			, { field: 'å®¡æ ¸æ¥æ', title: 'å®¡æ ¸æ¥æ', width: 200, templet: "<div>{{d.å®¡æ ¸æ¥æ ==null ? '':layui.util.toDateString(d.å®¡æ ¸æ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
			, { field: 'ä¿®æ¹äºº', title: 'ä¿®æ¹äºº', width: 125 }
			, { field: 'ä¿®æ¹æ¥æ', title: 'ä¿®æ¹æ¥æ', width: 200, templet: "<div>{{d.ä¿®æ¹æ¥æ ==null ?'':layui.util.toDateString(d.ä¿®æ¹æ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
			, { field: 'å³éäºº', title: 'å³éäºº', width: 125 }
			, { field: 'å³éæ¥æ', title: 'å³éæ¥æ', width: 200, templet: "<div>{{d.å³éæ¥æ ==null ?'':layui.util.toDateString(d.å³éæ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
			, { field: 'ä½åºäºº', title: 'ä½åºäºº', width: 125 }
			, { field: 'ä½åºæ¥æ', title: 'ä½åºæ¥æ', width: 200, templet: "<div>{{d.ä½åºæ¥æ ==null ?'':layui.util.toDateString(d.ä½åºæ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
			, { field: 'è¡å³éäºº', title: 'è¡å³éäºº', width: 125 }
			, { field: 'å³éç±»å', title: 'å³éç±»å', width: 125 }
			, { field: 'æºåä¸»åç ', title: 'æºåä¸»åç ', width: 200, hide: true }
			, { field: 'æºåååç ', title: 'æºåååç ', width: 200, hide: true }
			, { field: 'æºååå·', title: 'æºååå·', width: 125 }
			, { field: 'æºåç±»å', title: 'æºåç±»å', width: 125 }
			, { field: 'hmainid', title: 'åæ®ID', hide: true, sort: true }
			, { field: 'æ¥æ', title: 'æ¥æ', width: 125, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>", sort: true }
			, { field: 'åæ®å·', title: 'åæ®å·', width: 195, sort: true }
			, { field: 'åæ®ç±»å', title: 'åæ®ç±»å', width: 110, sort: true }
			, { field: 'HSupTypeID', title: 'HSupTypeID', width: 200, hide: true, sort: true }
			, { field: 'å¾æ¥ç±»ååç§°', title: 'å¾æ¥ç±»å', width: 200, sort: true }
			, { field: 'HSupID', title: 'HSupID', width: 200, hide: true, sort: true }
			, { field: 'å¾æ¥åä½', title: 'å¾æ¥åä½', width: 200, sort: true }
			, { field: 'HWHID', title: 'HWHID', width: 200, hide: true, sort: true }
			, { field: 'ä»åºä»£ç ', title: 'ä»åºä»£ç ', width: 125, sort: true }
			, { field: 'ä»åº', title: 'ä»åº', width: 125, sort: true }
			, { field: 'HSecManagerID', title: 'HSecManagerID', width: 200, hide: true, sort: true }
			, { field: 'é¢æäººä»£ç ', title: 'é¢æäººä»£ç ', width: 180, sort: true }
			, { field: 'é¢æäºº', title: 'é¢æäºº', width: 125, sort: true }
			, { field: 'HKeeperID', title: 'HKeeperID', width: 200, hide: true, sort: true }
			, { field: 'åæäººä»£ç ', title: 'åæäººä»£ç ', width: 180, sort: true }
			, { field: 'åæäºº', title: 'åæäºº', width: 125, sort: true }
			, { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true, sort: true }
			, { field: 'é¨é¨ä»£ç ', title: 'é¨é¨ä»£ç ', width: 115, sort: true }
			, { field: 'é¨é¨', title: 'é¨é¨', width: 125, sort: true }
			, { field: 'æè¦', title: 'æè¦', width: 125, sort: true }
			, { field: 'è¡¨å¤´å¤æ³¨', title: 'è¡¨å¤´å¤æ³¨', width: 125, sort: true }
			, { field: 'åé¨åæ®å·', title: 'åé¨åæ®å·', width: 115, sort: true }
			, { field: 'hsubid', title: 'hsubid', width: 200, hide: true, sort: true }
			, { field: 'HMaterID', title: 'HMaterID', width: 200, hide: true, sort: true }
			, { field: 'æ¨¡å·ä»£ç ', title: 'å¨å·ä»£ç ', width: 125, sort: true }
			, { field: 'æ¨¡å·åç§°', title: 'å¨å·åç§°', width: 125, sort: true }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 125, sort: true }
			, { field: 'Hunitid', title: 'Hunitid', width: 200, hide: true, sort: true }
			//, { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ', width: 125 , sort: true}
			//, { field: 'è®¡éåä½', title: 'è®¡éåä½', width: 125 , sort: true}
			, { field: 'åºåç»ç»', title: 'åºåç»ç»', width: 125, sort: true }
			, { field: 'æ¶æä»åºID', title: 'æ¶æä»åºID', width: 200, hide: true, sort: true }
			, { field: 'æ¶æä»åºä»£ç ', title: 'æ¶æä»åºä»£ç ', width: 125, sort: true }
			, { field: 'æ¶æä»åº', title: 'æ¶æä»åº', width: 125, sort: true }
			, { field: 'HSPID', title: 'HSPID', width: 200, hide: true, sort: true }
			, { field: 'ä»ä½ä»£ç ', title: 'ä»ä½ä»£ç ', width: 125, sort: true }
			, { field: 'ä»ä½', title: 'ä»ä½', width: 125, sort: true }
			, { field: 'åºåæ°é', title: 'åºåæ°é', width: 125, sort: true }
			, { field: 'å®åæ°é', title: 'å®åæ°é', width: 125, sort: true }
			, { field: 'åä»·', title: 'åä»·', width: 125, sort: true }
			, { field: 'éé¢', title: 'éé¢', width: 125, sort: true }
			, { field: 'è®¾è®¡å¯¿å½', title: 'è®¾è®¡å¯¿å½', width: 125, sort: true }
			, { field: 'ç´¯ç§¯ä½¿ç¨å¯¿å½', title: 'ç´¯ç§¯ä½¿ç¨å¯¿å½', width: 125, sort: true }
			, { field: 'å©ä½å¯¿å½', title: 'å©ä½å¯¿å½', width: 125, sort: true }
			, { field: 'å³èæ°é', title: 'å³èæ°é', width: 125, sort: true }
			, { field: 'è¡¨ä½å¤æ³¨', title: 'è¡¨ä½å¤æ³¨', width: 125, sort: true }
			, { field: 'çº¢èåæ è®°', title: 'çº¢èåæ è®°', width: 125, 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: 'å®¡æ ¸äºº', 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: 'ä¿®æ¹äºº', 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: 'å³éäºº', 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: 'ä½åºäºº', 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: 'è¡å³éäºº', title: 'è¡å³éäºº', width: 125, sort: true }
			, { field: 'å³éç±»å', title: 'å³éç±»å', width: 125, sort: true }
			, { field: 'æºåä¸»åç ', title: 'æºåä¸»åç ', width: 200, hide: true, sort: true }
			, { field: 'æºåååç ', title: 'æºåååç ', width: 200, hide: true, sort: true }
			, { field: 'æºååå·', title: 'æºååå·', width: 125, sort: true }
			, { field: 'æºåç±»å', title: 'æºåç±»å', width: 125, sort: true }
			]]
			};
			}
			@@ -216,7 +264,7 @@
			$.ajax({
			url: GetWEBURL() + '/Sc_MouldOtherInBill/GetMouldOtherInBill',
			type: "GET",
			data: { "sWhere": sWhere },
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"]},
			success: function (data1) {
			if (data1.count == 1) {
			option.data = data1.data;
			@@ -296,7 +344,7 @@
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "Sc_MouldOtherInBill/DeltetMouldOtherInBill", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			data: { "HInterID": InterID },
			data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.count == 1) {
			layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
			@@ -338,12 +386,16 @@
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			var InterID = data[0].hmainid.toString();
			layer.alert("ææ¯æå°æé®ï¼åæ®ä¸»IDæ¯ï¼" + InterID);
			//window.open("../çäº§å·¥åºç®¡ç/å·¥åºæ±æ¥å/HBarPlanPrint.html?linterid=" + linterid + "&Type=HDepartMent" + "&OpenTmp=b");
			//window.open("../../åºç¡èµæ/å¬ç¨åºç¡èµæ/HBarPlanPrint.html?linterid=" + InterID + "&Type=HDepartMent" + "&OpenTmp=b");
			window.open("../../åºç¡èµæ/å¬ç¨åºç¡èµæ/HBarPlanPrint.html?linterid=" + InterID + "&Type=HMouldOtherInBill&OpenTmp=å¨å·å¶ä»å¥åºæ¡ç ");

			layer.open({
			type: 2
			, area: ['50%', '50%']
			, title: 'æå°æ¨¡çéæ©'
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: false //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HMouldOtherInBill', 'yes']
			, resize: false
			})
			}
			else {
			layer.msg('è¯·éæ©ä¸è¡æ°æ®æå°ï¼');
			@@ -355,12 +407,16 @@
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			var InterID = data[0].hmainid.toString();
			layer.alert("ææ¯æå°æé®ï¼åæ®ä¸»IDæ¯ï¼" + InterID);
			//window.open("../çäº§å·¥åºç®¡ç/å·¥åºæ±æ¥å/HBarPlanPrint.html?linterid=" + linterid + "&Type=HDepartMent" + "&OpenTmp=b");
			//window.open("../../åºç¡èµæ/å¬ç¨åºç¡èµæ/HBarPlanPrint.html?linterid=" + InterID + "&Type=HDepartMent" + "&OpenTmp=b");
			window.open("../../åºç¡èµæ/å¬ç¨åºç¡èµæ/HBarPlanPrint.html?linterid=" + InterID + "&Type=HMouldOtherInBill&OpenTmp=å¨å·å¶ä»å¥åºæ¡ç ");

			layer.open({
			type: 2
			, area: ['50%', '50%']
			, title: 'æå°æ¨¡çéæ©'
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: false //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HMouldOtherInBill', 'yes']
			, resize: false
			})
			}
			else {
			layer.msg('è¯·éæ©ä¸è¡æ°æ®æå°ï¼');
			@@ -389,17 +445,42 @@

			//#region å¿«éè¿æ»¤
			function get_FastQuery(table, option) {
			var HDate = $("#HBeginDate").val();//å¼å§æ¥æ
			var HDate1 = $("#HEndDate").val();//ç»ææ¥æ
			var HBillNo = $("#HBillNo").val();//åæ®å·
			if (HDate) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + HDate + "'";
			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 (HDate1) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) <= '" + HDate1 + "'";
			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 + "%'";
			}
			get_Display(sWhere);
			sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			@@ -407,9 +488,15 @@
			//#endregion
			//#region éç½®è¿æ»¤æ¡ä»¶
			function set_ClearQuery() {
			$("#HDate").val("");//å¼å§æ¥æ
			$("#HDate1").val("");//ç»ææ¥æ
			$("#HBillNo").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);
			}