MES-WEB-LayUI.git

			@@ -9,6 +9,7 @@
			<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/treeTable.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>
			@@ -28,40 +29,67 @@
			<span></span>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">é¨é¨ä»£ç </label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HNumber" id="HNumber">
			<div>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btndelete" id="btndelete" style="padding:0 5px">å é¤</button>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnAdd" id="btnAdd" style="padding:0 5px">æ°å¢</button>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnModify" id="btnModify" style="padding:0 5px">ä¿®æ¹</button>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnJY" id="btnJY" style="padding:0 5px">ç¦ç¨</button>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnFJY" id="btnFJY" style="padding:0 5px">åç¦ç¨</button>
			</div>
			<div class="layui-row">
			<!--<div class="layui-col-xs2">
			<div id="treeDepartment" lay-filter="treeDepartment" class="demo-tree demo-tree-box" style="width: 200px; height: 500px; overflow: scroll;"></div>
			</div>-->
			<div class="layui-col-xs10">
			<div class="layui-inline">
			<label class="layui-form-label">é¨é¨ä»£ç </label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HNumber" id="HNumber">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">é¨é¨åç§°</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HName" id="HName">
			</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>
			<div class="layui-card">
			<div class="layui-card-header"></div>
			<div class="layui-card-body">
			<div class="layui-tab">
			<ul class="layui-tab-title" lay-filter="tab-all">
			<li data-status="">é¨é¨ä¿¡æ¯</li>
			<li data-status="2">å¶ä»</li>
			</ul>
			<div class="layui-tab-content">
			<div class="layui-tab-item layui-show">
			<table class="layui-hide" id="hk-table-jh" lay-filter="hk-table-jh"></table>
			</div>
			<div class="layui-tab-item">
			<table class="layui-hide" id="fj-table-qd" lay-filter="fj-table-qd"></table>
			</div>
			</div>
			</div>
			</div>
			</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="HName" id="HName">
			</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>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btndelete" id="btndelete" style="padding:0 5px">å é¤</button>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnAdd" id="btnAdd" style="padding:0 5px">æ°å¢</button>
			<button type="button" lay-submit="" class="buttom_box_little" lay-filter="btnModify">ä¿®æ¹</button>
			<button type="button" lay-submit="" class="buttom_box_little" lay-filter="btnJY">ç¦ç¨</button>
			<button type="button" lay-submit="" class="buttom_box_little" lay-filter="btnFJY">åç¦ç¨</button>

			</div>
			</div>
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>é¢è§</button>-->
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>å·æ°</button>
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>å·æ°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>ç¡®è®¤</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>é©³å</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>è¯¦æ</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>çæéè´§å</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>éåº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>éåº</button>-->

			</div>
			</script>
			@@ -75,7 +103,7 @@
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			}).extend({
			index: 'lib/index', //ä¸»å¥å£æ¨¡å
			}).use(['index', 'form', 'table', 'element', 'laypage','laydate'], function () {
			}).use(['tree','index', 'form', 'table', 'element', 'laypage','laydate'], function () {
			var $ = layui.$
			, admin = layui.admin
			, layer = layui.layer
			@@ -85,7 +113,35 @@
			, laypage = layui.laypage
			, laydate = layui.laydate
			, util = layui.util
			, tree = layui.tree
			var sWhere = "";


			//$.ajax({
			// url: GetWEBURL() + '/Gy_Department/list',
			// type: "post",
			// contentType: "application/json",
			// dataType: "json",
			// contentType: " application/json; charset=utf-8 ",
			// data: { "sWhere": sWhere },
			// success: function (data1) {
			// var xtree1 = new layuixtree({
			// elem: 'xtree1',
			// form: form,
			// data: strToJson(data1),
			// isopen: true, //falseåå§å³éï¼trueæå¼
			// click: function (data1) { //èç¹éä¸ç¶ææ¹åäºä»¶çå¬ï¼å¨éæ¡æèªå·±ççå¬äºä»¶
			// console.log(data1.elem); //å¾å°checkboxåå§DOMå¯¹è±¡
			// console.log(data1.elem.checked); //æ¯å¦éä¸ï¼trueéä¸
			// alert(data.value); //å¼¹åºvalueå¼
			// }
			// });
			// //to do:è¿éå¤çæ°æ®
			// },
			// error: function (x, y, z) {
			// layer.msg("æä½å¤±è´¥");
			// }
			//});

			var option = {
			elem: '#mainTable'
			@@ -148,6 +204,9 @@
			// layer.msg("è¯¥åæ®å·²å®¡æ ¸æ æ³å é¤ï¼è¯·ååå®¡æ ¸ï¼");
			// return;
			//}

			var ModRightNameDelete = 'Gy_Department_Delete'

			var data = obj.data //è·å¾å½åè¡æ°æ®
			, layEvent = obj.event; //è·å¾ lay-event å¯¹åºçå¼
			layer.confirm('æ¨ç¡®å®è¦å é¤åï¼', {
			@@ -159,7 +218,7 @@
			url: GetWEBURL() + '/Gy_Department/Delete_Json',
			type: "GET",
			//async: true,
			data: { "HItemID": checkStatus.data[0].HItemID},
			data: { "HItemID": checkStatus.data[0].HItemID, "User": sessionStorage["HUserName"], "ModRightNameDelete": ModRightNameDelete},
			success: function (result) {
			if (result.count == 1) {
			$("#btnSearch").click();