From f34da12c558d57d156529e23c04e2388e60b94e5 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 14 六月 2023 10:27:17 +0800
Subject: [PATCH] #组托逻辑
---
src/main/webapp/views/orderCheck/orderCheck.html | 62 +++++++++++++++++++++++++++++-
1 files changed, 59 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/views/orderCheck/orderCheck.html b/src/main/webapp/views/orderCheck/orderCheck.html
index 1a30105..70be74a 100644
--- a/src/main/webapp/views/orderCheck/orderCheck.html
+++ b/src/main/webapp/views/orderCheck/orderCheck.html
@@ -94,6 +94,7 @@
<!-- 琛ㄦ牸鎿嶄綔鍒� -->
<script type="text/html" id="operate">
<a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="btnPrint">鎵撳嵃</a>
+ <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="printExcel">瀵煎嚭Excel</a>
{{# 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-danger layui-btn-xs btn-delete" lay-event="del">鍒犻櫎</a>
@@ -153,6 +154,8 @@
<select id="checkType" name="checkType" lay-filter="checkType">
<option value="all" selected="">鍏ㄩ儴鐗╂枡</option>
<option value="matnr">鐗╂枡鍙�</option>
+ <option value="locno">搴撲綅鍙�</option>
+ <option value="owner">璐т富</option>
</select>
</div>
</div>
@@ -188,9 +191,6 @@
<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 == 0 || d.settle == 1) && (d.docType == 21 || d.docType == 11 || d.docType == 12)) { }}
- <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="manPrint">鐢熸垚鎷ｈ揣鍗�</a>
- {{# } }}
{{# if (d.settle == 2) { }}
<a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="complete">瀹岀粨</a>
{{# } }}
@@ -202,8 +202,14 @@
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
</script>
<script type="text/html" id="formSSXMTableBar3">
+ {{# if (d.type == 2 && d.examine == 0 ) { }}
<!-- <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">淇敼</a>-->
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="examine">瀹℃牳</a>
+ {{# } }}
+ {{# if (d.examine == 1 ) { }}
+ <span name="settle" class="layui-badge layui-badge-blue">宸插鏍�</span>
+ {{# } }}
+
</script>
<!-- 琛ㄥ崟寮圭獥1 -->
<script type="text/html" id="matEditDialog">
@@ -229,6 +235,29 @@
</form>
</script>
+<!-- 琛ㄥ崟寮圭獥3 -->
+<script type="text/html" id="matEditDialog2">
+ <form id="matEditForm2" lay-filter="matEditForm2" class="layui-form model-form">
+ <input name="experimentId" type="hidden"/>
+ <div class="layui-form-item" style="float: left">
+ <label class="layui-form-label">搴撲綅 - 澶氶��</label>
+ <div class="layui-input-block">
+ <div id="mat2" name="mat">
+ </div>
+ </div>
+ <label class="layui-form-label"style="margin-top: 15px;">鐩樼偣鐜囷細</label>
+ <div class="layui-input-block" style="margin-top: 15px;">
+ <select id="selectPerc2" name="selectPerc2" lay-filter="selectPerc2">
+ <option value="100" selected="">100%</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-form-item text-right" style="margin-left: 35px">
+ <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+ <button class="layui-btn" lay-filter="matEditSubmit" lay-submit>淇濆瓨</button>
+ </div>
+ </form>
+</script>
<!-- 琛ㄥ崟寮圭獥3 -->
<script type="text/html" id="matEditDialog3">
@@ -258,6 +287,33 @@
</form>
</script>
+<script type="text/html" id="matEditDialog4">
+ <form id="matEditForm4" lay-filter="matEditForm4" class="layui-form model-form">
+ <input name="experimentId" type="hidden"/>
+ <div class="layui-form-item" style="float: left">
+ <label class="layui-form-label">璐т富 - 澶氶��</label>
+ <div class="layui-input-block">
+ <div id="mat4" name="mat">
+ </div>
+ </div>
+ <label class="layui-form-label"style="margin-top: 15px;">鐩樼偣鐜囷細</label>
+ <div class="layui-input-block" style="margin-top: 15px;">
+ <select id="selectPerc4" name="selectPerc4" lay-filter="selectPerc4">
+ <option value="100" selected="">100%</option>
+ <option value="80">80%</option>
+ <option value="60">60%</option>
+ <option value="40">40%</option>
+ <option value="10">10%</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-form-item text-right" style="margin-left: 35px">
+ <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+ <button class="layui-btn" lay-filter="matEditSubmit" lay-submit>淇濆瓨</button>
+ </div>
+ </form>
+</script>
+
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
--
Gitblit v1.9.1