From c6bc9682699d3e10dc06a3d6641a70179e64f9a1 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 14 九月 2021 08:32:11 +0800
Subject: [PATCH] Merge branch 'xgmasrs' of https://gitee.com/luxiaotao1123/zy-asrs into xgmasrs

---
 src/main/webapp/views/pda/index.html |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/webapp/views/pda/index.html b/src/main/webapp/views/pda/index.html
index e3bfa61..f7f6575 100644
--- a/src/main/webapp/views/pda/index.html
+++ b/src/main/webapp/views/pda/index.html
@@ -73,14 +73,16 @@
 
 <!-- 瀵艰埅鏍� -->
 <ul class="nav">
-    <li><a id="comb" onclick="nav(this.id)" class="nav-select" href="#">缁勬墭</a></li>
-    <li><a id="stockIn" 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="combPro" onclick="nav(this.id)" class="nav-select" 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="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="stockQuery" onclick="nav(this.id)" class="nav-unselect" href="#">搴撳瓨鏌ヨ</a></li>
 </ul>
 
 <!-- 涓讳綋鍐呭 -->
-<iframe id="content" src="comb.html"></iframe>
+<iframe id="content" src="combPro.html"></iframe>
 
 </body>
 <script>

--
Gitblit v1.9.1