From d58fd0905004b5c4abf138c8fb95a597130af928 Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期四, 29 八月 2024 09:01:18 +0800
Subject: [PATCH] bug修复

---
 HTML/views/StatisticalReport/InOutBoundReports.html | 1206 +++++++++++++++++++++++++-------------------------------
 1 files changed, 543 insertions(+), 663 deletions(-)

diff --git a/HTML/views/StatisticalReport/InOutBoundReports.html b/HTML/views/StatisticalReport/InOutBoundReports.html
index ef16498..1ecaca7 100644
--- a/HTML/views/StatisticalReport/InOutBoundReports.html
+++ b/HTML/views/StatisticalReport/InOutBoundReports.html
@@ -1,129 +1,134 @@
 <!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 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 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="PalletNo"  name="PalletNo" 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>
 
-                        <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>
+	<script>
+		// 杩欓噷鏄渶瑕佸湪椤甸潰娓叉煋涔嬪墠鎵ц鐨勪唬鐮�
+		document.addEventListener("DOMContentLoaded", function () {
+			//鑾峰彇table榛樿鏄剧ず鏁�
+			pageCntFirst();
+			//鍒ゆ柇鏄惁寮�鍚痶able鍒楄〃鍒楀璋冩暣鍔熻兘銆�
+			GetIsSetColW();
+		});
+	</script>
+</head>
 
-						<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> 
+<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 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 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="PalletNo" name="PalletNo" 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;">
+							<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 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>
 
-							<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-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 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="templetCompleteTime">
+									<!-- #region 鑷畾涔夎〃澶� -->
+									<script type="text/html" id="templetCompleteTime">
 											{{# function GetBtn(d){
 													return formatDate(d.CompleteTime);
 												}	
@@ -131,590 +136,465 @@
 											{{ GetBtn(d) }}
 										</script>
 
-										<script type="text/html" id="templetCCreateTime">
+									<script type="text/html" id="templetCCreateTime">
 											{{# function GetBtn1(d){
 													return formatDate(d.CCreateTime);
 												}	
 											}}
 											{{ GetBtn1(d) }}
 										</script>
-										<!-- #endregion -->
-									</div>
+									<!-- #endregion -->
 								</div>
 							</div>
 						</div>
-						
 					</div>
-					
+
 				</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();
-                
-				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;
-				};
-            
-                var myDate = new Date();
-                console.log(myDate.getFullYear()+'-'+(myDate.getMonth() + 1)+'-'+myDate.getDate()+' 00:00:00')
-                myDate.getFullYear(); //鑾峰彇瀹屾暣鐨勫勾浠�(4浣�,1970-????)
-                myDate.getMonth(); //鑾峰彇褰撳墠鏈堜唤(0-11,0浠h〃1鏈�)
-                myDate.getDate(); //鑾峰彇褰撳墠鏃�(1-31)
-                // 姣忔棩鍒濆鏃堕棿
-                var chudate = myDate.getFullYear()+'-'+(myDate.getMonth() + 1)+'-'+myDate.getDate()+' 00:00:00'
-                var jiedate = myDate.getFullYear()+'-'+(myDate.getMonth() + 1)+'-'+myDate.getDate()+' 23:59:59'
-				var $ = layui.$;
-				var yemianid =0;
-				refreshTable("","","","","");
+			var h1 = GetTableTabHeight();
 
