From 07fc18f77a9764bd47857e30d65abc03cc1e439c Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期五, 08 十一月 2024 16:21:56 +0800
Subject: [PATCH] Merge branch 'phyzwms2' into phyzasrs-erp
---
src/main/webapp/views/order/order.html | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index 299529b..60bd19c 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -38,6 +38,11 @@
.btn-delete {
display: none;
}
+ td .layui-form-select {
+ margin-top: -9px;
+ margin-left: -14px;
+ margin-right: -14px;
+ }
</style>
</head>
<body>
@@ -84,9 +89,13 @@
<i class="layui-icon"></i>娣诲姞
</button>
<button id="importOrder" class="layui-btn icon-btn btn-add">
- <i class="layui-icon layui-icon-upload"></i> 瀵煎叆閿�鍞崟
+ <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>
@@ -109,6 +118,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">
@@ -201,6 +211,11 @@
<button class="layui-btn" lay-filter="matEditSubmit" lay-submit>淇濆瓨</button>
</div>
</form>
+</script>
+
+<!--宸ュ簭鐘舵��-->
+<script type="text/html" id="process">
+
</script>
<!-- 璁㈠崟浠诲姟杩芥函 -->
@@ -296,7 +311,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=3" charset="utf-8"></script>
<script type="text/template" id="docTypeTpl">
<option value="">閫夋嫨绫诲瀷</option>
--
Gitblit v1.9.1