From 6b7d0fd448738e8780c8b865d17d293a4251f9be Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 09 五月 2024 15:34:30 +0800
Subject: [PATCH] 2024-05-09
---
src/utils/utils.js | 89 ++++++++++++++++++--------------------------
1 files changed, 36 insertions(+), 53 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index c69f18b..64d2720 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -2151,6 +2151,10 @@
let detailId = ''
let error = ''
let userid = sessionStorage.getItem('UserID') || ''
+ let checkIds = []
+ let checkUsers = []
+ let noticeIds = []
+ let work_grade = sessionStorage.getItem('work_grade') || 0
if (verify.flowType === 'start') {
target = flow.cells.filter(cell => cell.mknode === 'start')[0]
@@ -2261,6 +2265,34 @@
status = line.mkdata.status
statusName = line.mkdata.statusName
target = flow.cells.filter(cell => cell.id === line.target.cell)[0]
+
+ line.mkdata.members && line.mkdata.members.forEach(item => {
+ if (line.mkdata.approver === 'departmentManager') {
+ if (item.job_type === 'manage' && departmentcode === item.parentIds[1]) {
+ checkIds.push(item.worker_id)
+ checkUsers.push(item)
+ }
+ } else if (line.mkdata.approver === 'directManager') {
+ if (departmentcode === item.parentIds[1] && item.work_grade > work_grade) {
+ checkIds.push(item.worker_id)
+ checkUsers.push(item)
+ }
+ } else {
+ checkIds.push(item.worker_id)
+ checkUsers.push(item)
+ }
+ })
+ line.mkdata.copys && line.mkdata.copys.forEach(item => {
+ noticeIds.push(item.worker_id)
+ })
+
+ if (!target) {
+ error = '鏈煡璇㈠埌宸ヤ綔娴佺洰鏍囪妭鐐�'
+ } else if (checkIds.length === 0 && line.mknode !== 'startEdge' && line.mknode !== 'endEdge') {
+ error = '鏈幏鍙栧埌涓嬩竴姝ュ鎵逛汉'
+ } else if (line.approvalMethod === 'countersign' && (!node.checkIds || !node.checkIds.includes(userid))) {
+ error = '褰撳墠鐢ㄦ埛涓嶅湪瀹℃壒浜哄垪琛ㄤ腑'
+ }
} else if (!error) {
error = '宸ヤ綔娴佷腑鏃犲搴旀祦绋�'
}
@@ -2276,7 +2308,7 @@
/* 宸ヤ綔娴佸紓甯竤ql */
select @ErrorCode='E',@retmsg='${error}' goto aaa
`
- } else if (verify.flowSql === 'true' && target) {
+ } else if (verify.flowSql === 'true') {
if (verify.flowType === 'start') {
_sql += `
/* 宸ヤ綔娴侀粯璁ql */
@@ -2289,15 +2321,7 @@
insert into s_my_works_flow_role (works_flow_id,works_flow_code,userid,works_flow_detail_id,createuserid,CreateUser,CreateStaff,upid,typecharone)
select @ID@,@works_flow_code@,@userid@,@works_flow_detail_id@,@userid@,@UserName,@FullName,@time_id@,'begin'
`
- } else if (line && line.approvalMethod === 'countersign' && (!node.checkIds || !node.checkIds.includes(userid))) {
- status = 0
- statusName = '寮傚父'
-
- _sql += `
- /* 宸ヤ綔娴佸紓甯竤ql */
- select @ErrorCode='E',@retmsg='褰撳墠鐢ㄦ埛涓嶅湪瀹℃壒浜哄垪琛ㄤ腑' goto aaa
- `
- } else if (line && line.approvalMethod === 'countersign' && node.checkIds.length > 1) {
+ } else if (line.approvalMethod === 'countersign' && node.checkIds.length > 1) {
let label = ''
let field = ''
let mark = line.mark || '宸插鏍�'
@@ -2427,51 +2451,10 @@
end
`
}
- } else if (verify.flowSql === 'true') {
- status = 0
- statusName = '寮傚父'
-
- _sql += `
- /* 宸ヤ綔娴佸紓甯竤ql */
- select @ErrorCode='E',@retmsg='${error || '宸ヤ綔娴佹墽琛屽紓甯�'}' goto aaa
- `
}
- let checkIds = []
- let checkUsers = []
- let work_grade = sessionStorage.getItem('work_grade') || 0
- if (verify.flowType !== 'start') {
- if (line) {
- let noticeIds = []
- line.mkdata.members && line.mkdata.members.forEach(item => {
- if (line.mkdata.approver === 'departmentManager') {
- if (item.job_type === 'manage' && departmentcode === item.parentIds[1]) {
- checkIds.push(item.worker_id)
- checkUsers.push(item)
- }
- } else if (line.mkdata.approver === 'directManager') {
- if (departmentcode === item.parentIds[1] && item.work_grade > work_grade) {
- checkIds.push(item.worker_id)
- checkUsers.push(item)
- }
- } else {
- checkIds.push(item.worker_id)
- checkUsers.push(item)
- }
- })
- line.mkdata.copys && line.mkdata.copys.forEach(item => {
- noticeIds.push(item.worker_id)
- })
- _sql = _sql.replace(/@check_userids@/ig, `'${checkIds.join(',')}'`)
- _sql = _sql.replace(/@notice_userids@/ig, `'${noticeIds.join(',')}'`)
- } else {
- _sql = _sql.replace(/@check_userids@/ig, `''`)
- _sql = _sql.replace(/@notice_userids@/ig, `''`)
- }
- } else {
- _sql = _sql.replace(/@check_userids@/ig, `''`)
- _sql = _sql.replace(/@notice_userids@/ig, `''`)
- }
+ _sql = _sql.replace(/@check_userids@/ig, `'${checkIds.join(',')}'`)
+ _sql = _sql.replace(/@notice_userids@/ig, `'${noticeIds.join(',')}'`)
_sql = _sql.replace(/@start_type@/ig, `'寮�濮�'`)
_sql = _sql.replace(/@check_type@/ig, verify.flowType === 'reject' ? `'椹冲洖'` : `'瀹℃牳'`)
--
Gitblit v1.8.0