From 59f461f6a0e9a97d3e42330892c223a53250302a Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期四, 14 三月 2024 10:28:07 +0800
Subject: [PATCH] ERP下发的单据任何状态下编辑按钮应不显示;(改为 只有WMS录入的单据且状态为等待执行的有编辑按钮,其余系统下发单据无编辑按钮)。增加客户编码查询条件。

---
 HTML/views/StatisticalReport/InventoryStatistics.html |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/HTML/views/StatisticalReport/InventoryStatistics.html b/HTML/views/StatisticalReport/InventoryStatistics.html
index 32821f8..cee3e63 100644
--- a/HTML/views/StatisticalReport/InventoryStatistics.html
+++ b/HTML/views/StatisticalReport/InventoryStatistics.html
@@ -29,11 +29,11 @@
 
 </head>
 
-<body>
+<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">
+			<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">
@@ -155,10 +155,13 @@
 			<div class="layui-card-body">
 				<div style="position: relative;">
 					<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
-						<ul class="layui-tab-title">
+						<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" --><!-- 鑷畾涔夎〃澶村姞涓� -->
@@ -255,6 +258,7 @@
 			element = layui.element;
 			laydate = layui.laydate;
 
+			var h1 = GetTableTabHeight();
 
 			laydate.render({
 				elem: '#StartTime',
@@ -382,7 +386,7 @@
 					}
 					infoOptions = {
 						elem: '#LAY-app-content-list',
-						height: 'full-206',
+						height: h1,
 						id: 'LAY-app-content-list',
 						totalRow: true,
 						page: true,
@@ -397,7 +401,7 @@
 						cols:colsJson
 					};
 
-					sendData(IP + "/Statistical/GetInventoryList?SkuNo=" + $("#SkuNo").val() + "&&SkuName=" + $("#SkuName").val() + "&&OwnerNo=" + $("#OwnerNo").val()+ "&&OwnerName=" + $("#OwnerName").val(), {}, 'get', function (res) {
+					sendData(IP + "/Statistical/GetInventoryList?SkuNo=" + $("#SkuNo").val() + "&&SkuName=" + $("#SkuName").val() + "&&OwnerNo=" + $("#OwnerNo").val()+ "&&OwnerName=" + $("#OwnerName").val()+"&&LotNo=" + $("#LotNo").val(), {}, 'get', function (res) {
 						console.log(res)
 						if (res.code == 0) { //鎴愬姛
 							var list = res.data;
@@ -523,6 +527,8 @@
 						{field: 'LotNo',title: '鎵规鍙�',align: 'center'}, 
 						{field: 'OwnerNo',title: '璐т富缂栫爜',align: 'center'},
 						{field: 'OwnerName',title: '璐т富鍚嶇О',align: 'center'}, 
+						{field: 'SupplierNo',title: '渚涘簲鍟嗙紪鐮�',align: 'center'},
+						{field: 'SupplierName',title: '渚涘簲鍟嗗悕绉�',align: 'center'}, 
 						{field: 'Qty',title: '搴撳瓨鏁伴噺',width: 110,align: 'center'}, 
 						{field: 'LockQty',title: '閿佸畾鏁伴噺',width: 110,align: 'center'},
 						{field: 'Status',templet: '#buttonTpl',title: '搴撳瓨鐘舵��',width: 90,align: 'center'}, 
@@ -549,7 +555,7 @@
 					}
 					infoOptions2 = {
 						elem: '#LAY-app-content-list2',
-						height: 'full-206',
+						height: h1,
 						id: 'LAY-app-content-list2',
 						page: true,
 						limit: pageCnt,

--
Gitblit v1.8.0