From 260c6e54c4f100ca49376a6afd70f73843868171 Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期三, 28 八月 2024 08:49:35 +0800
Subject: [PATCH] 组托收货测试

---
 HTML/views/StatisticalReport/BoxInfor.html | 1427 +++++++++++++++++++++++++++--------------------------------
 1 files changed, 651 insertions(+), 776 deletions(-)

diff --git a/HTML/views/StatisticalReport/BoxInfor.html b/HTML/views/StatisticalReport/BoxInfor.html
index 35b4739..04858a6 100644
--- a/HTML/views/StatisticalReport/BoxInfor.html
+++ b/HTML/views/StatisticalReport/BoxInfor.html
@@ -1,85 +1,92 @@
 <!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">
-		<style type="text/css">
-			.layui-form-item .layui-inline {
-			    margin-bottom: 1px;
-			    margin-right: 1px;
-			}
-			
-		</style>
-		<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" style="margin-bottom: 0px;">
-						<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="OwnerNo" name="OwnerNo" 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="OwnerName" name="OwnerName" 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>
 
-						<!-- 绠辩爜 绠辨敮鐘舵�� 妫�楠屾爣璁� 闆剁鏍囪 璐ㄩ噺鐘舵�� -->
+<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">
+	<style type="text/css">
+		.layui-form-item .layui-inline {
+			margin-bottom: 1px;
+			margin-right: 1px;
+		}
+	</style>
+	<script>
+		// 杩欓噷鏄渶瑕佸湪椤甸潰娓叉煋涔嬪墠鎵ц鐨勪唬鐮�
+		document.addEventListener("DOMContentLoaded", function () {
+			//鑾峰彇table榛樿鏄剧ず鏁�
+			pageCntFirst();
+			//鍒ゆ柇鏄惁寮�鍚痶able鍒楄〃鍒楀璋冩暣鍔熻兘銆�
+			GetIsSetColW();
+		});
+	</script>
 
-						<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="BoxNo"  name="BoxNo" placeholder="绠辩爜" autocomplete="off" class="layui-input">
-							</div>
+</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" style="margin-bottom: 0px;">
+					<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 class="layui-inline zhijian">
+					</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="OwnerNo" name="OwnerNo" 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="OwnerName" name="OwnerName" 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 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="BoxNo" name="BoxNo" placeholder="绠辩爜" autocomplete="off"
+								class="layui-input">
+						</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="Status" id="Status" lay-search>
@@ -91,117 +98,112 @@
 								</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="BitPalletMark" id="BitPalletMark" lay-filter="BitPalletMark"
-									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="BitBoxMark" id="BitBoxMark" lay-filter="BitBoxMark"
-									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 zhijian">
-							<label class="layui-form-label" style="width: 60px;">寮�濮嬫椂闂�</label>
-							<div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
-								<input type="text" autocomplete="off" id="StartTime" class="layui-input"
-									placeholder="寮�濮嬫椂闂�">
-							</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;">
-								<input type="text" autocomplete="off" id="EndTime" class="layui-input"
-									placeholder="缁撴潫鏃堕棿">
-							</div>
-						</div>
-
-						<div class="layui-inline sousuo">
-							<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 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="BitPalletMark" id="BitPalletMark" lay-filter="BitPalletMark" 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="BitBoxMark" id="BitBoxMark" lay-filter="BitBoxMark" 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 zhijian">
+						<label class="layui-form-label" style="width: 60px;">寮�濮嬫椂闂�</label>
+						<div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
+							<input type="text" autocomplete="off" id="StartTime" class="layui-input" placeholder="寮�濮嬫椂闂�">
+						</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;">
+							<input type="text" autocomplete="off" id="EndTime" class="layui-input" placeholder="缁撴潫鏃堕棿">
+						</div>
+					</div>
+
+					<div class="layui-inline sousuo">
+						<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 class="layui-card-body">
-					<div style="position: relative;">
-						<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
-							<ul class="layui-tab-title" id="tab">
-								<li  class="layui-this">鎵樼洏鏄庣粏</li>
-								<li >绠辩爜鏄庣粏</li>
-							</ul>
+			<div class="layui-card-body">
+				<div style="position: relative;">
+					<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+						<ul class="layui-tab-title" id="tab">
+							<li class="layui-this">鎵樼洏鏄庣粏</li>
+							<li>绠辩爜鏄庣粏</li>
+						</ul>
 
-							<div id="center">	
-							</div>
+						<div id="center">
+						</div>
 
-							<div class="layui-tab-content">
-								<div class="layui-tab-item layui-show">
-									<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 -->
+						<div class="layui-tab-content">
+							<div class="layui-tab-item layui-show">
+								<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 -->
 								</div>
-								<div class="layui-tab-item">
-									<div class="position-relative"><!-- class="position-relative" --><!-- 鑷畾涔夎〃澶村姞涓� -->
-										<table id="LAY-app-content-list2" lay-filter="LAY-app-content-list2"></table>
-										<!-- #region 鑷畾涔夎〃澶� -->
-										<div class="headerSetIcon">
-											<button class="layui-btn layui-btn-primary layui-btn-sm" data-type="customCols2">
-												<i class="layui-icon">&#xe610;</i>
-											</button>
-										</div>
-										<!-- #endregion -->
+							</div>
+							<div class="layui-tab-item">
+								<div class="position-relative"><!-- class="position-relative" --><!-- 鑷畾涔夎〃澶村姞涓� -->
+									<table id="LAY-app-content-list2" lay-filter="LAY-app-content-list2"></table>
+									<!-- #region 鑷畾涔夎〃澶� -->
+									<div class="headerSetIcon">
+										<button class="layui-btn layui-btn-primary layui-btn-sm"
+											data-type="customCols2">
+											<i class="layui-icon">&#xe610;</i>
+										</button>
+									</div>
+									<!-- #endregion -->
 
-										<!-- #region 鑷畾涔夎〃澶� -->									
-										<script type="text/html" id="templetProductionTime">
+									<!-- #region 鑷畾涔夎〃澶� -->
+									<script type="text/html" id="templetProductionTime">
 											{{# function GetBtn(d){
 													return formatDate(d.ProductionTime);
 												}	
@@ -209,22 +211,22 @@
 											{{ GetBtn(d) }}
 										</script>
 
-										<script type="text/html" id="templetInspectTime">
+									<script type="text/html" id="templetInspectTime">
 											{{# function GetBtn1(d){
 													return formatDate(d.InspectTime);
 												}	
 											}}
 											{{ GetBtn1(d) }}
 										</script>
