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/stockAdjust.html |   33 ++++++++++++++++++++++++++++++---
 1 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/views/pakStore/stockAdjust.html b/src/main/webapp/views/pakStore/stockAdjust.html
index f88846a..bd758e9 100644
--- a/src/main/webapp/views/pakStore/stockAdjust.html
+++ b/src/main/webapp/views/pakStore/stockAdjust.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,6 +15,7 @@
             height: 100%;
             padding: 10px;
             background-color: #f1f1f1;
+            box-sizing: border-box;
         }
         body {
             background-color: #fff;
@@ -50,7 +52,7 @@
         .function-btn {
             font-size: 16px;
             padding: 1px 1px 1px 1px;
-            width: 100px;
+            width: 120px;
             height: 40px;
             border-color: #2b425b;
             border-radius: 4px;
@@ -59,13 +61,18 @@
             border-style: solid;
             transition: 0.4s;
             cursor: pointer;
-            letter-spacing: 3px;
         }
         .function-btn:hover {
             background-color: #2b425b;
             color: #fff;
         }
 
+        #mat-query {
+            display: none;
+        }
+        #btn-adjust {
+            display: none;
+        }
     </style>
 </head>
 <body style="padding-bottom: 30px">
@@ -82,15 +89,35 @@
         <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 style="display: inline-block; font-size: 20px;font-weight: 300">
+        <div class="not-retrieve" style="color: #ff0000;font-family: '榛戜綋';">
+            璇峰厛妫�绱㈠簱浣�
+        </div>
+        <div class="retrieve" style="display: none;color: #0097ff;font-family: '榛戜綋';">
+            褰撳墠妫�绱㈠簱浣�:&nbsp; <span id="locMsg" style=""></span>
+        </div>
+
+    </div>
 </div>
 
 <hr>
 
 <!-- 鍔熻兘鍖� -->
 <div class="function-area">
-    <button id="mat-query" class="function-btn" onclick="getMat()">鏂板</button>
+    <button id="mat-query" class="function-btn">鏂板搴撳瓨</button>
 </div>
 
+<!-- 澶撮儴 -->
+<script type="text/html" id="toolbar">
+    <button class="layui-btn layui-btn-lg" id="btn-adjust" lay-event="adjust" style="">璋冩暣搴撳瓨</button>
+</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>
 

--
Gitblit v1.9.1