From 46607139e955ca266e24bd8561bca1f93a650178 Mon Sep 17 00:00:00 2001
From: wang..123 <brook_w@163.com>
Date: 星期二, 22 三月 2022 18:23:39 +0800
Subject: [PATCH] Merge branch 'master' of http://47.97.1.152:5880/r/wms_saas
---
src/main/webapp/views/pickout/pickout.html | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/main/webapp/views/pickout/pickout.html b/src/main/webapp/views/pickout/pickout.html
index 9521946..5ffc23f 100644
--- a/src/main/webapp/views/pickout/pickout.html
+++ b/src/main/webapp/views/pickout/pickout.html
@@ -17,19 +17,19 @@
}
/* 宸﹁〃 */
- #docTypeTable + .layui-table-view .layui-table-tool-temp {
+ #leftTable + .layui-table-view .layui-table-tool-temp {
padding-right: 0;
}
- #docTypeTable + .layui-table-view .layui-table-body tbody > tr td {
+ #leftTable + .layui-table-view .layui-table-body tbody > tr td {
cursor: pointer;
}
- #docTypeTable + .layui-table-view .layui-table-body tbody > tr.layui-table-click {
+ #leftTable + .layui-table-view .layui-table-body tbody > tr.layui-table-click {
background-color: #fff3e0;
}
- #docTypeTable + .layui-table-view .layui-table-body tbody > tr.layui-table-click td:last-child > div:before {
+ #leftTable + .layui-table-view .layui-table-body tbody > tr.layui-table-click td:last-child > div:before {
position: absolute;
right: 6px;
content: "\e602";
@@ -86,13 +86,13 @@
<form class="layui-form toolbar">
<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 name="id" class="layui-input"type="text" name="id" placeholder="缂栧彿" autocomplete="off"/>
+ <input name="matnr" class="layui-input"type="text" placeholder="缂栫爜" autocomplete="off"/>
</div>
</div>
<div class="layui-inline"> 
- <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
+ <button class="layui-btn icon-btn" lay-filter="rightSearch" lay-submit>
<i class="layui-icon"></i>鎼滅储
</button>
<button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
@@ -136,9 +136,15 @@
</script>
<script type="text/html" id="operate">
- {{#if (d.wrkSts == 1||d.wrkSts == 2){ }}
+ {{#if (d.wrkSts == 3){ }}
<a class="layui-btn layui-btn-xs btn-complete" lay-event="complete">瀹屾垚</a>
{{# } }}
+ {{#if (d.wrkSts == 1||d.wrkSts == 2){ }}
+ <a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="printOrder">鎵撳嵃鎷ｈ揣鍗�</a>
+ {{# } }}
+
+
+
<!-- <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">璇︽儏</a>-->
{{#if (d.wrkSts == 1||d.wrkSts == 2){ }}
<a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鎾ら攢</a>
--
Gitblit v1.9.1