From c96108bd84050feb01b47db3f5cae96670fda435 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 30 十月 2024 12:54:24 +0800
Subject: [PATCH] 2024-10-30
---
src/utils/utils.js | 231 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 217 insertions(+), 14 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index c861d4d..a93c540 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -71,6 +71,7 @@
uuid.push(_options.substr(Math.floor(Math.random() * 0x20), 1))
}
uuid = timestamp + uuid.join('')
+ uuid = uuid.replace(/minke/ig, 'mnkie')
return uuid
}
@@ -416,7 +417,11 @@
item.$first = true
}
}
-
+
+ if (window.backend && ['select', 'link', 'multiselect', 'checkcard', 'radio'].includes(item.type) && item.resourceType === '1') {
+ item.uuid = md5(config.uuid + item.uuid)
+ }
+
item.oriInitval = item.initval
if (values) {
@@ -710,6 +715,157 @@
})
return searchText.join(' AND ')
+ }
+
+ static getSearchkeys (searches) {
+ let searchText = []
+ let matchs = {
+ 'like': '01',
+ 'not like': '02',
+ '=': '03',
+ '>': '04',
+ '<': '05',
+ '>=': '06',
+ '<=': '07',
+ }
+
+ searches.forEach(item => {
+ if (item.forbid || !item.value) return
+
+ let cell = {
+ key: item.key,
+ match: item.match,
+ type: 'text',
+ value: item.value
+ }
+
+ if (item.type === 'text' || item.type === 'select') { // 缁煎悎鎼滅储锛屾枃鏈垨涓嬫媺锛屾墍鏈夊瓧娈垫嫾鎺�
+ if (/,/.test(item.key)) {
+ cell.type = 'text_or'
+ }
+ } else if (item.type === 'multi') {
+ cell.type = 'text_multi'
+ } else if (item.type === 'date') {
+ let _val = item.value
+ let timetail = ''
+
+ if (item.match === '<' || item.match === '<=') { // 鏃堕棿涓�<=鏃讹紝鍖归厤鍚庝竴澶╃殑0鐐癸紝鍖归厤鏂瑰紡涓�<
+ cell.match = '<'
+ if (item.precision === 'day') {
+ _val = moment(_val, 'YYYY-MM-DD').add(1, 'days').format('YYYY-MM-DD')
+ }
+ }
+ if (item.match === '=') {
+ timetail = ''
+ } else if (item.precision === 'day') {
+ timetail = ' 00:00:00.000'
+ } else if (item.precision === 'hour') {
+ timetail = ':00:00.000'
+ } else if (item.precision === 'minute') {
+ timetail = ':00.000'
+ } else if (item.precision === 'second') {
+ timetail = '.000'
+ }
+
+ cell.value = _val + timetail
+ }
+
+ if (item.type === 'datemonth') { // 鏈�-杩囨护鏉′欢锛屼粠鏈堝紑濮嬭嚦缁撴潫锛岀粨鏉熸椂闂翠负鏈堟湯鍔犱竴澶╃殑0鐐癸紝鏂瑰紡涓�<
+ if (item.match === '=') {
+ searchText.push(cell)
+ } else {
+ let _startval = moment(item.value, 'YYYY-MM').startOf('month').format('YYYY-MM-DD') + ' 00:00:00.000'
+ let _endval = moment(item.value, 'YYYY-MM').endOf('month').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000'
+
+ searchText.push({
+ key: item.key,
+ match: '>=',
+ type: 'text',
+ value: _startval
+ }, {
+ key: item.key,
+ match: '<',
+ type: 'text',
+ value: _endval
+ })
+ }
+ } else if (item.type === 'dateweek') { // 鍛�-杩囨护鏉′欢
+ let _startval = moment(item.value, 'YYYY-MM-DD' ).startOf('week').format('YYYY-MM-DD') + ' 00:00:00.000'
+ let _endval = moment(item.value, 'YYYY-MM-DD').endOf('week').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000'
+
+ searchText.push({
+ key: item.key,
+ match: '>=',
+ type: 'text',
+ value: _startval
+ }, {
+ key: item.key,
+ match: '<',
+ type: 'text',
+ value: _endval
+ })
+ } else if (item.type === 'daterange') {
+ let val = item.value.split(',')
+ let _startval = ''
+ let _endval = ''
+
+ if (item.precision === 'day') {
+ _startval = val[0] + ' 00:00:00.000'
+ _endval = moment(val[1], 'YYYY-MM-DD').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000'
+ } else if (item.precision === 'hour') {
+ _startval = val[0] + ':00:00.000'
+ _endval = val[1] + ':00:00.000'
+ } else if (item.precision === 'minute') {
+ _startval = val[0] + ':00.000'
+ _endval = val[1] + ':00.000'
+ } else if (item.precision === 'second') {
+ _startval = val[0] + '.000'
+ _endval = val[1] + '.000'
+ }
+
+ let _skey = item.key
+ let _ekey = item.key
+
+ if (/,/.test(item.key)) {
+ _skey = item.key.split(',')[0]
+ _ekey = item.key.split(',')[1]
+ }
+
+ searchText.push({
+ key: _skey,
+ match: '>=',
+ type: 'text',
+ value: _startval
+ }, {
+ key: _ekey,
+ match: '<',
+ type: 'text',
+ value: _endval
+ })
+ } else if (item.type === 'range') {
+ let val = item.value.split(',')
+
+ searchText.push({
+ key: item.key,
+ match: '>=',
+ type: 'text',
+ value: val[0] || -999999999
+ }, {
+ key: item.key,
+ match: '<=',
+ type: 'text',
+ value: val[1] || 999999999
+ })
+ } else {
+ searchText.push(cell)
+ }
+ })
+
+ searchText.forEach(item => {
+ item.match = matchs[item.match] || '01'
+ })
+
+ return searchText
}
/**
@@ -2468,6 +2624,10 @@
error = '琛屼俊鎭腑鏃犲伐浣滄祦鍙傛暟'
}
+ if (!error && verify.flowSql !== 'true' && verify.flowType !== 'start' && line && line.approvalMethod === 'countersign') {
+ error = '浼氱娴佺▼闇�瑕佷娇鐢ㄩ粯璁よ剼鏈�'
+ }
+
if (error) {
status = 0
statusName = '寮傚父'
@@ -2516,6 +2676,33 @@
_sql += `
/* 宸ヤ綔娴侀粯璁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 ${_declare},@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 ${_select},@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=''
@@ -2572,32 +2759,45 @@
_sql += `
/* 宸ヤ綔娴侀粯璁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
select @ErrorCode='E', @retmsg='褰撳墠鍗曟嵁宸插鏍革紝璇峰埛鏂板悗閲嶈瘯'
- goto aaa
+ goto aaa
end
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
+ 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 != ''
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
+ select @retmsg=workerCode+workerName from BD_workers where id=@retmsg
+
+ select @retmsg='椤甸潰鏁版嵁宸叉洿鏂帮紝鎴栨病鏈夊綋鍓嶅崟鎹殑瀹℃壒鏉冮檺锛岃鑱旂郴'+@retmsg+'鎿嶄綔'
+ goto aaa
+ end
+ end
select @retmsg='椤甸潰鏁版嵁宸叉洿鏂帮紝鎴栨病鏈夊綋鍓嶅崟鎹殑瀹℃壒鏉冮檺'
- goto aaa
- end
+ goto aaa
+ end
goto_mk:
@@ -2611,7 +2811,7 @@
update s_my_works_flow_role set deleted=10,modifydate=getdate(),upid=@time_id@,modifyuserid=@userid@,modifyuser=@username,modifystaff=@fullname
where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0
- ${line.mknode === 'startEdge' ? `update s_my_works_flow_role set deleted=0,modifydate=getdate(),upid=@time_id@,modifyuserid=@userid@,modifyuser=@username,modifystaff=@fullname
+ ${line.mknode === 'startEdge' ? `update s_my_works_flow_role set deleted=0,modifydate=getdate(),upid=@time_id@,modifyuserid=@userid@,modifyuser=@username,modifystaff=@fullname,works_flow_detail_id=@works_flow_detail_id@
where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and typecharone='begin'` : ''}
if @check_userids@ != ''
@@ -2639,14 +2839,17 @@
_sql += _backCustomScript
}
- _sql = _sql.replace(/@works_flow_sign@/ig, `'${sign}'`)
+ if (verify.flowType === 'start') {
+ _sql = _sql.replace(/@start_type@/ig, `'寮�濮�'`)
+ } else {
+ _sql = _sql.replace(/@works_flow_sign@/ig, `'${sign}'`)
- _sql = _sql.replace(/@check_userids@/ig, `'${checkIds.join(',')}'`)
- _sql = _sql.replace(/@notice_userids@/ig, `'${noticeIds.join(',')}'`)
+ _sql = _sql.replace(/@check_type@/ig, verify.flowType === 'reject' ? `'椹冲洖'` : `'瀹℃牳'`)
+ _sql = _sql.replace(/@notice_type@/ig, `'鎶勯��'`)
- _sql = _sql.replace(/@start_type@/ig, `'寮�濮�'`)
- _sql = _sql.replace(/@check_type@/ig, verify.flowType === 'reject' ? `'椹冲洖'` : `'瀹℃牳'`)
- _sql = _sql.replace(/@notice_type@/ig, `'鎶勯��'`)
+ _sql = _sql.replace(/@check_userids@/ig, `'${checkIds.join(',')}'`)
+ _sql = _sql.replace(/@notice_userids@/ig, `'${noticeIds.join(',')}'`)
+ }
_sql = _sql.replace(/@works_flow_code@/ig, `'${flow.flow_code}'`)
_sql = _sql.replace(/@works_flow_name@/ig, `'${flow.flow_name}'`)
--
Gitblit v1.8.0