From d32c4297cc47342f0a5229d5108cc7c26809f50f Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期四, 25 七月 2024 13:23:36 +0800 Subject: [PATCH] Merge branch 'master' into positec --- src/tabviews/zshare/actionList/printbutton/index.jsx | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/src/tabviews/zshare/actionList/printbutton/index.jsx b/src/tabviews/zshare/actionList/printbutton/index.jsx index 6d2e96c..c27c005 100644 --- a/src/tabviews/zshare/actionList/printbutton/index.jsx +++ b/src/tabviews/zshare/actionList/printbutton/index.jsx @@ -1435,9 +1435,14 @@ if (item.Field) { fields.push(item.Field) // 鏉$爜浜岀淮鐮佸瓧娈典笉鍙负绌� - if (item.Type === 'qrcode' || item.Type === 'barcode') { + if (item.Type === 'barcode') { nonEFields.push(item.Field) } + } else if (!item.Value) { + // 鏉$爜浜岀淮鐮佸唴瀹逛笉鍙负绌� + if (item.Type === 'barcode') { + error = '妯℃澘涓潯鐮�/浜岀淮鐮佸唴瀹逛笉鍙负绌猴紒' + } } control.push(item) -- Gitblit v1.8.0