From e2a27aeebf9e6d4e23eb8fde4b1c71a4f344383c Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期一, 07 六月 2021 11:09:54 +0800
Subject: [PATCH] 新增erp生产单查询

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

diff --git a/src/main/webapp/views/locNormal/locNormal.html b/src/main/webapp/views/locNormal/locNormal.html
index 6283083..61ef89a 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>
 
@@ -156,7 +171,7 @@
     <script type="text/html" id="locArea">
         {{
         locArea.map(function(item){
-        if (d.warehouse == item.id) {
+        if (d.warehouse == item.uuid) {
         return item.name;
         }
         });
@@ -164,13 +179,12 @@
     </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>
+        <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">鍑哄簱</button>
+        <button class="layui-btn layui-btn-xs layui-btn-disabled btn-out">鍑哄簱</button>
         {{#  } }}
-        <button class="layui-btn layui-btn-xs layui-btn-danger" lay-event="removeLocNormal">绉婚櫎</button>
+        <button class="layui-btn layui-btn-xs layui-btn-danger btn-remove" lay-event="removeLocNormal">绉婚櫎</button>
     </script>
-
 
 </div>
 

--
Gitblit v1.9.1