From 4726368fb058d0f396b345eaccde0164a4aecb0b Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期一, 31 五月 2021 13:34:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/htwms' into htwms
---
src/main/webapp/views/pda/index.html | 4 ++--
src/main/webapp/views/pda/stockSearch.html | 3 +--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/main/webapp/views/pda/index.html b/src/main/webapp/views/pda/index.html
index 198a660..e5e9b95 100644
--- a/src/main/webapp/views/pda/index.html
+++ b/src/main/webapp/views/pda/index.html
@@ -78,8 +78,8 @@
<!-- <li><a id="pakout" onclick="nav(this.id)" class="nav-unselect" href="#">鍑哄簱</a></li>-->
<li><a id="stockOut" onclick="nav(this.id)" class="nav-unselect" href="#">鎷ｈ揣</a></li>
<li><a id="stockCheck" onclick="nav(this.id)" class="nav-unselect" href="#">鐩樼偣</a></li>
- <li><a id="comb" onclick="nav(this.id)" class="nav-unselect" href="#">缁勬墭</a></li>
- <li><a id="stockIn" onclick="nav(this.id)" class="nav-unselect" href="#">涓婃灦</a></li>
+<!-- <li><a id="comb" onclick="nav(this.id)" class="nav-unselect" href="#">缁勬墭</a></li>-->
+<!-- <li><a id="stockIn" onclick="nav(this.id)" class="nav-unselect" href="#">涓婃灦</a></li>-->
<li><a id="stockSearch" onclick="nav(this.id)" class="nav-unselect" href="#">搴撳瓨</a></li>
</ul>
diff --git a/src/main/webapp/views/pda/stockSearch.html b/src/main/webapp/views/pda/stockSearch.html
index 12fc7fe..09e6f4a 100644
--- a/src/main/webapp/views/pda/stockSearch.html
+++ b/src/main/webapp/views/pda/stockSearch.html
@@ -81,7 +81,6 @@
<footer>
<div class="layui-btn-container">
<button type="button" id="reset-btn" class="layui-btn layui-btn-primary" onclick="reset()">閲嶇疆</button>
- <button type="button" id="comb-btn" class="layui-btn layui-btn-normal " onclick="check()" style="margin-left: 20px">纭</button>
<span id="tips"></span>
</div>
</footer>
@@ -103,7 +102,7 @@
limit: 500,
cellMinWidth: 50,
cols: [[
- {align: 'center', field: 'anfme', title: '鏁伴噺', style:'color: blue;', width:80},
+ {align: 'center', field: 'anfme', title: '鏁伴噺', style:'font-weight: bold;', width:80},
// {field: 'matnr', align: 'center', title: '鍟嗗搧缂栧彿', event: 'modify'},
{field: 'maktx', align: 'center', title: '鍟嗗搧鍚嶇О'}
]],
--
Gitblit v1.9.1