From 74b579ec300b2316c6ec0a744ea3c0ad9f8b54d3 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 20 一月 2025 15:30:54 +0800
Subject: [PATCH] 2025-01-20
---
src/utils/utils.js | 413 +++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 333 insertions(+), 80 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 35fb3a8..8f21c6f 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
}
/**
@@ -1366,7 +1522,7 @@
* @return {Object} item 鎸夐挳淇℃伅
* @return {Array} data excel鏁版嵁
*/
-export function getEditTableSql (verify, data, columns) {
+export function getEditTableSql (verify, data, columns, setting) {
let btn = verify
let userName = sessionStorage.getItem('User_Name') || ''
let fullName = sessionStorage.getItem('Full_Name') || ''
@@ -1485,6 +1641,7 @@
let _fields = unique.field.split(',')
let _fields_ = _fields.map(_field => `a.${_field}=b.${_field}`)
_fields_ = _fields_.join(' and ')
+ _fields_ += ` and a.jskey != b.${setting.primaryKey || 'id'}`
let _where = []
_fields.forEach(f => {
@@ -1541,6 +1698,7 @@
let declarefields = []
let fields = []
+ let upFields = []
columns.forEach(col => {
let key = col.field.toLowerCase()
@@ -1548,15 +1706,27 @@
declarefields.push(`${col.field} ${col.datatype}`)
fields.push(col.field)
+ upFields.push(`${col.field}=t.${col.field}`)
})
fields = fields.join(',')
+ upFields = upFields.join(',')
let _insert = ''
if (btn.default !== 'false') {
_insert = `
/* 榛樿sql */
- Insert into ${database}${sheet} (${fields},createuserid,createuser,createstaff,bid)
+ update a set ${upFields},modifydate=getdate(),modifyuserid='${sessionStorage.getItem('UserID') || ''}',modifyuser=@username,modifystaff=@fullname,deleted=0
+ from (select * from #${sheet} where data_type='upt') t
+ inner join ${database}${sheet} a on t.jskey=a.${setting.primaryKey || 'id'}
+
+ update a set deleted=1,modifydate=getdate(),modifyuserid='${sessionStorage.getItem('UserID') || ''}',modifyuser=@username,modifystaff=@fullname
+ from (select * from #${sheet} where data_type='del') t
+ inner join ${database}${sheet} a on t.jskey=a.${setting.primaryKey || 'id'}
+
+ delete t from #${sheet} t inner join ${database}${sheet} a on t.jskey=a.${setting.primaryKey || 'id'}
+
+ Insert into ${database}${sheet} (${fields},createuserid,createuser,createstaff,bid)
Select ${fields},'${sessionStorage.getItem('UserID') || ''}',@username,@fullname,'${BID}' From #${sheet}
`
}
@@ -1615,11 +1785,10 @@
* @return {Array} columns 鏄剧ず鍒�
* @return {Boolean} retmsg 鏄惁闇�瑕佹暟鎹繑鍥�
*/
-export function getSysDefaultSql (btn, setting, formdata, param, data, columns, retmsg = false, moduleParams) {
+export function getSysDefaultSql (btn, setting, formdata, param, data, columns, retmsg = false, submitType = '') {
let primaryId = param.ID
let BID = param.BID || ''
let verify = btn.verify || {}
- let datavars = {} // 澹版槑鐨勫彉閲忥紝琛ㄥ崟鍙婃樉绀哄垪
let _actionType = null
let _callbacksql = ''
@@ -1653,7 +1822,7 @@
})
// 闇�瑕佸０鏄庣殑鍙橀噺闆�
- let _vars = ['tbid', 'errorcode', 'retmsg', 'billcode', 'bvoucher', 'fibvoucherdate', 'fiyear', 'username', 'fullname', 'modulardetailcode', 'roleid', 'mk_departmentcode', 'mk_organization', 'mk_user_type', 'mk_nation', 'mk_province', 'mk_city', 'mk_district', 'mk_address', 'mk_deleted', 'bid']
+ let _vars = ['tbid', 'errorcode', 'retmsg', 'billcode', 'bvoucher', 'fibvoucherdate', 'fiyear', 'username', 'fullname', 'modulardetailcode', 'roleid', 'mk_departmentcode', 'mk_organization', 'mk_user_type', 'mk_nation', 'mk_province', 'mk_city', 'mk_district', 'mk_address', 'mk_deleted', 'bid', 'mk_submit_type']
// 涓婚敭瀛楁
let primaryKey = setting.primaryKey || 'id'
@@ -1665,18 +1834,28 @@
let _initFormfields = []
let _initColfields = []
let _declarefields = []
+ let verifyValSql = ''
// 鑾峰彇瀛楁閿�煎
formdata && formdata.forEach(form => {
+ if (form.$verify) {
+ verifyValSql += `
+ if @${form.key}=${form.type === 'number' ? 0 : `''`}
+ begin
+ select @errorcode='E',@retmsg='${form.label}锛屽叧鑱斾富琛ㄥけ鏁�'
+ goto aaa
+ end
+ `
+ }
+
let _key = form.key.toLowerCase()
- datavars[_key] = form.value
if (!_initvars.includes(_key)) {
_initvars.push(_key)
let val = form.value
if (form.type === 'number' || form.type === 'rate') {
- if (isNaN(val)) {
+ if (isNaN(val) || val === '') {
val = 0
}
_initFormfields.push(`@${_key}=${val}`)
@@ -1724,14 +1903,12 @@
// 娣诲姞鏁版嵁涓瓧娈碉紝琛ㄥ崟鍊间紭鍏�(鎸夐挳涓嶉�夎鎴栧琛屾嫾鎺ユ椂璺宠繃)
if (data && btn.Ot !== 'notRequired' && columns && columns.length > 0) {
- datavars = {..._data, ...datavars}
-
const setField = (col) => {
if (!col.field) return
let _key = col.field.toLowerCase()
if (!_initvars.includes(_key)) {
- let _val = datavars.hasOwnProperty(_key) ? datavars[_key] : ''
+ let _val = _data.hasOwnProperty(_key) ? _data[_key] : ''
if (col.datatype && /^date/ig.test(col.datatype) && !_val) {
_val = '1949-10-01'
@@ -1786,7 +1963,7 @@
_declarefields = ',' + _declarefields
}
_sql = `/* 绯荤粺鐢熸垚 */
- Declare @tbid nvarchar(50),@ErrorCode nvarchar(50),@retmsg nvarchar(4000),@BillCode nvarchar(50),@BVoucher nvarchar(50),@FIBVoucherDate nvarchar(50), @FiYear nvarchar(50),@ModularDetailCode nvarchar(50), @UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20),@mk_nation nvarchar(50),@mk_province nvarchar(50),@mk_city nvarchar(50),@mk_district nvarchar(50),@mk_address nvarchar(100),@mk_deleted int,@bid nvarchar(50)${_declarefields}
+ Declare @tbid nvarchar(50),@ErrorCode nvarchar(50),@retmsg nvarchar(4000),@BillCode nvarchar(50),@BVoucher nvarchar(50),@FIBVoucherDate nvarchar(50), @FiYear nvarchar(50),@ModularDetailCode nvarchar(50), @UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20),@mk_nation nvarchar(50),@mk_province nvarchar(50),@mk_city nvarchar(50),@mk_district nvarchar(50),@mk_address nvarchar(100),@mk_deleted int,@bid nvarchar(50),@mk_submit_type nvarchar(50)${_declarefields}
`
let userName = sessionStorage.getItem('User_Name') || ''
@@ -1804,7 +1981,7 @@
// 鍒濆鍖栧嚟璇佸強鐢ㄦ埛淇℃伅瀛楁
_sql += `
/* 鍑瘉鍙婄敤鎴蜂俊鎭垵濮嬪寲璧嬪�� */
- select @BVoucher='',@FIBVoucherDate='',@FiYear='',@ErrorCode='',@retmsg='',@UserName='${userName}', @FullName='${fullName}', @RoleID='${RoleID}', @mk_departmentcode='${departmentcode}', @mk_organization='${organization}', @mk_user_type='${mk_user_type}', @mk_nation='${nation}', @mk_province='${province}', @mk_city='${city}', @mk_district='${district}', @mk_address='${address}', @mk_deleted=1, @bid='${BID}', @BillCode='', @ModularDetailCode=''
+ select @BVoucher='',@FIBVoucherDate='',@FiYear='',@ErrorCode='',@retmsg='',@UserName='${userName}', @FullName='${fullName}', @RoleID='${RoleID}', @mk_departmentcode='${departmentcode}', @mk_organization='${organization}', @mk_user_type='${mk_user_type}', @mk_nation='${nation}', @mk_province='${province}', @mk_city='${city}', @mk_district='${district}', @mk_address='${address}', @mk_deleted=1, @bid='${BID}', @mk_submit_type='${submitType}', @BillCode='', @ModularDetailCode=''
`
// 琛ㄥ崟鍙橀噺璧嬪��
@@ -1864,9 +2041,31 @@
}
// 澶辨晥楠岃瘉锛屾坊鍔犳暟鎹椂涓嶇敤
- if (verify.invalid === 'true' && moduleParams && moduleParams.dataresource) {
- let datasource = moduleParams.dataresource
- let customScript = moduleParams.customScript || ''
+ if (verify.invalid === 'true' && setting.dataresource) {
+ let datasource = setting.dataresource
+ let customScript = setting.customScript || ''
+
+ let regoptions = [{
+ reg: new RegExp('@userName@', 'ig'),
+ value: `'${sessionStorage.getItem('User_Name') || ''}'`
+ }, {
+ reg: new RegExp('@fullName@', 'ig'),
+ value: `'${sessionStorage.getItem('Full_Name') || ''}'`
+ }, {
+ reg: new RegExp('@orderBy@', 'ig'),
+ value: setting.order || primaryKey
+ }, {
+ reg: new RegExp('@pageSize@', 'ig'),
+ value: 1
+ }, {
+ reg: new RegExp('@pageIndex@', 'ig'),
+ value: 1
+ }]
+
+ regoptions.forEach(item => {
+ datasource = datasource.replace(item.reg, item.value)
+ customScript = customScript.replace(item.reg, item.value)
+ })
if (customScript) {
_sql += `
@@ -1937,45 +2136,39 @@
verify.billcodes.forEach(item => {
let _key = item.field.toLowerCase()
- let _linkKey = item.linkField ? item.linkField.toLowerCase() : ''
if (!keys.includes(_key)) return // 琛ㄥ崟涓笉鍚崟鍙风敓鎴愬瓧娈�
- let _ModularDetailCode = ''
let _lpline = ''
if (item.TypeCharOne === 'Lp') {
- if (_linkKey === 'bid' && BID) { // 鏇挎崲bid
+ if (/^BID$/ig.test(item.linkField)) {
_lpline = `set @ModularDetailCode= 'Lp'+ right('${item.mark || btn.uuid}'+@BID@,48)`
} else {
- _lpline = `set @ModularDetailCode= 'Lp'+ right('${item.mark || btn.uuid}'+@${_linkKey},48)`
+ _lpline = `set @ModularDetailCode= 'Lp'+ right('${item.mark || btn.uuid}'+@${item.linkField},48)`
}
- _ModularDetailCode = '@ModularDetailCode'
} else if (item.TypeCharOne === 'BN') {
- let _val = ''
- if (_linkKey === 'bid' && BID) { // 鏇挎崲bid
- _val = BID
- } else if (_data.hasOwnProperty(_linkKey)) {
- _val = _data[_linkKey]
+ if (/^BID$/ig.test(item.linkField)) {
+ _lpline = `set @ModularDetailCode= 'BN'+ right(@BID@,48)`
+ } else {
+ _lpline = `set @ModularDetailCode= 'BN'+ right(@${item.linkField},48)`
}
- _ModularDetailCode = `'${item.TypeCharOne + _val}'`
} else {
- _ModularDetailCode = `'${item.ModularDetailCode}'`
+ _lpline = `set @ModularDetailCode= right('${item.ModularDetailCode}',50)`
}
- let _declare = ''
+ // let _declare = ''
- if (!_vars.includes(_key)) {
- _declare = `Declare @${_key} nvarchar(50)`
- _vars.push(_key)
- }
+ // if (!_vars.includes(_key)) {
+ // _declare = `Declare @${_key} nvarchar(50)`
+ // _vars.push(_key)
+ // }
_billcodesSql += `
/* 鍗曞彿鐢熸垚 */
- ${_declare}
select @BillCode='', @${_key}='', @ModularDetailCode=''
${_lpline}
exec s_get_BillCode
- @ModularDetailCode=${_ModularDetailCode},
+ @ModularDetailCode=@ModularDetailCode,
@Type=${item.Type},
@TypeCharOne='${item.TypeCharOne}',
@TypeCharTwo ='${item.TypeCharTwo}',
@@ -2003,30 +2196,34 @@
item.field.split(',').forEach((_field, index) => {
let _key = _field.toLowerCase()
- let _val = datavars[_key] !== undefined ? datavars[_key] : ''
+ let _val = ''
+ let _val2 = ''
arr.push(_key)
- if (_key === 'bid' && !_val) { // 琛ㄥ崟涓病鏈塨id鍒欎娇鐢ㄧ郴缁焍id鍙橀噺
- _val = BID
+ if (_key === 'bid') {
+ _val = `'${BID}'`
+ } else {
+ _val = `@${_field}`
}
-
- _fieldValue.push(`${_key}='${_val}'`)
- _value.push(`${_labels[index] || ''}锛�${_val || ''}`)
+
+ if (_key === 'bid') {
+ _val2 = BID
+ } else {
+ _val2 = `' + @${_field} + '`
+ }
+
+ _fieldValue.push(`${_key}=${_val}`)
+ _value.push(`${_labels[index] || ''}锛�${_val2}`)
})
- let _verifyType = ''
- if (item.verifyType === 'logic') {
- _verifyType = ' and deleted=0'
- }
-
- if (!arr.includes(primaryKey.toLowerCase())) {
+ if (!arr.includes(primaryKey.toLowerCase()) && btn.Ot !== 'notRequired') {
_fieldValue.push(`${primaryKey} !='${primaryId}'`)
}
_sql += `
/* 鍞竴鎬ч獙璇� */
select @tbid='', @ErrorCode='',@retmsg=''
- select @tbid='X' from ${btn.sql} where ${_fieldValue.join(' and ')}${_verifyType}
+ select @tbid='X' from ${btn.sql} where ${_fieldValue.join(' and ')}${item.verifyType === 'logic' ? ' and deleted=0' : ''}
If @tbid!=''
Begin
select @ErrorCode='${item.errorCode}',@retmsg='${_value.join(', ')} 宸插瓨鍦�'
@@ -2072,13 +2269,18 @@
// 鍑瘉-鏄剧ず鍒椾腑閫夊彇,蹇呴』閫夎
if (verify.voucher && verify.voucher.enabled) {
let _voucher = verify.voucher
+ let linkField = `@${_voucher.linkField}`
+
+ if (/^BID$/ig.test(_voucher.linkField)) {
+ linkField = `'${BID}'`
+ }
hasvoucher = true
_sql += `
/* 鍒涘缓鍑瘉 */
exec s_BVoucher_Create
- @Bill ='${_data[_voucher.linkField.toLowerCase()] || ''}',
+ @Bill = ${linkField},
@BVoucherType ='${_voucher.BVoucherType}',
@VoucherTypeOne ='${_voucher.VoucherTypeOne}',
@VoucherTypeTwo ='${_voucher.VoucherTypeTwo}',
@@ -2233,7 +2435,7 @@
if (data && columns && columns.length > 0 && btn.Ot !== 'notRequired') {
let _index = 0
columns.forEach(col => {
- if (!col.field || col.Hide === 'true' || _index >= 4) return
+ if (!col.field || col.Hide === 'true' || _index >= 4 || col.field === primaryKey) return
_msg += col.label + '=' + data[col.field] + ','
_index++
})
@@ -2456,6 +2658,10 @@
error = '琛屼俊鎭腑鏃犲伐浣滄祦鍙傛暟'
}
+ if (!error && verify.flowSql !== 'true' && verify.flowType !== 'start' && line && line.approvalMethod === 'countersign') {
+ error = '浼氱娴佺▼闇�瑕佷娇鐢ㄩ粯璁よ剼鏈�'
+ }
+
if (error) {
status = 0
statusName = '寮傚父'
@@ -2504,6 +2710,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=''
@@ -2560,32 +2793,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:
@@ -2599,7 +2845,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@ != ''
@@ -2627,14 +2873,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}'`)
@@ -2653,6 +2902,10 @@
_sql = _sql.replace(/@work_grade@/ig, `'${work_grade}'`)
} else if (_backCustomScript) {
_sql += _backCustomScript
+ }
+
+ if (verifyValSql) {
+ _sql += verifyValSql
}
if (window.GLOB.breakpoint) {
@@ -2799,23 +3052,23 @@
/**
* @description 鐢熸垚鏇挎崲鍑芥暟鍒楄〃
*/
-export function setGLOBFuncs () {
- window.GLOB.funcs = []
- if (!window.GLOB.IndexDB) {
- return
- }
+// export function setGLOBFuncs () {
+// window.GLOB.funcs = []
+// if (!window.GLOB.IndexDB) {
+// return
+// }
- let objectStore = window.GLOB.IndexDB.transaction('funcs').objectStore('funcs')
+// let objectStore = window.GLOB.IndexDB.transaction('funcs').objectStore('funcs')
- objectStore.openCursor().onsuccess = (event) => {
- let cursor = event.target.result
+// objectStore.openCursor().onsuccess = (event) => {
+// let cursor = event.target.result
- if (cursor) {
- window.GLOB.funcs.push({
- func_code: cursor.value.func_code,
- key_sql: window.decodeURIComponent(window.atob(cursor.value.key_sql))
- })
- cursor.continue()
- }
- }
-}
\ No newline at end of file
+// if (cursor) {
+// window.GLOB.funcs.push({
+// func_code: cursor.value.func_code,
+// key_sql: window.decodeURIComponent(window.atob(cursor.value.key_sql))
+// })
+// cursor.continue()
+// }
+// }
+// }
\ No newline at end of file
--
Gitblit v1.8.0