MES-WEB-LayUI.git

			@@ -7,8 +7,8 @@
			<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
			<link rel="stylesheet" href="../../../layuiadmin/ext/soulTable.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/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>
			@@ -17,7 +17,7 @@
			</head>
			<body>
			<div class="layui-fluid">
			<div class="layui-col-md12">
			<div class="layui-col-md13">
			<div class="layui-card" style="padding: 1px">
			<div class="layui-card-body" style="padding: 1px;">
			<form class="layui-form" action="" lay-filter="component-form-group">
			@@ -29,8 +29,8 @@
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">ä¿å</button>
			<!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnReady" id="btnReady">åå¤</button>-->
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnProPC" id="btnProPC">æäº§</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnLock" id="btnLock">éå®</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnUnlock" id="btnUnlock">è§£é</button>
			<!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnLock" id="btnLock">éå®</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnUnlock" id="btnUnlock">è§£é</button>-->
			<!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnLockRequest" id="btnLock">éå®ç³è¯·</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnUnlockRequest" id="btnUnlock">è§£éç³è¯·</button>-->
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnLockOrder" id="btnLockOrder">éå®å·¥å</button>
			@@ -250,10 +250,10 @@
			</div>
			</div>
			<div id="HProgressBar"></div>
			<div class="layui-row" style="padding:10px 0">
			<div class="layui-row" style="padding:0px 0">
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			</div>
			<div class="resizable-container layui-tab layui-tab-card" style="margin-top:40px;">
			<div class="resizable-container layui-tab layui-tab-card" style="margin-top: 40px; display: none;">
			<ul class="layui-tab-title">
			<li class="layui-this">çäº§è®¢å</li>
			<li>ç¼ºæåæ</li>
			@@ -312,14 +312,14 @@
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadyAsc"><i class="layui-icon layui-icon-delete"></i>åå¤æåº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadyWorkQty"><i class="layui-icon layui-icon-delete"></i>åå¤(åæ¥äº§è½)</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Souce"><i class="layui-icon layui-icon-delete"></i>éäº§çº¿</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Emp"><i class="layui-icon layui-icon-delete"></i>éæä½å·¥</button>
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Emp"><i class="layui-icon layui-icon-delete"></i>éæä½å·¥</button>-->
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Routing"><i class="layui-icon layui-icon-form"></i>å·¥èºè·¯çº¿</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Calendar"><i class="layui-icon layui-icon-form"></i>å·¥åæ¥å</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>å¯¼åº</button>
			</div>
			</script>
			<script type="text/html" id="toolbarDemo2">
			<!--<script type="text/html" id="toolbarDemo2">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Arrangement"><i class="layui-icon layuiiconform"></i>æäº§</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn_ICMO"><i class="layui-icon layuiiconform"></i>åè®¾ç½®</button>
			@@ -331,7 +331,7 @@
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn_Material"><i class="layui-icon layuiiconform"></i>åè®¾ç½®</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-logout"></i>éåº</button>
			</div>
			</script>
			</script>-->
			</form>
			</div>
			</div>
			@@ -351,7 +351,7 @@
			}).extend({
			index: 'lib/index', //ä¸»å¥å£æ¨¡å
			soulTable: 'soulTable'
			}).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util', 'soulTable','jquery'], function () {
			}).use(['index', 'form', 'table', 'element', 'laydate', 'util', 'soulTable','jquery'], function () {
			//#region å¬ç¨åé

			var $ = layui.$
			@@ -360,7 +360,6 @@
			, table = layui.table
			, form = layui.form
			, laydate = layui.laydate
			, excel = layui.excel
			, soulTable = layui.soulTable
			, element = layui.element;
			var ins;
			@@ -1073,7 +1072,8 @@
			//åå§åè¡¨æ ¼
			set_InitGrid();
			get_FastQuery(2);
			get_FastQuery_ICMO();
			//çäº§è®¢åæ¥è¯¢
			/get_FastQuery_ICMO();/
			}
			//#region åå§åä¸æåè¡¨ æäº§æ¶é´
			function setSelect_HArrangeProductDayQty() {
			@@ -1741,7 +1741,7 @@
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, title: "è®¡åæ¥è¡¨"
			, height: 'full-120'
			, height: 'full-175'
			, page: false
			, cellMinWidth: 90
			, cols: [columns]
			@@ -1873,15 +1873,15 @@
			//åè®¾ç½®
			DisPlay_HideColumnForPlan(HModName, sessionStorage["HUserName"], option);
			ins = table.render(option);
			var HinterID_S = [];
			for (var i = 0; i < data1.data.length; i++) {
			HinterID_S.push(data1.data[i]["hmainid"]);
			}
			//var HinterID_S = [];
			//for (var i = 0; i < data1.data.length; i++) {
			// HinterID_S.push(data1.data[i]["hmainid"]);
			//}
			layer.close(ajaxLoad);
			if (HinterID_S.length > 0) {
			get_Display_1(HinterID_S);
			get_Display_2(HinterID_S);
			}
			//if (HinterID_S.length > 0) {
			// get_Display_1(HinterID_S);
			// get_Display_2(HinterID_S);
			//}

			} else {
			layer.close(ajaxLoad);