From 91f2cd5b0f832091f654cce926585d2f05cad114 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期四, 08 四月 2021 23:22:32 +0800
Subject: [PATCH] Merge branches 'dev' and 'master' of https://gitee.com/luxiaotao1123/xtywms into master

---
 src/main/webapp/views/locNormal/locNormal.html |  189 +++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 189 insertions(+), 0 deletions(-)

diff --git a/src/main/webapp/views/locNormal/locNormal.html b/src/main/webapp/views/locNormal/locNormal.html
new file mode 100644
index 0000000..ff56feb
--- /dev/null
+++ b/src/main/webapp/views/locNormal/locNormal.html
@@ -0,0 +1,189 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title></title>
+    <meta name="renderer" content="webkit">
+    <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/cool.css" media="all">
+    <link rel="stylesheet" href="../../static/css/common.css" media="all">
+    <link rel="stylesheet" href="../../static/css/print.css" media="all">
+</head>
+<style>
+    #search-box {
+        padding: 30px 30px 10px 30px;
+    }
+
+    #search-box .layui-inline {
+        margin-right: 5px;
+    }
+
+    #data-search-btn {
+        margin-top: 10px;
+    }
+
+    #data-search-btn.layui-btn-container .layui-btn {
+        margin-right: 20px;
+    }
+
+    .btn-print {
+        display: none;
+    }
+
+    #btn-print-batch {
+        display: none;
+    }
+
+    .layui-btn-danger {
+        background-color: lightsalmon;
+        color: #333;
+    }
+
+    /* ------------------------- 鎵撳嵃琛ㄦ牸 -----------------------  */
+    .template-preview {
+        height: 200px;
+        display: inline-block;
+    }
+
+    .contain {
+    }
+
+    .contain td {
+        border: 1px solid #000;
+        /*line-height: 46px;*/
+    }
+
+    .function-area {
+        padding: 15px 0 20px 40px;
+    }
+
+    .function-btn {
+        font-size: 16px;
+        padding: 1px 1px 1px 1px;
+        width: 120px;
+        height: 40px;
+        border-color: #2b425b;
+        border-radius: 4px;
+        border-width: 1px;
+        background: none;
+        border-style: solid;
+        transition: 0.4s;
+        cursor: pointer;
+    }
+
+    .function-btn:hover {
+        background-color: #2b425b;
+        color: #fff;
+    }
+
+</style>
+<body>
+<div>
+    <!-- 鎼滅储鏍� -->
+    <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="matnr" placeholder="鐗╂枡缂栫爜" autocomplete="off">
+            </div>
+        </div>
+        <div class="layui-inline">
+            <div class="layui-input-inline">
+                <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
+            </div>
+        </div>
+        <div class="layui-inline" style="width: 150px">
+            <select id="matStatusSelect" name="state">
+                <option value="">鍑哄叆搴撶姸鎬�</option>
+                <option value="1">宸插叆搴�</option>
+                <option value="2">宸插嚭搴�</option>
+            </select>
+        </div>
+        <div class="layui-inline" style="width: 150px">
+            <select id="putSiteSelect" name="warehouse">
+                <option value="">璇烽�夋嫨搴撳尯</option>
+            </select>
+        </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>
+
+    <!-- 鍔熻兘鍖� -->
+    <!--<div class="function-area">-->
+        <!--<button id="mat-query" class="function-btn" onclick="addLocNormal()">鏂板搴撳瓨</button>-->
+    <!--</div>-->
+
+
+    <!-- 琛ㄦ牸 -->
+    <div class="layui-form">
+        <table class="layui-hide" id="locNormal" lay-filter="locNormal"></table>
+    </div>
+    <script type="text/html" id="toolbar">
+        <div class="layui-btn-container">
+            <button class="layui-btn layui-btn-sm" id="btn-locNormal-into" lay-event="intoData">瀵煎叆</button>
+        </div>
+    </script>
+
+    <!-- 瀵煎叆鎿嶄綔寮圭獥 -->
+    <div id="importDataDiv" style="display: none;padding: 20px 40px">
+        <div class="layui-upload-drag" id="uploadEx"
+             style="width: 200px; font-size: x-small; padding: 10px; text-align: center; box-sizing: border-box">
+            <div id="uploadDesc" style="display: inline-block; ">
+                <i class="layui-icon">顧�</i>
+                <p>鐐瑰嚮娣诲姞锛屾垨灏嗘枃浠舵嫋鎷藉埌姝ゅ</p>
+            </div>
+            <div id="uploadDemoView" style="display: none">
+                <img src="../../static/image/Excel.png" alt="涓婁紶鎴愬姛鍚庢覆鏌�" style="max-width: 196px; padding: 20px 0 10px 0">
+                <span id="fileMame" style="display: block; font-size: small; color: #333"></span>
+            </div>
+        </div>
+        <div style="text-align: center; margin-top: 20px">
+            <button class="layui-btn layui-btn-radius" id="uploadDo">寮�濮嬪鍏�</button>
+        </div>
+    </div>
+
+    <!-- 琛ㄦ牸鑷畾涔夊垪 -->
+    <script type="text/html" id="locNormalState">
+        {{#  if(d.state === '1'){ }}
+        <span style="color: green">宸插叆搴�</span>
+        {{# } else if(d.state === '2'){ }}
+        <span style="color: red">宸插嚭搴�</span>
+        {{#  } else { }}
+        {{#  } }}
+    </script>
+    <script type="text/html" id="locArea">
+        {{
+        locArea.map(function(item){
+        if (d.warehouse == item.uuid) {
+        return item.name;
+        }
+        });
+        }}
+    </script>
+    <script type="text/html" id="operate">
+        {{#  if(d.state === '1'){ }}
+        <button class="layui-btn layui-btn-xs layui-btn-normal" lay-event="outLocNormal">鍑哄簱</button>
+        {{#  } else { }}
+        <button class="layui-btn layui-btn-xs layui-btn-disabled">鍑哄簱</button>
+        {{#  } }}
+        <button class="layui-btn layui-btn-xs layui-btn-danger" lay-event="removeLocNormal">绉婚櫎</button>
+    </script>
+
+
+</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>
+<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
+<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/locNormal/locNormal.js"></script>
+</body>
+</html>
\ No newline at end of file

--
Gitblit v1.9.1