From d113e15bf1fb77152d0476b4340cc0b6ed24e63d Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期五, 12 三月 2021 16:04:49 +0800
Subject: [PATCH] 1.0.3 新增pda平仓移库功能

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

diff --git a/src/main/webapp/views/locNormal/locNormal.html b/src/main/webapp/views/locNormal/locNormal.html
index 5ee4626..6283083 100644
--- a/src/main/webapp/views/locNormal/locNormal.html
+++ b/src/main/webapp/views/locNormal/locNormal.html
@@ -111,9 +111,9 @@
     </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>-->
 
 
     <!-- 琛ㄦ牸 -->
@@ -153,8 +153,21 @@
         {{#  } else { }}
         {{#  } }}
     </script>
+    <script type="text/html" id="locArea">
+        {{
+        locArea.map(function(item){
+        if (d.warehouse == item.id) {
+        return item.name;
+        }
+        });
+        }}
+    </script>
     <script type="text/html" id="operate">
+        {{#  if(d.state === '1'){ }}
         <button class="layui-btn layui-btn-xs layui-btn-normal" lay-event="outLocNormal">鍑哄簱</button>
+        {{#  } else { }}
+        <button class="layui-btn layui-btn-xs layui-btn-disabled">鍑哄簱</button>
+        {{#  } }}
         <button class="layui-btn layui-btn-xs layui-btn-danger" lay-event="removeLocNormal">绉婚櫎</button>
     </script>
 

--
Gitblit v1.9.1