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/locMast/locMast_detail.html |   48 +++++++++++++++++++++++-------------------------
 1 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/src/main/webapp/views/locMast/locMast_detail.html b/src/main/webapp/views/locMast/locMast_detail.html
index 218edf1..1e12d40 100644
--- a/src/main/webapp/views/locMast/locMast_detail.html
+++ b/src/main/webapp/views/locMast/locMast_detail.html
@@ -29,11 +29,17 @@
                 <input id="locNo" class="layui-input" type="text" onkeyup="check(this.id, 'locMast')">
             </div>
         </div>
-        <div class="layui-inline"  style="width:80%;display: none">
+        <div class="layui-inline"  style="width:31%;display: none">
+            <label class="layui-form-label"><span class="not-null">*</span>锛�</label>
+            <div class="layui-input-inline">
+                <input id="locType" class="layui-input" type="text" >
+            </div>
+        </div>
+        <div class="layui-inline"  style="width:80%; display: none">
             <label class="layui-form-label">搴撲綅绫诲瀷锛�</label>
             <div class="layui-input-inline cool-auto-complete">
                 <input id="whsType" 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()>
+                <input id="whsType$" 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">
@@ -53,10 +59,16 @@
                 <input id="ctnType" class="layui-input" type="text">
             </div>
         </div>
-        <div class="layui-inline"  style="width:31%;display: none">
-            <label class="layui-form-label"><span class="not-null">*</span>锛�</label>
-            <div class="layui-input-inline">
-                <input id="locSts" class="layui-input" type="text" >
+        <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="locSts" class="layui-input" type="text" style="display: none">
+                <input id="locSts$" 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="basLocStsQueryBylocSts" onkeyup="autoLoad(this.getAttribute('data-key'))">
+                    <select class="cool-auto-complete-window-select" data-key="basLocStsQueryBylocStsSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+                    </select>
+                </div>
             </div>
         </div>
         <div class="layui-inline"  style="width:31%;display: none">
@@ -68,43 +80,31 @@
         <div class="layui-inline"  style="width:80%;">
             <label class="layui-form-label">鍫嗗灈鏈哄彿锛�</label>
             <div class="layui-input-inline">
-                <input id="crnNo" class="layui-input" type="text" disabled="disabled">
+                <input id="crnNo" class="layui-input" type="text" autocomplete="off" disabled="disabled">
             </div>
         </div>
         <div class="layui-inline"  style="width:80%;">
             <label class="layui-form-label">鎺掞細</label>
             <div class="layui-input-inline">
-                <input id="row1" class="layui-input" type="text" disabled="disabled">
+                <input id="row1" class="layui-input" type="text" autocomplete="off" disabled="disabled">
             </div>
         </div>
         <div class="layui-inline"  style="width:80%;">
             <label class="layui-form-label">鍒楋細</label>
             <div class="layui-input-inline">
-                <input id="bay1" class="layui-input" type="text" disabled="disabled">
+                <input id="bay1" class="layui-input" type="text" autocomplete="off" disabled="disabled">
             </div>
         </div>
         <div class="layui-inline"  style="width:80%;">
             <label class="layui-form-label">灞傦細</label>
             <div class="layui-input-inline">
-                <input id="lev1" class="layui-input" type="text" disabled="disabled">
+                <input id="lev1" class="layui-input" type="text" autocomplete="off" disabled="disabled">
             </div>
         </div>
-        <div class="layui-inline"  style="width:80%;">
+        <div class="layui-inline"  style="width:80%;display: none">
             <label class="layui-form-label">婊°��銆�鏉匡細</label>
             <div class="layui-input-inline" style="text-align: left">
                 <input id="fullPlt" class="layui-input" type="checkBox" lay-skin="primary" lay-filter='detailCheckbox'>
-            </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="locType" class="layui-input" type="text" style="display: none" lay-verify="required" >
-                <input id="locType$" 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="basLocTypeQueryBylocType" onkeyup="autoLoad(this.getAttribute('data-key'))" >
-                    <select class="cool-auto-complete-window-select" data-key="basLocTypeQueryBylocTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
-                    </select>
-                </div>
             </div>
         </div>
         <div class="layui-inline"  style="width:31%;display: none">
@@ -216,8 +216,6 @@
             </div>
         </div>
 
-
-        <hr class="layui-bg-gray">
 
         <div id="data-detail-btn" class="layui-btn-container layui-form-item">
             <div id="data-detail-submit-save" type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="save">淇濆瓨</div>

--
Gitblit v1.9.1