From 20519db2a8f7407c6c6f0748196f3fadb0485a25 Mon Sep 17 00:00:00 2001
From: admin <qiutairan163@163.com>
Date: 星期四, 04 十二月 2025 17:06:51 +0800
Subject: [PATCH] 格式化代码

---
 HTML/views/StatisticalReport/AdventSlot.html |  811 +++++++++++++++++++++++++++++----------------------------
 1 files changed, 416 insertions(+), 395 deletions(-)

diff --git a/HTML/views/StatisticalReport/AdventSlot.html b/HTML/views/StatisticalReport/AdventSlot.html
index d843642..3359bb5 100644
--- a/HTML/views/StatisticalReport/AdventSlot.html
+++ b/HTML/views/StatisticalReport/AdventSlot.html
@@ -1,132 +1,143 @@
 <!DOCTYPE html>
 <html>
-	<head>
-		<meta charset="utf-8">
-		<title>涓存湡棰勮鍒楄〃</title>
-		<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.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
-		<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="../../css/public.css" media="all">
-		<script>
-			// 杩欓噷鏄渶瑕佸湪椤甸潰娓叉煋涔嬪墠鎵ц鐨勪唬鐮�
-			document.addEventListener("DOMContentLoaded", function() {				
-				//鑾峰彇table榛樿鏄剧ず鏁�
-				pageCntFirst();
-				//鍒ゆ柇鏄惁寮�鍚痶able鍒楄〃鍒楀璋冩暣鍔熻兘銆�
-				GetIsSetColW();
-			});
-		  </script>
-	</head>
-	<body id="body">
-		<div class="layui-fluid" style="padding-bottom: 0; ">
-			<div class="layui-card">
-				<div class="layui-form layui-card-header layuiadmin-card-header-auto" id="top">
-					<div class="layui-form-item">
-                        
-                        <div class="layui-inline zongdan" >
-							<label class="layui-form-label" style="width: 60px;">鐗╂枡缂栫爜</label>
-							<div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
-								<input type="text" id="SkuNo"  name="SkuNo" placeholder="鐗╂枡缂栫爜" autocomplete="off" class="layui-input">
-							</div>
-						</div>
-                        <div class="layui-inline zongdan" >
-							<label class="layui-form-label" style="width: 60px;">鐗╂枡鍚嶇О</label>
-							<div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
-								<input type="text" id="SkuName"  name="SkuName" placeholder="鐗╂枡鍚嶇О" autocomplete="off" class="layui-input">
-							</div>
-						</div>
-						<div class="layui-inline zongdan" >
-							<label class="layui-form-label" style="width: 60px;">鎵樼洏鍙�</label>
-							<div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
-								<input type="text" id="PalletNo"  name="PalletNo" placeholder="鎵樼洏鍙�" autocomplete="off" class="layui-input">
-							</div>
-						</div>
-						<div class="layui-inline mingxi">
-							<label class="layui-form-label" style="width: 60px;">鎵规鍙�</label>
-							<div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
-								<input type="text" id="LotNo"  name="LotNo" placeholder="鎵规鍙�" autocomplete="off" class="layui-input">
-							</div>
-						</div>
-                        <div class="layui-inline ">
-							<label class="layui-form-label" style="width: 60px;">搴撳瓨鐘舵��</label>
-							<div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
-								<select name="Status" id="Status" lay-filter="Status"
-									lay-search>
-									<option value=""></option>
-									<option value="0">寰呭垎閰�</option>
-									<option value="1">閮ㄥ垎鍒嗛厤</option>
-									<option value="2">宸插垎閰�</option>
-									<option value="3">鐩樼偣閿佸畾</option>
-									<option value="4">绉诲簱閿佸畾</option>
-								</select>
-							</div>
-						</div>
-                        <div class="layui-inline zhijian">
-							<label class="layui-form-label" style="width: 60px;">鎶芥鏍囪</label>
-							<div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
-								<select name="InspectMark" id="InspectMark" lay-filter="InspectMark"
-									lay-search>
-									<option value=""></option>
-									<option value="0">鍚�</option>
-									<option value="1">鏄�</option>
-								</select>
-							</div>
-						</div>
-                        <div class="layui-inline zhijian">
-							<label class="layui-form-label" style="width: 60px;">璐ㄦ鐘舵��</label>
-							<div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
-								<select name="InspectStatus" id="InspectStatus" lay-filter="InspectStatus"
-									lay-search>
-									<option value=""></option>
-									<option value="0">寰呰川妫�</option><!-- 寰呮楠� -->
-									<option value="1">妫�楠屽悎鏍�</option><!-- 鍚堟牸鍝� -->
-									<option value="2">涓嶅悎鏍�</option><!-- 涓嶅悎鏍� -->
-									<option value="3">鏀剧疆鏈�</option><!-- 涓嶅悎鏍� -->
-								</select>
-							</div>
-						</div>
-                         
-						<div class="layui-inline">
-							<button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit lay-filter="LAY-app-contlist-search">
-								<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>鎼滅储
-							</button>
-							<button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit
-								lay-filter="daochu">
-								<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>瀵煎嚭
-							</button> 
+
+<head>
+	<meta charset="utf-8">
+	<title>涓存湡棰勮鍒楄〃</title>
+	<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.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+	<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="../../css/public.css" media="all">
+	<script>
+		// 杩欓噷鏄渶瑕佸湪椤甸潰娓叉煋涔嬪墠鎵ц鐨勪唬鐮�
+		document.addEventListener("DOMContentLoaded", function () {
+			//鑾峰彇table榛樿鏄剧ず鏁�
+			pageCntFirst();
+			//鍒ゆ柇鏄惁寮�鍚痶able鍒楄〃鍒楀璋冩暣鍔熻兘銆�
+			GetIsSetColW();
+		});
+	</script>
+</head>
+
+<body id="body">
+	<div class="layui-fluid" style="padding-bottom: 0; ">
+		<div class="layui-card">
+			<div class="layui-form layui-card-header layuiadmin-card-header-auto" id="top">
+				<div class="layui-form-item">
+
+					<div class="layui-inline zongdan">
+						<label class="layui-form-label" style="width: 60px;">鐗╂枡缂栫爜</label>
+						<div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
+							<input type="text" id="SkuNo" name="SkuNo" placeholder="鐗╂枡缂栫爜" autocomplete="off"
+								class="layui-input">
 						</div>
 					</div>
