MES-WEB-LayUI.git

			@@ -37,7 +37,7 @@
			<option value="ZHSJ">ä¸æ¶å½è¿å</option>
			</select>
			</div>
			</div>-->
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">åæ®å·</label>
			<div class="layui-input-block">
			@@ -49,32 +49,31 @@
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HCreateBy" id="HCreateBy">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">å¼å§æ¶é´</label>
			<div class="layui-input-block">
			<input type="date" class="layui-input" name="BenginHCreateDate" id="BenginHCreateDate">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ç»ææ¶é´</label>
			<div class="layui-input-block">
			<input type="date" class="layui-input" name="EndHCreateDate" id="EndHCreateDate">
			</div>
			</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">
			<!--<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-inline">
			<span>å¶ä»æ¡ä»¶></span>
			</div>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">å¼å§æ¶é´</label>
			<div class="layui-input-block">
			<input type="date" class="layui-input" name="BenginHCreateDate" id="BenginHCreateDate">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ç»ææ¶é´</label>
			<div class="layui-input-block">
			<input type="date" class="layui-input" name="EndHCreateDate" id="EndHCreateDate">
			</div>
			</div>
			</div>-->
			</div>

			</div>
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			<script type="text/html" id="toolbarDemo">
			@@ -117,7 +116,6 @@
			, laypage = layui.laypage
			, laydate = layui.laydate
			, util = layui.util
			//æ¥è¯¢æ¡ä»¶
			var sWhere = "";
			var index = layer.load(0);
			var option = [];
			@@ -126,7 +124,7 @@

			//åå§åé¡µé¢å è½½
			set_ClearBill();



			//#region å¤´å·¥å·æ äºä»¶
			table.on('toolbar(mainTable)', function (obj) {
			@@ -215,14 +213,14 @@
			, cols: [[
			{ type: 'checkbox', fixed: 'left' }
			, { field: 'hmainid', title: 'hmainid', hide: true }
			, { field: 'æ¥æ', title: 'æ¥æ', width: 160 ,templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>"}
			, { field: 'æ¥æ', title: 'æ¥æ', width: 160 }
			, { field: 'åæ®å·', title: 'åæ®å·', width: 160 }
			, { field: 'åæ®ç±»å', title: 'åæ®ç±»å', width: 160, hide: true }
			, { field: 'è®¾å¤ä»£ç ', title: 'è®¾å¤ä»£ç ', width: 200 }
			, { field: 'è®¾å¤åç§°', title: 'è®¾å¤åç§°', width: 200, hide: true }
			, { field: 'è¡¨å¤´å¤æ³¨', title: 'è¡¨å¤´å¤æ³¨', width: 200, hide: true }
			, { field: 'å¼å§æ¥æ', title: 'å¼å§æ¥æ', width: 200, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>"}
			, { field: 'ç»ææ¥æ', title: 'ç»ææ¥æ', width: 200, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>"}
			, { field: 'å¼å§æ¥æ', title: 'å¼å§æ¥æ', width: 200 }
			, { field: 'ç»ææ¥æ', title: 'ç»ææ¥æ', width: 200 }
			, { field: 'å¨æåä½', title: 'å¨æåä½', width: 200 }
			, { field: 'ç¹æ£å¨æ', title: 'ç¹æ£å¨æ', width: 200 }
			, { field: 'æè¦', title: 'æè¦', width: 200 }
			@@ -238,16 +236,16 @@
			, { field: 'è¡å³éäºº', title: 'è¡å³éäºº', width: 115, hide: true }
			, { field: 'å³éç±»å', title: 'å³éç±»å', width: 200 }
			, { field: 'è¡¨ä½å¤æ³¨', title: 'è¡¨ä½å¤æ³¨', width: 200, hide: true }
			, { field: 'å¶åäºº', title: 'å¶åäºº', width: 115 }
			, { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ', width: 200, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'å¶åäºº', title: 'å¶åäºº', width: 115, hide: true }
			, { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ', width: 200 }
			, { field: 'å®¡æ ¸äºº', title: 'å®¡æ ¸äºº', width: 200 }
			, { field: 'å®¡æ ¸æ¥æ', title: 'å®¡æ ¸æ¥æ', width: 200, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'ä¿®æ¹äºº', title: 'ä¿®æ¹äºº', width: 200 }
			, { field: 'ä¿®æ¹æ¥æ', title: 'ä¿®æ¹æ¥æ', width: 115, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>"}
			, { field: 'å®¡æ ¸æ¥æ', title: 'å®¡æ ¸æ¥æ', width: 200, hide: true }
			, { field: 'ä¿®æ¹äºº', title: 'ä¿®æ¹äºº', width: 200, hide: true }
			, { field: 'ä¿®æ¹æ¥æ', title: 'ä¿®æ¹æ¥æ', width: 115, hide: true }
			, { field: 'å³éäºº', title: 'å³éäºº', width: 200 }
			, { field: 'å³éæ¥æ', title: 'å³éæ¥æ', width: 200, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>"}
			, { field: 'ä½åºäºº', title: 'ä½åºäºº', width: 200 }
			, { field: 'ä½åºæ¥æ', title: 'ä½åºæ¥æ', width: 115, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>"}
			, { field: 'å³éæ¥æ', title: 'å³éæ¥æ', width: 200 }
			, { field: 'ä½åºäºº', title: 'ä½åºäºº', width: 200, hide: true }
			, { field: 'ä½åºæ¥æ', title: 'ä½åºæ¥æ', width: 115, hide: true }
			, { field: 'æºåä¸»åç ', title: 'æºåä¸»åç ', width: 200, hide: true }
			, { field: 'æºåååç ', title: 'æºåååç ', width: 200, hide: true }
			, { field: 'æºååå·', title: 'æºååå·', width: 200 }
			@@ -256,36 +254,23 @@
			]]
			};
			}

			//éç½®è¿æ»¤æ¡ä»¶
			function set_ClearQuery() {
			//$("#HBillType").val("");//åæ®ç±»å
			$("#HBillNo").val("");//åæ®å·
			$("#HSourceBillNo").val("");//æºåå·
			$("#HCreateBy").val("");//å¶åäºº
			$("#BenginHCreateDate").val("");//å¼å§å¶åæ¶é´
			$("#EndHCreateDate").val("");//ç»æå¶åæ¶é´
			sWhere = "";
			$("#btnSearch").click();
			$("#HNumber").val("");
			$("#HName").val("");
			}
			//å¿«éè¿æ»¤
			function get_FastQuery(table, option) {
			//var HBillType = $("#HBillType").val();//åæ®ç±»å
			var HBillNo = $("#HBillNo").val();//åæ®å·
			var HCreateBy = $("#HCreateBy").val();//å¶åäºº
			var BenginHCreateDate = $("#BenginHCreateDate").val();//å¼å§å¶åæ¶é´
			var EndHCreateDate = $("#EndHCreateDate").val();//ç»æå¶åæ¶é´
			if (HBillNo) {
			sWhere += " and åæ®å· like '%" + HBillNo + "%'";
			}
			if (HCreateBy) {
			sWhere += " and å¶åäºº like '%" + HCreateBy + "%'";
			}
			if (BenginHCreateDate) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + BenginHCreateDate + "'";
			}
			if (EndHCreateDate) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + EndHCreateDate + "'";
			}
			//var HNumber = $("#HNumber").val();
			//var HName = $("#HName").val();
			//if (HNumber) {
			// sWhere += " and èåä»£ç like '%" + HNumber + "%'";
			//}
			//if (HName) {
			// sWhere += " and èååç§° like '%" + HName + "%'";
			//}
			var index = layer.load(0);
			get_Display(sWhere);
			sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			}
			@@ -299,7 +284,7 @@
			shift: 2,
			area: ['100%', '100%'],
			maxmin: true,
			content: '../è®¾å¤ç®¡ç/Sb_EquipDotCheckPlanBillEdit.html??OperationType=1&linterid=&HSouceBillType=',
			content: '../è®¾å¤ç®¡ç/Sb_EquipDotCheckPlanBillEdit.html',
			end: function () {
			//å·æ°é¡µé¢,
			location.reload();
			@@ -314,7 +299,7 @@
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			var linterid = data[0].hmainid.toString();
			var hID = data[0].hmainid.toString();
			//if (AllowLoadData(sSubStr) != false) {//éç©ºéªè¯
			layer.open({
			type: 2
			@@ -323,7 +308,7 @@
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: '../è®¾å¤ç®¡ç/Sb_EquipDotCheckPlanBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
			, content: '../è®¾å¤ç®¡ç/Sb_EquipDotCheckPlanBillEdit.html?hID=' + hID
			, resize: false,
			end: function () {
			//å·æ°é¡µé¢,
			@@ -375,6 +360,7 @@
			layer.msg('è¯·éæ©ä¸è¡æ°æ®å é¤ï¼');
			}
			}


			//#endregion
			});