From 07fc18f77a9764bd47857e30d65abc03cc1e439c Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期五, 08 十一月 2024 16:21:56 +0800
Subject: [PATCH] Merge branch 'phyzwms2' into phyzasrs-erp
---
src/main/webapp/views/pda/comb.html | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/views/pda/comb.html b/src/main/webapp/views/pda/comb.html
index 4739ffb..00585ad 100644
--- a/src/main/webapp/views/pda/comb.html
+++ b/src/main/webapp/views/pda/comb.html
@@ -55,8 +55,8 @@
cellMinWidth: 50,
cols: [[
{fixed: 'left', align: 'center', field: 'count', title: '鏁伴噺', style:'color: blue', width:50},
- {field: 'matnr', align: 'center', title: '鍟嗗搧缂栧彿'},
- {field: 'maktx', align: 'center', title: '鍟嗗搧鍚嶇О'}
+ {field: 'matnr', align: 'center', title: '鐗╂枡鍙�'},
+ {field: 'maktx', align: 'center', title: '鐗╂枡鍚嶇О'}
]],
done: function (res, curr, count) {
}
@@ -122,7 +122,7 @@
function comb() {
let barcode = $('#code').val();
if (isEmpty(barcode)) {
- tips("鎵樼洏鏉＄爜涓虹┖", true);
+ tips("璐ф灦鏉＄爜涓虹┖", true);
// document.getElementById("code").focus();
return;
}
--
Gitblit v1.9.1