From 7fb33fe84ce97e402c16d0d5558c914e621cdcd1 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 19 八月 2024 16:45:31 +0800
Subject: [PATCH] #入库作搜索栏：品号，名称，制令，拥有者，时间
---
zy-asrs-wms/src/main/webapp/static/js/prior/prior.js | 4
zy-asrs-wms/src/main/webapp/static/js/orderDetlLog/orderDetlLog.js | 4
zy-asrs-wms/src/main/webapp/static/js/report/workCountOut.js | 4
zy-asrs-wms/src/main/webapp/static/js/locDetl/locDetl.js | 2
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MatController.java | 8 ++
zy-asrs-wms/src/main/webapp/static/js/report/workCountIn.js | 4
zy-asrs-wms/src/main/webapp/views/pakStore/matQuery.html | 19 +++++
zy-asrs-wms/src/main/webapp/views/prior/prior.html | 8 +-
zy-asrs-wms/src/main/webapp/static/js/orderDetl/orderDetl.js | 4
zy-asrs-wms/src/main/webapp/views/pakStore/locDetlQuery.html | 20 +++++-
zy-asrs-wms/src/main/webapp/static/js/safeSto/safeSto.js | 4
zy-asrs-wms/src/main/webapp/views/order/out.html | 8 +-
zy-asrs-wms/src/main/webapp/views/orderDetlLog/orderDetlLog.html | 8 +-
zy-asrs-wms/src/main/webapp/static/js/order/out.js | 4
zy-asrs-wms/src/main/webapp/views/mat/mat.html | 8 +-
zy-asrs-wms/src/main/webapp/static/js/common.js | 4
zy-asrs-wms/src/main/webapp/views/safeSto/safeSto.html | 4
zy-asrs-wms/src/main/webapp/static/js/order/order.js | 4
zy-asrs-wms/src/main/webapp/views/orderDetl/orderDetl.html | 8 +-
19 files changed, 81 insertions(+), 48 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MatController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MatController.java
index 4718c8e..4f5915a 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MatController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MatController.java
@@ -77,8 +77,16 @@
if (!Cools.isEmpty(param.get("maktx"))) {
wrapper.eq("maktx", param.get("maktx"));
}
+ if (!Cools.isEmpty(param.get("decrees"))) {
+ wrapper.eq("decrees", param.get("decrees"));
+ }
+// if (!Cools.isEmpty(param.get("owner$"))) {
+// wrapper.eq("owner", param.get("owner$"));
+// }
param.remove("matnr");
param.remove("maktx");
+ param.remove("decrees");
+// param.remove("owner$");
allLike(Mat.class, param.keySet(), wrapper, condition);
return R.ok(matService.page(new Page<>(curr, limit), wrapper));
}
diff --git a/zy-asrs-wms/src/main/webapp/static/js/common.js b/zy-asrs-wms/src/main/webapp/static/js/common.js
index c0b9450..b3e8334 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/common.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/common.js
@@ -233,7 +233,7 @@
{field: 'matnr', align: 'center',title: '鍝佸彿', sort:true}
,{field: 'maktx', align: 'center',title: '鍚嶇О', sort:true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
- ,{field: 'batch', align: 'center',title: '鎵瑰彿', width: 300, sort:true}
+ ,{field: 'batch', align: 'center',title: '鎵瑰彿', width: 80, sort:true}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
,{field: 'owner', align: 'center',title: '璐т富'}
@@ -282,7 +282,7 @@
,{field: 'maktx', align: 'center',title: '鍚嶇О', sort:true, width: 150}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
,{field: 'orderType', align: 'center',title: '鍗曟嵁绫诲瀷', hide: false}
- ,{field: 'batch', align: 'center',title: '鎵瑰彿', width: 300, sort:true}
+ ,{field: 'batch', align: 'center',title: '鎵瑰彿', width: 80, sort:true}
,{field: 'anfme', align: 'center',title: '鏁伴噺', width: 70}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜', width: 100}
,{field: 'owner', align: 'center',title: '璐т富', width: 80}
diff --git a/zy-asrs-wms/src/main/webapp/static/js/locDetl/locDetl.js b/zy-asrs-wms/src/main/webapp/static/js/locDetl/locDetl.js
index c3fc15b..c948a57 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/locDetl/locDetl.js
@@ -6,7 +6,7 @@
,{field: 'maktx', align: 'center',title: '鍚嶇О', sort:true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
,{field: 'orderType', align: 'center',title: '鍗曟嵁绫诲瀷', hide: false}
- ,{field: 'batch', align: 'center',title: '鎵瑰彿', width: 300, sort:true}
+ ,{field: 'batch', align: 'center',title: '鎵瑰彿', width: 80, sort:true}
,{field: 'anfme', align: 'center',title: '鏁伴噺', width: 100}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鐮�'}
,{field: 'templet', align: 'center',title: '鏈哄瀷',templet:function(row){
diff --git a/zy-asrs-wms/src/main/webapp/static/js/order/order.js b/zy-asrs-wms/src/main/webapp/static/js/order/order.js
index ed18cb4..37355ea 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/order/order.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/order/order.js
@@ -311,8 +311,8 @@
cellMinWidth: 100,
cols: [[
{type: 'numbers', title: '#'},
- {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
- {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 200},
+ {field: 'matnr', title: '鍝佸悕', width: 160},
+ {field: 'maktx', title: '鍚嶇О', width: 200},
{field: 'batch', title: '搴忓垪鐮�', edit: true},
{field: 'specs', title: '瑙勬牸'},
{field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
diff --git a/zy-asrs-wms/src/main/webapp/static/js/order/out.js b/zy-asrs-wms/src/main/webapp/static/js/order/out.js
index c43ffea..6f0bf25 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/order/out.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/order/out.js
@@ -32,8 +32,8 @@
{type: 'checkbox'}
,{type: 'numbers', title: '#'}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl', width: 160}
- ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜', width: 160}
- ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', width: 200}
+ ,{field: 'matnr', align: 'center',title: '鍝佸悕', width: 160}
+ ,{field: 'maktx', align: 'center',title: '鍚嶇О', width: 200}
,{field: 'batch', align: 'center',title: '搴忓垪鐮�'}
,{field: 'origin', align: 'center',title: '浠撳簱鍙�'}
// ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
diff --git a/zy-asrs-wms/src/main/webapp/static/js/orderDetl/orderDetl.js b/zy-asrs-wms/src/main/webapp/static/js/orderDetl/orderDetl.js
index 305a5f4..ee2474f 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/orderDetl/orderDetl.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/orderDetl/orderDetl.js
@@ -29,8 +29,8 @@
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'qty', align: 'center',title: ''}
- ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜'}
- ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
+ ,{field: 'matnr', align: 'center',title: '鍝佸悕'}
+ ,{field: 'maktx', align: 'center',title: '鍚嶇О'}
,{field: 'batch', align: 'center',title: '鎵瑰彿'}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
,{field: 'model', align: 'center',title: '鍨嬪彿'}
diff --git a/zy-asrs-wms/src/main/webapp/static/js/orderDetlLog/orderDetlLog.js b/zy-asrs-wms/src/main/webapp/static/js/orderDetlLog/orderDetlLog.js
index 3afdfe5..65fc1e2 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/orderDetlLog/orderDetlLog.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/orderDetlLog/orderDetlLog.js
@@ -27,8 +27,8 @@
,{field: 'id', align: 'center',title: 'ID'}
,{field: 'orderId$', align: 'center',title: '璁㈠崟鍐呯爜'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
- ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜'}
- ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
+ ,{field: 'matnr', align: 'center',title: '鍝佸悕'}
+ ,{field: 'maktx', align: 'center',title: '鍚嶇О'}
,{field: 'name', align: 'center',title: '鍚嶇О'}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
,{field: 'model', align: 'center',title: '鍨嬪彿'}
diff --git a/zy-asrs-wms/src/main/webapp/static/js/prior/prior.js b/zy-asrs-wms/src/main/webapp/static/js/prior/prior.js
index 4085b36..aae357c 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/prior/prior.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/prior/prior.js
@@ -28,8 +28,8 @@
,{field: 'uuid', align: 'center',title: '缂栧彿'}
,{field: 'name', align: 'center',title: '鎺ㄨ崘鍚�'}
,{field: 'matId$', align: 'center',title: '鍏宠仈鍟嗗搧'}
- ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿'}
- ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
+ ,{field: 'matnr', align: 'center',title: '鍝佸悕'}
+ ,{field: 'maktx', align: 'center',title: '鍚嶇О'}
,{field: 'nodeId', align: 'center',title: '鍏宠仈璐т綅'}
,{field: 'nodeName', align: 'center',title: '璐т綅鍚嶇О'}
,{field: 'safeQua', align: 'center',title: '瀹夊叏搴撳瓨'}
diff --git a/zy-asrs-wms/src/main/webapp/static/js/report/workCountIn.js b/zy-asrs-wms/src/main/webapp/static/js/report/workCountIn.js
index 0edc32b..e49ec93 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/report/workCountIn.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/report/workCountIn.js
@@ -2,8 +2,8 @@
function getCol() {
var cols = [
{field: 'oneday', align: 'center', title: '鍏ュ簱鏃ユ湡', width: 200}
- ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿'}
- ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
+ ,{field: 'matnr', align: 'center',title: '鍝佸悕'}
+ ,{field: 'maktx', align: 'center',title: '鍚嶇О'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
];
diff --git a/zy-asrs-wms/src/main/webapp/static/js/report/workCountOut.js b/zy-asrs-wms/src/main/webapp/static/js/report/workCountOut.js
index 6534f00..bb72e2f 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/report/workCountOut.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/report/workCountOut.js
@@ -2,8 +2,8 @@
function getCol() {
var cols = [
{field: 'oneday', align: 'center', title: '鍏ュ簱鏃ユ湡', width: 200}
- ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿'}
- ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
+ ,{field: 'matnr', align: 'center',title: '鍝佸悕'}
+ ,{field: 'maktx', align: 'center',title: '鍚嶇О'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
];
diff --git a/zy-asrs-wms/src/main/webapp/static/js/safeSto/safeSto.js b/zy-asrs-wms/src/main/webapp/static/js/safeSto/safeSto.js
index 6390f10..1974d2d 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/safeSto/safeSto.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/safeSto/safeSto.js
@@ -24,8 +24,8 @@
cols: [[
{type: 'numbers', fixed: 'left'}
,{field: 'locNo$', align: 'center',title: '搴撲綅'}
- ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿'}
- ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
+ ,{field: 'matnr', align: 'center',title: '鍝佸悕'}
+ ,{field: 'maktx', align: 'center',title: '鍚嶇О'}
,{field: 'progress', align: 'center',title: '浣跨敤鎯呭喌', templet: '#progressTpl', width: 350}
,{field: 'status', align: 'center',title: '璀︽姤', templet: '#statusTpl', width: 100}
,{field: 'safeQua', align: 'center',title: '瀹夊叏搴撳瓨閲�', style: 'font-weight: bold'}
diff --git a/zy-asrs-wms/src/main/webapp/views/mat/mat.html b/zy-asrs-wms/src/main/webapp/views/mat/mat.html
index 5db8078..e3e9459 100644
--- a/zy-asrs-wms/src/main/webapp/views/mat/mat.html
+++ b/zy-asrs-wms/src/main/webapp/views/mat/mat.html
@@ -94,15 +94,15 @@
<!-- 琛ㄦ牸宸ュ叿鏍�2 -->
<div id="search-box" class="layui-form toolbar" style="padding-top: 5px">
<div class="layui-inline">
- <label class="layui-form-label" style="padding: 8px 15px 8px 15px">鍟嗗搧缂栧彿:</label>
+ <label class="layui-form-label" style="padding: 8px 15px 8px 15px">鍝佸悕:</label>
<div class="layui-input-inline">
- <input name="matnr" class="layui-input" placeholder="杈撳叆鍟嗗搧缂栧彿"/>
+ <input name="matnr" class="layui-input" placeholder="杈撳叆鍝佸悕"/>
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="padding: 8px 15px 8px 15px">鍟嗗搧鍚嶇О:</label>
+ <label class="layui-form-label" style="padding: 8px 15px 8px 15px">鍚嶇О:</label>
<div class="layui-input-inline">
- <input name="maktx" class="layui-input" placeholder="杈撳叆鍟嗗搧鍚嶇О"/>
+ <input name="maktx" class="layui-input" placeholder="杈撳叆鍚嶇О"/>
</div>
</div>
<div class="layui-inline">
diff --git a/zy-asrs-wms/src/main/webapp/views/order/out.html b/zy-asrs-wms/src/main/webapp/views/order/out.html
index ecbbb04..4fe5aa8 100644
--- a/zy-asrs-wms/src/main/webapp/views/order/out.html
+++ b/zy-asrs-wms/src/main/webapp/views/order/out.html
@@ -95,15 +95,15 @@
<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="matnr" class="layui-input" placeholder="鍟嗗搧缂栫爜"/>
+ <input name="matnr" class="layui-input" placeholder="鍝佸悕"/>
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鍟嗗搧鍚嶇О:</label>
+ <label class="layui-form-label">鍚嶇О:</label>
<div class="layui-input-inline">
- <input name="maktx" class="layui-input" placeholder="鍟嗗搧鍚嶇О"/>
+ <input name="maktx" class="layui-input" placeholder="鍚嶇О"/>
</div>
</div>
<div class="layui-inline">
diff --git a/zy-asrs-wms/src/main/webapp/views/orderDetl/orderDetl.html b/zy-asrs-wms/src/main/webapp/views/orderDetl/orderDetl.html
index 1ea98e6..cb70e29 100644
--- a/zy-asrs-wms/src/main/webapp/views/orderDetl/orderDetl.html
+++ b/zy-asrs-wms/src/main/webapp/views/orderDetl/orderDetl.html
@@ -98,15 +98,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="璇疯緭鍏ュ晢鍝佺紪鐮�">
+ <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="maktx" placeholder="璇疯緭鍏ュ晢鍝佸悕绉�">
+ <input class="layui-input" name="maktx" placeholder="璇疯緭鍏ュ悕绉�">
</div>
</div>
<div class="layui-form-item">
diff --git a/zy-asrs-wms/src/main/webapp/views/orderDetlLog/orderDetlLog.html b/zy-asrs-wms/src/main/webapp/views/orderDetlLog/orderDetlLog.html
index ca8b002..b9e878c 100644
--- a/zy-asrs-wms/src/main/webapp/views/orderDetlLog/orderDetlLog.html
+++ b/zy-asrs-wms/src/main/webapp/views/orderDetlLog/orderDetlLog.html
@@ -92,15 +92,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="璇疯緭鍏ュ晢鍝佺紪鐮�">
+ <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="maktx" placeholder="璇疯緭鍏ュ晢鍝佸悕绉�">
+ <input class="layui-input" name="maktx" placeholder="璇疯緭鍏ュ悕绉�">
</div>
</div>
<div class="layui-form-item">
diff --git a/zy-asrs-wms/src/main/webapp/views/pakStore/locDetlQuery.html b/zy-asrs-wms/src/main/webapp/views/pakStore/locDetlQuery.html
index 63e9a08..f5b44ef 100644
--- a/zy-asrs-wms/src/main/webapp/views/pakStore/locDetlQuery.html
+++ b/zy-asrs-wms/src/main/webapp/views/pakStore/locDetlQuery.html
@@ -56,16 +56,26 @@
<input class="layui-input" type="text" name="matnr" placeholder="鍝佸彿" autocomplete="off">
</div>
</div>
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="batch" placeholder="鎵瑰彿" autocomplete="off">
- </div>
- </div>
+<!-- <div class="layui-inline">-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input class="layui-input" type="text" name="batch" placeholder="鎵瑰彿" autocomplete="off">-->
+<!-- </div>-->
+<!-- </div>-->
<div class="layui-inline">
<div class="layui-input-inline">
<input class="layui-input" type="text" name="maktx" placeholder="鍚嶇О" autocomplete="off">
</div>
</div>
+<!-- <div class="layui-inline">-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input class="layui-input" type="text" name="decrees" placeholder="鍒朵护" autocomplete="off">-->
+<!-- </div>-->
+<!-- </div>-->
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="owner" placeholder="鎷ユ湁鑰匢D" autocomplete="off">
+ </div>
+ </div>
<div class="layui-inline">
<div class="layui-input-inline">
<input class="layui-input" type="text" name="zpallet" placeholder="鎵樼洏鐮�" autocomplete="off">
diff --git a/zy-asrs-wms/src/main/webapp/views/pakStore/matQuery.html b/zy-asrs-wms/src/main/webapp/views/pakStore/matQuery.html
index fe5c2e1..6f5f03d 100644
--- a/zy-asrs-wms/src/main/webapp/views/pakStore/matQuery.html
+++ b/zy-asrs-wms/src/main/webapp/views/pakStore/matQuery.html
@@ -30,12 +30,27 @@
<div id="search-box" class="layui-form layui-card-header">
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧缂栧彿" autocomplete="off">
+ <input class="layui-input" type="text" name="matnr" placeholder="鍝佸彿" autocomplete="off">
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="maktx" placeholder="鍟嗗搧鍚嶇О" autocomplete="off">
+ <input class="layui-input" type="text" name="maktx" placeholder="鍚嶇О" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="decrees" placeholder="鍒朵护" autocomplete="off">
+ </div>
+ </div>
+<!-- <div class="layui-inline">-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input class="layui-input" type="text" name="owner$" placeholder="鎷ユ湁鑰�" autocomplete="off">-->
+<!-- </div>-->
+<!-- </div>-->
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="maktx" placeholder="鍚嶇О" autocomplete="off">
</div>
</div>
<!-- 鏃ユ湡鑼冨洿 -->
diff --git a/zy-asrs-wms/src/main/webapp/views/prior/prior.html b/zy-asrs-wms/src/main/webapp/views/prior/prior.html
index 5fdc837..5c1c4eb 100644
--- a/zy-asrs-wms/src/main/webapp/views/prior/prior.html
+++ b/zy-asrs-wms/src/main/webapp/views/prior/prior.html
@@ -92,15 +92,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="璇疯緭鍏ュ晢鍝佺紪鍙�">
+ <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="maktx" placeholder="璇疯緭鍏ュ晢鍝佸悕绉�">
+ <input class="layui-input" name="maktx" placeholder="璇疯緭鍏ュ悕绉�">
</div>
</div>
<div class="layui-form-item">
diff --git a/zy-asrs-wms/src/main/webapp/views/safeSto/safeSto.html b/zy-asrs-wms/src/main/webapp/views/safeSto/safeSto.html
index 473c989..0779541 100644
--- a/zy-asrs-wms/src/main/webapp/views/safeSto/safeSto.html
+++ b/zy-asrs-wms/src/main/webapp/views/safeSto/safeSto.html
@@ -25,12 +25,12 @@
<div id="search-box" class="layui-form layui-card-header">
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧缂栧彿" autocomplete="off">
+ <input class="layui-input" type="text" name="matnr" placeholder="鍝佸悕" autocomplete="off">
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="maktx" placeholder="鍟嗗搧鍚嶇О" autocomplete="off">
+ <input class="layui-input" type="text" name="maktx" placeholder="鍚嶇О" autocomplete="off">
</div>
</div>
<div class="layui-inline">
--
Gitblit v1.9.1