From 8d0d6126ea8d17df13d62a8dd6a5a6e2b8d279c3 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期五, 05 十一月 2021 10:57:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/src/main/webapp/views/locNormal/locNormal.html b/src/main/webapp/views/locNormal/locNormal.html
index e4ef433..02f4dfd 100644
--- a/src/main/webapp/views/locNormal/locNormal.html
+++ b/src/main/webapp/views/locNormal/locNormal.html
@@ -170,7 +170,7 @@
         {{#  } }}
     </script>
     <script type="text/html" id="operate">
-        {{#  if(d.state === '1'){ }}
+        {{#  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>

--
Gitblit v1.9.1