-				// 琛ㄥ崟闇�瑕佺殑鍙橀噺
-				var infoOptions;
-				//#region 鍘熷闈炶嚜瀹氫箟鍒�
-				// infoOptions = {
-				// 	elem: '#LAY-app-content-list',
-				// 	height: 'full-164',
-				// 	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: 'LotNo', title: '鎵规鍙�', align: 'center',
-                //         },
-                //         {
-                //             field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center'
-                //         },
-                //         {
-                //             field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center',
-                //         },
-                //         {
-                //             field: 'RQty', title: '鍏ュ簱鏁伴噺', align: 'center'
-                //         },
-                //         {
-                //             field: 'RFactQty', title: '宸茬粍鏁伴噺', align: 'center',
-                //         },
-                //         {
-                //             field: 'RCompleteQty', title: '瀹屾垚鏁伴噺', align: 'center'
-                //         },
-                //         {
-                //             field: 'CQty', title: '鍑哄簱鏁伴噺', align: 'center'
-                //         },
-                //         {
-                //             field: 'CAllotQty', title: '鍒嗛厤鏁伴噺', align: 'center'
-                //         },
-                //         {
-                //             field: 'CFactQty', title: '涓嬫灦鏁伴噺', align: 'center',
-                //         },
-                //         {
-                //             field: 'CompleteQty', title: '鎷h揣鏁伴噺', align: 'center'
-                //         },
-                        
-				// 	]]
-				// };
-                //#endregion
-				
+			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;
+			};
+
+			var myDate = new Date();
+			console.log(myDate.getFullYear() + '-' + (myDate.getMonth() + 1) + '-' + myDate.getDate() + ' 00:00:00')
+			myDate.getFullYear(); //鑾峰彇瀹屾暣鐨勫勾浠�(4浣�,1970-????)
+			myDate.getMonth(); //鑾峰彇褰撳墠鏈堜唤(0-11,0浠h〃1鏈�)
+			myDate.getDate(); //鑾峰彇褰撳墠鏃�(1-31)
+			// 姣忔棩鍒濆鏃堕棿
+			var chudate = myDate.getFullYear() + '-' + (myDate.getMonth() + 1) + '-' + myDate.getDate() + ' 00:00:00'
+			var jiedate = myDate.getFullYear() + '-' + (myDate.getMonth() + 1) + '-' + myDate.getDate() + ' 23:59:59'
+			var $ = layui.$;
+			var yemianid = 0;
+			refreshTable("", "", "", "", "");
+
+			// 琛ㄥ崟闇�瑕佺殑鍙橀噺
+			var infoOptions;
+			//#region 鑷畾涔夎〃澶�
+			var TotalColsArr = [[
+				{ field: '', title: '搴忓彿', type: 'numbers', fixed: 'left', "disabled": true },
+				{ field: 'LotNo', title: '鎵规鍙�', align: 'center' },
+				{ field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center' },
+				{ field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center' },
+				{ field: 'RQty', title: '鍏ュ簱鏁伴噺', align: 'center' },
+				{ field: 'RFactQty', title: '宸茬粍鏁伴噺', align: 'center' },
+				{ field: 'RCompleteQty', title: '瀹屾垚鏁伴噺', align: 'center' },
+				{ field: 'CQty', title: '鍑哄簱鏁伴噺', align: 'center' },
+				{ field: 'CAllotQty', title: '鍒嗛厤鏁伴噺', align: 'center' },
+				{ field: 'CFactQty', title: '涓嬫灦鏁伴噺', align: 'center' },
+				{ field: 'CompleteQty', title: '鎷h揣鏁伴噺', align: 'center' }
+			]];
+			var TotalColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
+			//#endregion
+			//鑾峰彇鍑哄叆搴撴�婚噺
+			function refreshTable(SkuNo, SkuName, LotNo, StartTime, EndTime) {
 				//#region 鑷畾涔夎〃澶�
-				var TotalColsArr = [[
-							{field: '',title: '搴忓彿',type:'numbers',fixed: 'left', "disabled": true},
-                        	{field: 'LotNo', title: '鎵规鍙�', align: 'center'},
-                        	{field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center'},
-                        	{field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center'},
-                        	{field: 'RQty', title: '鍏ュ簱鏁伴噺', align: 'center'},
-                        	{field: 'RFactQty', title: '宸茬粍鏁伴噺', align: 'center'},
-                        	{field: 'RCompleteQty', title: '瀹屾垚鏁伴噺', align: 'center'},
-                        	{field: 'CQty', title: '鍑哄簱鏁伴噺', align: 'center'},
-                        	{field: 'CAllotQty', title: '鍒嗛厤鏁伴噺', align: 'center'},
-                        	{field: 'CFactQty', title: '涓嬫灦鏁伴噺', align: 'center'},
-                        	{field: 'CompleteQty', title: '鎷h揣鏁伴噺', align: 'center'}
-						]];
-				var TotalColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
-				//#endregion
-				//鑾峰彇鍑哄叆搴撴�婚噺
-                function refreshTable(SkuNo,SkuName,LotNo,StartTime,EndTime) {
-					//#region 鑷畾涔夎〃澶�
-					var colsJson
-					var param1={
-						Href:'Statistical/GetTotalRecord'
-					};
-					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/GetTotalRecord'
+				};
+				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/GetTotalRecord',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/GetTotalRecord', TotalColsSysArr);
+						},
+						cols: colsJson
+					};
 
+					var param = {
+						SkuNo: SkuNo, //鐗╂枡鍙�
+						SkuName: SkuName, //鐗╂枡鍚嶇О
+						LotNo: LotNo, //鎵规鍙�
+						StartTime: StartTime, //寮�濮嬫椂闂�
+						EndTime: EndTime, //缁撴潫鏃堕棿
+						//StartTime:StartTime?""=chudate:StartTime, //寮�濮嬫椂闂�
+						//EndTime:EndTime?""=jiedate:EndTime, //缁撴潫鏃堕棿
+					};
+					// if(StartTime == "")
+					// {
+					// 	param.StartTime = chudate;
+					// }
+					// if(EndTime == "")
+					// {
+					// 	param.EndTime = jiedate;
+					// }
+					console.log(param)
+					//sendData(IP + "/Statistical/GetBindList?SkuNo="+$("#SkuNo").val()+"&&SkuName="+$("#SkuName").val()+"&&PalletNo="+$("#PalletNo").val()+"&&LotNo="+$("#LotNo").val()+"&&BoxNo="+$("#BoxNo").val()+"&&Status="+$("#Status").val()+"&&InspectMark="+$("#InspectMark").val()+"&&BitPalletMark="+$("#BitPalletMark").val()+"&&BitBoxMark="+$("#BitBoxMark").val()+"&&InspectStatus="+$("#InspectStatus").val(), {}, 'post', function(res) {
+					sendData(IP + "/Statistical/GetTotalRecord", 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', width: 70, fixed: 'left', "disabled": true },
+				{ field: 'ASNNo', title: '鍏ュ簱鍗曞彿', align: 'center', width: 100 },
+				{ field: 'SONo', title: '鍑哄簱鍗曞彿', align: 'center', width: 100 },
+				{ field: 'LotNo', title: '鎵规鍙�', align: 'center', width: 100 },
+				{ field: 'SupplierLot', title: '渚涜揣鎵规', align: 'center', width: 100 },
+				{ field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center', width: 100 },
+				{ field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center', width: 100 },
+				{ field: 'PalletNo', title: '鎵樼洏鍙�', align: 'center', width: 100 },
+				{ field: 'LotText', title: '鎵规鎻忚堪', align: 'center', width: 100 },
+				{ field: 'CompleteTime', title: '鍏ュ簱鏃堕棿', align: 'center', width: 160, templet: '#templetCompleteTime' },
+				{ field: 'RQty', title: '鍏ュ簱鏁伴噺', align: 'center', width: 100 },
+				{ field: 'RFactQty', title: '宸茬粍鏁伴噺', align: 'center' },
+				{ field: 'RCompleteQty', title: '瀹屾垚鏁伴噺', align: 'center', width: 100 },
+				{ field: 'CCreateTime', title: '鎷h揣鏃堕棿', align: 'center', width: 160, templet: '#templetCCreateTime' },
+				{ field: 'CQty', title: '鍑哄簱鏁伴噺', align: 'center', width: 100 },
+				{ field: 'CAllotQty', title: '鍒嗛厤鏁伴噺', align: 'center', width: 100 },
+				{ field: 'CFactQty', title: '涓嬫灦鏁伴噺', align: 'center', width: 100 },
+				{ field: 'CompleteQty', title: '鎷h揣鏁伴噺', align: 'center', width: 100 },
+			]];
+			var DetailColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(DetailColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
+			//#endregion
+			function refreshTable2(SkuNo, SkuName, LotNo, PalletNo, StartTime, EndTime) {
+				//#region 鑷畾涔夎〃澶�
+				var colsJson2
+				var param1 = {
+					Href: 'Statistical/GetDetailedRecord'
+				};
+				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/GetDetailedRecord', DetailColsSysArr);
+						},
+						cols: colsJson2
+					};
+
+					var param = {
+						SkuNo: SkuNo,
+						SkuName: SkuName,
+						LotNo: LotNo,
+						PalletNo: PalletNo,
+						StartTime: StartTime,
+						EndTime: EndTime
+					}
+					//sendData(IP + "/Statistical/GetBoxInfor?Id="+Id+"&&SkuNo="+$("#SkuNo").val()+"&&SkuName="+$("#SkuName").val()+"&&PalletNo="+$("#PalletNo").val()+"&&LotNo="+$("#LotNo").val()+"&&BoxNo="+$("#BoxNo").val()+"&&Status="+$("#Status").val()+"&&InspectMark="+$("#InspectMark").val()+"&&BitBoxMark="+$("#BitBoxMark").val()+"&&InspectStatus="+$("#InspectStatus").val(), {}, 'get', function(res) {
+					sendData(IP + "/Statistical/GetDetailedRecord", param, 'get', function (res) {
+						console.log(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 quanlotno = '';
+			let quanskuno = '';
+			let quanskuname = '';
+			//鐩戝惉鎼滅储
+			form.on('submit(LAY-app-contlist-search)', function (data) {
+				var SkuNo = $("#SkuNo").val();
+				var SkuName = $("#SkuName").val();
+				var LotNo = $("#LotNo").val();
+				var StartTime = $("#StartTime").val();
+				var EndTime = $("#EndTime").val();
+				var PalletNo = $("#PalletNo").val();
+
+
+				if (yemianid == 0) {
+					console.log("鎬诲崟");
+					refreshTable(SkuNo, SkuName, LotNo, StartTime, EndTime);
+				} else if (yemianid == 1) {
+					quanlotno = '';
+					quanskuno = '';
+					quanskuname = '';
+					console.log("鏄庣粏");
+					refreshTable2(quanskuno, quanskuname, quanlotno, PalletNo, 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);
+				quanlotno = obj.data.LotNo;
+				quanskuno = obj.data.SkuNo;
+				quanskuname = obj.data.SkuName;
+				refreshTable2(obj.data.SkuNo, obj.data.SkuName, obj.data.LotNo, "", "", "");
+				yemianid = 1;
+			});
+
+			//鐩戝惉Tab鍒囨崲锛屼互鏀瑰彉鍦板潃hash鍊�
+			element.on('tab(docDemoTabBrief)', function (data) {
+				console.log(data.index);
+				yemianid = data.index
+				if (yemianid == 0) {
+					console.log("鎬诲崟");
+					refreshTable("", "", "", "", "");
+				} else if (yemianid == 1) {
+					console.log("鏄庣粏");
+					refreshTable2(quanskuno, quanskuname, quanlotno, "", "", "");
+				}
+			});
+			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, //鐗╂枡鍙�
-						SkuName:SkuName, //鐗╂枡鍚嶇О
-						LotNo:LotNo, //鎵规鍙�
-                        StartTime:StartTime, //寮�濮嬫椂闂�
-                        EndTime:EndTime, //缁撴潫鏃堕棿
-                        //StartTime:StartTime?""=chudate:StartTime, //寮�濮嬫椂闂�
-                        //EndTime:EndTime?""=jiedate:EndTime, //缁撴潫鏃堕棿
+							SkuNo: $("#SkuNo").val(),
+							SkuName: $("#SkuName").val(),
+							LotNo: $("#LotNo").val(),
+							StartTime: $("#StartTime").val(),
+							EndTime: $("#EndTime").val(),
 						};
-						// if(StartTime == "")
-						// {
-						// 	param.StartTime = chudate;
-						// }
-						// if(EndTime == "")
-						// {
-						// 	param.EndTime = jiedate;
-						// }
-						console.log(param)
-						//sendData(IP + "/Statistical/GetBindList?SkuNo="+$("#SkuNo").val()+"&&SkuName="+$("#SkuName").val()+"&&PalletNo="+$("#PalletNo").val()+"&&LotNo="+$("#LotNo").val()+"&&BoxNo="+$("#BoxNo").val()+"&&Status="+$("#Status").val()+"&&InspectMark="+$("#InspectMark").val()+"&&BitPalletMark="+$("#BitPalletMark").val()+"&&BitBoxMark="+$("#BitBoxMark").val()+"&&InspectStatus="+$("#InspectStatus").val(), {}, 'post', function(res) {
-						sendData(IP + "/Statistical/GetTotalRecord", param, 'get', function(res) {
-							console.log(res)
+						sendData(IP + "/Statistical/GetTotalRecord", 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-164',
-				// 	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', width: 70
-                //         },
-                //         {
-                //             field: 'ASNNo', title: '鍏ュ簱鍗曞彿', align: 'center', width: 100
-                //         },
-                //         {
-                //             field: 'SONo', title: '鍑哄簱鍗曞彿', align: 'center', width: 100
-                //         },
-                //         {
-                //             field: 'LotNo', title: '鎵规鍙�', align: 'center', width: 100
-                //         },
-                //         {
-                //             field: 'SupplierLot', title: '渚涜揣鎵规', align: 'center', width: 100
-                //         },
-                //         {
-                //             field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center', width: 100
-                //         },
-                //         {
-                //             field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center', width: 100
-                //         },
-                //         {
-                //             field: 'PalletNo', title: '鎵樼洏鍙�', align: 'center', width: 100
-                //         },
-                //         {
-                //             field: 'LotText', title: '鎵规鎻忚堪', align: 'center', width: 100
-                //         },
-                //         {
-                //             field: 'CompleteTime', title: '鍏ュ簱鏃堕棿', align: 'center', width: 160,
-                //             templet: function(d) {
-                //                 return formatDate(d.CompleteTime);
-                //             },
-                //         },
-                //         {
-                //             field: 'RQty', title: '鍏ュ簱鏁伴噺', align: 'center', width: 100
-                //         },
-                //         {
-                //             field: 'RFactQty', title: '宸茬粍鏁伴噺', align: 'center',
-                //         },
-                //         {
-                //             field: 'RCompleteQty', title: '瀹屾垚鏁伴噺', align: 'center', width: 100
-                //         },
-                //         {
-                //             field: 'CCreateTime', title: '鎷h揣鏃堕棿', align: 'center',width: 160,
-                //             templet: function(d) {
-                //                 return formatDate(d.CCreateTime);
-                //             },
-                //         },
-                //         {
-                //             field: 'CQty', title: '鍑哄簱鏁伴噺', align: 'center', width: 100
-                //         },
-                //         {
-                //             field: 'CAllotQty', title: '鍒嗛厤鏁伴噺', align: 'center', width: 100
-                //         },
-                //         {
-                //             field: 'CFactQty', title: '涓嬫灦鏁伴噺', align: 'center', width: 100
-                //         },
-                //         {
-                //             field: 'CompleteQty', title: '鎷h揣鏁伴噺', align: 'center', width: 100
-                //         },
-				// 	]]
-				// };
-                //#endregion
-				
-				//鑾峰彇鏄庣粏淇℃伅
-				//#region 鑷畾涔夎〃澶�
-				var DetailColsArr = [[
-					{field: '',title: '搴忓彿',type:'numbers',width: 70,fixed: 'left', "disabled": true},
-					{field: 'ASNNo', title: '鍏ュ簱鍗曞彿', align: 'center', width: 100},
-					{field: 'SONo', title: '鍑哄簱鍗曞彿', align: 'center', width: 100},
-					{field: 'LotNo', title: '鎵规鍙�', align: 'center', width: 100},
-					{field: 'SupplierLot', title: '渚涜揣鎵规', align: 'center', width: 100},
-					{field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center', width: 100},
-					{field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center', width: 100},
-					{field: 'PalletNo', title: '鎵樼洏鍙�', align: 'center', width: 100},
-					{field: 'LotText', title: '鎵规鎻忚堪', align: 'center', width: 100},
-					{field: 'CompleteTime', title: '鍏ュ簱鏃堕棿', align: 'center', width: 160,templet: '#templetCompleteTime'},
-					{field: 'RQty', title: '鍏ュ簱鏁伴噺', align: 'center', width: 100},
-					{field: 'RFactQty', title: '宸茬粍鏁伴噺', align: 'center'},
-					{field: 'RCompleteQty', title: '瀹屾垚鏁伴噺', align: 'center', width: 100},
-					{field: 'CCreateTime', title: '鎷h揣鏃堕棿', align: 'center',width: 160,templet: '#templetCCreateTime'},
-					{field: 'CQty', title: '鍑哄簱鏁伴噺', align: 'center', width: 100},
-					{field: 'CAllotQty', title: '鍒嗛厤鏁伴噺', align: 'center', width: 100},
-					{field: 'CFactQty', title: '涓嬫灦鏁伴噺', align: 'center', width: 100},
-					{field: 'CompleteQty', title: '鎷h揣鏁伴噺', align: 'center', width: 100},
-				]];
-				var DetailColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(DetailColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
-				//#endregion
-				function refreshTable2(SkuNo,SkuName,LotNo,PalletNo,StartTime,EndTime) {
-					//#region 鑷畾涔夎〃澶�
-					var colsJson2
-					var param1={
-						Href:'Statistical/GetDetailedRecord'
-					};
-					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/GetDetailedRecord',DetailColsSysArr);
-							},
-							cols:colsJson2
-						};
-						
+					} else if (yemianid == 1) {
+						//console.log("璁板綍");
 						var param = {
-							SkuNo:SkuNo,
-							SkuName:SkuName,
-							LotNo:LotNo,
-							PalletNo:PalletNo,
-							StartTime:StartTime,
-							EndTime:EndTime
-						}
-						//sendData(IP + "/Statistical/GetBoxInfor?Id="+Id+"&&SkuNo="+$("#SkuNo").val()+"&&SkuName="+$("#SkuName").val()+"&&PalletNo="+$("#PalletNo").val()+"&&LotNo="+$("#LotNo").val()+"&&BoxNo="+$("#BoxNo").val()+"&&Status="+$("#Status").val()+"&&InspectMark="+$("#InspectMark").val()+"&&BitBoxMark="+$("#BitBoxMark").val()+"&&InspectStatus="+$("#InspectStatus").val(), {}, 'get', function(res) {
-						sendData(IP + "/Statistical/GetDetailedRecord", param, 'get', function(res) {
-							console.log(res)
-							if (res.code == 0) //鎴愬姛
-							{
-								var list = res.data;
-								$.extend(infoOptions2, {
-									data: list
+							skuNo: quanskuno,
+							SkuName: $("#SkuName").val(),
+							LotNo: $("#LotNo").val(),
+							PalletNo: $("#PalletNo").val(),
+							StartTime: $("#StartTime").val(),
+							EndTime: $("#EndTime").val(),
+
+						};
+						sendData(IP + "/Statistical/GetDetailedRecord", param, 'get', function (res) {
+							//console.log(res);
+							if (res.code == 0) { //鎴愬姛
+								var list = res.data; 7
+								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 quanlotno = '';
-				let quanskuno = '';
-				let quanskuname = '';
-				//鐩戝惉鎼滅储
-				form.on('submit(LAY-app-contlist-search)', function(data) {
-					var SkuNo = $("#SkuNo").val();
-					var SkuName = $("#SkuName").val();
-					var LotNo = $("#LotNo").val();
-                    var StartTime = $("#StartTime").val();
-                    var EndTime = $("#EndTime").val();
-                    var PalletNo = $("#PalletNo").val();
-
-
-					if(yemianid == 0){
-						console.log("鎬诲崟");
-						refreshTable(SkuNo,SkuName,LotNo,StartTime,EndTime);
-					}else if(yemianid == 1){
-						quanlotno = '';
-						quanskuno = '';
-						quanskuname = '';
-						console.log("鏄庣粏");
-						refreshTable2(quanskuno,quanskuname,quanlotno,PalletNo,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);
-					quanlotno = obj.data.LotNo;
-					quanskuno = obj.data.SkuNo;
-					quanskuname = obj.data.SkuName;
-					refreshTable2(obj.data.SkuNo,obj.data.SkuName,obj.data.LotNo,"","","");
-					yemianid=1;
-				});
-				
-				//鐩戝惉Tab鍒囨崲锛屼互鏀瑰彉鍦板潃hash鍊�
-				element.on('tab(docDemoTabBrief)', function(data){
-					console.log(data.index);
-					yemianid = data.index
-					if(yemianid == 0){
-						console.log("鎬诲崟");
-						refreshTable("","","","","");
-					}else if(yemianid == 1){
-						console.log("鏄庣粏");
-						refreshTable2(quanskuno,quanskuname,quanlotno,"","","");
-					}
-				});
-				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(),
-								StartTime:$("#StartTime").val(),
-								EndTime:$("#EndTime").val(),
-							};
-							sendData(IP + "/Statistical/GetTotalRecord", 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 = {
-								skuNo:quanskuno,
-								SkuName:$("#SkuName").val(),
-								LotNo:$("#LotNo").val(),
-								PalletNo:$("#PalletNo").val(),
-								StartTime:$("#StartTime").val(),
-								EndTime:$("#EndTime").val(),
-								
-							};
-							sendData(IP + "/Statistical/GetDetailedRecord", param, 'get', function (res) {
-								//console.log(res);
-								if (res.code == 0) { //鎴愬姛
-									var list = res.data;7
-									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/GetTotalRecord&ColsSysArr='+TotalColsSysArr,
-							maxmin: false,
-							resize: false,
-							area: ['970px', '650px']
-						});
-					},
-					customCols2: function(){
-						layer.open({
-							type: 2,
-							title: '鑷畾涔夊垪',
-							content: '../SystemSettings/HeaderSetting.html?Href=Statistical/GetDetailedRecord&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/GetTotalRecord&ColsSysArr=' + TotalColsSysArr,
+						maxmin: false,
+						resize: false,
+						area: ['970px', '650px']
+					});
+				},
+				customCols2: function () {
+					layer.open({
+						type: 2,
+						title: '鑷畾涔夊垪',
+						content: '../SystemSettings/HeaderSetting.html?Href=Statistical/GetDetailedRecord&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