-				</div>
-
-				<div id="center"></div>
-
-				<div class="layui-card-body">
-					<div class="position-relative"><!-- class="position-relative" --><!-- 鑷畾涔夎〃澶村姞涓� -->
-						<table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
-						<!-- #region 鑷畾涔夎〃澶� -->
-						<div class="headerSetIcon">
-							<button class="layui-btn layui-btn-primary layui-btn-sm" data-type="customCols">
-								<i class="layui-icon">&#xe610;</i>
-							</button>
+					<div class="layui-inline zongdan">
+						<label class="layui-form-label" style="width: 60px;">鐗╂枡鍚嶇О</label>
+						<div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
+							<input type="text" id="SkuName" name="SkuName" placeholder="鐗╂枡鍚嶇О" autocomplete="off"
+								class="layui-input">
 						</div>
-						<!-- #endregion -->
+					</div>
+					<div class="layui-inline zongdan">
+						<label class="layui-form-label" style="width: 60px;">鎵樼洏鍙�</label>
+						<div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
+							<input type="text" id="PalletNo" name="PalletNo" placeholder="鎵樼洏鍙�" autocomplete="off"
+								class="layui-input">
+						</div>
+					</div>
+					<div class="layui-inline mingxi">
+						<label class="layui-form-label" style="width: 60px;">鎵规鍙�</label>
+						<div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
+							<input type="text" id="LotNo" name="LotNo" placeholder="鎵规鍙�" autocomplete="off"
+								class="layui-input">
+						</div>
+					</div>
+					<div class="layui-inline ">
+						<label class="layui-form-label" style="width: 60px;">搴撳瓨鐘舵��</label>
+						<div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
+							<select name="Status" id="Status" lay-filter="Status" lay-search>
+								<option value=""></option>
+								<option value="0">寰呭垎閰�</option>
+								<option value="1">閮ㄥ垎鍒嗛厤</option>
+								<option value="2">宸插垎閰�</option>
+								<option value="3">鐩樼偣閿佸畾</option>
+								<option value="4">绉诲簱閿佸畾</option>
+							</select>
+						</div>
+					</div>
+					<div class="layui-inline zhijian">
+						<label class="layui-form-label" style="width: 60px;">鎶芥鏍囪</label>
+						<div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
+							<select name="InspectMark" id="InspectMark" lay-filter="InspectMark" lay-search>
+								<option value=""></option>
+								<option value="0">鍚�</option>
+								<option value="1">鏄�</option>
+							</select>
+						</div>
+					</div>
+					<div class="layui-inline zhijian">
+						<label class="layui-form-label" style="width: 60px;">璐ㄦ鐘舵��</label>
+						<div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
+							<select name="InspectStatus" id="InspectStatus" lay-filter="InspectStatus" lay-search>
+								<option value=""></option>
+								<option value="0">寰呰川妫�</option><!-- 寰呮楠� -->
+								<option value="1">妫�楠屽悎鏍�</option><!-- 鍚堟牸鍝� -->
+								<option value="2">涓嶅悎鏍�</option><!-- 涓嶅悎鏍� -->
+								<option value="3">鏀剧疆鏈�</option><!-- 涓嶅悎鏍� -->
+							</select>
+						</div>
+					</div>
 
