From 10d7b3239e4baec952b9ee8a3e948399916d336c Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 20 十月 2025 08:23:58 +0800
Subject: [PATCH] 13

---
 src/main/webapp/views/locMast/locMast.html |   69 ++++++++++++++++++++++++++++++++--
 1 files changed, 64 insertions(+), 5 deletions(-)

diff --git a/src/main/webapp/views/locMast/locMast.html b/src/main/webapp/views/locMast/locMast.html
index ee397dd..16c3475 100644
--- a/src/main/webapp/views/locMast/locMast.html
+++ b/src/main/webapp/views/locMast/locMast.html
@@ -41,6 +41,17 @@
         </div>
     </div>
     <div class="layui-inline">
+        <div class="layui-input-inline cool-auto-complete">
+            <input id="whsType" name="whs_type" class="layui-input" type="text"  style="display: none">
+            <input id="whsType$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="搴撲綅绫诲瀷" onfocus=this.blur()>
+            <div class="cool-auto-complete-window">
+                <input class="cool-auto-complete-window-input" data-key="basWhsQueryBywhsType" onkeyup="autoLoad2(this.getAttribute('data-key'))">
+                <select class="cool-auto-complete-window-select" data-key="basWhsQueryBywhsTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+                </select>
+            </div>
+        </div>
+    </div>
+    <div class="layui-inline">
         <div class="layui-input-inline">
             <select name="loc_type1" id="loc_type1" class="layui-input" type="text" placeholder="搴撲綅绫诲瀷" autocomplete="off">
                 <!--                    <option style="display: none"></option>-->
@@ -86,7 +97,7 @@
         <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
         <button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
         <button class="layui-btn layui-btn-primary" id="btn-init" lay-event="init">鍒濆鍖�</button>
-        <button class="layui-btn layui-btn-sm" id="btn-convertSize" lay-event="convertSize">澶у皬搴撲綅杞崲</button>
+<!--        <button class="layui-btn layui-btn-sm" id="btn-convertSize" lay-event="convertSize">澶у皬搴撲綅杞崲</button>-->
         <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">瀵煎嚭</button>
     </div>
 </script>
@@ -106,6 +117,45 @@
 <!-- 閲嶇疆搴撲綅寮圭獥 -->
 <div id="resetLocDiv" style="margin: 20px 0 10px 30px; display: none">
     <div class="layui-form layui-form-pane">
+        <div class="layui-form-item">
+            <div class="layui-inline">
+                <label class="layui-form-label">鍒犻櫎搴撲綅</label>
+                <div class="layui-input-inline" style="width: 100px;">
+                    <input type="checkbox" name="enable" lay-skin="switch" value="1" lay-text="鍒犻櫎|淇濈暀">
+                </div>
+            </div>
+        </div>
+<!--        <div class="layui-inline"  style="width:80%">-->
+<!--            <label class="layui-form-label"><span class="not-null">*</span>搴撲綅绫诲瀷锛�</label>-->
+<!--            <div class="layui-input-inline cool-auto-complete">-->
+<!--                <input id="identifying" class="layui-input" type="text" style="display: none">-->
+<!--                <input id="identifying$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" onfocus=this.blur()>-->
+<!--                <div class="cool-auto-complete-window">-->
+<!--                    <input class="cool-auto-complete-window-input" data-key="basWhsQueryBywhsType" onkeyup="autoLoad(this.getAttribute('data-key'))">-->
+<!--                    <select class="cool-auto-complete-window-select" data-key="basWhsQueryBywhsTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">-->
+<!--                    </select>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--        </div>-->
+        <!--
+        /**
+        * 搴撳瀷 1: 鏍囧噯鍫嗗灈鏈哄簱  2: 骞冲簱  3: 绌挎鏉�  4: 鍥涘悜杞�  5: AGV  0: 鏈煡
+        */
+        -->
+        <div class="layui-form-item">
+            <label class="layui-form-label">搴撲綅绫诲瀷锛�</label>
+            <div class="layui-input-inline">
+                <select name="identifying">
+<!--                    <option style="display: none"></option>-->
+<!--                    <option value="0">鏈煡</option>-->
+                    <option value="1" style="display: none">鏍囧噯鍫嗗灈鏈哄簱</option>
+                    <option value="2">骞冲簱</option>
+                    <option value="3">绌挎鏉�</option>
+                    <option value="4">鍥涘悜杞�</option>
+                    <option value="5">AGV</option>
+                </select>
+            </div>
+        </div>
         <!-- 鎺� -->
         <div class="layui-form-item">
             <div class="layui-inline">
@@ -151,6 +201,14 @@
                 <input type="text" name="crnAmount" lay-verify="required|number" autocomplete="off" class="layui-input">
             </div>
         </div>
+        <div class="layui-form-item">
+            <div class="layui-inline">
+                <label class="layui-form-label">璧峰鍫嗗灈鏈�</label>
+                <div class="layui-input-inline" >
+                    <input type="text" name="staCrn" autocomplete="off" class="layui-input" lay-verify="number">
+                </div>
+            </div>
+        </div>
         <!-- 搴撲綅绫诲瀷 -->
         <div class="layui-form-item">
             <label class="layui-form-label">楂樹綆绫诲瀷</label>
@@ -159,7 +217,8 @@
                     <option style="display: none"></option>
                     <option value="0">鏈煡</option>
                     <option value="1">浣庡簱浣�</option>
-                    <option value="2">楂樺簱浣�</option>
+                    <option value="2">涓簱浣�</option>
+                    <option value="3">楂樺簱浣�</option>
                 </select>
             </div>
         </div>
@@ -185,9 +244,9 @@
                 </select>
             </div>
         </div>
-        <div id="prompt" style="text-indent: 10px;">
-            <span class="not-null">鍒濆鍖栧簱浣嶅悗灏嗗垹闄ゅ簱瀛樻槑缁嗭紝璇疯皑鎱庢搷浣滐紒</span>
-        </div>
+<!--        <div id="prompt" style="text-indent: 10px;">-->
+<!--            <span class="not-null">鍒濆鍖栧簱浣嶅悗灏嗗垹闄ゅ簱瀛樻槑缁嗭紝璇疯皑鎱庢搷浣滐紒</span>-->
+<!--        </div>-->
         <!-- 鎸夐挳 -->
         <div style="text-align: center; margin-top: 20px">
             <button class="layui-btn layui-btn-radius layui-btn-normal" id="initDo" lay-submit lay-filter="initDo">纭畾</button>

--
Gitblit v1.9.1