From f1accd0bd710abb39c361194d053f71b3b170865 Mon Sep 17 00:00:00 2001
From: Administrator <707231019@qq.com>
Date: Mon, 30 Mar 2020 21:00:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8F=91BOM=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/technology/bom/addOrUpdate.ftl       | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/mes/src/main/resources/templates/technology/bom/addOrUpdate.ftl b/mes/src/main/resources/templates/technology/bom/addOrUpdate.ftl
index 72361e6..aa0b98a 100644
--- a/mes/src/main/resources/templates/technology/bom/addOrUpdate.ftl
+++ b/mes/src/main/resources/templates/technology/bom/addOrUpdate.ftl
@@ -16,7 +16,6 @@
             <div carousel-item>
                 <div>
                     <form class="layui-form" style="margin: 0 auto;max-width: 460px;padding-top: 40px;">
-
                         <div class="layui-form-item">
                             <div class="layui-inline">
                                 <label for="js-bomCode" class="layui-form-label sp-required">BOM编码
@@ -31,11 +30,12 @@
                         <div class="layui-form-item">
                             <label for="js-bomCode" class="layui-form-label sp-required">物料编码
                             </label>
-                            <div class="layui-inline">
+                            <div  style="display: flex;   flex-direction: row;">
+                            <button type="button" id="js-test-btn" class="layui-btn" style="height:37px "><i class="layui-icon layui-icon-search "></i>
+                            </button>
                                 <input id="js-test-input" placeholder="搜索物料" autocomplete="off" value=""
-                                       class="layui-input">
+                                       class="layui-input" style="width: 133PX">
                             </div>
-                            <button id="js-test-btn" class="layui-btn"><i class="layui-icon layui-icon-search "></i></button>
                         </div>
                         <div class="layui-form-item">
                             <div class="layui-inline">
@@ -63,6 +63,7 @@
                             </div>
                         </div>
                     </form>
+
                 </div>
                 <div>
                     <form class="layui-form" style="margin: 0 auto;max-width: 460px;padding-top: 40px;">
@@ -121,9 +122,10 @@
     </div>
 </div>
 <script>
-    layui.use(['form', 'util', 'step', 'spLayer'], function () {
+    layui.use(['form', 'util', 'layer','step', 'spLayer'], function () {
         var form = layui.form,
             spLayer = layui.spLayer,
+            layer = layui.layer,
             step = layui.step;
 
         step.render({
@@ -172,6 +174,7 @@
 
         // 测试搜索弹框
         $('#js-test-btn').click(function () {
+            console.log('开始');
             var index = spLayer.open({
                 type: 2,
                 area: ['680px', '500px'],
@@ -185,6 +188,7 @@
                     }
                 }
             });
+            console.log('结束');
         });
 
     });