From 85f8eed3fa9f52a68dff30ea8bdee00fbc1d5938 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 22 十二月 2025 12:48:14 +0800
Subject: [PATCH] #
---
src/main/webapp/views/order/order.html | 89 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 78 insertions(+), 11 deletions(-)
diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index a3a7753..e9ca8e4 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -13,6 +13,7 @@
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+ <script type="text/javascript" src="../../static/js/xlsx/xlsx.full.min.js"></script>
<![endif]-->
<style>
.wrk-trace {
@@ -97,11 +98,14 @@
<!-- 琛ㄦ牸鎿嶄綔鍒� -->
<script type="text/html" id="operate">
{{# if (d.settle == 0 || d.settle == 1) { }}
- <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
+<!-- <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>-->
<a class="layui-btn layui-btn-danger layui-btn-xs btn-delete" lay-event="del">鍒犻櫎</a>
{{# } }}
- {{# if (d.settle == 2) { }}
- <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="complete">瀹岀粨</a>
+ <a class="layui-btn layui-btn-danger layui-btn-xs btn-delete" lay-event="del">鍒犻櫎</a>
+
+ {{# if (d.settle == 98) { }}
+ <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="complete">褰诲簳瀹岀粨</a>
+ <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="continueExecution">缁х画鎵ц</a>
{{# } }}
</script>
<!-- 琛ㄦ牸鎿嶄綔鍒� -->
@@ -140,6 +144,25 @@
{{# } }}
>{{d.settle$}}</span>
</script>
+<script type="text/html" id="importExcelDialog">
+ <form class="layui-form" style="margin: 20px;">
+ <div class="layui-form-item">
+ <label class="layui-form-label">Excel鏂囦欢锛�</label>
+ <div class="layui-input-block">
+ <input type="file" id="excelFileInput" accept=".xlsx,.xls" lay-verify="required"/>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-input-block">
+ <a href="javascript:;" id="downloadExcelTemplate" class="layui-btn layui-btn-primary">涓嬭浇瀵煎叆妯℃澘</a>
+ </div>
+ </div>
+ <div class="layui-form-item text-right">
+ <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+ <button class="layui-btn" type="button" id="doImportExcel">寮�濮嬪鍏�</button>
+ </div>
+ </form>
+</script>
<!-- 琛ㄥ崟寮圭獥 -->
<script type="text/html" id="editDialog">
<form id="editForm" lay-filter="editForm" class="layui-form model-form">
@@ -163,6 +186,32 @@
<!-- lay-verify="required"-->
</div>
</div>
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">瀹㈡埛PO锛�</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input id="standby1" name="standby1" placeholder="杈撳叆瀹㈡埛PO" type="text" class="layui-input" maxlength="20" lay-verType="tips" />-->
+<!-- <!– lay-verify="required"–>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">璐т富锛�</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input id="owner" name="owner" placeholder="杈撳叆璐т富" type="text" class="layui-input" maxlength="20" lay-verType="tips" />-->
+<!-- <!– lay-verify="required"–>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">璐т富锛�</label>-->
+<!-- <div class="layui-input-block cool-auto-complete">-->
+<!-- <input class="layui-input" name="owner" placeholder="杈撳叆璐т富鍚嶇О" style="display: none">-->
+<!-- <input id="owner$" name="owner$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ヨ揣涓诲悕绉�" onfocus=this.blur() lay-verType="tips" lay-verify="required">-->
+<!-- <div class="cool-auto-complete-window">-->
+<!-- <input class="cool-auto-complete-window-input" data-key="locOwnerQueryBydocType" onkeyup="autoLoad(this.getAttribute('data-key'))">-->
+<!-- <select class="cool-auto-complete-window-select" data-key="locOwnerQueryBydocTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">-->
+<!-- </select>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
<div class="layui-form-item" style="position: relative;">
<label class="layui-form-label">鍗曟嵁鏄庣粏锛�</label>
<div class="layui-input-block">
@@ -171,6 +220,10 @@
<button class="layui-btn layui-btn-sm icon-btn" id="matAddBtnComment"
style="position: absolute; left: 20px;top: 60px;padding: 0 5px;" type="button">
<i class="layui-icon"></i>娣诲姞鏄庣粏
+ </button>
+ <button class="layui-btn layui-btn-sm icon-btn" id="importExcelBtn"
+ style="position: absolute; left: 10px;top: 120px;padding: 0 5px;" type="button">
+ <i class="layui-icon"></i>瀵煎叆Excel
</button>
</div>
<div class="layui-form-item text-right">
@@ -256,19 +309,31 @@
</div>
<table class="layui-table" lay-skin="nob" style="width: 80%">
- <thead>
- <tr style="background: none">
- <td>No.</td>
- <td>鍟嗗搧缂栧彿</td>
- <td>鏁伴噺</td>
- </tr>
- </thead>
<tbody>
{{# layui.each(item.wrkDetls, function(idx, wrkDetl){ }}
- <tr>
+ <tr style="background: none">
+ <td>No.</td>
<td><span class="layui-badge layui-bg-cyan">{{ idx+1 }}</span></td>
+ </tr>
+ <tr style="background: none">
+ <td>鍝佸彿锛�</td>
<td>{{ wrkDetl.matnr }}</td>
+ </tr>
+ <tr style="background: none">
+ <td>鍝佸悕锛�</td>
+ <td>{{ wrkDetl.maktx }}</td>
+ </tr>
+ <tr style="background: none">
+ <td>瑙勬牸锛�</td>
+ <td>{{ wrkDetl.specs }}</td>
+ </tr>
+ <tr style="background: none">
+ <td>鏁伴噺锛�</td>
<td style="font-weight: bold">{{ wrkDetl.anfme }}</td>
+ </tr>
+ <tr style="background: none">
+ <td>鏉＄爜锛�</td>
+ <td style="font-weight: bold">{{ wrkDetl.zpallet }}</td>
</tr>
{{# }); }}
</tbody>
@@ -296,6 +361,8 @@
<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/xlsx/xlsx.full.min.js"></script>
+
<script type="text/template" id="docTypeTpl">
<option value="">閫夋嫨绫诲瀷</option>
--
Gitblit v1.9.1