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/order/order.html | 121 +++++++++++++++++++++++++++++++++++++--
1 files changed, 113 insertions(+), 8 deletions(-)
diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index 7458c87..99155f2 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -49,6 +49,23 @@
</div>
</div>
<div class="layui-inline">
+ <div class="layui-input-inline">
+ <select name="doc_type" id="docType-query">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <select name="settle">
+ <option value="">閫夋嫨鐘舵��</option>
+ <option value="1">寰呭鐞�</option>
+ <option value="2">浣滀笟涓�</option>
+ <option value="4">宸插畬鎴�</option>
+ <option value="6">涓婃姤瀹屾垚</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
<button class="layui-btn icon-btn" lay-filter="tbSearch" lay-submit>
<i class="layui-icon"></i>鎼滅储
</button>
@@ -67,15 +84,21 @@
</div>
</div>
</div>
+<div id="box" style="display: block"></div>
<!-- 琛ㄦ牸鎿嶄綔鍒� -->
<script type="text/html" id="operate">
- {{# if (d.settle == 1 || d.settle == 2) { }}
+ {{# if (d.settle == 0 || d.settle == 1) { }}
<a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</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>
{{# } }}
- <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>
+ {{# } }}
+
+<!-- {{# if ((d.settle == 0 || d.settle == 1) && (d.docType == 1 || d.docType == 11 || d.docType == 14 || d.docType == 17 || d.docType == 18)) { }}-->
+<!-- <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="manPrint">鐢熸垚鎷ｈ揣鍗�</a>-->
+<!-- {{# } }}-->
+ <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="btnPrint">鎵撳嵃</a>
</script>
<!-- 琛ㄦ牸鎿嶄綔鍒� -->
<script type="text/html" id="tbLook">
@@ -124,7 +147,8 @@
<div class="layui-form-item">
<label class="layui-form-label">鍗曟嵁缂栧彿锛�</label>
<div class="layui-input-block">
- <input id="orderNo" name="orderNo" placeholder="杈撳叆鍗曟嵁缂栧彿" type="text" class="layui-input" maxlength="20" lay-verType="tips" lay-verify="required"/>
+ <input id="orderNo" name="orderNo" placeholder="杈撳叆鍗曟嵁缂栧彿" type="text" class="layui-input" maxlength="20" lay-verType="tips" />
+<!-- lay-verify="required"-->
</div>
</div>
<div class="layui-form-item" style="position: relative;">
@@ -152,14 +176,14 @@
<script type="text/html" id="matEditDialog">
<form id="matEditForm" lay-filter="matEditForm" class="layui-form model-form">
<input name="experimentId" type="hidden"/>
- <div class="layui-form-item">
+ <div class="layui-form-item" style="float: left">
<label class="layui-form-label">鐗╂枡 - 澶氶��</label>
<div class="layui-input-block">
<div id="mat" name="mat">
</div>
</div>
</div>
- <div class="layui-form-item text-right">
+ <div class="layui-form-item text-right" style="display: inline-block; 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>
@@ -167,10 +191,91 @@
</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>
+<script type="text/javascript" src="../../static/js/jquery/jQuery.print.js"></script>
<script type="text/javascript" src="../../static/layui/layui.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/template" id="docTypeTpl">
+ <option value="">閫夋嫨绫诲瀷</option>
+ {{#each records}}
+ <option value="{{docId}}">{{docName}}</option>
+ {{/each}}
+</script>
+
+<script type="text/template" id="templatePreview3" class="template-qrcode">
+ {{#each data}}
+ <table class="contain" width="280" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
+ <thead></thead>
+ <tbody style="font-weight: bold">
+ <tr style="height: 30px;">
+ <td align="center" scope="col" colspan="1">鍟嗗搧</td>
+ <td align="lift" colspan="4" style="padding-left: 8px;overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.maktx}}</td>
+ <td align="center" scope="col" colspan="3" rowspan="3">
+ <img class="template-code template-qrcode" src="{{this.barcodeUrl}}" width="80%">
+ </td>
+ </tr>
+ <tr style="height: 30px">
+ <td align="center" scope="col" colspan="1">鏂欏彿</td>
+ <!-- overflow:hidden; 婧㈠嚭闅愯棌 white-space:nowrap; text-overflow:ellipsis;-->
+ <!-- word-break : break-all; 瓒呭嚭鑷姩鎹㈣-->
+ <td align="lift" colspan="4" style="padding-left: 8px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.matnr}}</td>
+ </tr>
+ <tr style="height: 30px">
+ <td align="center" scope="col" colspan="1">鏃ユ湡</td>
+ <td align="lift" colspan="4" style="padding-left: 8px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.createTime$}}</td>
+ </tr>
+ <tr style="height: 30px">
+ <td align="center" scope="col" colspan="1">鐗屽彿</td>
+ <td align="lift" colspan="3" style="padding-left: 8px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.brand}}</td>
+ <td align="center" scope="col" colspan="1">鎵瑰彿</td>
+ <td align="lift" colspan="3" style="padding-left: 8px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.batch}}</td>
+ </tr>
+ <tr style="height: 30px">
+ <td align="center" scope="col" colspan="1">鏁伴噺</td>
+ <td align="lift" colspan="3" style="padding-left: 8px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.anfme}}</td>
+ <td align="center" scope="col" colspan="1">鐘舵��</td>
+ <td align="lift" colspan="3" style="padding-left: 8px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.status$}}</td>
+ </tr>
+
+
+ </tbody>
+ </table>
+ <div style="height: 20px">
+
+ </div>
+ {{/each}}
+</script>
+
+
+<script type="text/html" id="payment">
+ <select id="select-primary" style="width: 100%" class="layui-border select-primary" lay-ignore >
+ <option value="0"
+ {{# if( d.payment === 0){ }}
+ selected = "selected"
+ {{# } }}
+ >浠ｉ噰</option>
+ <option value="1"
+ {{# if( d.payment === 1){ }}
+ selected = "selected"
+ {{# } }}
+ >浠撳偍</option>
+ </select>
+</script>
+
+
+<!--<script type="text/html" id="payment">-->
+<!-- {{# var cityList = d.cityList || ["鍖椾含","涓婃捣","骞垮窞","鍩庡競-1"]; }}-->
+<!-- <select name="payment" class="layui-border select-demo-primary" lay-ignore>-->
+<!-- <option value="">鍘熺敓 select 妗�</option>-->
+<!-- {{# layui.each(cityList, function(i, v){ }}-->
+<!-- <option value="{{= v }}" {{= v === d.city ? 'selected' : '' }}>{{= v }}</option>-->
+<!-- {{# }); }}-->
+<!-- </select>-->
+<!--</script>-->
</body>
+
</html>
--
Gitblit v1.9.1