From 8c890f686ae2060c4c2e6afebce6c69c493c2e04 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 13 二月 2023 16:23:41 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/pack/pack.js | 2
src/main/webapp/static/js/trayCode/trayCode.js | 2
src/main/webapp/views/pda/stockIn.html | 10 ++--
src/main/webapp/views/wrkDetlLog/wrkDetlLog_detail.html | 2
src/main/webapp/static/js/basErrLog/basErrLog.js | 2
src/main/webapp/views/pda/comb.html | 6 +-
src/main/webapp/static/js/wrkMast/wrkMast.js | 4 +-
src/main/java/com/zy/common/web/WcsController.java | 2
src/main/webapp/static/js/stoMan/stoQue.js | 2
src/main/webapp/static/js/orderDetl/orderDetl.js | 2
src/main/java/com/zy/asrs/entity/ManLocDetl.java | 2
src/main/webapp/static/js/locDetl/locDetl.js | 4 +-
src/main/webapp/views/locDetl/locDetl_detail.html | 2
src/main/webapp/views/wrkDetl/wrkDetl_detail.html | 2
src/main/webapp/static/js/wrkMastLog/wrkMastLog.js | 2
src/main/webapp/views/trayCode/trayCode.html | 2
src/main/webapp/static/js/order/out.js | 2
src/main/java/com/zy/asrs/controller/TrayCodeController.java | 2
src/main/webapp/static/js/handWrkMast/handWrkMast.js | 4 +-
src/main/webapp/views/orderDetl/orderDetl.html | 4 +-
src/main/webapp/views/stoMan/stoQue.html | 2
src/main/webapp/static/js/common.js | 4 +-
src/main/webapp/static/js/errorWrkMast/errorWrkMast.js | 4 +-
src/main/webapp/views/pack/pack.html | 4 +-
24 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TrayCodeController.java b/src/main/java/com/zy/asrs/controller/TrayCodeController.java
index 555c80d..0426564 100644
--- a/src/main/java/com/zy/asrs/controller/TrayCodeController.java
+++ b/src/main/java/com/zy/asrs/controller/TrayCodeController.java
@@ -151,7 +151,7 @@
}
@RequestMapping(value = "/trayCode/print/auth")
- @ManagerAuth(memo = "鎵樼洏鐮佹墦鍗�")
+ @ManagerAuth(memo = "pack鐮佹墦鍗�")
public R print(@RequestParam String startNo,
@RequestParam Integer count,
@RequestParam Integer type){
diff --git a/src/main/java/com/zy/asrs/entity/ManLocDetl.java b/src/main/java/com/zy/asrs/entity/ManLocDetl.java
index ce546a1..d6ad84f 100644
--- a/src/main/java/com/zy/asrs/entity/ManLocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/ManLocDetl.java
@@ -50,7 +50,7 @@
/**
* 鎵樼洏鐮�
*/
- @ApiModelProperty(value= "鎵樼洏鐮�")
+ @ApiModelProperty(value= "pack鐮�")
private String zpallet;
/**
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index bf59f84..2549d83 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -97,7 +97,7 @@
default:
break;
}
- log.info("WCS鍏ュ簱鎺ュ彛杩斿弬:{},鎵樼洏鐮�:{}", dto, param.getBarcode());
+ log.info("WCS鍏ュ簱鎺ュ彛杩斿弬:{},pack鐮�:{}", dto, param.getBarcode());
return R.ok().add(dto);
}
diff --git a/src/main/webapp/static/js/basErrLog/basErrLog.js b/src/main/webapp/static/js/basErrLog/basErrLog.js
index a38e3b6..8f4b314 100644
--- a/src/main/webapp/static/js/basErrLog/basErrLog.js
+++ b/src/main/webapp/static/js/basErrLog/basErrLog.js
@@ -32,7 +32,7 @@
,{field: 'staNo', align: 'center',title: '鐩爣绔�', hide: true}
,{field: 'sourceStaNo', align: 'center',title: '婧愮珯', hide: true}
,{field: 'sourceLocNo', align: 'center',title: '婧愬簱浣�', hide: true}
- ,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
+ ,{field: 'barcode', align: 'center',title: 'pack鐮�', hide: true}
,{field: 'errCode', align: 'center',title: '寮傚父鐮�'}
,{field: 'error', align: 'center',title: '寮傚父鎻忚堪'}
,{field: 'status$', align: 'center',title: '寮傚父鎯呭喌'}
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index e2df534..4caf0c1 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -195,7 +195,7 @@
,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
,{field: 'sku', align: 'center',title: 'sku', hide: true}
,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
- ,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
+ ,{field: 'barcode', align: 'center',title: 'pack鐮�', hide: true}
,{field: 'origin', align: 'center',title: '浜у湴', hide: true}
,{field: 'manu', align: 'center',title: '鍘傚', hide: true}
,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
@@ -237,7 +237,7 @@
,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
,{field: 'sku', align: 'center',title: 'sku', hide: true}
,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
- ,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
+ ,{field: 'barcode', align: 'center',title: 'pack鐮�', hide: true}
,{field: 'origin', align: 'center',title: '浜у湴', hide: true}
,{field: 'manu', align: 'center',title: '鍘傚', hide: true}
,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
diff --git a/src/main/webapp/static/js/errorWrkMast/errorWrkMast.js b/src/main/webapp/static/js/errorWrkMast/errorWrkMast.js
index bff82e3..02c08b2 100644
--- a/src/main/webapp/static/js/errorWrkMast/errorWrkMast.js
+++ b/src/main/webapp/static/js/errorWrkMast/errorWrkMast.js
@@ -30,7 +30,7 @@
,{field: 'staNo$', align: 'center',title: '鐩爣绔�', hide:true}
,{field: 'sourceLocNo$', align: 'center',title: '婧愬簱浣�', hide:true}
,{field: 'locNo$', align: 'center',title: '鐩爣搴撲綅', hide:true}
- ,{field: 'barcode', align: 'center',title: '鏉＄爜', hide:true}
+ ,{field: 'barcode', align: 'center',title: 'pack鐮�', hide:true}
,{field: 'updMk', align: 'center',title: '寮傚父鏍囪'}
,{field: 'errorTime$', align: 'center',title: '寮傚父璁板綍鏃堕棿'}
,{field: 'errorMemo', align: 'center',title: '寮傚父鍐呭'}
@@ -368,7 +368,7 @@
,{field: 'werks', align: 'center',title: '宸ュ巶'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'altme', align: 'center',title: '鍗曚綅'}
- ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
+ ,{field: 'zpallet', align: 'center',title: 'pack鐮�'}
,{field: 'bname', align: 'center',title: '鐢ㄦ埛ID'}
,{field: 'memo', align: 'center',title: '澶囨敞'}
diff --git a/src/main/webapp/static/js/handWrkMast/handWrkMast.js b/src/main/webapp/static/js/handWrkMast/handWrkMast.js
index 686640d..75f136a 100644
--- a/src/main/webapp/static/js/handWrkMast/handWrkMast.js
+++ b/src/main/webapp/static/js/handWrkMast/handWrkMast.js
@@ -30,7 +30,7 @@
,{field: 'staNo$', align: 'center',title: '鐩爣绔�', hide:true}
,{field: 'sourceLocNo$', align: 'center',title: '婧愬簱浣�', hide:true}
,{field: 'locNo$', align: 'center',title: '鐩爣搴撲綅', hide:true}
- ,{field: 'barcode', align: 'center',title: '鏉＄爜', hide:true}
+ ,{field: 'barcode', align: 'center',title: 'pack鐮�', hide:true}
,{field: 'manuType', align: 'center',title: '澶勭悊鏂瑰紡'}
@@ -364,7 +364,7 @@
,{field: 'werks', align: 'center',title: '宸ュ巶'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'altme', align: 'center',title: '鍗曚綅'}
- ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
+ ,{field: 'zpallet', align: 'center',title: 'pack鐮�'}
,{field: 'bname', align: 'center',title: '鐢ㄦ埛ID'}
,{field: 'memo', align: 'center',title: '澶囨敞'}
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index 211c380..721bed5 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -7,7 +7,7 @@
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
,{field: 'batch', align: 'center',title: '鎵瑰彿', width: 300, sort:true}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
- ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
+ ,{field: 'zpallet', align: 'center',title: 'pack鐮�'}
,{field: 'specs', align: 'center',title: '閰嶇疆'}
,{field: 'model', align: 'center',title: '浠ｇ爜', hide: true}
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
@@ -16,7 +16,7 @@
,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
,{field: 'sku', align: 'center',title: 'sku', hide: true}
,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
- ,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
+ ,{field: 'barcode', align: 'center',title: 'pack鐮�', hide: true}
,{field: 'origin', align: 'center',title: '浜у湴', hide: true}
,{field: 'manu', align: 'center',title: '鍘傚', hide: true}
,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
diff --git a/src/main/webapp/static/js/order/out.js b/src/main/webapp/static/js/order/out.js
index be85831..aa84663 100644
--- a/src/main/webapp/static/js/order/out.js
+++ b/src/main/webapp/static/js/order/out.js
@@ -42,7 +42,7 @@
// ,{field: 'name', align: 'center',title: '鍚嶇О'}
// ,{field: 'model', align: 'center',title: '鍨嬪彿'}
,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
- ,{field: 'barcode', align: 'center',title: '鍟嗗搧鏉＄爜', hide: true}
+ ,{field: 'barcode', align: 'center',title: 'pack鐮�', hide: true}
// ,{field: 'supplier', align: 'center',title: '渚涘簲鍟�'}
// ,{field: 'unitPrice', align: 'center',title: '鍗曚环'}
// ,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�'}
diff --git a/src/main/webapp/static/js/orderDetl/orderDetl.js b/src/main/webapp/static/js/orderDetl/orderDetl.js
index caef270..db43d3c 100644
--- a/src/main/webapp/static/js/orderDetl/orderDetl.js
+++ b/src/main/webapp/static/js/orderDetl/orderDetl.js
@@ -32,7 +32,7 @@
,{field: 'model', align: 'center',title: '鍨嬪彿'}
,{field: 'batch', align: 'center',title: '鎵瑰彿'}
,{field: 'unit', align: 'center',title: '鍗曚綅'}
- ,{field: 'barcode', align: 'center',title: '鍟嗗搧鏉＄爜'}
+ ,{field: 'barcode', align: 'center',title: 'pack鐮�'}
,{field: 'supplier', align: 'center',title: '渚涘簲鍟�'}
,{field: 'unitPrice', align: 'center',title: '鍗曚环'}
,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�'}
diff --git a/src/main/webapp/static/js/pack/pack.js b/src/main/webapp/static/js/pack/pack.js
index 7236aae..11aae05 100644
--- a/src/main/webapp/static/js/pack/pack.js
+++ b/src/main/webapp/static/js/pack/pack.js
@@ -23,7 +23,7 @@
cols: [[
{type: 'checkbox'}
// ,{field: 'id', align: 'center',title: 'ID'}
- ,{field: 'barcode',title: '鏉＄爜'}
+ ,{field: 'barcode',title: 'pack鐮�'}
,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', minWidth: 250, width: 250}
,{field: 'batch', align: 'center',title: '鎵瑰彿', hide: true}
,{field: 'settle$', align: 'center',title: '鐘舵��', templet: '#settleTpl', minWidth: 160, width: 160}
diff --git a/src/main/webapp/static/js/stoMan/stoQue.js b/src/main/webapp/static/js/stoMan/stoQue.js
index 45f0d32..934eb69 100644
--- a/src/main/webapp/static/js/stoMan/stoQue.js
+++ b/src/main/webapp/static/js/stoMan/stoQue.js
@@ -215,7 +215,7 @@
,{field: 'werks', align: 'center',title: '宸ュ巶'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'altme', align: 'center',title: '鍗曚綅'}
- ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
+ ,{field: 'zpallet', align: 'center',title: 'pack鐮�'}
,{field: 'bname', align: 'center',title: '鐢ㄦ埛ID'}
]],
request: {
diff --git a/src/main/webapp/static/js/trayCode/trayCode.js b/src/main/webapp/static/js/trayCode/trayCode.js
index bc70c7a..83b0ae8 100644
--- a/src/main/webapp/static/js/trayCode/trayCode.js
+++ b/src/main/webapp/static/js/trayCode/trayCode.js
@@ -105,7 +105,7 @@
case "btnTray":
layer.open({
type: 1,
- title: '鐢熸垚鎵樼洏鐮�',
+ title: '鐢熸垚pack鐮�',
offset: '100px',
area: ['360px'],
shade: 0.1,
diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js
index fe33064..2931ae0 100644
--- a/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -30,7 +30,7 @@
,{field: 'staNo$', align: 'center',title: '鐩爣绔�'}
,{field: 'sourceLocNo$', align: 'center',title: '婧愬簱浣�'}
,{field: 'locNo$', align: 'center',title: '鐩爣搴撲綅'}
- ,{field: 'barcode', align: 'center',title: '鏉＄爜'}
+ ,{field: 'barcode', align: 'center',title: 'pack鐮�'}
,{field: 'preHave', align: 'center',title: '鍏堝叆鍝�', hide: true}
,{field: 'takeNone', align: 'center',title: '绌烘搷浣�', hide: true}
// ,{field: 'picking', align: 'center',title: '鎷ｆ枡', templet:function(row){
@@ -557,7 +557,7 @@
,{field: 'werks', align: 'center',title: '宸ュ巶'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'altme', align: 'center',title: '鍗曚綅'}
- ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
+ ,{field: 'zpallet', align: 'center',title: 'pack鐮�'}
,{field: 'bname', align: 'center',title: '鐢ㄦ埛ID'}
,{field: 'memo', align: 'center',title: '澶囨敞'}
diff --git a/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js b/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js
index e637bfa..87c70f3 100644
--- a/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js
+++ b/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js
@@ -59,7 +59,7 @@
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:true}
// ,{field: 'appeUser$', align: 'center',title: '鍒涘缓鑰�',event: 'appeUser', style: 'cursor:pointer'}
// ,{field: 'appeTime$', align: 'center',title: '娣诲姞鏃堕棿'}
- ,{field: 'barcode', align: 'center',title: '鏉＄爜'}
+ ,{field: 'barcode', align: 'center',title: 'pack鐮�'}
// ,{field: 'fullPlt', align: 'center',title: '婊℃澘', templet:function(row){
// var html = "<input value='fullPlt' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
// if(row.fullPlt === 'Y'){html += " checked ";}
diff --git a/src/main/webapp/views/locDetl/locDetl_detail.html b/src/main/webapp/views/locDetl/locDetl_detail.html
index 7684ede..5512afe 100644
--- a/src/main/webapp/views/locDetl/locDetl_detail.html
+++ b/src/main/webapp/views/locDetl/locDetl_detail.html
@@ -90,7 +90,7 @@
</div>
</div>
<div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">鎵樼洏鏉＄爜锛�</label>
+ <label class="layui-form-label">pack鐮侊細</label>
<div class="layui-input-inline">
<input id="zpallet" class="layui-input" type="text">
</div>
diff --git a/src/main/webapp/views/orderDetl/orderDetl.html b/src/main/webapp/views/orderDetl/orderDetl.html
index 2f890dd..76fc62e 100644
--- a/src/main/webapp/views/orderDetl/orderDetl.html
+++ b/src/main/webapp/views/orderDetl/orderDetl.html
@@ -124,9 +124,9 @@
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">鍟嗗搧鏉＄爜: </label>
+ <label class="layui-form-label">鍟嗗搧pack鐮�: </label>
<div class="layui-input-block">
- <input class="layui-input" name="barcode" placeholder="璇疯緭鍏ュ晢鍝佹潯鐮�">
+ <input class="layui-input" name="barcode" placeholder="璇疯緭鍏ュ晢鍝乸ack鐮�">
</div>
</div>
<div class="layui-form-item">
diff --git a/src/main/webapp/views/pack/pack.html b/src/main/webapp/views/pack/pack.html
index a0acf45..3c2a67f 100644
--- a/src/main/webapp/views/pack/pack.html
+++ b/src/main/webapp/views/pack/pack.html
@@ -91,9 +91,9 @@
<div class="layui-row">
<div class="layui-col-md12">
<div class="layui-form-item">
- <label class="layui-form-label layui-form-required">鏉＄爜: </label>
+ <label class="layui-form-label layui-form-required">pack鐮�: </label>
<div class="layui-input-block">
- <input class="layui-input" name="barcode" placeholder="璇疯緭鍏ユ潯鐮�" lay-vertype="tips" lay-verify="required">
+ <input class="layui-input" name="barcode" placeholder="璇疯緭鍏ack鐮�" lay-vertype="tips" lay-verify="required">
</div>
</div>
<div class="layui-form-item">
diff --git a/src/main/webapp/views/pda/comb.html b/src/main/webapp/views/pda/comb.html
index 4739ffb..aadc803 100644
--- a/src/main/webapp/views/pda/comb.html
+++ b/src/main/webapp/views/pda/comb.html
@@ -19,7 +19,7 @@
<!-- 澶撮儴 -->
<header>
<div class="layui-input-inline">
- <label class="layui-form-label">鏉＄爜</label>
+ <label class="layui-form-label">pack鐮�</label>
<input class="layui-input" type="number" id="code" onkeyup="findCode(this)" oninput="if(value.length>8)value=value.slice(0,8)" placeholder="鎵爜 / 杈撳叆" autocomplete="off">
</div>
<div style="margin: 5px 5px">
@@ -122,12 +122,12 @@
function comb() {
let barcode = $('#code').val();
if (isEmpty(barcode)) {
- tips("鎵樼洏鏉＄爜涓虹┖", true);
+ tips("鎵樼洏pack鐮佷负绌�", true);
// document.getElementById("code").focus();
return;
}
if (barcode.length !== 8) {
- tips("鏉＄爜蹇呴』涓�8浣�", true);
+ tips("pack鐮佸繀椤讳负8浣�", true);
return;
}
if (matData.length === 0) {
diff --git a/src/main/webapp/views/pda/stockIn.html b/src/main/webapp/views/pda/stockIn.html
index 9384793..1bcdca9 100644
--- a/src/main/webapp/views/pda/stockIn.html
+++ b/src/main/webapp/views/pda/stockIn.html
@@ -71,7 +71,7 @@
<!-- 澶撮儴 -->
<header>
<div class="layui-input-inline">
- <label class="layui-form-label">鏉＄爜</label>
+ <label class="layui-form-label">pack鐮�</label>
<input class="layui-input" type="number" id="code" onkeyup="findCode(this)" oninput="if(value.length>8)value=value.slice(0,8)" placeholder="鎵爜 / 杈撳叆" autocomplete="off">
</div>
<div style="margin: 5px 5px" class="layui-form">
@@ -213,11 +213,11 @@
function pakIn() {
var barcode = $('#code').val();
if (isEmpty(barcode)) {
- tips("鎵樼洏鏉＄爜涓虹┖", true);
+ tips("pack鐮佷负绌�", true);
return;
}
if (barcode.length !== 8) {
- tips("鏉＄爜蹇呴』涓�8浣�", true);
+ tips("pack鐮佸繀椤讳负8浣�", true);
return;
}
if (matData.length === 0) {
@@ -258,11 +258,11 @@
function emptyPakIn() {
var barcode = $('#code').val();
if (isEmpty(barcode)) {
- tips("鎵樼洏鏉＄爜涓虹┖", true);
+ tips("pack鐮佷负绌�", true);
return;
}
if (barcode.length !== 8) {
- tips("鏉＄爜蹇呴』涓�8浣�", true);
+ tips("pack鐮佸繀椤讳负8浣�", true);
return;
}
var site = $('#putSiteSelect').val();
diff --git a/src/main/webapp/views/stoMan/stoQue.html b/src/main/webapp/views/stoMan/stoQue.html
index 0e92375..20e03bd 100644
--- a/src/main/webapp/views/stoMan/stoQue.html
+++ b/src/main/webapp/views/stoMan/stoQue.html
@@ -50,7 +50,7 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="barcode" placeholder="鎵樼洏鐮�" autocomplete="off">
+ <input class="layui-input" type="text" name="barcode" placeholder="pack鐮�" autocomplete="off">
</div>
</div>
<!-- 鏃ユ湡鑼冨洿 -->
diff --git a/src/main/webapp/views/trayCode/trayCode.html b/src/main/webapp/views/trayCode/trayCode.html
index e619fa8..7d54c95 100644
--- a/src/main/webapp/views/trayCode/trayCode.html
+++ b/src/main/webapp/views/trayCode/trayCode.html
@@ -86,7 +86,7 @@
<script type="text/html" id="toolbar">
<div class="layui-btn-container">
- <button class="layui-btn layui-btn-normal" id="btn-tray" lay-event="btnTray"><i class="layui-icon layui-icon-print" style="font-size: 15px"></i>鐢熸垚鎵樼洏鐮�</button>
+ <button class="layui-btn layui-btn-normal" id="btn-tray" lay-event="btnTray"><i class="layui-icon layui-icon-print" style="font-size: 15px"></i>鐢熸垚pack鐮�</button>
<button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">瀵煎嚭</button>
</div>
</script>
diff --git a/src/main/webapp/views/wrkDetl/wrkDetl_detail.html b/src/main/webapp/views/wrkDetl/wrkDetl_detail.html
index d4703a4..bd2b4b5 100644
--- a/src/main/webapp/views/wrkDetl/wrkDetl_detail.html
+++ b/src/main/webapp/views/wrkDetl/wrkDetl_detail.html
@@ -82,7 +82,7 @@
</div>
</div>
<div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">鎵樼洏鏉＄爜锛�</label>
+ <label class="layui-form-label">pack鐮侊細</label>
<div class="layui-input-inline">
<input id="zpallet" class="layui-input" type="text">
</div>
diff --git a/src/main/webapp/views/wrkDetlLog/wrkDetlLog_detail.html b/src/main/webapp/views/wrkDetlLog/wrkDetlLog_detail.html
index 72bf6f1..092120b 100644
--- a/src/main/webapp/views/wrkDetlLog/wrkDetlLog_detail.html
+++ b/src/main/webapp/views/wrkDetlLog/wrkDetlLog_detail.html
@@ -90,7 +90,7 @@
</div>
</div>
<div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">鎵樼洏鏉＄爜锛�</label>
+ <label class="layui-form-label">pack鐮侊細</label>
<div class="layui-input-inline">
<input id="zpallet" class="layui-input" type="text">
</div>
--
Gitblit v1.9.1