From e47184cc704621dd439fe24be40b94fed927b76f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 11 十月 2024 10:51:00 +0800
Subject: [PATCH] 2024-10-11
---
src/utils/utils-custom.js | 38 +++++++++++++++++++++++++++++---------
1 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/src/utils/utils-custom.js b/src/utils/utils-custom.js
index 9dd2f92..3a6e6de 100644
--- a/src/utils/utils-custom.js
+++ b/src/utils/utils-custom.js
@@ -3196,13 +3196,17 @@
resetButton(item, group.subButton)
})
} else if (item.type === 'module' && item.subtype === 'invoice') {
- let msg = getDataSource(item.buyer, [])
-
- sqls.push({uuid: item.uuid + 'buyer', type: 'datasource', ...msg})
+ if (item.buyer.setting && item.buyer.setting.interType === 'system') {
+ let msg = getDataSource(item.buyer, [])
+
+ sqls.push({uuid: item.uuid + 'buyer', type: 'datasource', ...msg})
+ }
- let _msg = getDataSource(item.detail, [])
-
- sqls.push({uuid: item.uuid + 'detail', type: 'datasource', ..._msg})
+ if (item.detail.setting && item.detail.setting.interType === 'system') {
+ let _msg = getDataSource(item.detail, [])
+
+ sqls.push({uuid: item.uuid + 'detail', type: 'datasource', ..._msg})
+ }
let btnmsg = getInvoicePreSql(item.billSaveBtn, item.$menuname + '-' + item.billSaveBtn.label)
@@ -3279,6 +3283,10 @@
} else if (cell.OpenType === 'excelOut') {
if (cell.intertype === 'system' && cell.verify && cell.verify.dataType === 'custom') {
let msg = getExcelOutSql(cell, item)
+
+ sqls.push({uuid: cell.uuid, type: 'excelOut', ...msg})
+ } else if (cell.intertype === 'system' && cell.verify && item.subtype === 'dualdatacard' && item.setting && item.setting.interType === 'system') {
+ let msg = getDoubleExcelOutSql(cell, item)
sqls.push({uuid: cell.uuid, type: 'excelOut', ...msg})
}
@@ -4662,8 +4670,6 @@
}
let getDataSource = (item, mainSearch = [], type) => {
- if (!item.setting || item.setting.interType !== 'system') return
-
let searches = item.search || []
if (item.setting.useMSearch === 'true' && mainSearch.length > 0) {
searches = [...searches, ...mainSearch]
@@ -4714,7 +4720,7 @@
_search = ''
}
- if (/\s/.test(_dataresource)) {
+ if (/\s/.test(_dataresource) && !/\)\s+tb$/.test(_dataresource)) {
_dataresource = '(' + _dataresource + ') tb'
}
@@ -5548,6 +5554,20 @@
return msg
}
+ let getDoubleExcelOutSql = (btn, component) => {
+ let item = fromJS(component).toJS()
+ item.search = item.$searches || []
+ item.subtype = 'datacard'
+ item.columns = [...item.columns, ...item.subColumns]
+
+ item.setting.laypage = btn.pagination
+ item.setting.$name = btn.logLabel || ''
+
+ let msg = getDataSource(item, [])
+
+ return msg
+ }
+
let getPrintSql = (btn, component) => {
let item = {setting: {}, columns: btn.verify.columns || [], search: [], useMSearch: 'false'}
--
Gitblit v1.8.0