From 6f7a815b2d6e4f30e7ccf901b24d5103aaa72078 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 25 十二月 2023 10:23:08 +0800
Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1
---
src/main/webapp/views/pack/pack.html | 77 ++++++++++----------------------------
1 files changed, 20 insertions(+), 57 deletions(-)
diff --git a/src/main/webapp/views/pack/pack.html b/src/main/webapp/views/pack/pack.html
index eb5ab0d..8380b1a 100644
--- a/src/main/webapp/views/pack/pack.html
+++ b/src/main/webapp/views/pack/pack.html
@@ -18,9 +18,19 @@
<div class="layui-form toolbar" id="search-box">
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">鏉＄爜:</label>
+ <label class="layui-form-label">鏉� 鐮�:</label>
<div class="layui-input-inline">
<input class="layui-input" type="text" name="barcode" placeholder="璇疯緭鍏�..." autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐘� 鎬�:</label>
+ <div class="layui-input-inline">
+ <select name="settle">
+ <option value="">閫夋嫨鐘舵��</option>
+ <option value="1">鏈鐞�</option>
+ <option value="2">涓嬬嚎甯墭</option>
+ </select>
</div>
</div>
<div class="layui-inline"> 
@@ -54,19 +64,18 @@
<script type="text/html" id="settleTpl">
<span name="settle"
{{# if( d.settle === 1){ }}
- class="layui-badge layui-badge-red"
+ class="layui-badge layui-badge-red" >{{d.settle$}}</span>
{{# }else if(d.settle === 2){ }}
- class="layui-badge layui-badge-green"
+ class="layui-badge layui-badge-green" >涓嬬嚎甯墭</span>
{{# }else if(d.settle === 3){ }}
- class="layui-badge layui-badge-gray"
+ class="layui-badge layui-badge-gray" >{{d.settle$}}</span>
{{# }else if(d.settle === 4){ }}
- class="layui-badge layui-badge-blue"
+ class="layui-badge layui-badge-blue" >{{d.settle$}}</span>
{{# }else if(d.settle === 5){ }}
- class="layui-badge layui-badge-gray"
+ class="layui-badge layui-badge-gray" >{{d.settle$}}</span>
{{# }else if(d.settle === 6){ }}
- class="layui-badge layui-badge-gray"
+ class="layui-badge layui-badge-gray" >{{d.settle$}}</span>
{{# } }}
- >{{d.settle$}}</span>
</script>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
@@ -88,15 +97,15 @@
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">鍟嗗搧缂栧彿: </label>
+ <label class="layui-form-label">鐗╂枡鍙�: </label>
<div class="layui-input-block">
<input class="layui-input" name="matnr" placeholder="璇疯緭鍏ュ晢鍝佺紪鍙�">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">鎵瑰彿: </label>
+ <label class="layui-form-label">璁㈠崟鍙�: </label>
<div class="layui-input-block">
- <input class="layui-input" name="batch" placeholder="璇疯緭鍏ユ壒鍙�">
+ <input class="layui-input" name="batch" placeholder="璇疯緭鍏ュ簭鍒楃爜">
</div>
</div>
<div class="layui-form-item">
@@ -107,52 +116,6 @@
<div class="cool-auto-complete-window">
<input class="cool-auto-complete-window-input" data-key="orderSettleQueryBysettle" onkeyup="autoLoad(this.getAttribute('data-key'))">
<select class="cool-auto-complete-window-select" data-key="orderSettleQueryBysettleSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鐘舵��: </label>
- <div class="layui-input-block">
- <select name="status">
- <option value="">璇烽�夋嫨鐘舵��</option>
- <option value="1">姝ｅ父</option>
- <option value="0">绂佺敤</option>
- </select>
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">娣诲姞鏃堕棿: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="createTime" id="createTime$" placeholder="璇疯緭鍏ユ坊鍔犳椂闂�">
- </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="createBy" placeholder="璇疯緭鍏ユ坊鍔犱汉鍛�" style="display: none">
- <input id="createBy$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ユ坊鍔犱汉鍛�" onfocus=this.blur()>
- <div class="cool-auto-complete-window">
- <input class="cool-auto-complete-window-input" data-key="userQueryBycreateBy" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="userQueryBycreateBySelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">淇敼鏃堕棿: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="updateTime" id="updateTime$" placeholder="璇疯緭鍏ヤ慨鏀规椂闂�">
- </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="updateBy" placeholder="璇疯緭鍏ヤ慨鏀逛汉鍛�" style="display: none">
- <input id="updateBy$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ヤ慨鏀逛汉鍛�" onfocus=this.blur()>
- <div class="cool-auto-complete-window">
- <input class="cool-auto-complete-window-input" data-key="userQueryByupdateBy" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="userQueryByupdateBySelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
</select>
</div>
</div>
--
Gitblit v1.9.1