From 6f7a815b2d6e4f30e7ccf901b24d5103aaa72078 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 25 十二月 2023 10:23:08 +0800
Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1

---
 src/main/webapp/views/pakStore/stockOut.html |  115 +++++++++++++++++++++++++++++----------------------------
 1 files changed, 58 insertions(+), 57 deletions(-)

diff --git a/src/main/webapp/views/pakStore/stockOut.html b/src/main/webapp/views/pakStore/stockOut.html
index 959defd..3e02f19 100644
--- a/src/main/webapp/views/pakStore/stockOut.html
+++ b/src/main/webapp/views/pakStore/stockOut.html
@@ -7,6 +7,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
     <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
     <link rel="stylesheet" href="../../static/css/cool.css" media="all">
     <link rel="stylesheet" href="../../static/css/common.css" media="all">
     <style>
@@ -14,30 +15,13 @@
             height: 100%;
             padding: 10px;
             background-color: #f1f1f1;
+            box-sizing: border-box;
         }
         body {
             background-color: #fff;
             border-radius: 5px;
             box-shadow: 0 0 3px rgba(0,0,0,.3);
             padding-bottom: 20px;
-        }
-
-        #search-box {
-            padding: 30px 0 20px 0;
-        }
-        #search-box .layui-inline:first-child {
-            margin-left: 30px;
-        }
-        #search-box .layui-inline {
-            margin-right: 5px;
-        }
-
-        #data-search-btn {
-            margin-left: 10px;
-            display: inline-block;
-        }
-        #data-search-btn.layui-btn-container .layui-btn {
-            margin-right: 20px;
         }
 
         #staNoSpan {
@@ -67,51 +51,68 @@
             display: none;
         }
 
+        /*----------------------------------*/
+        .function-area {
+            padding: 20px 50px;
+        }
+        .function-btn {
+            font-size: 16px;
+            padding: 1px 2px;
+            width: 100px;
+            height: 50px;
+            border-color: #2b425b;
+            border-radius: 4px;
+            border-width: 2px;
+            background: none;
+            border-style: solid;
+            transition: 0.4s;
+            cursor: pointer;
+            letter-spacing: 1.5px;
+        }
+        .function-btn:hover {
+            background-color: #2b425b;
+            color: #fff;
+        }
+
+        #mat-query {
+            display: none;
+        }
     </style>
 </head>
 <body>
 
-<!-- 鎼滅储鏍� -->
-<!-- 鎼滅储鏍� -->
-<div id="search-box" class="layui-form layui-card-header">
-    <div class="layui-inline">
-        <div class="layui-input-inline">
-            <input class="layui-input" type="text" name="loc_no" placeholder="搴撲綅鍙�" autocomplete="off">
-        </div>
-    </div>
-    <div class="layui-inline">
-        <div class="layui-input-inline">
-            <input class="layui-input" type="text" name="matnr" placeholder="绠卞彿/鎵瑰彿"  autocomplete="off">
-        </div>
-    </div>
-    <div class="layui-inline">
-        <div class="layui-input-inline">
-            <input class="layui-input" type="text" name="mat_name" placeholder="鐗╂枡鍚嶇О" autocomplete="off">
-        </div>
-    </div>
-
-    <!-- 寰呮坊鍔� -->
-    <div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
-        <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
-        <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆</button>
-    </div>
+<!-- 鍔熻兘鍖� -->
+<div class="function-area">
+    <button id="mat-query" class="function-btn">鎻愬彇搴撳瓨</button>
 </div>
 
-<script type="text/html" id="toolbar">
-    <div class="layui-form">
-        <div class="layui-btn-container">
-            <!-- 1.閫夋嫨鍑哄簱鍙� -->
-            <span id="staNoSpan">鍑哄簱鍙o細</span>
-            <select id="staNoSelect" lay-verify="required">
-                <option value="">璇烽�夋嫨绔欑偣</option>
-            </select>
-            <!-- 2.鍚姩鍑哄簱 -->
-            <button class="layui-btn layui-btn-lg" id="btn-outbound" lay-event="outbound">鍚姩鍑哄簱</button>
-        </div>
-    </div>
-</script>
+<hr>
 
-<table class="layui-hide" id="stockOut" lay-filter="stockOut"></table>
+<!-- 琛ㄦ牸 -->
+<div style="padding-bottom: 5px; margin-bottom: 45px">
+
+    <!-- 澶撮儴 -->
+    <script type="text/html" id="toolbar">
+        <div class="layui-form">
+            <div class="layui-btn-container">
+                <!-- 1.閫夋嫨鍑哄簱鍙� -->
+                <span id="staNoSpan">鍑哄簱鍙o細</span>
+                <select id="staNoSelect" lay-verify="required">
+                    <option value="">璇烽�夋嫨绔欑偣</option>
+                </select>
+                <!-- 2.鍚姩鍑哄簱 -->
+                <button class="layui-btn layui-btn-lg" id="btn-outbound" lay-event="outbound">鍚姩鍑哄簱</button>
+            </div>
+        </div>
+    </script>
+
+    <!-- 琛� -->
+    <script type="text/html" id="operate">
+        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="remove">绉婚櫎</a>
+    </script>
+
+    <table class="layui-table" id="chooseData" lay-filter="chooseData"></table>
+</div>
 
 <script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
 <script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
@@ -122,7 +123,7 @@
 
 <script type="text/template" id="takeSiteSelectTemplate">
     {{#each data}}
-    <option value="{{this}}">{{this}}</option>
+    <option value="{{siteId}}">{{desc}}</option>
     {{/each}}
 </script>
 </body>

--
Gitblit v1.9.1