-						<!-- #region 鑷畾涔夎〃澶� -->									
-						<script type="text/html" id="templetProductionTime">
+					<div class="layui-inline">
+						<button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit
+							lay-filter="LAY-app-contlist-search">
+							<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>鎼滅储
+						</button>
+						<button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit lay-filter="daochu">
+							<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>瀵煎嚭
+						</button>
+					</div>
+				</div>
+			</div>
+
+			<div id="center"></div>
+
+			<div class="layui-card-body">
+				<div class="position-relative"><!-- class="position-relative" --><!-- 鑷畾涔夎〃澶村姞涓� -->
+					<table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
+					<!-- #region 鑷畾涔夎〃澶� -->
+					<div class="headerSetIcon">
+						<button class="layui-btn layui-btn-primary layui-btn-sm" data-type="customCols">
+							<i class="layui-icon">&#xe610;</i>
+						</button>
+					</div>
+					<!-- #endregion -->
+
+					<!-- #region 鑷畾涔夎〃澶� -->
+					<script type="text/html" id="templetProductionTime">
 							{{# function GetBtn(d){
 									return formatDate(d.ProductionTime);
 								}	
 							}}
 							{{ GetBtn(d) }}
 						</script>
-						<!-- #endregion -->
-					</div>
+					<script type="text/html" id="templetExpirationTime">
+							{{# function GetBtn(d){
+								return formatDate(d.ExpirationTime);
+							}
+						}}
+						{{GetBtn(d)}}
+						</script>
+					<!-- #endregion -->
+				</div>
 
 
-                    <!-- 鐗╂枡鐘舵�� -->
-                    <script type="text/html" id="buttonTpl">
+				<!-- 鐗╂枡鐘舵�� -->
+				<script type="text/html" id="buttonTpl">
                         {{#  if(d.Status=='0'){ }}
                           <button class="layui-btn layui-btn-radius layui-btn-danger layui-btn-xs">寰呭垎閰�</button>
                         {{#  } else if(d.Status == '1') { }}
@@ -139,8 +150,8 @@
                             <button class="layui-btn layui-btn-radius layui-btn-xs">绉诲簱閿佸畾</button>
                         {{#  } }}
                     </script>
-                    <!-- 璐ㄦ鐘舵�� -->
-                    <script type="text/html" id="InspectStatus1">
+				<!-- 璐ㄦ鐘舵�� -->
+				<script type="text/html" id="InspectStatus1">
                         {{#  if(d.InspectStatus == '0') { }}
                             <p>寰呮楠�</p>
                         {{#  } else if(d.InspectStatus == '1'){ }}
@@ -151,8 +162,8 @@
                             <p>鏀剧疆鏈�</p>
                         {{#  } }}
                     </script>
-                    <!-- 妫�楠屾爣璁� -->
-                    <script type="text/html" id="InspectMarkStatus">
+				<!-- 妫�楠屾爣璁� -->
+				<script type="text/html" id="InspectMarkStatus">
                         {{#  if(d.InspectMark=='0'){ }}
                             <p>鍚�</p>
                         {{#  } else if(d.InspectMark == '1') { }}
@@ -160,296 +171,306 @@
                         {{# } }}
                     </script>
 
-                </div>
-
 			</div>
+
 		</div>
+	</div>
 
-		<script src="../../layuiadmin/layui/layui.js"></script>
-		<script src="../../js/public.js"></script>
-		<script src="../../js/jquery-3.5.1.min.js"></script>
-		<script src="../../js/jquery.cookie.js"></script>
-		<script>
-			var uid = $.cookie('userId');
-			layui.config({
-				base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
-			}).extend({
-				index: 'lib/index' //涓诲叆鍙fā鍧�
-			}).use(['index', 'table', 'laypage', 'layer'], function() {
-				var table = layui.table,
-					form = layui.form,
-					laypage = layui.laypage,
-					layer = layui.layer;
-				
-				var h1 = GetTableHeight();
+	<script src="../../layuiadmin/layui/layui.js"></script>
+	<script src="../../js/public.js"></script>
+	<script src="../../js/jquery-3.5.1.min.js"></script>
+	<script src="../../js/jquery.cookie.js"></script>
+	<script>
+		var uid = $.cookie('userId');
+		layui.config({
+			base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+		}).extend({
+			index: 'lib/index' //涓诲叆鍙fā鍧�
+		}).use(['index', 'table', 'laypage', 'layer'], function () {
+			var table = layui.table,
+				form = layui.form,
+				laypage = layui.laypage,
+				layer = layui.layer;
 
-				refreshTable("","","","","","","","","");
-				var tableIns;
+			var h1 = GetTableHeight();
 
-				//鑾峰彇褰撳墠鏃堕棿
-				function getNowTime() {
-					var date = new Date();
-					//骞� getFullYear()锛氬洓浣嶆暟瀛楄繑鍥炲勾浠�
-					var year = date.getFullYear(); //getFullYear()浠f浛getYear()
-					//鏈� getMonth()锛�0 ~ 11
-					var month = date.getMonth() + 1;
-					//鏃� getDate()锛�(1 ~ 31)
-					var day = date.getDate();
-					//鏃� getHours()锛�(0 ~ 23)
-					var hour = date.getHours();
-					//鍒� getMinutes()锛� (0 ~ 59)
-					var minute = date.getMinutes();
-					//绉� getSeconds()锛�(0 ~ 59)
-					var second = date.getSeconds();
+			refreshTable("", "", "", "", "", "", "", "", "");
+			var tableIns;
 
-					var time = year + addZero(month) + addZero(day) + addZero(hour) + addZero(minute) + addZero(second);
-					return time;
+			//鑾峰彇褰撳墠鏃堕棿
+			function getNowTime() {
+				var date = new Date();
+				//骞� getFullYear()锛氬洓浣嶆暟瀛楄繑鍥炲勾浠�
+				var year = date.getFullYear(); //getFullYear()浠f浛getYear()
+				//鏈� getMonth()锛�0 ~ 11
+				var month = date.getMonth() + 1;
+				//鏃� getDate()锛�(1 ~ 31)
+				var day = date.getDate();
+				//鏃� getHours()锛�(0 ~ 23)
+				var hour = date.getHours();
+				//鍒� getMinutes()锛� (0 ~ 59)
+				var minute = date.getMinutes();
+				//绉� getSeconds()锛�(0 ~ 59)
+				var second = date.getSeconds();
 
-					//灏忎簬10鐨勬嫾鎺ヤ笂0瀛楃涓�
+				var time = year + addZero(month) + addZero(day) + addZero(hour) + addZero(minute) + addZero(second);
+				return time;
 
-				};
-				function addZero(s) {
-					return s < 10 ? ('0' + s) : s;
-				};
+				//灏忎簬10鐨勬嫾鎺ヤ笂0瀛楃涓�
 
-				// 琛ㄥ崟闇�瑕佺殑鍙橀噺
-				var infoOptions;
-				//#region 鍘熷闈炶嚜瀹氫箟鍒�
-				// infoOptions = {
-				// 	elem: '#LAY-app-content-list',
-				// 	height: 'full-142',
-				// 	id: 'LAY-app-content-list',
-				// 	page: true,
-				// 	limit: pageCnt,
-				// 	limits: pageLimits,
-				// 	cellMinWidth: 60, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
-				// 	cols: [
-				// 		[
-                //             {
-                //                 title: '搴忓彿',type: 'numbers',fixed: 'left',width:65
-                //             },
-				// 			{
-                //                 field: 'WareHouseName', title: '浠撳簱', align: 'center', width:100
-                //             },
-				// 			{
-                //                 field: 'RoadwayName', title: '宸烽亾', align: 'center', width:100,hide:true
-                //             },
-				// 			{
-                //                 field: 'AreaName', title: '鍖哄煙', align: 'center', width:100,hide:true
-                //             },
-                //             {
-                //                 field: 'PalletNo', title: '鎵樼洏鍙�', align: 'center',width:100
-                //             },
-				// 			{
-                //                 field: 'LocatNo', title: '鍌ㄤ綅鍦板潃', align: 'center', width:100
-                //             },
-				// 			{
-                //                 field: 'BoxNo', title: '绠卞彿', align: 'center', width:220
-                //             },
-                //             {
-                //                 field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center', width:100
-                //             },
-                //             {
-                //                 field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center',width:100
-                //             },
-                //             {
-                //                 field: 'Qty', title: '搴撳瓨鏁伴噺', align: 'center',width:100
-                //             },
-                //             {
-                //                 field: 'Standard', title: '鐗╂枡瑙勬牸', align: 'center',width:130
-                //             },
-                //             {
-                //                 title: '鎵规鍙�', field: 'LotNo', align: 'center', width:140
-                //             },
-                //             {
-                //                 title: '鎵规鎻忚堪', field: 'LotText', align: 'center', width:100
-                //             },
-                //             {
-                //                 title: '渚涜揣鎵规', field: 'SupplierLot', align: 'center', width:100
-                //             },
-                //             {
-                //                 field: 'LocatNo', title: '鍌ㄤ綅鍦板潃', align: 'center',width:100
-                //             },
-                //             {
-                //                 field: 'ProductionTime', title: '鐢熶骇鏃堕棿', align: 'center',width:150,
-                //                 templet: function(d) {
-                //                     return formatDate2(d.ProductionTime);
-                //                 },
-                //             },
-                //             {
-                //                 field: 'Status', title: '鐗╂枡鐘舵��', align: 'center',width:100, templet: '#buttonTpl'
-                //             },
-                //             {
-                //                 field: 'InspectMark', title: '鎶芥鏍囪', align: 'center',width:100, templet: '#InspectMarkStatus'
-                //             },
-                //             {
-                //                 field: 'InspectStatus', title: '璐ㄩ噺鐘舵��', align: 'center',width:100, templet: '#InspectStatus1'
-                //             },
-				// 		]
-				// 	],
+			};
+			function addZero(s) {
+				return s < 10 ? ('0' + s) : s;
+			};
 
-				// };
-				//#endregion
-				
+			// 琛ㄥ崟闇�瑕佺殑鍙橀噺
+			var infoOptions;
+			//#region 鍘熷闈炶嚜瀹氫箟鍒�
+			// infoOptions = {
+			// 	elem: '#LAY-app-content-list',
+			// 	height: 'full-142',
+			// 	id: 'LAY-app-content-list',
+			// 	page: true,
+			// 	limit: pageCnt,
+			// 	limits: pageLimits,
+			// 	cellMinWidth: 60, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
+			// 	cols: [
+			// 		[
+			//             {
+			//                 title: '搴忓彿',type: 'numbers',fixed: 'left',width:65
+			//             },
+			// 			{
+			//                 field: 'WareHouseName', title: '浠撳簱', align: 'center', width:100
+			//             },
+			// 			{
+			//                 field: 'RoadwayName', title: '宸烽亾', align: 'center', width:100,hide:true
+			//             },
+			// 			{
+			//                 field: 'AreaName', title: '鍖哄煙', align: 'center', width:100,hide:true
+			//             },
+			//             {
+			//                 field: 'PalletNo', title: '鎵樼洏鍙�', align: 'center',width:100
+			//             },
+			// 			{
+			//                 field: 'LocatNo', title: '鍌ㄤ綅鍦板潃', align: 'center', width:100
+			//             },
+			// 			{
+			//                 field: 'BoxNo', title: '绠卞彿', align: 'center', width:220
+			//             },
+			//             {
+			//                 field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center', width:100
+			//             },
+			//             {
+			//                 field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center',width:100
+			//             },
+			//             {
+			//                 field: 'Qty', title: '搴撳瓨鏁伴噺', align: 'center',width:100
+			//             },
+			//             {
+			//                 field: 'Standard', title: '鐗╂枡瑙勬牸', align: 'center',width:130
+			//             },
+			//             {
+			//                 title: '鎵规鍙�', field: 'LotNo', align: 'center', width:140
+			//             },
+			//             {
+			//                 title: '鎵规鎻忚堪', field: 'LotText', align: 'center', width:100
+			//             },
+			//             {
+			//                 title: '渚涜揣鎵规', field: 'SupplierLot', align: 'center', width:100
+			//             },
+			//             {
+			//                 field: 'LocatNo', title: '鍌ㄤ綅鍦板潃', align: 'center',width:100
+			//             },
+			//             {
+			//                 field: 'ProductionTime', title: '鐢熶骇鏃堕棿', align: 'center',width:150,
+			//                 templet: function(d) {
+			//                     return formatDate2(d.ProductionTime);
+			//                 },
+			//             },
+			//             {
+			//                 field: 'ExpirationTime', title: '杩囨湡鏃堕棿', align: 'center',width:150,
+			//                 templet: function(d) {
+			//                     return formatDate2(d.ExpirationTime);
+			//                 },
+			//             },
+			//             {
+			//                 field: 'Status', title: '鐗╂枡鐘舵��', align: 'center',width:100, templet: '#buttonTpl'
+			//             },
+			//             {
+			//                 field: 'InspectMark', title: '鎶芥鏍囪', align: 'center',width:100, templet: '#InspectMarkStatus'
+			//             },
+			//             {
+			//                 field: 'InspectStatus', title: '璐ㄩ噺鐘舵��', align: 'center',width:100, templet: '#InspectStatus1'
+			//             },
+			// 		]
+			// 	],
+
+			// };
+			//#endregion
+
+			//#region 鑷畾涔夎〃澶�
+			var TotalColsArr = [[
+				{ field: '', title: '搴忓彿', type: 'numbers', fixed: 'left', width: 65, "disabled": true },
+				{ field: 'WareHouseName', title: '浠撳簱', align: 'center', width: 100 },
+				{ field: 'RoadwayName', title: '宸烽亾', align: 'center', width: 100 },
+				{ field: 'AreaName', title: '鍖哄煙', align: 'center', width: 100 },
+				{ field: 'PalletNo', title: '鎵樼洏鍙�', align: 'center', width: 100, sort: true },
+				{ field: 'LocatNo', title: '鍌ㄤ綅鍦板潃', align: 'center', width: 100 },
+				{ field: 'BoxNo', title: '绠卞彿', align: 'center', width: 220 },
+				{ field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center', width: 100, sort: true },
+				{ field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center', width: 100 },
+				{ field: 'Qty', title: '搴撳瓨鏁伴噺', align: 'center', width: 100 },
+				{ field: 'Standard', title: '鐗╂枡瑙勬牸', align: 'center', width: 130 },
+				{ field: 'LotNo', title: '鎵规鍙�', align: 'center', width: 140 },
+				{ field: 'LotText', title: '鎵规鎻忚堪', align: 'center', width: 100 },
+				{ field: 'SupplierLot', title: '渚涜揣鎵规', align: 'center', width: 100 },
+				{ field: 'ProductionTime', title: '鐢熶骇鏃堕棿', align: 'center', width: 150, templet: '#templetProductionTime' },
+				{ field: 'ExpirationTime', title: '杩囨湡鏃堕棿', align: 'center', width: 150, templet: '#templetExpirationTime' },
+				{ field: 'Status', title: '鐗╂枡鐘舵��', align: 'center', width: 100, templet: '#buttonTpl' },
+				{ field: 'InspectMark', title: '鎶芥鏍囪', align: 'center', width: 100, templet: '#InspectMarkStatus' },
+				{ field: 'InspectStatus', title: '璐ㄩ噺鐘舵��', align: 'center', width: 100, templet: '#InspectStatus1' },
+			]];
+			var TotalColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
+			console.log(TotalColsSysArr);
+			//#endregion
+			//鑾峰彇鎬婚噺淇℃伅
+			function refreshTable(SkuNo, SkuName, LotNo, PalletNo, Status, InspectMark, InspectStatus, IsBale, IsBelt) {
 				//#region 鑷畾涔夎〃澶�
-				var TotalColsArr = [[
-							{field: '',title: '搴忓彿',type:'numbers',fixed: 'left',width:65, "disabled": true},
-							{field: 'WareHouseName', title: '浠撳簱', align: 'center', width:100},
-							{field: 'RoadwayName', title: '宸烽亾', align: 'center', width:100},
-							{field: 'AreaName', title: '鍖哄煙', align: 'center', width:100},
-                            {field: 'PalletNo', title: '鎵樼洏鍙�', align: 'center',width:100},
-							{field: 'LocatNo', title: '鍌ㄤ綅鍦板潃', align: 'center', width:100},
-							{field: 'BoxNo', title: '绠卞彿', align: 'center', width:220},
-                            {field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center', width:100},
-                            {field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center',width:100},
-                            {field: 'Qty', title: '搴撳瓨鏁伴噺', align: 'center',width:100},
-                            {field: 'Standard', title: '鐗╂枡瑙勬牸', align: 'center',width:130},
-                            {field: 'LotNo',title: '鎵规鍙�',  align: 'center', width:140},
-                            {field: 'LotText',title: '鎵规鎻忚堪',  align: 'center', width:100},
-                            {field: 'SupplierLot',title: '渚涜揣鎵规', align: 'center', width:100},
-                            {field: 'ProductionTime', title: '鐢熶骇鏃堕棿', align: 'center',width:150,templet: '#templetProductionTime'},
-                            {field: 'Status', title: '鐗╂枡鐘舵��', align: 'center',width:100, templet: '#buttonTpl'},
-                            {field: 'InspectMark', title: '鎶芥鏍囪', align: 'center',width:100, templet: '#InspectMarkStatus'},
-                            {field: 'InspectStatus', title: '璐ㄩ噺鐘舵��', align: 'center',width:100, templet: '#InspectStatus1'},
-						]];
-				var TotalColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
-				//#endregion
-				//鑾峰彇鎬婚噺淇℃伅
-				function refreshTable(SkuNo,SkuName,LotNo,PalletNo,Status,InspectMark,InspectStatus,IsBale,IsBelt) {
-					//#region 鑷畾涔夎〃澶�
-					var colsJson
-					var param1={
-						Href:'Statistical/GetEmergencyWarning'
-					};
-					sendData(IP + "/Sys/GetTableColsByUserId", param1, 'post', function(res) {
-						if (res.code == 0){							
-							if(res.data=='' || res.data==undefined || res.data==null){
-								colsJson=TotalColsArr
-							}else{
-								colsJson= eval(res.data);
-							}
-						}else{
-							colsJson=TotalColsArr
+				var colsJson
+				var param1 = {
+					Href: 'Statistical/GetEmergencyWarning'
+				};
+				sendData(IP + "/Sys/GetTableColsByUserId", param1, 'post', function (res) {
+					if (res.code == 0) {
+						if (res.data == '' || res.data == undefined || res.data == null) {
+							colsJson = TotalColsArr
+						} else {
+							colsJson = eval(res.data);
 						}
-						infoOptions = {
-							elem: '#LAY-app-content-list',
-							height: h1,
-							id: 'LAY-app-content-list',
-							page: true,
-							limit: pageCnt,
-							limits: pageLimits,
-							cellMinWidth: 60, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
-							done: function(){
-								//鑷畾涔夊垪瀹�
-								SetTableColW('LAY-app-content-list','Statistical/GetEmergencyWarning',TotalColsSysArr);
-							}, 
-							cols:colsJson
-						};
-
-						var param = {
-							SkuNo:SkuNo,
-							SkuName:SkuName,
-							LotNo:LotNo,
-							PalletNo:PalletNo,
-							Status:Status,
-							InspectMark:InspectMark,
-							InspectStatus:InspectStatus,
-						};
-						sendData(IP + "/Statistical/GetEmergencyWarning", param, 'get', function(res) {
-							console.log(res);
-							if (res.code == 0) { //鎴愬姛
-								var list = res.data;
-								$.extend(infoOptions, {
-									data: list
-								});
-								infoOptions.page = {
-									curr: 1
-								}
-								tableIns = table.render(infoOptions);
-							} else { //涓嶆垚鍔�
-								layer.msg('鑾峰彇涓存湡鐗╂枡淇℃伅澶辫触锛�', {
-									icon: 2,
-									time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
-								}, function() {});
-							}
-						});
-					});
-					//#endregion
-				}
-				// table.reload()
-				
-				var $ = layui.$;
-				//鐩戝惉鎼滅储
-				form.on('submit(LAY-app-contlist-search)', function(data) {
-                    var SkuNo=data.field.SkuNo;
-                    var SkuName=data.field.SkuName;
-                    var LotNo=data.field.LotNo;
-                    var PalletNo=data.field.PalletNo;
-                    var Status=data.field.Status;
-                    var InspectMark=data.field.InspectMark;
-                    var InspectStatus=data.field.InspectStatus; 
-                    var IsBale=data.field.IsBale; 
-                    var IsBelt=data.field.IsBelt;
-					refreshTable(SkuNo,SkuName,LotNo,PalletNo,Status,InspectMark,InspectStatus,IsBale,IsBelt);
-				});
-
-				form.on('submit(daochu)', function () {
-					layer.confirm('纭畾瀵煎嚭褰撳墠鏁版嵁鍚楋紵', function(index) {
-						var param = {
-							SkuNo:$("#SkuNo").val(),
-							SkuName:$("#SkuName").val(),
-							LotNo:$("#LotNo").val(),
-							PalletNo:$("#PalletNo").val(),
-							Status:$("#Status").val(),
-							InspectMark:$("#InspectMark").val(),
-							InspectStatus:$("#InspectStatus").val(),
-							IsBale:$("#IsBale").val(),
-							IsBelt:$("#IsBelt").val()
-							
-						};
-						sendData(IP + "/Statistical/GetEmergencyWarning", param, 'get', function (res) {
-							//console.log(res);
-							if (res.code == 0) { //鎴愬姛
-								var list = res.data;
-								table.exportFile(tableIns.config.id, list,'xls',"涓存湡棰勮"+getNowTime(),); //data 涓鸿瀹炰緥涓殑浠绘剰鏁伴噺鐨勬暟鎹�
-								layer.msg('瀵煎嚭鎴愬姛锛�', {
-									icon: 1,
-									time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
-								}, function () {
-									
-								});
-								
-							} else { //涓嶆垚鍔�
-								layer.msg('鑾峰彇淇℃伅澶辫触锛�', {
-									icon: 2,
-									time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
-								}, function () { });
-							}
-						});
-					});
-				});
-
-				//#region 鑷畾涔夎〃澶�
-				//鑷畾涔夎〃澶�			
-				active = {
-					customCols: function(){
-						layer.open({
-							type: 2,
-							title: '鑷畾涔夊垪',
-							content: '../SystemSettings/HeaderSetting.html?Href=Statistical/GetEmergencyWarning&ColsSysArr='+TotalColsSysArr,
-							maxmin: false,
-							resize: false,
-							area: ['970px', '650px']
-						});
+					} else {
+						colsJson = TotalColsArr
 					}
+					infoOptions = {
+						elem: '#LAY-app-content-list',
+						height: h1,
+						id: 'LAY-app-content-list',
+						page: true,
+						limit: pageCnt,
+						limits: pageLimits,
+						cellMinWidth: 60, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
+						autoSort: false, //鍓嶇鎺掑簭
+						done: function () {
+							//鑷畾涔夊垪瀹�
+							SetTableColW('LAY-app-content-list', 'Statistical/GetEmergencyWarning', TotalColsSysArr);
+						},
+						cols: colsJson
+					};
 
-				};
-				$('.layui-btn').on('click', function() {
-					var type = $(this).data('type');
-					active[type] ? active[type].call(this) : '';
+					var param = {
+						SkuNo: SkuNo,
+						SkuName: SkuName,
+						LotNo: LotNo,
+						PalletNo: PalletNo,
+						Status: Status,
+						InspectMark: InspectMark,
+						InspectStatus: InspectStatus,
+					};
+					sendData(IP + "/Statistical/GetEmergencyWarning", param, 'get', function (res) {
+						console.log(res);
+						if (res.code == 0) { //鎴愬姛
+							var list = res.data;
+							$.extend(infoOptions, {
+								data: list
+							});
+							infoOptions.page = {
+								curr: 1
+							}
+							tableIns = table.render(infoOptions);
+						} else { //涓嶆垚鍔�
+							layer.msg('鑾峰彇涓存湡鐗╂枡淇℃伅澶辫触锛�', {
+								icon: 2,
+								time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+							}, function () { });
+						}
+					});
 				});
 				//#endregion
+			}
+			// table.reload()
+
+			var $ = layui.$;
+			//鐩戝惉鎼滅储
+			form.on('submit(LAY-app-contlist-search)', function (data) {
+				var SkuNo = data.field.SkuNo;
+				var SkuName = data.field.SkuName;
+				var LotNo = data.field.LotNo;
+				var PalletNo = data.field.PalletNo;
+				var Status = data.field.Status;
+				var InspectMark = data.field.InspectMark;
+				var InspectStatus = data.field.InspectStatus;
+				var IsBale = data.field.IsBale;
+				var IsBelt = data.field.IsBelt;
+				refreshTable(SkuNo, SkuName, LotNo, PalletNo, Status, InspectMark, InspectStatus, IsBale, IsBelt);
 			});
-		</script>
-	</body>
-</html>
+
+			form.on('submit(daochu)', function () {
+				layer.confirm('纭畾瀵煎嚭褰撳墠鏁版嵁鍚楋紵', function (index) {
+					var param = {
+						SkuNo: $("#SkuNo").val(),
+						SkuName: $("#SkuName").val(),
+						LotNo: $("#LotNo").val(),
+						PalletNo: $("#PalletNo").val(),
+						Status: $("#Status").val(),
+						InspectMark: $("#InspectMark").val(),
+						InspectStatus: $("#InspectStatus").val(),
+						IsBale: $("#IsBale").val(),
+						IsBelt: $("#IsBelt").val()
+
+					};
+					sendData(IP + "/Statistical/GetEmergencyWarning", param, 'get', function (res) {
+						//console.log(res);
+						if (res.code == 0) { //鎴愬姛
+							var list = res.data;
+							table.exportFile(tableIns.config.id, list, 'xls', "涓存湡棰勮" + getNowTime(),); //data 涓鸿瀹炰緥涓殑浠绘剰鏁伴噺鐨勬暟鎹�
+							layer.msg('瀵煎嚭鎴愬姛锛�', {
+								icon: 1,
+								time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+							}, function () {
+
+							});
+
+						} else { //涓嶆垚鍔�
+							layer.msg('鑾峰彇淇℃伅澶辫触锛�', {
+								icon: 2,
+								time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+							}, function () { });
+						}
+					});
+				});
+			});
+
+			//#region 鑷畾涔夎〃澶�
+			//鑷畾涔夎〃澶�			
+			active = {
+				customCols: function () {
+					layer.open({
+						type: 2,
+						title: '鑷畾涔夊垪',
+						content: '../SystemSettings/HeaderSetting.html?Href=Statistical/GetEmergencyWarning&ColsSysArr=' + TotalColsSysArr,
+						maxmin: false,
+						resize: false,
+						area: ['970px', '650px']
+					});
+				}
+
+			};
+			$('.layui-btn').on('click', function () {
+				var type = $(this).data('type');
+				active[type] ? active[type].call(this) : '';
+			});
+			//#endregion
+		});
+	</script>
+</body>
+
+</html>
\ No newline at end of file

--
Gitblit v1.8.0