From 2d28053beec1de1e98b442b6af3734cea7fd0949 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 12 三月 2021 17:02:46 +0800
Subject: [PATCH] #
---
src/main/webapp/views/custOrder/custOrder.html | 39 +++++++++++++++++++++++++++++++++------
1 files changed, 33 insertions(+), 6 deletions(-)
diff --git a/src/main/webapp/views/custOrder/custOrder.html b/src/main/webapp/views/custOrder/custOrder.html
index 2e807ef..08e3988 100644
--- a/src/main/webapp/views/custOrder/custOrder.html
+++ b/src/main/webapp/views/custOrder/custOrder.html
@@ -19,7 +19,21 @@
<input class="layui-input" type="text" name="number" placeholder="閿�鍞崟鍙�" autocomplete="off">
</div>
</div>
-
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="user_code" placeholder="鍟嗗搧缂栧彿" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <select name="status">
+ <option value="" style="display: none">閫夋嫨鐘舵��</option>
+ <option value="1">寰呭鐞�</option>
+ <option value="2">宸插畬鎴�</option>
+ <option value="3">鍙栨秷</option>
+ </select>
+ </div>
+ </div>
<!-- 寰呮坊鍔� -->
<div id="data-search-btn" class="layui-btn-container layui-form-item">
<button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
@@ -33,6 +47,7 @@
</div>
<script type="text/html" id="toolbar">
<div class="layui-btn-container">
+ <button class="layui-btn" onclick="right()" style="background-color: #2F4056">鑷畾涔夐攢鍞崟</button>
<!-- <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>-->
<button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
<button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">瀵煎嚭</button>
@@ -41,11 +56,23 @@
<script type="text/html" id="operate">
{{#if (d.status == 1){ }}
- <a class="layui-btn layui-btn-sm layui-btn-danger" lay-event="stockOut" style="font-size: 16px">鎹¤揣</a>
+ <a class="layui-btn layui-btn-sm layui-btn-danger" lay-event="stockOut" style="font-size: 16px">鎷ｈ揣</a>
{{# } }}
{{#if (d.status == 2){ }}
<a class="layui-btn layui-btn-sm layui-btn-normal" lay-event="print" style="font-size: 16px">鎵撳嵃</a>
{{# } }}
+</script>
+
+<script type="text/html" id="statusTpl">
+ <span name="status"
+ {{# if( d.status === 1){ }}
+ class="layui-badge layui-badge-blue"
+ {{# } else if(d.status === 2){ }}
+ class="layui-badge layui-badge-green"
+ {{# } else if(d.status === 3){ }}
+ class="layui-badge layui-badge-red"
+ {{# } }}
+ >{{d.status$}}</span>
</script>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
@@ -63,10 +90,10 @@
<script type="text/template" id="pakoutPrintTpl">
<!-- 澶� -->
- <div id="print-header" style="margin-bottom: 20px">
+ <div id="print-header" style="margin: 20px 0">
<div style="text-align: center">
<div style="text-align: center;margin-bottom: 10px">
- <span style="font-family: 瀹嬩綋"> 鎹¤揣鍗� </span>
+ <span style="font-family: 瀹嬩綋"> 鎷ｈ揣鍗� </span>
</div>
<img class="template-code template-qrcode" src="{{data.barcodeUrl}}" style="width: 80%">
@@ -77,10 +104,10 @@
</div>
<div style="margin-top: 10px">
<div style="float: left;width: 50%; text-align: left">
- <span style="font-size: xx-small;font-family: 瀹嬩綋">鎹¤揣鏁伴噺锛歿{data.total}}</span>
+ <span style="font-size: xx-small;font-family: 瀹嬩綋">鎷ｈ揣鏁伴噺锛歿{data.total}}</span>
</div>
<div style="float: left; width: 50%; text-align: right">
- <span style="font-size: xx-small;font-family: 瀹嬩綋">鎹¤揣浜猴細{{data.workerName}}</span>
+ <span style="font-size: xx-small;font-family: 瀹嬩綋">鎷ｈ揣浜猴細{{data.workerName}}</span>
</div>
<div style="clear:both;"></div>
</div>
--
Gitblit v1.9.1