MES-WEB-LayUI.git

			@@ -6,14 +6,14 @@
			<meta name="renderer" content="webkit">
			<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
			<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
			<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
			<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
			<script src="../../../layuiadmin/layui/layui.js"></script>
			<script src="../../../layuiadmin/Scripts/json2.js"></script>
			<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/PubCustom.js"></script>
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
			<link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
			<link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
			<script src="../../layuiadmin/layui/layui.js"></script>
			<script src="../../layuiadmin/Scripts/json2.js"></script>
			<script src="../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
			<script src="../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../layuiadmin/PubCustom.js"></script>
			<script src="../../layuiadmin/zgqCustom/zgqCustom.js"></script>
			<style type="text/css">
			input.layui-input.layui-unselect {
			padding-right: 0;
			@@ -37,7 +37,27 @@
			</div>
			<div class="layui-inline">
			<input type="date" class="layui-input" id="HEndDate" style="width:110px;" placeholder="yyyy-MM-dd">
			</div>
			</div>

			<div class="layui-inline" style="margin-top:2px;">
			<label class="layui-form-label" style="width: 60px;">è®¾å¤ç¼ç </label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HEqNumber" lay-verify="HEqNumber" id="HEqNumber">
			</div>
			</div>
			<div class="layui-inline" style="margin-top:2px;">
			<label class="layui-form-label" style="width: 60px;">è®¾å¤åç§°</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HEqName" lay-verify="HEqName" id="HEqName">
			</div>
			</div>
			<div class="layui-inline" style="margin-top:2px;">
			<label class="layui-form-label" style="width: 60px;">å æ® å·</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="width:125px;">
			</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>
			@@ -59,7 +79,7 @@

			<script>
			layui.config({
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			base: '../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			}).extend({
			index: 'lib/index', //ä¸»å¥å£æ¨¡å
			}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
			@@ -78,6 +98,8 @@
			var sWhere = "";
			var option = [];
			var HModName = "Sb_EquipDotCheckBillList_PDA";
			//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			var titleData = ["hmainid", "è®¾å¤ID", "ç¹æ£é¡¹ç®ID","è´è´£äººID","hsubid","HBillType"];

			//#endregion

			@@ -103,7 +125,10 @@
			case 'btnDel': btnDel();
			break;
			//éåº
			case 'btn-exit': Pub_Close(2);
			case 'btn-exit':
			layer.confirm('æ¨ç¡®å®è¦éåºåï¼', { icon: 3, title: 'æç¤º' }, function (index) {
			parent.location.href = "../../../views/index_Mobile.html";
			});
			break;
			//éèåè®¾ç½®
			case 'HideColumn':
			@@ -147,9 +172,9 @@
			//åå§åæ¶é´
			$("#HBeginDate").val(Format(new Date() - 1000 * 60 * 60 * 24 * 30, "yyyy-MM-dd"));
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));

			//å è½½æ°æ®å°ç½æ ¼
			get_FastQuery();
			//åå§åè¡¨æ ¼
			DisPlay_HideColumn();
			}

			@@ -174,7 +199,7 @@
			url: GetWEBURL() + "/Web/GetEquipmentBillsList",
			type: "GET",
			async: false,
			data: { "sWhere": sWhere, "Type": "DJ" },
			data: { "sWhere": sWhere, "Type": "DJ", "user": sessionStorage["HUserName"] },
			success: function (data1) {

			if (data1.count == 1) {
			@@ -189,7 +214,7 @@
			//å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
			col.push({ type: 'checkbox', fixed: 'left' });
			for (var i = 0; i < data.length; i++) {
			if ($.inArray(data[i].name, "") > -1) {
			if ($.inArray(data[i].name, titleData) > -1) {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
			}
			else {
			@@ -213,7 +238,7 @@
			, height: 'full-70'
			, totalRow: false //å¼å¯åè®¡
			, cols: [col]
			, data: data1.data
			, data: data1.data == null ? [] : data1.data
			};
			table.render(option);

			@@ -237,12 +262,22 @@
			function get_FastQuery() {
			var HBeginDate = $("#HBeginDate").val();//ä¸è¾¾æ¥æ å¼å§æ¥æ
			var HEndDate = $("#HEndDate").val();//ç»ææ¥æ

			var HEqNumber = $("#HEqNumber").val(); //è®¾å¤ä»£ç
			var HEqName = $("#HEqName").val(); //è®¾å¤åç§°
			var HBillNo = $("#HBillNo").val(); //åæ®å·

			if (HBeginDate != "" && HEndDate != "") {
			sWhere += " and æ¥æ between '" + HBeginDate + "' and '" + HEndDate + "' ";
			}

			if (HEqNumber != "") {
			sWhere += " and è®¾å¤ä»£ç like '%" + HEqNumber + "%'"
			}
			if (HEqName != "") {
			sWhere += " and è®¾å¤åç§° like '%" + HEqName + "%'"
			}
			if (HBillNo != "") {
			sWhere += " and åæ®å· like '%" + HBillNo + "%'"
			}
			get_Display(sWhere);
			//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			sWhere = "";
			@@ -255,12 +290,8 @@
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
			$("#HMaterNumber").val("");
			$("#HBillNo").val("");
			$("#HProductName").val("");
			$("#HProductModel").val("");
			$("#ColContent").val("");
			$("#ColName").val("0");
			$("#Comparator").val("0");
			ColFilter();
			$("#HEqNumber").val(""); //è®¾å¤ä»£ç
			$("#HEqName").val(""); //è®¾å¤åç§°
			sWhere = "";
			}

			@@ -274,9 +305,9 @@
			var wait = layer.load();
			//é»è¾å é¤æ¹æ³
			$.ajax({
			url: GetWEBURL() + '/ProcessCheck/DelProcessCheckBill',
			url: GetWEBURL() + '/Sb_EquipDotCheckBill/DeltetEquipDotCheckBillList',
			type: "GET",
			data: { "lngBillKey": hmainid, "user": sessionStorage["HUserName"] },
			data: { "HInterID": hmainid, "user": sessionStorage["HUserName"] },
			success: function (result) {
			console.log('gouba' + result);
			if (result.count == 1) {
			@@ -344,7 +375,7 @@
			if (data1.data.length != 0) {

			var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
			var titleData = ["hmainid","HMaterID"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			var titleData = ["hmainid","è®¾å¤ID"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±

			dataCol = data1.data[0].HGridString.split(',');