From 1e26a7575d9969e728b0aa01466f490409cb173c Mon Sep 17 00:00:00 2001
From: chengsc <Demo@DESKTOP-CPA90BF>
Date: 星期五, 18 十月 2024 18:41:30 +0800
Subject: [PATCH] Merge branch 'master' into csc
---
HTML/views/StatisticalReport/AdventSlot.html | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/HTML/views/StatisticalReport/AdventSlot.html b/HTML/views/StatisticalReport/AdventSlot.html
index 3cd8676..9ac2358 100644
--- a/HTML/views/StatisticalReport/AdventSlot.html
+++ b/HTML/views/StatisticalReport/AdventSlot.html
@@ -19,10 +19,10 @@
});
</script>
</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">
<div class="layui-inline zongdan" >
@@ -44,9 +44,9 @@
</div>
</div>
<div class="layui-inline mingxi">
- <label class="layui-form-label" style="width: 60px;">鎵规鍙�</label>
+ <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">
+ <input type="text" id="LotNo" name="LotNo" placeholder="杩涘巶缂栧彿" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-inline ">
@@ -95,6 +95,9 @@
</div>
</div>
</div>
+
+ <div id="center"></div>
+
<div class="layui-card-body">
<div class="position-relative"><!-- class="position-relative" --><!-- 鑷畾涔夎〃澶村姞涓� -->
<table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
@@ -173,6 +176,9 @@
form = layui.form,
laypage = layui.laypage,
layer = layui.layer;
+
+ var h1 = GetTableHeight();
+
refreshTable("","","","","","","","","");
var tableIns;
@@ -223,13 +229,13 @@
// field: 'Standard', title: '鐗╂枡瑙勬牸', align: 'center',width:130
// },
// {
- // title: '鎵规鍙�', field: 'LotNo', align: 'center', width:140
+ // title: '杩涘巶缂栧彿', field: 'LotNo', align: 'center', width:140
// },
// {
// title: '鎵规鎻忚堪', field: 'LotText', align: 'center', width:100
// },
// {
- // title: '渚涜揣鎵规', field: 'SupplierLot', align: 'center', width:100
+ // title: '鍘熷巶鎵瑰彿', field: 'SupplierLot', align: 'center', width:100
// },
// {
// field: 'LocatNo', title: '鍌ㄤ綅鍦板潃', align: 'center',width:100
@@ -268,9 +274,9 @@
{field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center',width:100},
{field: 'Qty', title: '搴撳瓨鏁伴噺', align: 'center',width:100},
{field: 'Standard', title: '鐗╂枡瑙勬牸', align: 'center',width:130},
- {field: 'LotNo',title: '鎵规鍙�', align: 'center', width:140},
+ {field: 'LotNo',title: '杩涘巶缂栧彿', align: 'center', width:140},
{field: 'LotText',title: '鎵规鎻忚堪', align: 'center', width:100},
- {field: 'SupplierLot',title: '渚涜揣鎵规', align: 'center', width:100},
+ {field: 'SupplierLot',title: '鍘熷巶鎵瑰彿', align: 'center', width:100},
{field: 'ProductionTime', title: '鐢熶骇鏃堕棿', align: 'center',width:150,templet: '#templetProductionTime'},
{field: 'Status', title: '鐗╂枡鐘舵��', align: 'center',width:100, templet: '#buttonTpl'},
{field: 'InspectMark', title: '鎶芥鏍囪', align: 'center',width:100, templet: '#InspectMarkStatus'},
@@ -297,7 +303,7 @@
}
infoOptions = {
elem: '#LAY-app-content-list',
- height: 'full-136',
+ height: h1,
id: 'LAY-app-content-list',
page: true,
limit: pageCnt,
--
Gitblit v1.8.0