-										<!-- #endregion -->
-									</div>
+									<!-- #endregion -->
 								</div>
 							</div>
 						</div>
-						
 					</div>
-					
-                    <script type="text/html" id="BoxStatus">
+
+				</div>
+
+				<script type="text/html" id="BoxStatus">
                         {{#  if(d.Status=='0'){ }}
                             <p>鏈粍鎵�</p>
                         {{#  } else if(d.Status == '1') { }}
@@ -240,14 +242,14 @@
 						{{#  } }}
 						
                     </script>
-                    <script type="text/html" id="InspectMarkStatus">
+				<script type="text/html" id="InspectMarkStatus">
                         {{#  if(d.InspectMark=='0'){ }}
                             <p>鍚�</p>
                         {{#  } else if(d.InspectMark == '1') { }}
                             <p>鏄�</p>
                         {{# } }}
                     </script>
-                    <script type="text/html" id="BitPalletMarkStatus">
+				<script type="text/html" id="BitPalletMarkStatus">
                         {{#  if(d.BitPalletMark=='0'){ }}
                             <p>鍚�</p>
                         {{#  } else if(d.BitPalletMark == '1') { }}
@@ -255,7 +257,7 @@
                         {{# } }}
                     </script>
 
-                    <script type="text/html" id="InspectStatus1">
+				<script type="text/html" id="InspectStatus1">
                         {{#  if(d.InspectStatus == '0') { }}
                             <p>寰呮楠�</p>
                         {{#  } else if(d.InspectStatus == '1'){ }}
@@ -266,630 +268,503 @@
                             <p>鏀剧疆鏈�</p>
                         {{#  } }}
                     </script>
-                    <script type="text/html" id="BitPalletMarkStatus1">
+				<script type="text/html" id="BitPalletMarkStatus1">
                         {{#  if(d.BitBoxMark=='0'){ }}
                             <p>鍚�</p>
                         {{#  } else if(d.BitBoxMark == '1') { }}
                             <p>鏄�</p>
                         {{# } }}
                     </script>
-                    <script type="text/html" id="table-content-list">
+				<script type="text/html" id="table-content-list">
                         <button class="layui-btn layui-btn-normal layui-btn-xs approvalBtnupt" id="approvalBtnupt" lay-event="edit">
                             <i class="layui-icon layui-icon-edit"></i>璇︽儏
                         </button>
                     </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','element','laydate'], function() {
-				var table = layui.table,
-					form = layui.form,
-					laypage = layui.laypage,
-					layer = layui.layer;
-					element = layui.element;
-					laydate = layui.laydate;
+	<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', 'element', 'laydate'], function () {
+			var table = layui.table,
+				form = layui.form,
+				laypage = layui.laypage,
+				layer = layui.layer;
+			element = layui.element;
+			laydate = layui.laydate;
 
-				var h1 = GetTableTabHeight();
-				// var h1 =  GetTkableTopHeight();
-				// console.log(h1)
+			var h1 = GetTableTabHeight();
+			// var h1 =  GetTkableTopHeight();
+			// console.log(h1)
 
-				laydate.render({
-					elem: '#StartTime',
-					format: 'yyyy-MM-dd' //鍙换鎰忕粍鍚�
-				});
-				laydate.render({
-					elem: '#EndTime',
-					format: 'yyyy-MM-dd' //鍙换鎰忕粍鍚�
-				});
-				//鑾峰彇褰撳墠鏃堕棿
-				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();
-					
-					var time = year + addZero(month) + addZero(day) + addZero(hour) + addZero(minute) + addZero(second);
-					return time;
-					
-					//灏忎簬10鐨勬嫾鎺ヤ笂0瀛楃涓�
-					
-				};
-				function addZero(s) {
-					return s < 10 ? ('0' + s) : s;
-				};
+			laydate.render({
+				elem: '#StartTime',
+				format: 'yyyy-MM-dd' //鍙换鎰忕粍鍚�
+			});
+			laydate.render({
+				elem: '#EndTime',
+				format: 'yyyy-MM-dd' //鍙换鎰忕粍鍚�
+			});
+			//鑾峰彇褰撳墠鏃堕棿
+			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();
 
-				var $ = layui.$;
-				var yemianid =0;
-				refreshTable("","","","","","","","","","","","","","");
+				var time = year + addZero(month) + addZero(day) + addZero(hour) + addZero(minute) + addZero(second);
+				return time;
 
-				// 琛ㄥ崟闇�瑕佺殑鍙橀噺
-				var infoOptions;
-				//#region 鍘熷闈炶嚜瀹氫箟鍒�
-				// infoOptions = {
-				// 	elem: '#LAY-app-content-list',
-				// 	height: 'full-206',
-				// 	id: 'LAY-app-content-list',
-				// 	page: true,
-				// 	limit: pageCnt,
-				// 	limits: pageLimits,
-				// 	even: true,
-				// 	cellMinWidth: 80, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
-				// 	cols: 
-				// 	[[
-                //         {
-                //             title: '搴忓彿',  type: 'numbers',  fixed: 'left'
-                //         },
-                //         {
-                //             field: 'AreaNo', title: '鎵�灞炲尯鍩�', align: 'center',
-                //         },
-                //         {
-                //             field: 'LocatNo', title: '鍌ㄤ綅鍦板潃', align: 'center'
-                //         },
-                //         {
-                //             field: 'PalletNo', title: '鎵樼洏鍙�', align: 'center',
-                //         },
-                //         {
-                //             field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center'
-                //         },
-                //         {
-                //             field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center',
-                //         },
-                //         {
-                //             field: 'LotNo', title: '鎵规鍙�', align: 'center',
-                //         },
-                //         {
-                //             field: 'LotText', title: '鎵规鎻忚堪', align: 'center'
-                //         },
-                //         {
-                //             field: 'SupplierLot', title: '渚涜揣鎵规', align: 'center',
-                //         },
-                //         {
-                //             field: 'Qty', title: '鏁伴噺', align: 'center'
-                //         },
-                //         {
-                //             field: 'LockQty', title: '閿佸畾鏁伴噺', align: 'center',
-                //         },
-                //         {
-                //             field: 'FrozenQty', title: '鍐荤粨鏁伴噺', align: 'center'
-                //         },
-                //         {
-                //             field: 'InspectMark', title: '鎶芥鏍囪', align: 'center', templet: '#InspectMarkStatus'
-                //         },
-                //         {
-                //             field: 'BitPalletMark', title: '闆舵墭鏍囪', align: 'center', templet: '#BitPalletMarkStatus'
-                //         },
-                //        //{
-                //        //    field: 'Status', title: '鎵樼洏鐘舵��', align: 'center', templet: '#PalletStatus',
-                //        //},
-				// 	]]
-				// };
-                //#endregion
+				//灏忎簬10鐨勬嫾鎺ヤ笂0瀛楃涓�
 
+			};
+			function addZero(s) {
+				return s < 10 ? ('0' + s) : s;
+			};
+
+			var $ = layui.$;
+			var yemianid = 0;
+			refreshTable("", "", "", "", "", "", "", "", "", "", "", "", "", "");
+
+			// 琛ㄥ崟闇�瑕佺殑鍙橀噺
+			var infoOptions;
+			//#region 鑷畾涔夎〃澶�
+			var TotalColsArr = [[
+				{ field: '', title: '搴忓彿', type: 'numbers', align: 'center', fixed: 'left', "disabled": true },
+				{ field: 'WareHouseName', title: '鎵�灞炰粨搴�', align: 'center' },
+				{ field: 'RoadwayName', title: '鎵�灞炲贩閬�', align: 'center' },
+				{ field: 'AreaName', title: '鎵�灞炲尯鍩�', align: 'center' },
+				{ field: 'LocatNo', title: '鍌ㄤ綅鍦板潃', align: 'center' },
+				{ field: 'PalletNo', title: '鎵樼洏鍙�', align: 'center' },
+				{ field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center' },
+				{ field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center' },
+				{ field: 'OwnerNo', title: '璐т富缂栫爜', align: 'center' },
+				{ field: 'OwnerName', title: '璐т富鍚嶇О', align: 'center' },
+				{ field: 'SupplierNo', title: '渚涘簲鍟嗙紪鐮�', align: 'center' },
+				{ field: 'SupplierName', title: '渚涘簲鍟嗗悕绉�', align: 'center' },
+				{ field: 'LotNo', title: '鎵规鍙�', align: 'center' },
+				{ field: 'LotText', title: '鎵规鎻忚堪', align: 'center' },
+				{ field: 'SupplierLot', title: '渚涜揣鎵规', align: 'center' },
+				{ field: 'Qty', title: '鏁伴噺', align: 'center' },
+				{ field: 'LockQty', title: '閿佸畾鏁伴噺', align: 'center', },
+				{ field: 'FrozenQty', title: '鍐荤粨鏁伴噺', align: 'center' },
+				{ field: 'InspectMark', title: '鎶芥鏍囪', align: 'center', templet: '#InspectMarkStatus' },
+				{ field: 'ProductionTime', title: '鐢熶骇鏃ユ湡', align: 'center', templet: '#templetProductionTime' },
+				{ field: 'InspectStatus', templet: '#InspectStatus1', title: '璐ㄦ鐘舵��', align: 'center' },
+				{ field: 'BitPalletMark', title: '闆舵墭鏍囪', align: 'center', templet: '#BitPalletMarkStatus' },
+			]];
+			var TotalColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
+			//#endregion
+			//鑾峰彇鎵樼洏鏄庣粏
+			function refreshTable(SkuNo, SkuName, PalletNo, LotNo, BoxNo, Status, InspectMark, BitPalletMark,
+				BitBoxMark, InspectStatus, OwnerNo, OwnerName, StartTime, EndTime) {
 				//#region 鑷畾涔夎〃澶�
-				var TotalColsArr = [[
-					{field: '',title: '搴忓彿',type:'numbers',align: 'center',fixed: 'left', "disabled": true},
-					{field: 'WareHouseName', title: '鎵�灞炰粨搴�', align: 'center'},
-					{field: 'RoadwayName', title: '鎵�灞炲贩閬�', align: 'center'},
-                    {field: 'AreaName', title: '鎵�灞炲尯鍩�', align: 'center'},
-                    {field: 'LocatNo', title: '鍌ㄤ綅鍦板潃', align: 'center'},
-                    {field: 'PalletNo', title: '鎵樼洏鍙�', align: 'center'},
-                    {field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center'},
-                    {field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center'},
-					{field: 'OwnerNo',title: '璐т富缂栫爜',align: 'center'},
-					{field: 'OwnerName',title: '璐т富鍚嶇О',align: 'center'}, 
-					{field: 'SupplierNo',title: '渚涘簲鍟嗙紪鐮�',align: 'center'},
-					{field: 'SupplierName',title: '渚涘簲鍟嗗悕绉�',align: 'center'}, 
-                    {field: 'LotNo', title: '鎵规鍙�', align: 'center'},
-                    {field: 'LotText', title: '鎵规鎻忚堪', align: 'center'},
-                    {field: 'SupplierLot', title: '渚涜揣鎵规', align: 'center'},
-                    {field: 'Qty', title: '鏁伴噺', align: 'center'},
-                    {field: 'LockQty', title: '閿佸畾鏁伴噺', align: 'center',},
-                    {field: 'FrozenQty', title: '鍐荤粨鏁伴噺', align: 'center'},
-                    {field: 'InspectMark', title: '鎶芥鏍囪', align: 'center', templet: '#InspectMarkStatus'},
-                    {field: 'BitPalletMark', title: '闆舵墭鏍囪', align: 'center', templet: '#BitPalletMarkStatus'},
-				]];
-				var TotalColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
-				//#endregion
-				//鑾峰彇鎵樼洏鏄庣粏
-                function refreshTable(SkuNo,SkuName,PalletNo,LotNo,BoxNo,Status,InspectMark,BitPalletMark,BitBoxMark,InspectStatus,OwnerNo,OwnerName,StartTime,EndTime) {
-					//#region 鑷畾涔夎〃澶�
-					var colsJson
-					var param1={
-						Href:'Statistical/GetBindList'
-					};
-					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/GetBindList'
+				};
+				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,
-							even: true,
-							cellMinWidth: 80, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
-							done: function(){
-								//鑷畾涔夊垪瀹�
-								SetTableColW('LAY-app-content-list','Statistical/GetBindList',TotalColsSysArr);
-							}, 
-							cols:colsJson
+					} else {
+						colsJson = TotalColsArr
+					}
+					infoOptions = {
+						elem: '#LAY-app-content-list',
+						height: h1,
+						id: 'LAY-app-content-list',
+						page: true,
+						limit: pageCnt,
+						limits: pageLimits,
+						even: true,
+						cellMinWidth: 80, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
+						done: function () {
+							//鑷畾涔夊垪瀹�
+							SetTableColW('LAY-app-content-list', 'Statistical/GetBindList', TotalColsSysArr);
+						},
+						cols: colsJson
+					};
+
+					var param = {
+						SkuNo: SkuNo, //鐗╂枡鍙�
+						SkuName: SkuName, //鐗╂枡鍚嶇О
+						palletNo: PalletNo, //鎵樼洏鍙�
+						LotNo: LotNo, //鎵规鍙�
+						BoxNo: BoxNo, //绠辩爜
+						Status: Status, //绠辨敮鐘舵��
+						InspectMark: InspectMark, //妫�楠屾爣璁�
+						BitPalletMark: BitPalletMark, //闆舵墭鏍囪
+						BitBoxMark: BitBoxMark, //闆剁鏍囪
+						InspectStatus: InspectStatus, //璐ㄩ噺鐘舵��
+						OwnerNo: OwnerNo, //璐т富缂栫爜
+						OwnerName: OwnerName, //璐т富鍚嶇О
+						StartTime: StartTime, //寮�濮嬫椂闂�
+						EndTime: EndTime, //缁撴潫鏃堕棿
+					};
+					sendData(IP + "/Statistical/GetBindList", 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                    
+			}
+
+			// 琛ㄥ崟闇�瑕佺殑鍙橀噺
+			var infoOptions2;
+
+			//鑾峰彇鏄庣粏淇℃伅
+			//#region 鑷畾涔夎〃澶�
+			var DetailColsArr = [[
+				{ field: '', title: '搴忓彿', type: 'numbers', fixed: 'left', "disabled": true },
+				{ field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center' },
+				{ field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center' },
+				{ field: 'PalletNo', title: '鎵樼洏鍙�', align: 'center', width: 110 },
+				{ field: 'BoxNo', title: '绠辩爜', align: 'center', width: 100 },
+				{ field: 'Status', title: '绠辨敮鐘舵��', align: 'center', templet: '#BoxStatus' },
+				{ field: 'LotNo', title: '鎵规鍙�', align: 'center' },
+				{ field: 'LotText', title: '鎵规鎻忚堪', align: 'center' },
+				{ field: 'Qty', title: '鏁伴噺', width: 90, align: 'center' },
+				{ field: 'FullQty', title: '鏁寸鏁伴噺', width: 100, align: 'center' },
+				{ field: 'ProductionTime', title: '鐢熶骇鏃ユ湡', align: 'center', templet: '#templetProductionTime' },
+				{ field: 'InspectMark', title: '鎶芥鏍囪', align: 'center', templet: '#InspectMarkStatus' },
+				{ field: 'BitBoxMark', templet: '#BitPalletMarkStatus1', title: '闆剁鏍囪', align: 'center' },
+				{ field: 'InspectStatus', templet: '#InspectStatus1', title: '璐ㄦ鐘舵��', align: 'center' },
+				{ field: 'InspectTime', title: '澶嶆鏃堕棿', align: 'center', templet: '#templetInspectTime' },
+				{ field: 'caozuo', title: '鎿嶄綔', fixed: 'right', align: 'center', toolbar: '#table-content-list', "disabled": true }
+			]];
+			var DetailColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(DetailColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
+			//#endregion				
+			function refreshTable2(Id, SkuNo, SkuName, LotNo, PalletNo, BoxNo, Status, InspectMark, BitBoxMark, InspectStatus, StartTime, EndTime) {
+				//#region 鑷畾涔夎〃澶�
+				var colsJson2
+				var param1 = {
+					Href: 'Statistical/GetBoxInfo'
+				};
+				sendData(IP + "/Sys/GetTableColsByUserId", param1, 'post', function (res) {
+					if (res.code == 0) {
+						if (res.data == '' || res.data == undefined || res.data == null) {
+							colsJson2 = DetailColsArr
+						} else {
+							colsJson2 = eval(res.data);
+						}
+					} else {
+						colsJson2 = DetailColsArr
+					}
+					infoOptions2 = {
+						elem: '#LAY-app-content-list2',
+						height: h1,
+						id: 'LAY-app-content-list2',
+						page: true,
+						limit: pageCnt,
+						limits: pageLimits,
+						even: true,
+						cellMinWidth: 80, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
+						done: function () {
+							//鑷畾涔夊垪瀹�
+							SetTableColW('LAY-app-content-list2', 'Statistical/GetBoxInfo', DetailColsSysArr);
+						},
+						cols: colsJson2
+					};
+
+					var param = {
+						Id: Id,
+						SkuNo: SkuNo,
+						SkuName: SkuName,
+						LotNo: LotNo,
+						PalletNo: PalletNo,
+						BoxNo: BoxNo,
+						Status: Status,
+						InspectMark: InspectMark,
+						BitBoxMark: BitBoxMark,
+						InspectStatu: InspectStatus,
+						StartTime: StartTime,
+						EndTime: EndTime,
+					}
+					sendData(IP + "/Statistical/GetBoxInfo", param, 'get', function (res) {
+						if (res.code == 0) //鎴愬姛
+						{
+							var list = res.data;
+							$.extend(infoOptions2, {
+								data: list
+							});
+							infoOptions2.page = {
+								curr: 1
+							}
+							tableIns2 = table.render(infoOptions2);
+						}
+						else //涓嶆垚鍔�
+						{
+							layer.msg('鑾峰彇鏄庣粏鍒楄〃淇℃伅澶辫触锛�', {
+								icon: 2,
+								time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+							}, function () { });
+						}
+					})
+				});
+				//#endregion					
+			}
+
+			//var url = IP + "/Statistical/GetInventoryList1";
+
+
+
+			//鎺ュ彈鍏ㄥ眬鍙橀噺
+			let quanid = '';
+			//鐩戝惉鎼滅储
+			form.on('submit(LAY-app-contlist-search)', function (data) {
+				var SkuNo = $("#SkuNo").val();
+				var SkuName = $("#SkuName").val();
+				var LotNo = $("#LotNo").val();
+				var PalletNo = $("#PalletNo").val();
+
+				var BoxNo = $("#BoxNo").val();
+				var Status = $("#Status").val();
+				var InspectMark = $("#InspectMark").val();
+				var BitPalletMark = $("#BitPalletMark").val();
+				var BitBoxMark = $("#BitBoxMark").val();
+				var InspectStatus = $("#InspectStatus").val();
+
+				var OwnerNo = $("#OwnerNo").val();
+				var OwnerName = $("#OwnerName").val();
+
+				var StartTime = $("#StartTime").val();
+				var EndTime = $("#EndTime").val();
+
+				if (yemianid == 0) {
+					console.log("鎬诲崟");
+					refreshTable(SkuNo, SkuName, PalletNo, LotNo, BoxNo, Status, InspectMark, BitPalletMark, BitBoxMark, InspectStatus, OwnerNo, OwnerName, StartTime, EndTime);
+				} else if (yemianid == 1) {
+					quanid = '';
+					console.log("鏄庣粏");
+					refreshTable2(quanid, SkuNo, SkuName, LotNo, PalletNo, BoxNo, Status, InspectMark, BitBoxMark, InspectStatus, StartTime, EndTime);
+				}
+
+			});
+			//瑙﹀彂琛屽弻鍑讳簨浠�
+			table.on('rowDouble(LAY-app-content-list)', function (obj) {
+				$(".layui-tab-title>li").attr("class", "");
+				$('.layui-tab-title>li').eq(1).attr('class', 'layui-this');
+				$('.layui-tab-content .layui-tab-item').attr('class', 'layui-tab-item')
+				$('.layui-tab-content .layui-tab-item').eq(1).attr('class', 'layui-tab-item layui-show')
+				console.log(obj.data.Id);
+				quanid = obj.data.Id;
+				refreshTable2(obj.data.Id);
+				yemianid = 1;
+			});
+
+			//鐩戝惉Tab鍒囨崲锛屼互鏀瑰彉鍦板潃hash鍊�
+			element.on('tab(docDemoTabBrief)', function (data) {
+				var SkuNo = $("#SkuNo").val();
+				var SkuName = $("#SkuName").val();
+				var LotNo = $("#LotNo").val();
+				var PalletNo = $("#PalletNo").val();
+
+				var BoxNo = $("#BoxNo").val();
+				var Status = $("#Status").val();
+				var InspectMark = $("#InspectMark").val();
+				var BitPalletMark = $("#BitPalletMark").val();
+				var BitBoxMark = $("#BitBoxMark").val();
+				var InspectStatus = $("#InspectStatus").val();
+
+				var OwnerNo = $("#OwnerNo").val();
+				var OwnerName = $("#OwnerName").val();
+
+				var StartTime = $("#StartTime").val();
+				var EndTime = $("#EndTime").val();
+
+				console.log(data.index);
+				yemianid = data.index
+				if (yemianid == 0) {
+					console.log("鎬诲崟");
+					refreshTable(SkuNo, SkuName, PalletNo, LotNo, BoxNo, Status, InspectMark, BitPalletMark, BitBoxMark, InspectStatus, OwnerNo, OwnerName, StartTime, EndTime);
+				} else if (yemianid == 1) {
+					console.log("鏄庣粏");
+					refreshTable2(quanid, SkuNo, SkuName, LotNo, PalletNo, BoxNo, Status, InspectMark, BitBoxMark, InspectStatus, StartTime, EndTime);
+				}
+			});
+			var doing = true;
+			// ------------------------------------璇︽儏---------------------------------------------------
+			table.on('tool(LAY-app-content-list2)', function (obj) {
+				console.log(obj)
+				var data = obj.data;
+				//璇︽儏
+				if (obj.event === 'edit') {
+					BoxNo = data.BoxNo;
+					console.log(data)
+					layer.open({
+						type: 2,
+						title: '绠辨敮璇︽儏淇℃伅',
+						content: 'BoxSupportInfor.html?BoxNo=' + BoxNo,
+						maxmin: true,
+						area: ['80%', '85%'],
+						btn: ['鍏抽棴'],
+						yes: function (index, layero) {
+							var iframeWindow = window['layui-layer-iframe' + index],
+								submitID = 'layuiadmin-app-form-edit',
+								submit = layero.find('iframe').contents().find('#' + submitID);
+							if (doing) {
+								doing = false;
+
+								layer.close(index); //鍏抽棴寮瑰眰
+								refreshTable();
+								doing = true;
+
+
+							}
+						}
+					});
+				}
+			});
+
+			form.on('submit(daochu)', function () {
+				layer.confirm('纭畾瀵煎嚭褰撳墠鏁版嵁鍚楋紵', function (index) {
+					if (yemianid == 0) {
+						console.log("鎵樼洏鏄庣粏");
+						var param = {
+							SkuNo: $("#SkuNo").val(),
+							SkuName: $("#SkuName").val(),
+							LotNo: $("#LotNo").val(),
+							PalletNo: $("#PalletNo").val(),
+
+							BoxNo: $("#BoxNo").val(),
+							Status: $("#Status").val(),
+							InspectMark: $("#InspectMark").val(),
+							BitPalletMark: $("#BitPalletMark").val(),
+							BitBoxMark: $("#BitBoxMark").val(),
+							InspectStatus: $("#InspectStatus").val(),
+
+							StartTime: $("#StartTime").val(),
+							EndTime: $("#EndTime").val(),
 						};
 
-						var param = {
-							SkuNo:SkuNo, //鐗╂枡鍙�
-							SkuName:SkuName, //鐗╂枡鍚嶇О
-							palletNo:PalletNo, //鎵樼洏鍙�
-							LotNo:LotNo, //鎵规鍙�
-							BoxNo:BoxNo, //绠辩爜
-							Status:Status, //绠辨敮鐘舵��
-							InspectMark:InspectMark, //妫�楠屾爣璁�
-							BitPalletMark:BitPalletMark, //闆舵墭鏍囪
-							BitBoxMark:BitBoxMark, //闆剁鏍囪
-							InspectStatus:InspectStatus, //璐ㄩ噺鐘舵��
-							OwnerNo:OwnerNo, //璐т富缂栫爜
-							OwnerName:OwnerName, //璐т富鍚嶇О
-							StartTime:StartTime, //寮�濮嬫椂闂�
-							EndTime:EndTime, //缁撴潫鏃堕棿
-						};
-						sendData(IP + "/Statistical/GetBindList", param, 'get', function(res) { 
-							console.log(res)                       
+						sendData(IP + "/Statistical/GetBindListDaoChu", param, 'get', function (res) {
+							console.log(res);
 							if (res.code == 0) { //鎴愬姛
 								var list = res.data;
-								$.extend(infoOptions, {
-									data: list
+								table.exportFile(tableIns.config.id, list, 'xls', "鎵樼洏鏄庣粏淇℃伅" + getNowTime(),); //data 涓鸿瀹炰緥涓殑浠绘剰鏁伴噺鐨勬暟鎹�
+								layer.msg('瀵煎嚭鎴愬姛锛�', {
+									icon: 1,
+									time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+								}, function () {
+
 								});
-								infoOptions.page = {
-									curr: 1
-								}
-								tableIns = table.render(infoOptions);
-							}
-							else { //涓嶆垚鍔�
-								layer.msg('鑾峰彇鎬婚噺鍒楄〃淇℃伅澶辫触锛�', {
+
+							} else { //涓嶆垚鍔�
+								layer.msg('鑾峰彇淇℃伅澶辫触锛�', {
 									icon: 2,
 									time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
-								}, function() {});
+								}, function () { });
 							}
 						});
-					});
-					//#endregion                    
-                }                
-
-				// 琛ㄥ崟闇�瑕佺殑鍙橀噺
-				var infoOptions2;
-				//#region 鍘熷闈炶嚜瀹氫箟鍒�
-				// infoOptions2 = {
-				// 	elem: '#LAY-app-content-list2',
-				// 	height: 'full-206',
-				// 	id: 'LAY-app-content-list2',
-				// 	page: true,
-				// 	limit: pageCnt,
-				// 	limits: pageLimits,
-				// 	even: true,
-				// 	cellMinWidth: 80, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
-				// 	cols: 
-				// 	[[
-                //         {
-                //             title: '搴忓彿',  type: 'numbers',  fixed: 'left'
-                //         },
-                //         {
-                //             field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center',
-                //         },
-                //         {
-                //             field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center',
-                //         },
-                //         {
-                //             field: 'PalletNo', title: '鎵樼洏鍙�', align: 'center', width: 110,
-                //         },
-                //         {
-                //             field: 'BoxNo', title: '绠辩爜', align: 'center', width: 100,
-                //         }, 
-                //         {
-                //             field: 'Status', title: '绠辨敮鐘舵��', align: 'center', templet: '#BoxStatus',
-                //         },
-                //         {
-                //             field: 'LotNo', title: '鎵规鍙�', align: 'center',
-                //         },
-                //         {
-                //             field: 'LotText', title: '鎵规鎻忚堪', align: 'center',
-                //         },
-                //         {
-                //             field: 'Qty', title: '鏁伴噺', width: 90, align: 'center',
-                //         },
-                //         {
-                //             field: 'FullQty', title: '鏁寸鏁伴噺', width: 100, align: 'center',
-                //         },
-                //         {
-                //             field: 'ProductionTime', title: '鐢熶骇鏃ユ湡', align: 'center',
-                //             templet: function(d) {
-                //                 return formatDate(d.ProductionTime);
-                //             },
-                //         },
-                //         {
-                //             field: 'InspectMark', title: '鎶芥鏍囪', align: 'center', templet: '#InspectMarkStatus',
-                //         }, 
-                //         {
-                //             field: 'BitBoxMark', templet: '#BitPalletMarkStatus1', title: '闆剁鏍囪', align: 'center',
-                //         },
-                //         {
-                //             field: 'InspectStatus', templet: '#InspectStatus1', title: '璐ㄦ鐘舵��', align: 'center',
-                //         }, 
-                //         {
-                //             field: 'InspectTime', title: '澶嶆鏃堕棿', align: 'center',
-                //             templet: function(d) {
-                //                 return formatDate(d.InspectTime);
-                //             },
-                //         },
-                //         {
-				// 			title: '鎿嶄綔', fixed: 'right', align: 'center', toolbar: '#table-content-list'
-				// 		}
-				// 	]]
-				// };
-                //#endregion
-				
-				//鑾峰彇鏄庣粏淇℃伅
-				//#region 鑷畾涔夎〃澶�
-				var DetailColsArr = [[
-					{field: '',title: '搴忓彿',type:'numbers',fixed: 'left', "disabled": true},   
-                    {field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center'},
-                    {field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center'},
-                    {field: 'PalletNo', title: '鎵樼洏鍙�', align: 'center', width: 110},
-                    {field: 'BoxNo', title: '绠辩爜', align: 'center', width: 100}, 
-                    {field: 'Status', title: '绠辨敮鐘舵��', align: 'center', templet: '#BoxStatus'},
-                    {field: 'LotNo', title: '鎵规鍙�', align: 'center'},
-                    {field: 'LotText', title: '鎵规鎻忚堪', align: 'center'},
-                    {field: 'Qty', title: '鏁伴噺', width: 90, align: 'center'},
-                    {field: 'FullQty', title: '鏁寸鏁伴噺', width: 100, align: 'center'},
-                    {field: 'ProductionTime', title: '鐢熶骇鏃ユ湡', align: 'center',templet: '#templetProductionTime'},
-                    {field: 'InspectMark', title: '鎶芥鏍囪', align: 'center', templet: '#InspectMarkStatus'}, 
-                    {field: 'BitBoxMark', templet: '#BitPalletMarkStatus1', title: '闆剁鏍囪', align: 'center'},
-                    {field: 'InspectStatus', templet: '#InspectStatus1', title: '璐ㄦ鐘舵��', align: 'center'}, 
-                    {field: 'InspectTime', title: '澶嶆鏃堕棿', align: 'center',templet: '#templetInspectTime'},
-                    {field: 'caozuo',title: '鎿嶄綔', fixed: 'right', align: 'center', toolbar: '#table-content-list', "disabled": true}
-				]];
-				var DetailColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(DetailColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
-				//#endregion				
-				function refreshTable2(Id,SkuNo,SkuName,LotNo,PalletNo,BoxNo,Status,InspectMark,BitBoxMark,InspectStatus,StartTime,EndTime) {
-					//#region 鑷畾涔夎〃澶�
-					var colsJson2
-					var param1={
-						Href:'Statistical/GetBoxInfo'
-					};
-					sendData(IP + "/Sys/GetTableColsByUserId", param1, 'post', function(res) {
-						if (res.code == 0){							
-							if(res.data=='' || res.data==undefined || res.data==null){
-								colsJson2=DetailColsArr
-							}else{
-								colsJson2= eval(res.data);
-							}
-						}else{
-								colsJson2=DetailColsArr
-						}
-						infoOptions2 = {
-							elem: '#LAY-app-content-list2',
-							height: h1,
-							id: 'LAY-app-content-list2',
-							page: true,
-							limit: pageCnt,
-							limits: pageLimits,
-							even: true,
-							cellMinWidth: 80, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
-							done: function(){
-								//鑷畾涔夊垪瀹�
-								SetTableColW('LAY-app-content-list2','Statistical/GetBoxInfo',DetailColsSysArr);
-							}, 
-							cols:colsJson2
-						};
-						
+					} else if (yemianid == 1) {
+						console.log("绠辩爜鏄庣粏");
 						var param = {
-							Id:Id,
-							SkuNo:SkuNo,
-							SkuName:SkuName,
-							LotNo:LotNo,
-							PalletNo:PalletNo,
-							BoxNo:BoxNo,
-							Status:Status,
-							InspectMark:InspectMark,
-							BitBoxMark:BitBoxMark,
-							InspectStatu:InspectStatus,
-							StartTime:StartTime,
-							EndTime:EndTime,
-						} 
-						sendData(IP + "/Statistical/GetBoxInfo", param, 'get', function(res) {
-							if (res.code == 0) //鎴愬姛
-							{
+							Id: quanid,
+							SkuNo: $("#SkuNo").val(),
+							SkuName: $("#SkuName").val(),
+							LotNo: $("#LotNo").val(),
+							LocatNo: $("#LocatNo").val(),
+							PalletNo: $("#PalletNo").val(),
+							Status: $("#Status").val(),
+							InspectStatus: $("#InspectStatus").val(),
+							IsSamolingTray: $("#IsSamolingTray").val(),
+							StartTime: $("#StartTime").val(),
+							EndTime: $("#EndTime").val(),
+						};
+						sendData(IP + "/Statistical/GetBoxInfoDaoChu", param, 'get', function (res) {
+							console.log(res);
+							if (res.code == 0) { //鎴愬姛
 								var list = res.data;
-								$.extend(infoOptions2, {
-									data: list
+								table.exportFile(tableIns2.config.id, list, 'xls', "绠辩爜鏄庣粏淇℃伅" + getNowTime(),); //data 涓鸿瀹炰緥涓殑浠绘剰鏁伴噺鐨勬暟鎹�
+								layer.msg('瀵煎嚭鎴愬姛锛�', {
+									icon: 1,
+									time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+								}, function () {
+
 								});
-								infoOptions2.page = {
-									curr: 1
-								}
-								tableIns2 = table.render(infoOptions2);
-							}
-							else //涓嶆垚鍔�
-							{
-								layer.msg('鑾峰彇鏄庣粏鍒楄〃淇℃伅澶辫触锛�', {
+
+							} else { //涓嶆垚鍔�
+								layer.msg('鑾峰彇淇℃伅澶辫触锛�', {
 									icon: 2,
 									time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
-								}, function() {});
-							}
-						})
-					});
-					//#endregion					
-				}
-                
-				//var url = IP + "/Statistical/GetInventoryList1";
-				
-               
-				
-				//鎺ュ彈鍏ㄥ眬鍙橀噺
-				let quanid = '';
-				//鐩戝惉鎼滅储
-				form.on('submit(LAY-app-contlist-search)', function(data) {
-					var SkuNo = $("#SkuNo").val();
-					var SkuName = $("#SkuName").val();
-					var LotNo = $("#LotNo").val();
-					var PalletNo = $("#PalletNo").val();
-
-					var BoxNo = $("#BoxNo").val();
-					var Status = $("#Status").val();
-					var InspectMark = $("#InspectMark").val();
-					var BitPalletMark = $("#BitPalletMark").val();
-					var BitBoxMark = $("#BitBoxMark").val();
-					var InspectStatus = $("#InspectStatus").val();
-
-					var OwnerNo = $("#OwnerNo").val();
-					var OwnerName = $("#OwnerName").val();
-
-					var StartTime = $("#StartTime").val();
-					var EndTime = $("#EndTime").val();
-
-					if(yemianid == 0){
-						console.log("鎬诲崟");
-						refreshTable(SkuNo,SkuName,PalletNo,LotNo,BoxNo,Status,InspectMark,BitPalletMark,BitBoxMark,InspectStatus,OwnerNo,OwnerName,StartTime,EndTime);
-					}else if(yemianid == 1){
-						quanid = '';
-						console.log("鏄庣粏");
-						refreshTable2(quanid,SkuNo,SkuName,LotNo,PalletNo,BoxNo,Status,InspectMark,BitBoxMark,InspectStatus,StartTime,EndTime);
-					}
-					
-				});
-				//瑙﹀彂琛屽弻鍑讳簨浠�
-				table.on('rowDouble(LAY-app-content-list)', function(obj) {
-					$(".layui-tab-title>li").attr("class", "");
-					$('.layui-tab-title>li').eq(1).attr('class', 'layui-this');
-					$('.layui-tab-content .layui-tab-item').attr('class', 'layui-tab-item')
-					$('.layui-tab-content .layui-tab-item').eq(1).attr('class', 'layui-tab-item layui-show')
-					console.log(obj.data.Id);
-					quanid = obj.data.Id;
-					refreshTable2(obj.data.Id);
-					yemianid=1;
-				});
-				
-				//鐩戝惉Tab鍒囨崲锛屼互鏀瑰彉鍦板潃hash鍊�
-				element.on('tab(docDemoTabBrief)', function(data){
-					var SkuNo = $("#SkuNo").val();
-					var SkuName = $("#SkuName").val();
-					var LotNo = $("#LotNo").val();
-					var PalletNo = $("#PalletNo").val();
-
-					var BoxNo = $("#BoxNo").val();
-					var Status = $("#Status").val();
-					var InspectMark = $("#InspectMark").val();
-					var BitPalletMark = $("#BitPalletMark").val();
-					var BitBoxMark = $("#BitBoxMark").val();
-					var InspectStatus = $("#InspectStatus").val();
-
-					var OwnerNo = $("#OwnerNo").val();
-					var OwnerName = $("#OwnerName").val();
-
-					var StartTime = $("#StartTime").val();
-					var EndTime = $("#EndTime").val();
-
-					console.log(data.index);
-					yemianid = data.index
-					if(yemianid == 0){
-						console.log("鎬诲崟");
-						refreshTable(SkuNo,SkuName,PalletNo,LotNo,BoxNo,Status,InspectMark,BitPalletMark,BitBoxMark,InspectStatus,OwnerNo,OwnerName,StartTime,EndTime);
-					}else if(yemianid == 1){
-						console.log("鏄庣粏");
-						refreshTable2(quanid,SkuNo,SkuName,LotNo,PalletNo,BoxNo,Status,InspectMark,BitBoxMark,InspectStatus,StartTime,EndTime);
-					}
-				});
-				var doing = true;
-				// ------------------------------------璇︽儏---------------------------------------------------
-				table.on('tool(LAY-app-content-list2)', function(obj) {
-					console.log(obj)
-					var data = obj.data;
-					//璇︽儏
-					if (obj.event === 'edit') {
-						BoxNo = data.BoxNo;
-						console.log(data)
-						layer.open({
-							type: 2,
-							title: '绠辨敮璇︽儏淇℃伅',
-							content: 'BoxSupportInfor.html?BoxNo=' + BoxNo,
-							maxmin: true,
-							area: ['80%', '85%'],
-							btn: ['鍏抽棴'],
-							yes: function(index, layero) {
-								var iframeWindow = window['layui-layer-iframe' + index],
-									submitID = 'layuiadmin-app-form-edit',
-									submit = layero.find('iframe').contents().find('#' + submitID);
-									if(doing)
-									{
-										doing = false;
-										
-										layer.close(index); //鍏抽棴寮瑰眰
-										refreshTable();
-										doing = true;
-												
-											
-									}
+								}, function () { });
 							}
 						});
-					} 
-				});
-
-				form.on('submit(daochu)', function () {
-					layer.confirm('纭畾瀵煎嚭褰撳墠鏁版嵁鍚楋紵', function(index) {
-						if(yemianid == 0){
-							console.log("鎵樼洏鏄庣粏"); 
-							var param = {
-								SkuNo : $("#SkuNo").val(),
-								SkuName : $("#SkuName").val(),
-								LotNo : $("#LotNo").val(),
-								PalletNo : $("#PalletNo").val(),
-
-								BoxNo : $("#BoxNo").val(),
-								Status : $("#Status").val(),
-								InspectMark : $("#InspectMark").val(),
-								BitPalletMark : $("#BitPalletMark").val(),
-								BitBoxMark : $("#BitBoxMark").val(),
-								InspectStatus : $("#InspectStatus").val(),
-
-								StartTime: $("#StartTime").val(),
-								EndTime: $("#EndTime").val(),
-							};
-
-							sendData(IP + "/Statistical/GetBindListDaoChu", 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 () { });
-								}
-							});
-						}else if(yemianid == 1){
-							console.log("绠辩爜鏄庣粏");
-							var param = {
-								Id:quanid,
-								SkuNo: $("#SkuNo").val(),
-								SkuName: $("#SkuName").val(),
-								LotNo:$("#LotNo").val(),
-								LocatNo:$("#LocatNo").val(),
-								PalletNo:$("#PalletNo").val(),
-								Status:$("#Status").val(),
-								InspectStatus:$("#InspectStatus").val(),
-								IsSamolingTray:$("#IsSamolingTray").val(),
-								StartTime: $("#StartTime").val(),
-								EndTime: $("#EndTime").val(),
-							};
-							sendData(IP + "/Statistical/GetBoxInfoDaoChu", param, 'get', function (res) {
-								console.log(res);
-								if (res.code == 0) { //鎴愬姛
-									var list = res.data;
-									table.exportFile(tableIns2.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/GetBindList&ColsSysArr='+TotalColsSysArr,
-							maxmin: false,
-							resize: false,
-							area: ['970px', '650px']
-						});
-					},
-					customCols2: function(){
-						layer.open({
-							type: 2,
-							title: '鑷畾涔夊垪',
-							content: '../SystemSettings/HeaderSetting.html?Href=Statistical/GetBoxInfo&ColsSysArr='+DetailColsSysArr,
-							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>
+
+			//#region 鑷畾涔夎〃澶�
+			//鑷畾涔夎〃澶�			
+			active = {
+				customCols: function () {
+					layer.open({
+						type: 2,
+						title: '鑷畾涔夊垪',
+						content: '../SystemSettings/HeaderSetting.html?Href=Statistical/GetBindList&ColsSysArr=' + TotalColsSysArr,
+						maxmin: false,
+						resize: false,
+						area: ['970px', '650px']
+					});
+				},
+				customCols2: function () {
+					layer.open({
+						type: 2,
+						title: '鑷畾涔夊垪',
+						content: '../SystemSettings/HeaderSetting.html?Href=Statistical/GetBoxInfo&ColsSysArr=' + DetailColsSysArr,
+						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