From 83b8b7cecfe8266a44bfce696d857b3be7149e3f Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 31 十二月 2024 10:52:28 +0800
Subject: [PATCH] 优化MES调拨信息上报及库位查询逻辑
---
src/main/webapp/views/order/order.html | 34 +++++++++++++++++++++++++++++++---
1 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index 0c4cb7f..32a1253 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -38,6 +38,14 @@
.btn-delete {
display: none;
}
+ .btn-report {
+ display: none;
+ }
+ td .layui-form-select {
+ margin-top: -9px;
+ margin-left: -14px;
+ margin-right: -14px;
+ }
</style>
</head>
<body>
@@ -52,6 +60,11 @@
<div class="layui-inline">
<div class="layui-input-inline mr0">
<input name="order_no" class="layui-input" type="text" placeholder="杈撳叆鍗曟嵁缂栧彿"/>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline mr0">
+ <input name="tel" class="layui-input" type="text" placeholder="杈撳叆閿�鍞崟鍙�"/>
</div>
</div>
<div class="layui-inline" style="width: 300px">
@@ -80,8 +93,17 @@
<button class="layui-btn icon-btn" lay-filter="tbSearch" lay-submit>
<i class="layui-icon"></i>鎼滅储
</button>
- <button id="orderAddBtn" class="layui-btn icon-btn btn-add"><i class="layui-icon"></i>娣诲姞
+ <button id="orderAddBtn" class="layui-btn icon-btn btn-add">
+ <i class="layui-icon"></i>娣诲姞
</button>
+ <button id="importOrder" class="layui-btn icon-btn btn-add">
+ <i class="layui-icon layui-icon-upload"></i> 瀵煎叆鍗曟嵁
+ </button>
+ <button id="orderCheckBtn" class="layui-btn icon-btn btn-add">
+ <i class="layui-icon"></i>娣诲姞
+ </button>
+ <input style="display:none" id="importExcel" type="file" onchange="upload(this)" >
+ <input style="display:none" id="importExcel2" type="file" onchange="upload2(this)" >
</div>
</div>
</div>
@@ -104,6 +126,7 @@
{{# } }}
{{# } }}
<a class="layui-btn layui-btn-danger layui-btn-xs btn-delete" lay-event="del">鍒犻櫎</a>
+ <a class="layui-btn layui-btn-primary layui-btn-xs btn-report" lay-event="report">涓婃姤</a>
</script>
<!-- 琛ㄦ牸鎿嶄綔鍒� -->
<script type="text/html" id="tbLook">
@@ -198,6 +221,11 @@
</form>
</script>
+<!--宸ュ簭鐘舵��-->
+<script type="text/html" id="process">
+
+</script>
+
<!-- 璁㈠崟浠诲姟杩芥函 -->
<script id="wrkTraceDialog" type="text/html" style="position: relative">
<div style="position: absolute; top: 0; left: 0;">
@@ -256,7 +284,7 @@
<thead>
<tr style="background: none">
<td>No.</td>
- <td>鍟嗗搧缂栧彿</td>
+ <td>鐗╂枡鍙�</td>
<td>鏁伴噺</td>
</tr>
</thead>
@@ -291,7 +319,7 @@
<script type="text/javascript" src="../../static/js/echarts/echarts.min.js" charset="utf-8"></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/order/order.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/order/order.js?v=7" charset="utf-8"></script>
<script type="text/template" id="docTypeTpl">
<option value="">閫夋嫨绫诲瀷</option>
--
Gitblit v1.9.1