From b4a8d50e3d97fc9e893b554a60134e4eceb012eb Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期一, 05 一月 2026 08:58:08 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/locNormal/locNormal.html |   45 ++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/src/main/webapp/views/locNormal/locNormal.html b/src/main/webapp/views/locNormal/locNormal.html
index 5ee4626..9e8002f 100644
--- a/src/main/webapp/views/locNormal/locNormal.html
+++ b/src/main/webapp/views/locNormal/locNormal.html
@@ -78,6 +78,16 @@
         color: #fff;
     }
 
+    #btn-locNormal-into{
+        display: none;
+    }
+    .btn-out{
+        display: none;
+    }
+    .btn-remove{
+        display: none;
+    }
+
 </style>
 <body>
 <div>
@@ -93,11 +103,16 @@
                 <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
             </div>
         </div>
-        <div class="layui-inline">
+        <div class="layui-inline" style="width: 150px">
             <select id="matStatusSelect" name="state">
-                <option value="">璇烽�夋嫨鍑哄叆搴撶姸鎬�</option>
+                <option value="">鍑哄叆搴撶姸鎬�</option>
                 <option value="1">宸插叆搴�</option>
                 <option value="2">宸插嚭搴�</option>
+            </select>
+        </div>
+        <div class="layui-inline" style="width: 150px">
+            <select id="putSiteSelect" name="warehouse">
+                <option value="">璇烽�夋嫨搴撳尯</option>
             </select>
         </div>
 
@@ -107,13 +122,14 @@
             </button>
             <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆
             </button>
+            <button id="updateMatStatus" class="layui-btn layui-btn-normal" lay-submit onclick="showMatStatus1()">鐗╂枡鐘舵�佺淮鎶�</button>
         </div>
     </div>
 
     <!-- 鍔熻兘鍖� -->
-    <div class="function-area">
-        <button id="mat-query" class="function-btn" onclick="addLocNormal()">鏂板搴撳瓨</button>
-    </div>
+    <!--<div class="function-area">-->
+        <!--<button id="mat-query" class="function-btn" onclick="addLocNormal()">鏂板搴撳瓨</button>-->
+    <!--</div>-->
 
 
     <!-- 琛ㄦ牸 -->
@@ -123,6 +139,7 @@
     <script type="text/html" id="toolbar">
         <div class="layui-btn-container">
             <button class="layui-btn layui-btn-sm" id="btn-locNormal-into" lay-event="intoData">瀵煎叆</button>
+            <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">瀵煎嚭</button>
         </div>
     </script>
 
@@ -154,10 +171,24 @@
         {{#  } }}
     </script>
     <script type="text/html" id="operate">
-        <button class="layui-btn layui-btn-xs layui-btn-normal" lay-event="outLocNormal">鍑哄簱</button>
-        <button class="layui-btn layui-btn-xs layui-btn-danger" lay-event="removeLocNormal">绉婚櫎</button>
+        {{#  if(d.state === '1' && d.warehouse === 'cs'){ }}
+        <button class="layui-btn layui-btn-xs layui-btn-normal btn-out" lay-event="outLocNormal">鍑哄簱</button>
+        {{#  } else { }}
+        <button class="layui-btn layui-btn-xs layui-btn-disabled btn-out">鍑哄簱</button>
+        {{#  } }}
+        <button class="layui-btn layui-btn-xs layui-btn-danger btn-remove" lay-event="removeLocNormal">绉婚櫎</button>
     </script>
 
+    <script type="text/html" id="matStatus">
+        {{#  if(d.matStatus === '1'){ }}
+        <span style="color: green">鑹搧</span>
+        {{# } else if(d.matStatus === '2'){ }}
+        <span style="color: red">涓嶈壇鍝�</span>
+        {{# } else if(d.matStatus === '3'){ }}
+        <span style="color: blue">鐭</span>
+        {{#  } else { }}
+        {{#  } }}
+    </script>
 
 </div>
 

--
Gitblit v1.9.1