From e4db9c4fc4e40d7b41ee0014aaa9feb8ba9e9bf0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 02 三月 2021 17:02:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/webapp/views/pakStore/pakStore.html |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/src/main/webapp/views/pakStore/pakStore.html b/src/main/webapp/views/pakStore/pakStore.html
index 2387f41..70d7127 100644
--- a/src/main/webapp/views/pakStore/pakStore.html
+++ b/src/main/webapp/views/pakStore/pakStore.html
@@ -102,6 +102,8 @@
                 </select>
                 <!-- 2.鍚姩鍑哄簱 -->
                 <button class="layui-btn layui-btn-normal layui-btn-lg" id="btn-comb" lay-event="comb" style="">鍚姩鍏ュ簱</button>
+                <button class="layui-btn layui-btn-primary layui-btn-lg" id="btn-mat-status" style="margin-left: 8px" onclick="showMatStatus()">鎵归噺淇敼鐘舵��</button>
+                <button class="layui-btn layui-btn-danger layui-btn-lg" id="btn-mat-remove" style="margin-left: 8px" onclick="batchRemove()">鎵归噺绉婚櫎</button>
             </div>
         </div>
     </script>
@@ -126,6 +128,9 @@
         <option value="{{this}}">{{this}}</option>
     {{/each}}
 </script>
+<script type="text/html" id="matStatus">
+    {{ d.matStatus == '1' ? '<span style="color: green">鑹搧</span>' : '<span style="color: red">涓嶈壇鍝�</span>' }}
+</script>
 </body>
 </html>
 

--
Gitblit v1.9.1