MES-WEB-LayUI.git

			@@ -11,6 +11,7 @@
			<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>
			<style>
			.layui-row .layui-btn layui-btn-normal {
			margin: 0px 10px;
			@@ -42,28 +43,52 @@
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ç©æä»£ç </label>
			<div class="layui-input-block" style="margin-left: 77px;">
			<input type="text" class="layui-input" lay-verify="MaterialNumber" name="MaterialNumber" id="MaterialNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnMaterial" id="btnMaterial" style="padding: 0 10px;float: right;margin-right: 3px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			<label class="layui-form-label">æ£æç¶æ</label>
			<div class="layui-input-block" style="margin-left: 120px;width: 184px;">
			<select name="HJLStatus" lay-verify="HJLStatus" id="HJLStatus">
			<option value="å¨é¨">å¨é¨</option>
			<option value="å·²æ£æ">å·²æ£æ</option>
			<option value="æªæ£æ" selected="selected">æªæ£æ</option>
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ç©æåç§°</label>
			<label class="layui-form-label" style="width: 85px;">æ£ææ¥æ</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="MaterialName" lay-verify="MaterialName" id="MaterialName" style="background-color:#efefef4d;" readonly>
			<input type="hidden" name="MaterialID" id="MaterialID" lay-verify="MaterialID" value="0">
			<input type="date" class="layui-input" lay-verify="HBeginDate" name="HBeginDate" id="HBeginDate" style="padding-left: 80px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ç©æè§æ ¼åå·</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="MaterialModel" id="MaterialModel" onmouseover="this.title=this.value" readonly>
			<label class="layui-form-label" style="width: 85px;">â</label>
			<div class="layui-input-block" style="margin-left: 118px;">
			<input type="date" class="layui-input" lay-verify="HEndDate" name="HEndDate" id="HEndDate" style="padding-left: 80px;">
			</div>
			</div>
			<div class="layui-colla-content" style="padding: 0px; margin-left: 5%;">
			<div class="layui-row" style="margin-top:10px;">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ç©æä»£ç </label>
			<div class="layui-input-block" style="margin-left: 77px;">
			<input type="text" class="layui-input" lay-verify="MaterialNumber" name="MaterialNumber" id="MaterialNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnMaterial" id="btnMaterial" style="padding: 0 10px;float: right;margin-right: 3px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ç©æåç§°</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="MaterialName" lay-verify="MaterialName" id="MaterialName" style="background-color:#efefef4d;" readonly>
			<input type="hidden" name="MaterialID" id="MaterialID" lay-verify="MaterialID" value="0">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ç©æè§æ ¼åå·</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="MaterialModel" id="MaterialModel" onmouseover="this.title=this.value" readonly>
			</div>
			</div>
			</div>
			<div class="layui-row" style="margin-top:10px;">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">å·¥æ®µ</label>
			@@ -84,28 +109,6 @@
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 80px;">å½åç»ç»</label>
			<div class="layui-input-block" style="margin-left: 110px; width: 185px;">
			<select name="Organization" id="Organization" lay-verify="Organization">
			<!--å¨ææ¸²æç»ç»-->
			</select>
			</div>
			</div>
			</div>
			<div class="layui-row" style="margin-top:10px;">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">æ£ææ¥æ</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="date" class="layui-input" lay-verify="HBeginDate" name="HBeginDate" id="HBeginDate" style="padding-left: 80px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">â</label>
			<div class="layui-input-block" style="margin-left: 118px;">
			<input type="date" class="layui-input" lay-verify="HEndDate" name="HEndDate" id="HEndDate" style="padding-left: 80px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">é¨é¨</label>
			<div class="layui-input-block" style="margin-left: 77px;">
			<input type="text" class="layui-input" name="HDeptName" lay-verify="HDeptName" id="HDeptName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
			@@ -117,39 +120,12 @@
			</div>
			<div class="layui-row" style="margin-top:10px;">
			<div class="layui-inline">
			<label class="layui-form-label">æ£æç¶æ</label>
			<div class="layui-input-block" style="margin-left: 120px;width: 184px;">
			<select name="HJLStatus" lay-verify="HJLStatus" id="HJLStatus">
			<option value="å¨é¨">å¨é¨</option>
			<option value="å·²æ£æ">å·²æ£æ</option>
			<option value="æªæ£æ">æªæ£æ</option>
			<label class="layui-form-label" style="width: 80px;">å½åç»ç»</label>
			<div class="layui-input-block" style="margin-left: 110px; width: 185px;">
			<select name="Organization" id="Organization" lay-verify="Organization">
			<!--å¨ææ¸²æç»ç»-->
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
			<option value="0" selected="selected"></option>
			<option value="=">=</option>
			<option value=">=">>=</option>
			<option value=">">></option>
			<option value="<="><=</option>
			<option value="<"><</option>
			<option value="<>"><></option>
			<option value="7">åå«</option>
			<option value="8">å·¦åå«</option>
			<option value="9">å³åå«</option>
			<option value="10">ä¸åå«</option>
			</select>
			</div>
			<div class="layui-inline">
			<input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
			</div>
			</div>
			</div>
			@@ -169,13 +145,14 @@
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			}).extend({
			index: 'lib/index' //ä¸»å¥å£æ¨¡å
			}).use(['index', 'form', 'laydate', 'table', 'element'], function () {
			}).use(['index', 'form', 'laydate', 'table', 'element','soulTable'], function () {
			//#region å¬å±åé
			var $ = layui.$
			, admin = layui.admin
			, layer = layui.layer
			, table = layui.table
			, form = layui.form
			, soulTable = layui.soulTable
			, element = layui.element;
			//æ¥è¯¢æ¡ä»¶
			var sWhere = "";
			@@ -277,6 +254,7 @@
			Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
			}
			$("#Organization").append(Organization);
			$("#Organization").val(sessionStorage["OrganizationID"]);
			form.render('select');
			}
			layer.closeAll("loading");
			@@ -288,30 +266,34 @@
			option = {
			elem: '#mainTable'
			//, toolbar: '#toolbarDemo'
			, height: 'full-190'
			, height: 'full-120'
			, page: true
			, totalRow: true
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			, done: function (res, curr, count) {
			soulTable.render(this);
			}
			, cols: [[
			{ type: 'checkbox', fixed: 'left' }
			, { field: 'æ£æåæ¥æ', title: 'æ£æåæ¥æ', width: 150, templet: "<div>{{d.æ£æåæ¥æ ==null ?'':layui.util.toDateString(d.æ£æåæ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'æ£æééåå·', title: 'çäº§è®¢åå·', width: 170 }
			, { field: 'ééäºº', title: 'ééäºº', width: 170 }
			, { field: 'å¶åäºº', title: 'å¶åäºº', width: 260, }
			, { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ', width: 160, templet: "<div>{{d.å¶åæ¥æ ==null ?'':layui.util.toDateString(d.å¶åæ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'HMaterID', title: 'HMaterID', width: 160, hide: true }
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 160 }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 160 }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 160 }
			, { field: 'æ£ææ°é', title: 'æ£ææ°é', width: 160 }
			, { field: 'å·²è°æ¨æ°é', title: 'å·²è°æ¨æ°é', width: 160 }
			, { field: 'è®¡éåä½', title: 'è®¡éåä½', width: 160 }
			, { field: 'è½¦é´', title: 'è½¦é´', width: 160 }
			, { field: 'å·¥æ®µ', title: 'å·¥æ®µ', width: 160 }
			, { field: 'å¤æ³¨', title: 'å¤æ³¨', width: 160 }
			, { field: 'è°åºä»åº', title: 'è°åºä»åº', width: 160 }
			, { field: 'è°åºä»ä½', title: 'è°åºä»ä½', width: 160 }
			, { field: 'æ£æåæ¥æ', title: 'æ£æåæ¥æ', width: 150, templet: "<div>{{d.æ£æåæ¥æ ==null ?'':layui.util.toDateString(d.æ£æåæ¥æ, 'yyyy-MM-dd')}}</div>" ,sort:true}
			, { field: 'æ£æééåå·', title: 'çäº§è®¢åå·', width: 170 ,sort:true}
			, { field: 'ééäºº', title: 'ééäºº', width: 170, sort: true}
			, { field: 'å¶åäºº', title: 'å¶åäºº', width: 260, sort: true}
			, { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ', width: 160, templet: "<div>{{d.å¶åæ¥æ ==null ?'':layui.util.toDateString(d.å¶åæ¥æ, 'yyyy-MM-dd')}}</div>", sort: true}
			, { field: 'HMaterID', title: 'HMaterID', width: 160, hide: true, sort: true}
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 160, sort: true}
			, { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 160, sort: true}
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 160, sort: true}
			, { field: 'æ£ææ°é', title: 'æ£ææ°é', totalRow: true,width: 160, sort: true}
			, { field: 'å·²è°æ¨æ°é', title: 'å·²è°æ¨æ°é', totalRow: true, width: 160, sort: true}
			, { field: 'è®¡éåä½', title: 'è®¡éåä½', width: 160, sort: true}
			, { field: 'è½¦é´', title: 'è½¦é´', width: 160, sort: true}
			, { field: 'å·¥æ®µ', title: 'å·¥æ®µ', width: 160, sort: true}
			, { field: 'å¤æ³¨', title: 'å¤æ³¨', width: 160, sort: true}
			, { field: 'è°åºä»åº', title: 'è°åºä»åº', width: 160, sort: true}
			, { field: 'è°åºä»ä½', title: 'è°åºä»ä½', width: 160, sort: true}
			]]
			};
			}
			@@ -330,9 +312,6 @@
			table.render(option);
			layer.close(ajaxLoad);

			if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
			ColFilter();
			}
			} else {
			layer.close(ajaxLoad);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			@@ -521,32 +500,6 @@
			var HDeptName = $("#HDeptName").val(); //é¨é¨
			var HJLStatus = $("#HJLStatus").val(); //æ£æç¶æ
			var user = sessionStorage["HUserName"]; //å¶åäºº
			var ColName = $("#ColName").val();//å¤éæ¡
			var Comparator = $("#Comparator").val()
			var ColContent = $("#ColContent").val();

			var Arbitrarily = "";
			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;
			}
			Arbitrarily = " and " + ColName + " " + com;
			}

			sWhere = {
			MaterialNumber: MaterialNumber,
			@@ -560,7 +513,6 @@
			HDeptName: HDeptName,
			HJLStatus: HJLStatus,
			user: user,
			Arbitrarily: Arbitrarily
			};
			get_Display(JSON.stringify(sWhere));
			sWhere = "";
			@@ -749,18 +701,6 @@
			})
			}

			//åææ¾ç¤ºä¸ææ¡
			function ColFilter() {
			var Organization = '<option value="0" selected="selected" ></option>';
			for (var i = 1; i < option.cols[0].length; i++) {
			if (option.cols[0][i].hide != true) {
			Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
			}
			}
			$("#ColName").empty();
			$("#ColName").append(Organization);
			form.render('select');
			}

			//#endregion