From 87b85735d23c6751f43c4cdc8372e8ef653811d1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 12 九月 2024 11:19:58 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/views/billprint/index.jsx | 40 +++++++++++++++++++++++++++++++---------
1 files changed, 31 insertions(+), 9 deletions(-)
diff --git a/src/views/billprint/index.jsx b/src/views/billprint/index.jsx
index f708040..0ea001b 100644
--- a/src/views/billprint/index.jsx
+++ b/src/views/billprint/index.jsx
@@ -558,11 +558,11 @@
} else if (_tailScript) {
component.setting.sync = 'false'
}
+ component.dataName = 'mk' + component.uuid.slice(-18)
// floor 缁勪欢鐨勫眰绾�
// pageable 鏄惁鍒嗛〉锛岀粍浠跺睘鎬э紝涓嶅垎椤电殑缁勪欢鎵嶅彲浠ョ粺涓�鏌ヨ
if (component.setting.sync === 'true') {
- component.dataName = 'mk' + component.uuid.slice(-18)
let param = this.getDefaultParam(component)
_pars.push(param)
} else if (component.subtype !== 'dualdatacard') {
@@ -580,8 +580,28 @@
_pars = this.getFormatParam(_pars, config.MenuName)
if (_pars) {
- _pars.componentId = 'union'
+ _pars.componentId = ''
params.unshift(_pars)
+ } else if (window.backend && config.allSqls && params.length > 0) {
+ let data = []
+ params = params.filter(item => {
+ if (!item.$backend || item.public) return true
+
+ item.data[0].exps.forEach(cell => {
+ if (cell.key === 'mk_obj_name') {
+ cell.value = 'mk' + item.componentId.slice(-18)
+ }
+ })
+ data.push(item.data[0])
+ return false
+ })
+ if (data.length > 0) {
+ params.push({
+ $backend: true,
+ componentId: '',
+ data
+ })
+ }
}
if (config.everyPCount && !config.printPage) { // 鍏煎
@@ -904,11 +924,13 @@
return new Promise(resolve => {
Api.genericInterface(item).then(res => {
if (!res.status) {
- notification.warning({
- top: 92,
- message: res.message,
- duration: 5
- })
+ if (res.ErrCode !== '-2') {
+ notification.warning({
+ top: 92,
+ message: res.message,
+ duration: 5
+ })
+ }
resolve()
} else {
let _data = { $$empty: true }
@@ -950,7 +972,7 @@
}
if (res.ErrCode === 'version_up') {
this.reloadTabs()
- } else {
+ } else if (res.ErrCode !== '-2') {
notification.warning({
top: 92,
message: res.message,
@@ -990,7 +1012,7 @@
_results.forEach(res => {
if ((res.componentId === item.uuid || res.componentId === item.componentId) && res.data) {
item.dataArray = fromJS(res.data).toJS()
- } else if (res.componentId === 'union' && res[item.dataName]) {
+ } else if (res[item.dataName]) {
let data = res[item.dataName]
if (!Array.isArray(data)) {
data = [data]
--
Gitblit v1.8.0