From ba4d6e414fbb37121e80815d3f5ab1aca7a60b08 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 28 十月 2024 13:59:34 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/utils/utils-custom.js | 105 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 84 insertions(+), 21 deletions(-)
diff --git a/src/utils/utils-custom.js b/src/utils/utils-custom.js
index 3a6e6de..59a8add 100644
--- a/src/utils/utils-custom.js
+++ b/src/utils/utils-custom.js
@@ -3100,8 +3100,14 @@
item.setting.$name = item.$menuname || ''
let msg = getDataSource(item, mainSearch)
+ let roleId = config.uuid
+ if (item.wrap && item.wrap.permission === 'false') {
+ roleId = ''
+ } else if (item.setting.database === 'sso') {
+ roleId = ''
+ }
- sqls.push({uuid: item.uuid, type: 'datasource', ...msg})
+ sqls.push({uuid: item.uuid, roleId: roleId, type: 'datasource', ...msg})
} else if (item.setting && item.setting.useMSearch === 'true') {
let searches = item.search || []
if (mainSearch.length > 0) {
@@ -3226,6 +3232,14 @@
let resetButton = (item, cell, isback) => {
cell.logLabel = item.$menuname + '-' + cell.label
+ let roleId = cell.uuid
+ if (item.wrap && item.wrap.permission === 'false') {
+ roleId = ''
+ } else if (cell.hidden === 'true' || cell.permission === 'false') {
+ roleId = ''
+ } else if (cell.database === 'sso') {
+ roleId = ''
+ }
if (['exec', 'prompt', 'pop', 'form', 'formSubmit'].includes(cell.OpenType)) {
if (cell.intertype === 'system' || cell.procMode === 'system') { // 绯荤粺鎺ュ彛
@@ -3239,11 +3253,11 @@
let msg = getSysDefaultSql(cell, _item)
- sqls.push({uuid: cell.uuid, type: 'button', ...msg})
+ sqls.push({uuid: cell.uuid, roleId: roleId, type: 'button', ...msg})
} else {
let msg = getSysDefaultSql(cell, item)
- sqls.push({uuid: cell.uuid, type: 'button', ...msg})
+ sqls.push({uuid: cell.uuid, roleId: roleId, type: 'button', ...msg})
}
}
if (cell.callbackType === 'script' && cell.verify && cell.verify.cbScripts) {
@@ -3278,24 +3292,30 @@
if (cell.intertype === 'system') {
let msg = getExcelInSql(cell)
- sqls.push({uuid: cell.uuid, type: 'excelIn', ...msg})
+ sqls.push({uuid: cell.uuid, roleId: roleId, type: 'excelIn', ...msg})
}
} 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})
+ sqls.push({uuid: cell.uuid, roleId: roleId, type: 'excelOut', ...msg})
+ } else if (cell.intertype === 'system' && cell.verify && item.setting && item.setting.interType === 'system') {
+ if (appType === 'mob') {
+ cell.pagination = 'false'
+ }
+ if (item.subtype === 'dualdatacard' || item.setting.laypage !== cell.pagination) {
+ let msg = getDoubleExcelOutSql(cell, item)
+
+ sqls.push({uuid: cell.uuid, roleId: roleId, type: 'excelOut', ...msg})
+ }
}
+
} else if (cell.OpenType === 'funcbutton') {
if (cell.funcType === 'print') {
if (cell.intertype === 'system' && cell.verify && cell.verify.dataType === 'custom') {
let msg = getPrintSql(cell, item)
- sqls.push({uuid: cell.uuid, type: 'print', ...msg})
+ sqls.push({uuid: cell.uuid, roleId: roleId, type: 'print', ...msg})
}
if (cell.execMode === 'pop' && cell.modal && cell.modal.fields) {
cell.modal.fields.forEach(form => {
@@ -3314,13 +3334,13 @@
} else if ((cell.funcType === 'refund' || cell.funcType === 'pay') && cell.payMode === 'system') {
let msg = getPaySql(cell, item)
- sqls.push({uuid: cell.uuid, type: 'pay', ...msg})
+ sqls.push({uuid: cell.uuid, roleId: roleId, type: 'pay', ...msg})
}
} else if (cell.OpenType === 'innerpage' || cell.OpenType === 'outerpage') {
if (cell.pageTemplate === 'pay' && cell.payMode === 'system') {
let msg = getPaySql(cell, item)
- sqls.push({uuid: cell.uuid, type: 'pay', ...msg})
+ sqls.push({uuid: cell.uuid, roleId: roleId, type: 'pay', ...msg})
}
} else if (cell.OpenType === 'popview') {
if (cell.config && cell.config.components) {
@@ -4051,6 +4071,33 @@
if @works_flow_countersign@ = 'Y'
begin
/* 宸ヤ綔娴侀粯璁ql锛堜細绛撅級 */
+ set @retmsg =''
+ select @retmsg='X' from s_my_works_flow_role where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0 and userid =@userid@ and works_flow_detail_id =@works_flow_detail_id
+
+ if @retmsg =''
+ begin
+ select @retmsg='X' from s_my_works_flow_role where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and userid=@userid@ and works_flow_detail_id =@works_flow_detail_id
+ if @retmsg !=''
+ begin
+ select @ErrorCode='E', @retmsg='褰撳墠鍗曟嵁宸插鏍革紝璇峰埛鏂板悗閲嶈瘯'
+ goto aaa
+ end
+
+ set @retmsg =''
+ select @retmsg=userid from s_my_works_flow_role where works_flow_id=@id@ and works_flow_code=@works_flow_code@ and deleted=0 and works_flow_detail_id =@works_flow_detail_id
+
+ if @retmsg !=''
+ begin
+ select @retmsg=workerCode+workerName from BD_workers where id=@retmsg
+
+ select @retmsg='椤甸潰鏁版嵁宸叉洿鏂帮紝鎴栨病鏈夊綋鍓嶅崟鎹殑瀹℃壒鏉冮檺锛岃鑱旂郴'+@retmsg+'鎿嶄綔'
+ goto aaa
+ end
+
+ select @retmsg='椤甸潰鏁版嵁宸叉洿鏂帮紝鎴栨病鏈夊綋鍓嶅崟鎹殑瀹℃壒鏉冮檺'
+ goto aaa
+ end
+
declare @works_flow_statuscharone nvarchar(50),@works_flow_statuschartwo nvarchar(50),@works_flow_statuscharthree nvarchar(50),@works_flow_statuscharfour nvarchar(50),@works_flow_statuscharfive nvarchar(50),@works_flow_key_id nvarchar(50),@works_flow_key_status nvarchar(20),@s_my_works_flow_log_param nvarchar(max),@s_my_works_flow_log_status int,@s_my_works_flow_log_statusname nvarchar(50),@s_my_works_flow_log_detail_id nvarchar(50)
select @works_flow_statuscharone='',@works_flow_statuschartwo='',@works_flow_statuscharthree='',@works_flow_statuscharfour='',@works_flow_statuscharfive='',@works_flow_key_id='',@works_flow_key_status ='',@s_my_works_flow_log_param='',@s_my_works_flow_log_status=0,@s_my_works_flow_log_statusname='',@s_my_works_flow_log_detail_id=''
@@ -4107,11 +4154,11 @@
begin
/* 宸ヤ綔娴侀粯璁ql锛堟垨绛撅級 */
set @retmsg =''
- select @retmsg='X' from s_my_works_flow_role where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0 and userid =@userid@
+ select @retmsg='X' from s_my_works_flow_role where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0 and userid =@userid@ and works_flow_detail_id =@works_flow_detail_id
if @retmsg =''
begin
- select @retmsg='X' from s_my_works_flow_role where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and userid=@userid@
+ select @retmsg='X' from s_my_works_flow_role where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and userid=@userid@ and works_flow_detail_id =@works_flow_detail_id
if @retmsg !=''
begin
@@ -4121,18 +4168,31 @@
if @dataM@ !=''
begin
- set @retmsg =''
- select @retmsg='X' from s_my_works_flow_role where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0
+ set @retmsg =''
+ select @retmsg='X' from s_my_works_flow_role where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0 and works_flow_detail_id =@works_flow_detail_id
- if @retmsg != ''
+ if @retmsg != ''
+ begin
+ goto goto_mk
+ end
+ end
+ else
+ begin
+ set @retmsg =''
+ select @retmsg=userid from s_my_works_flow_role where works_flow_id=@id@ and works_flow_code=@works_flow_code@ and deleted=0 and works_flow_detail_id =@works_flow_detail_id
+
+ if @retmsg !=''
begin
- goto goto_mk
+ select @retmsg=workerCode+workerName from BD_workers where id=@retmsg
+
+ select @retmsg='椤甸潰鏁版嵁宸叉洿鏂帮紝鎴栨病鏈夊綋鍓嶅崟鎹殑瀹℃壒鏉冮檺锛岃鑱旂郴'+@retmsg+'鎿嶄綔'
+ goto aaa
end
end
-
+
select @retmsg='椤甸潰鏁版嵁宸叉洿鏂帮紝鎴栨病鏈夊綋鍓嶅崟鎹殑瀹℃壒鏉冮檺'
goto aaa
- end
+ end
goto_mk:
@@ -5557,8 +5617,11 @@
let getDoubleExcelOutSql = (btn, component) => {
let item = fromJS(component).toJS()
item.search = item.$searches || []
+
+ if (item.subtype === 'dualdatacard') {
+ item.columns = [...item.columns, ...item.subColumns]
+ }
item.subtype = 'datacard'
- item.columns = [...item.columns, ...item.subColumns]
item.setting.laypage = btn.pagination
item.setting.$name = btn.logLabel || ''
--
Gitblit v1.8.0