MES-WEB-LayUI.git

			@@ -5,14 +5,15 @@
			<title>ç¼ºæåææ¥è¡¨</title>
			<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
			<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
			<link rel="stylesheet" href="../../../layuiadmin/ext/soulTable.css" media="all">
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
			<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/soulTable.slim.js"></script>

			<!--<script src="../../../layuiadmin/soulTable.slim.js"></script>-->
			<script src="../../../layuiadmin/SetColumn.js"></script>
			</head>
			<body>
			<div class="layui-fluid">
			@@ -51,7 +52,7 @@
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch">éç½®</button>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnExport" id="btnExport">å¯¼åº</button>
			<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
			<div class="layui-row" style="margin-top:10px;">
			<!--<div class="layui-row" style="margin-top:10px;">
			<div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			@@ -135,7 +136,7 @@
			<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
			</div>
			</div>
			</div>
			</div>-->
			</div>
			</div>
			</div>
			@@ -160,6 +161,7 @@
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			}).extend({
			index: 'lib/index', //ä¸»å¥å£æ¨¡å
			soulTable: '../ext/soulTable'
			}).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util','soulTable'], function () {
			//#region å¬ç¨åé
			var $ = layui.$
			@@ -194,7 +196,7 @@
			switch (obj.event) {
			//éèåè®¾ç½®
			case 'HideColumn':
			get_HideColumn();
			get_HideColumnNoPageForPlan(HModName, option, get_FastQuery);
			break;
			};
			});
			@@ -234,12 +236,13 @@
			$("#HENDDATE").val(Format(new Date($("#HBEGINDATE").val()).setDate(new Date($("#HBEGINDATE").val()).getDate() + 30), 'yyyy-MM-dd'));
			//çäº§ç»ç»å è½½
			Organ();
			//åå§åè¡¨æ ¼
			set_InitGrid();
			////åå§åè¡¨æ ¼
			//set_InitGrid();
			//å¿«éè¿æ»¤
			get_FastQuery(1);
			DisPlay_HideColumn();
			ColFilter();
			//ColFilter();
			}
			//#endregion

			@@ -247,13 +250,13 @@
			function set_InitGrid() {
			var columns = [];

			columns.push({ field: 'HOrgName', title: 'éè´ç»ç»', sort: true });
			columns.push({ field: 'FNUMBER', title: 'ç©æç¼ç ', sort: true });
			columns.push({ field: 'HMaterName', title: 'ç©æåç§°', sort: true });
			columns.push({ field: 'HMaterModel', title: 'ç©æè§æ ¼', sort: true });
			columns.push({ field: 'å¨éæ°é', title: 'å¨éæ°é', totalRow: true });
			columns.push({ field: 'CountHQty', title: 'åè®¡', sort: true });
			columns.push({ field: 'FBASEQTY', title: 'å³æ¶åºåæ°é', sort: true, totalRow: true});
			columns.push({ field: 'HOrgName', title: 'éè´ç»ç»', sort: false, filter: true });
			columns.push({ field: 'FNUMBER', title: 'ç©æç¼ç ', sort: false, filter: true });
			columns.push({ field: 'HMaterName', title: 'ç©æåç§°', sort: false, filter: true });
			columns.push({ field: 'HMaterModel', title: 'ç©æè§æ ¼', sort: false, filter: true });
			columns.push({ field: 'å¨éæ°é', title: 'å¨éæ°é', totalRow: true, filter: true });
			columns.push({ field: 'CountHQty', title: 'åè®¡', sort: false, filter: true });
			columns.push({ field: 'FBASEQTY', title: 'å³æ¶åºåæ°é', sort: false, totalRow: true, filter: true});
			//è·åä¸¤ä¸ªææä¹é´çç¸å·®
			var time1 = Date.parse(new Date($("#HBEGINDATE").val()));//å¼å§æ¶é´
			var time2 = Date.parse(new Date($("#HENDDATE").val()));//ç»ææ¶é´
			@@ -377,6 +380,8 @@
			success: function (result) {
			if (result.count == 1) {
			option.data = result.data;
			//åè®¾ç½®
			DisPlay_HideColumnForPlan(HModName, sessionStorage["HUserName"], option);
			table.render(option);
			layer.close(ajaxLoad);
			//layer.alert("æ¥è¯¢æå", { icon: 1 });
			@@ -413,71 +418,6 @@
			var ColName2 = $("#ColName2").val();//å¤éæ¡
			var Comparator2 = $("#Comparator2").val()
			var ColContent2 = $("#ColContent2").val();

			if (ColName != 0 && Comparator != 0) {
			var com = "";
			switch (Comparator) {
			case "7":
			com = "like'%" + ColContent + "%'";
			break;
			case "8":
			com = "like'%" + ColContent + "'";
			break;
			case "9":
			com = "like'" + ColContent + "%'";
			break;
			case "10":
			com = "not like'%" + ColContent + "%'";
			break;
			default:
			com = "" + Comparator + "'" + ColContent + "'";
			break;
			}
			sWhere += " and " + ColName + " " + com;
			}

			if (ColName1 != 0 && Comparator1 != 0) {
			var com1 = "";
			switch (Comparator1) {
			case "7":
			com1 = "like'%" + ColContent1 + "%'";
			break;
			case "8":
			com1 = "like'%" + ColContent1 + "'";
			break;
			case "9":
			com1 = "like'" + ColContent1 + "%'";
			break;
			case "10":
			com1 = "not like'%" + ColContent1 + "%'";
			break;
			default:
			com1 = "" + Comparator1 + "'" + ColContent1 + "'";
			break;
			}
			sWhere += " and " + ColName1 + " " + com1;
			}
			if (ColName2 != 0 && Comparator2 != 0) {
			var com2 = "";
			switch (Comparator2) {
			case "7":
			com2 = "like'%" + ColContent2 + "%'";
			break;
			case "8":
			com2 = "like'%" + ColContent2 + "'";
			break;
			case "9":
			com2 = "like'" + ColContent2 + "%'";
			break;
			case "10":
			com2 = "not like'%" + ColContent2 + "%'";
			break;
			default:
			com2 = "" + Comparator + "'" + ColContent + "'";
			break;
			}
			sWhere += " and " + ColName2 + " " + com2;
			}
			if (HBEGINDATE > HENDDATE) {
			return layer.msg("å¼å§æ¥æä¸è½å°äºç»ææ¥æ!");
			}
			@@ -633,8 +573,7 @@
			//, HXQD: HXQD
			//, HPURORDERNO: HPURORDERNO
			}
			//åå§åè¡¨æ ¼
			set_InitGrid();

			get_Display(JSON.stringify(sWhere));
			sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			}