From 1aa5654a0b51bb82948fff8bed77b166f25f11ea Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 19 二月 2025 20:14:20 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/utils/utils.js | 976 ++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 785 insertions(+), 191 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index c46bc39..dbda559 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
}
@@ -264,7 +265,7 @@
}
if (d) {
- item.initval = moment(d).subtract(item.initval, 'month').format('YYYY-MM')
+ item.initval = moment(d).subtract(item.$initval, 'month').format('YYYY-MM')
}
}
}
@@ -293,6 +294,10 @@
item.initval = [moment().startOf('month').format(format), moment().endOf('month').format(format)].join(',')
} else if (item.initval === 'lastMonth') {
item.initval = [moment().subtract(1, 'months').startOf('month').format(format), moment().subtract(1, 'months').endOf('month').format(format)].join(',')
+ } else if (item.initval === 'year') {
+ item.initval = [moment().startOf('year').format(format), moment().endOf('year').format(format)].join(',')
+ } else if (item.initval === 'lastYear') {
+ item.initval = [moment().subtract(1, 'years').startOf('year').format(format), moment().subtract(1, 'years').endOf('year').format(format)].join(',')
} else if (item.initval) {
try {
let _initval = JSON.parse(item.initval)
@@ -334,6 +339,10 @@
item.initval = [moment(d).startOf('month').format(format), moment(d).endOf('month').format(format)].join(',')
} else if (item.$initval === 'lastMonth') {
item.initval = [moment(d).subtract(1, 'months').startOf('month').format(format), moment(d).subtract(1, 'months').endOf('month').format(format)].join(',')
+ } else if (item.$initval === 'year') {
+ item.initval = [moment(d).startOf('year').format(format), moment(d).endOf('year').format(format)].join(',')
+ } else if (item.$initval === 'lastYear') {
+ item.initval = [moment(d).subtract(1, 'years').startOf('year').format(format), moment(d).subtract(1, 'years').endOf('year').format(format)].join(',')
} else {
try {
let _initval = JSON.parse(item.$initval)
@@ -416,7 +425,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) {
@@ -712,6 +725,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
+ }
+
/**
* @description 鑾峰彇鎼滅储鐢ㄤ簬姝ｅ垯鏇挎崲
* @param {Array} searches 鎼滅储鏉′欢
@@ -854,24 +1018,6 @@
}
/**
- * @description 鑾峰彇浜戠鍥剧墖鐪熷疄璺緞
- * @return {String} url 鍥剧墖璺緞
- */
- static getcloudurl (url) {
- if (!url) return ''
-
- let baseurl = ''
-
- if (window.GLOB.cloudServiceApi) {
- baseurl = window.GLOB.cloudServiceApi.replace(/webapi(.*)$/, '')
- } else {
- baseurl = window.GLOB.baseurl
- }
-
- return url.match(/^http/) || url.match(/^\/\//) ? url : baseurl + url
- }
-
- /**
* @description 鑾峰彇涓嬫媺鎼滅储鏌ヨ鏉′欢
* @return {String} item 鎼滅储鏉′欢淇℃伅
*/
@@ -934,6 +1080,7 @@
sql = sql.replace(/@SessionUid@/ig, `'${localStorage.getItem('SessionUid') || ''}'`)
sql = sql.replace(/@UserID@/ig, `'${sessionStorage.getItem('UserID') || ''}'`)
sql = sql.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
+ sql = sql.replace(/@lang@/ig, `'${sessionStorage.getItem('lang')}'`)
return {
sql: sql,
@@ -993,16 +1140,34 @@
cols.push('A' + cols[i])
}
+ let columns = JSON.parse(JSON.stringify(btn.columns))
+ columns = columns.filter((col, index) => {
+ col.colIndex = cols[index] || (index + 1)
+ if (col.import !== 'init' && (/^Decimal/ig.test(col.type) || /^int/ig.test(col.type))) {
+ col.declen = 0
+ if (/^Decimal/ig.test(col.type)) {
+ col.declen = +col.type.match(/\d+/g)[1]
+ }
+ col.declen = col.declen || 0
+ }
+ if (col.required === 'false') {
+ delete col.min
+ delete col.max
+ }
+
+ return col.import !== 'false'
+ })
+
let _Ltext = data.map((item, lindex) => {
let vals = []
- btn.columns.forEach((col, cindex) => {
- if (col.import === 'false') return
-
+ columns.forEach(col => {
let val = item[col.Column] !== undefined ? item[col.Column] : ''
- let _colindex = cols[cindex] || (cindex + 1)
- let _position = (_topline + lindex + 1) + '琛� ' + _colindex + '鍒� '
+ let _position = (_topline + lindex + 1) + '琛� ' + col.colIndex + '鍒� '
+ let eLen = errors.length
- if (col.import === 'init') {
+ if (col.$error) {
+
+ } else if (col.import === 'init') {
if (/^Nvarchar/ig.test(col.type)) {
val = ''
} else if (/^Decimal/ig.test(col.type) || /^int/ig.test(col.type)) {
@@ -1038,14 +1203,24 @@
if (!val || isNaN(val)) {
val = 0
}
- } else if (!val && val !== 0) {
+ }
+ if (!val && val !== 0) {
errors.push(_position + '鍐呭涓嶅彲涓虹┖')
} else if (isNaN(val)) { // 妫�楠屾槸鍚︿负鏁板��
errors.push(_position + '鍐呭搴斾负鏁板��')
- } else if ((col.min || col.min === 0) && val < col.min) { // 鏈�灏忓�兼楠�
+ } else if (typeof(col.min) === 'number' && val < col.min) { // 鏈�灏忓�兼楠�
errors.push(_position + '灏忎簬鏈�灏忓��')
- } else if ((col.max || col.max === 0) && val > col.max) { // 鏈�澶у�兼楠�
+ } else if (typeof(col.max) === 'number' && val > col.max) { // 鏈�澶у�兼楠�
errors.push(_position + '澶т簬鏈�澶у��')
+ } else {
+ let _float = (val + '').split('.')[1]
+ if (_float && _float.length > col.declen) {
+ if (col.declen) {
+ errors.push(_position + `鏁板�间笉鍙ぇ浜�${col.declen}浣嶅皬鏁癭)
+ } else {
+ errors.push(_position + '鏁板�煎簲涓烘暣鏁�')
+ }
+ }
}
} else if (col.type === 'date' || col.type === 'datetime') {
if (typeof(val) === 'number') {
@@ -1066,14 +1241,24 @@
}
} else if (typeof(val) === 'string') {
val = val.replace(/(^\s+$)|\t+|\v+/ig, '')
- if (!val && col.required === 'true') { // 鏃堕棿蹇呭～鏍￠獙
- errors.push(_position + '鍐呭涓嶅彲涓虹┖')
- } else if (val && !/^[1-9][0-9]{3}/.test(val)) { // 鏃堕棿姝ｅ垯鏍￠獙
+ if (!val) {
+ if (col.required === 'true') { // 鏃堕棿蹇呭～鏍￠獙
+ errors.push(_position + '鍐呭涓嶅彲涓虹┖')
+ } else if (col.type === 'date') {
+ val = '1949-10-01'
+ } else if (col.type === 'datetime') {
+ val = '1949-10-01 00:00:00'
+ }
+ } else if (!/^[1-9][0-9]{3}/.test(val)) { // 鏃堕棿姝ｅ垯鏍￠獙
errors.push(_position + '鏃堕棿鏍煎紡閿欒')
}
- } else { // 鏃堕棿鏍煎紡閿欒
+ } else { // 鏃堕棿鏍煎紡閿欒
errors.push(_position + '鏃堕棿鏍煎紡閿欒')
}
+ }
+
+ if (errors.length > eLen) {
+ col.$error = true
}
vals.push(`'${val}'`)
@@ -1106,6 +1291,7 @@
{reg: /@SessionUid@/ig, value: `'${localStorage.getItem('SessionUid') || ''}'`},
{reg: /@UserID@/ig, value: `'${sessionStorage.getItem('UserID') || ''}'`},
{reg: /@Appkey@/ig, value: `'${window.GLOB.appkey || ''}'`},
+ {reg: /@lang@/ig, value: `'${sessionStorage.getItem('lang')}'`},
{reg: /@typename@/ig, value: `'admin'`},
{reg: /\$@/ig, value: isDM ? '/*' : ''},
{reg: /@\$/ig, value: isDM ? '*/' : ''},
@@ -1145,22 +1331,61 @@
let _uniquesql = ''
if (btn.uniques && btn.uniques.length > 0) {
+ let textFields = []
+ let numberFields = []
+ let dateFields = []
+ btn.columns.forEach((col) => {
+ if (/Nvarchar/ig.test(col.type)) {
+ textFields.push(col.Column)
+ } else if (/Decimal|int/ig.test(col.type)) {
+ numberFields.push(col.Column)
+ } else if (/date/ig.test(col.type)) {
+ dateFields.push(col.Column)
+ }
+ })
+
btn.uniques.forEach(unique => {
if (unique.status === 'false' || !unique.verifyType) return
let _fields = unique.field.split(',')
let _fields_ = _fields.map(_field => `a.${_field}=b.${_field}`)
- let _afields = _fields.map(_field => `a.${_field}`)
+
_fields_ = _fields_.join(' and ')
+
+ let _where = []
+ _fields.forEach(f => {
+ if (textFields.includes(f)) {
+ _where.push(`${f}!=''`)
+ } else if (numberFields.includes(f)) {
+ _where.push(`${f}!=0`)
+ } else if (dateFields.includes(f)) {
+ _where.push(`${f}>'1949-10-01'`)
+ }
+ })
+ _where = _where.length ? `where ${_where.join(' and ')} ` : ''
if (unique.verifyType === 'logic' || unique.verifyType === 'logic_temp') {
_fields_ += ' and b.deleted=0'
}
+ let _afields = []
+ _fields = _fields.map(f => {
+ if (numberFields.includes(f)) {
+ _afields.push(`cast(a.${f} as nvarchar(50))`)
+ return `cast(${f} as nvarchar(50))`
+ } else if (dateFields.includes(f)) {
+ _afields.push(`CONVERT(nvarchar(50), a.${f}, 21)`)
+ return `CONVERT(nvarchar(50), ${f}, 21)`
+ }
+ _afields.push(`a.${f}`)
+
+ return f
+ })
+
_uniquesql += `
/* 閲嶅鎬ч獙璇� */
Set @tbid=''
- Select top 1 @tbid=${_fields.join('+\' \'+')} from (select 1 as n,${unique.field} from #${sheet} ) a group by ${unique.field} having sum(n)>1
+ Select top 1 @tbid=${_fields.join('+\' \'+')} from (select 1 as n,${unique.field} from #${sheet} ${_where}) a group by ${unique.field} having sum(n)>1
If @tbid!=''
Begin
@@ -1169,7 +1394,7 @@
end
${unique.verifyType.indexOf('temp') === -1 ? `Set @tbid=''
- Select top 1 @tbid=${_afields.join('+\' \'+')} from #${sheet} a Inner join ${database}${sheet} b on ${_fields_}
+ Select top 1 @tbid=${_afields.join('+\' \'+')} from ${_where ? `(select * from #${sheet} ${_where})` : `#${sheet}`} a Inner join ${database}${sheet} b on ${_fields_}
If @tbid!=''
Begin
@@ -1229,18 +1454,90 @@
${_uniquesql}
${_prevCustomScript}
- ${_insert}
+ ${_insert}`
+
+ if (item.$process && btn.workFlow === 'true' && window.GLOB.UserCacheMap.has(item.$flowId)) {
+ let flow = window.GLOB.UserCacheMap.get(item.$flowId)
+ let target = flow.cells.filter(cell => cell.mknode === 'start')[0]
+
+ let flowsql = ''
+ let status = 0
+ let statusName = ''
+ let detailId = ''
+ let work_grade = sessionStorage.getItem('work_grade') || 0
+
+ if (target) {
+ detailId = target.id
+ status = target.mkdata.status
+ statusName = target.mkdata.statusName
+ }
+
+ if (!target) {
+ status = 0
+ statusName = '寮傚父'
+
+ flowsql = `
+ /* 宸ヤ綔娴佸紓甯竤ql */
+ select @ErrorCode='E',@retmsg='宸ヤ綔娴佹棤寮�濮嬭妭鐐�' goto aaa
+ `
+ } else if (btn.flowSql === 'true') {
+ flowsql = `
+ /* 宸ヤ綔娴侀粯璁ql */
+ insert into s_my_works_flow (works_flow_id,works_flow_code,works_flow_name,works_flow_param,status,statusname,work_group,works_flow_detail_id,work_grade,bid,createuserid,CreateUser,CreateStaff,upid)
+ select jskey,@works_flow_code@,@works_flow_name@,@works_flow_param@,@status@,@statusname@,@work_group@,@works_flow_detail_id@,@work_grade@,@bid@,@UserID@,@UserName,@FullName,@time_id@
+ from #${sheet}
+
+ insert into s_my_works_flow_log (works_flow_id,works_flow_code,works_flow_name,works_flow_param,status,statusname,works_flow_detail_id,work_group,work_grade,bid,createuserid,CreateUser,CreateStaff,upid)
+ select jskey,@works_flow_code@,@works_flow_name@ ,@works_flow_param@,@status@,@statusname@,@works_flow_detail_id@,@work_group@,@work_grade@,@bid@,@UserID@,@UserName,@FullName,@time_id@
+ from #${sheet}
+
+ insert into s_my_works_flow_notice (works_flow_id,works_flow_code,works_flow_detail_id,userid,notice_type,createuserid,CreateUser,CreateStaff,upid)
+ select jskey,@works_flow_code@,@works_flow_detail_id@,@userid@,@start_type@,@userid@,@UserName,@FullName,@time_id@
+ from #${sheet}
+
+ insert into s_my_works_flow_role (works_flow_id,works_flow_code,userid,works_flow_detail_id,createuserid,CreateUser,CreateStaff,upid,typecharone)
+ select jskey,@works_flow_code@,@userid@,@works_flow_detail_id@,@userid@,@UserName,@FullName,@time_id@,'begin'
+ from #${sheet}
+ `
+ }
+ sql += `
+ ${flowsql}
${_backCustomScript}
drop table #${sheet}
aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg`
+ sql = sql.replace(/@start_type@/ig, `'寮�濮�'`)
+ sql = sql.replace(/@works_flow_code@/ig, `'${flow.flow_code}'`)
+ sql = sql.replace(/@works_flow_name@/ig, `'${flow.flow_name}'`)
+
+ if (target) {
+ let label = target.attrs && target.attrs.text && target.attrs.text.text ? target.attrs.text.text : ''
+ let msg = {...target.mkdata, label: label, id: target.id, checkIds: [], checkUsers: []}
+ sql = sql.replace(/@works_flow_param@/ig, `'${window.btoa(window.encodeURIComponent(JSON.stringify(msg)))}'`)
+ } else {
+ sql = sql.replace(/@works_flow_param@/ig, `''`)
+ }
+ sql = sql.replace(/@works_flow_detail_id@/ig, `'${detailId}'`)
+ sql = sql.replace(/@status@/ig, `'${status}'`)
+ sql = sql.replace(/@statusname@/ig, `'${statusName}'`)
+ sql = sql.replace(/@work_group@/ig, `'${sessionStorage.getItem('work_group') || ''}'`)
+ sql = sql.replace(/@work_grade@/ig, `'${work_grade}'`)
+ } else {
+ sql += `
+ ${_backCustomScript}
+
+ drop table #${sheet}
+
+ aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg`
+ }
+
sql = sql.replace(/\n\s{6}/ig, '\n')
if (window.GLOB.debugger === true) {
- console.info('%c' + item.logLabel, 'color: blue')
- console.info(sql)
+ window.mkInfo('%c' + item.logLabel, 'color: blue')
+ window.mkInfo(sql)
}
} else {
for(let i = 0; i < _Ltext.length; i += 20) {
@@ -1265,7 +1562,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') || ''
@@ -1326,6 +1623,7 @@
{reg: /@SessionUid@/ig, value: `'${localStorage.getItem('SessionUid') || ''}'`},
{reg: /@UserID@/ig, value: `'${sessionStorage.getItem('UserID') || ''}'`},
{reg: /@Appkey@/ig, value: `'${window.GLOB.appkey || ''}'`},
+ {reg: /@lang@/ig, value: `'${sessionStorage.getItem('lang')}'`},
{reg: /@typename@/ig, value: `'admin'`},
{reg: /\$@/ig, value: isDM ? '/*' : ''},
{reg: /@\$/ig, value: isDM ? '*/' : ''},
@@ -1365,17 +1663,55 @@
let _uniquesql = ''
if (btn.uniques && btn.uniques.length > 0) {
+ let textFields = []
+ let numberFields = []
+ let dateFields = []
+ columns.forEach((col) => {
+ if (/Nvarchar/ig.test(col.datatype)) {
+ textFields.push(col.field)
+ } else if (/Decimal|int/ig.test(col.datatype)) {
+ numberFields.push(col.field)
+ } else if (/date/ig.test(col.datatype)) {
+ dateFields.push(col.field)
+ }
+ })
btn.uniques.forEach(unique => {
if (unique.status === 'false' || !unique.verifyType) return
let _fields = unique.field.split(',')
let _fields_ = _fields.map(_field => `a.${_field}=b.${_field}`)
- let _afields = _fields.map(_field => `a.${_field}`)
_fields_ = _fields_.join(' and ')
+ _fields_ += ` and a.jskey != b.${setting.primaryKey || 'id'}`
+
+ let _where = []
+ _fields.forEach(f => {
+ if (textFields.includes(f)) {
+ _where.push(`${f}!=''`)
+ } else if (numberFields.includes(f)) {
+ _where.push(`${f}!=0`)
+ } else if (dateFields.includes(f)) {
+ _where.push(`${f}>'1949-10-01'`)
+ }
+ })
+ _where = _where.length ? `where ${_where.join(' and ')} ` : ''
if (unique.verifyType === 'logic' || unique.verifyType === 'logic_temp') {
_fields_ += ' and b.deleted=0'
}
+
+ let _afields = []
+ _fields = _fields.map(f => {
+ if (numberFields.includes(f)) {
+ _afields.push(`cast(a.${f} as nvarchar(50))`)
+ return `cast(${f} as nvarchar(50))`
+ } else if (dateFields.includes(f)) {
+ _afields.push(`CONVERT(nvarchar(50), a.${f}, 21)`)
+ return `CONVERT(nvarchar(50), ${f}, 21)`
+ }
+ _afields.push(`a.${f}`)
+
+ return f
+ })
_uniquesql += `
/* 閲嶅鎬ч獙璇� */
@@ -1389,7 +1725,7 @@
end
${unique.verifyType.indexOf('temp') === -1 ? `Set @tbid=''
- Select top 1 @tbid=${_afields.join('+\' \'+')} from #${sheet} a Inner join ${database}${sheet} b on ${_fields_}
+ Select top 1 @tbid=${_afields.join('+\' \'+')} from ${_where ? `(select * from #${sheet} ${_where})` : `#${sheet}`} a Inner join ${database}${sheet} b on ${_fields_}
If @tbid!=''
Begin
@@ -1402,6 +1738,7 @@
let declarefields = []
let fields = []
+ let upFields = []
columns.forEach(col => {
let key = col.field.toLowerCase()
@@ -1409,22 +1746,34 @@
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}
`
}
sql = `
/* 绯荤粺鐢熸垚 */
- create table #${sheet} (${declarefields.join(',')},jskey nvarchar(50),data_type nvarchar(50),BID nvarchar(50) )
+ create table #${sheet} (${declarefields.join(',')},jskey nvarchar(50),data_type nvarchar(50),BID nvarchar(256))
Declare @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),@ErrorCode nvarchar(50),@retmsg nvarchar(4000),@tbid Nvarchar(512)
Select @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}'
@@ -1446,8 +1795,8 @@
sql = sql.replace(/\n\s{6}/ig, '\n')
if (window.GLOB.debugger === true) {
- console.info('%c' + btn.logLabel, 'color: blue')
- console.info(sql)
+ window.mkInfo('%c' + btn.logLabel, 'color: blue')
+ window.mkInfo(sql)
}
} else {
for(let i = 0; i < _Ltext.length; i += 20) {
@@ -1476,11 +1825,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 = ''
@@ -1514,7 +1862,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'
@@ -1526,18 +1874,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}`)
@@ -1585,14 +1943,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'
@@ -1647,7 +2003,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') || ''
@@ -1665,7 +2021,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=''
`
// 琛ㄥ崟鍙橀噺璧嬪��
@@ -1725,9 +2081,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 += `
@@ -1798,45 +2176,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}',
@@ -1864,30 +2236,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(', ')} 宸插瓨鍦�'
@@ -1933,13 +2309,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}',
@@ -2094,7 +2475,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++
})
@@ -2134,7 +2515,13 @@
let status = 0
let statusName = ''
let detailId = ''
+ let sign = ''
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]
@@ -2158,25 +2545,18 @@
if (verify.flowType === 'reject') {
line = lines.filter(cell => cell.mkdata.flowType === 'reject' || cell.mknode === 'startEdge')[0]
} else {
- let endEdge = null
- lines = lines.filter(cell => {
- if (cell.mknode === 'endEdge') {
- endEdge = cell
- return false
- }
-
- return cell.mkdata.flowType !== 'reject' && cell.mknode !== 'startEdge'
- })
+ lines = lines.filter(cell => cell.mkdata.flowType !== 'reject' && cell.mknode !== 'startEdge')
if (lines.length === 0) {
- if (!endEdge) {
- error = '鏃犲彲鎵ц鐨勬祦绋嬪垎鏀�'
- } else {
- line = endEdge
- }
+ error = '鏃犲彲鎵ц鐨勬祦绋嬪垎鏀�'
} else {
let branchKey = verify.flowBranch ? verify.flowBranch.toLowerCase() : ''
-
+
+ formdata && formdata.forEach(form => {
+ let _key = form.key.toLowerCase()
+ _data[_key] = form.value
+ })
+
if (!branchKey) {
lines.forEach(line => {
if (line.mkdata.execCondition === 'open') {
@@ -2184,18 +2564,31 @@
}
})
if (!error) {
- line = lines[0]
+ lines = lines.filter(cell => {
+ if (cell.mkdata.seniorCondition === 'open' && !line) {
+ cell.mkdata.seniorbers && cell.mkdata.seniorbers.forEach(per => {
+ if (per.worker_id === userid) {
+ line = cell
+ }
+ })
+
+ return false
+ }
+
+ return true
+ })
+
+ if (!line) {
+ line = lines[0]
+ }
}
} else if (!_data.hasOwnProperty(branchKey)) {
- error = '琛屼俊鎭腑鏃犳祦绋嬫帶鍒跺瓧娈点��'
+ error = '淇℃伅涓棤娴佺▼鎺у埗瀛楁銆�'
} else {
- if (endEdge) {
- line = endEdge
- }
-
- let equalLine = null
- let gtOrLtLine = []
- let unEqualLine = null
+ let _def_lines = []
+ let _equ_lines = []
+ let _unequ_lines = []
+ let _or_lines = []
let branchVal = _data[branchKey]
if (branchVal && typeof(branchVal) === 'string' && !isNaN(branchVal)) {
@@ -2204,45 +2597,58 @@
lines.forEach(item => {
if (item.mkdata.execCondition !== 'open') {
- line = item
+ _def_lines.push(item)
} else {
if (item.mkdata.match === '=') {
if (item.mkdata.matchVal === branchVal + '') {
- equalLine = item
+ _equ_lines.push(item)
}
} else if (item.mkdata.match === '!=') {
if (item.mkdata.matchVal !== branchVal + '') {
- unEqualLine = item
+ _unequ_lines.push(item)
}
} else {
if (item.mkdata.match === '<') {
if (item.mkdata.matchVal < branchVal) {
- gtOrLtLine.push({...item, dist: Math.abs(item.mkdata.matchVal - branchVal)})
+ _or_lines.push({...item, dist: Math.abs(item.mkdata.matchVal - branchVal)})
}
} else if (item.mkdata.match === '>') {
if (item.mkdata.matchVal > branchVal) {
- gtOrLtLine.push({...item, dist: Math.abs(item.mkdata.matchVal - branchVal)})
+ _or_lines.push({...item, dist: Math.abs(item.mkdata.matchVal - branchVal)})
}
} else if (item.mkdata.match === '<=') {
if (item.mkdata.matchVal <= branchVal) {
- gtOrLtLine.push({...item, dist: Math.abs(item.mkdata.matchVal - branchVal)})
+ _or_lines.push({...item, dist: Math.abs(item.mkdata.matchVal - branchVal)})
}
} else if (item.mkdata.match === '>=') {
if (item.mkdata.matchVal >= branchVal) {
- gtOrLtLine.push({...item, dist: Math.abs(item.mkdata.matchVal - branchVal)})
+ _or_lines.push({...item, dist: Math.abs(item.mkdata.matchVal - branchVal)})
}
}
}
}
})
- if (equalLine) {
- line = equalLine
- } else if (gtOrLtLine.length > 0) {
- gtOrLtLine.sort((a, b) => a.dist - b.dist)
- line = gtOrLtLine[0]
- } else if (unEqualLine) {
- line = unEqualLine
+ _or_lines.sort((a, b) => a.dist - b.dist)
+
+ let _lines = [..._equ_lines, ..._or_lines, ..._unequ_lines, ..._def_lines]
+
+ _lines = _lines.filter(cell => {
+ if (cell.mkdata.seniorCondition === 'open' && !line) {
+ cell.mkdata.seniorbers && cell.mkdata.seniorbers.forEach(per => {
+ if (per.worker_id === userid) {
+ line = cell
+ }
+ })
+
+ return false
+ }
+
+ return true
+ })
+
+ if (!line) {
+ line = _lines[0]
}
}
}
@@ -2255,7 +2661,36 @@
detailId = line.id
status = line.mkdata.status
statusName = line.mkdata.statusName
+ sign = line.mkdata.seniorSign || ''
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 && !['startEdge', 'endEdge', 'throughEdge'].includes(line.mknode)) {
+ error = '鏈幏鍙栧埌涓嬩竴姝ュ鎵逛汉'
+ } else if (line.approvalMethod === 'countersign' && (!node.checkIds || !node.checkIds.includes(userid))) {
+ error = '褰撳墠鐢ㄦ埛涓嶅湪瀹℃壒浜哄垪琛ㄤ腑'
+ }
} else if (!error) {
error = '宸ヤ綔娴佷腑鏃犲搴旀祦绋�'
}
@@ -2263,27 +2698,198 @@
error = '琛屼俊鎭腑鏃犲伐浣滄祦鍙傛暟'
}
- if (verify.flowSql === 'true' && target) {
+ if (!error && verify.flowSql !== 'true' && verify.flowType !== 'start' && line && line.approvalMethod === 'countersign') {
+ error = '浼氱娴佺▼闇�瑕佷娇鐢ㄩ粯璁よ剼鏈�'
+ }
+
+ if (error) {
+ status = 0
+ statusName = '寮傚父'
+
+ _sql += `
+ /* 宸ヤ綔娴佸紓甯竤ql */
+ select @ErrorCode='E',@retmsg='${error}' goto aaa
+ `
+ } else if (verify.flowSql === 'true') {
if (verify.flowType === 'start') {
_sql += `
/* 宸ヤ綔娴侀粯璁ql */
insert into s_my_works_flow (works_flow_id,works_flow_code,works_flow_name,works_flow_param,status,statusname,work_group,works_flow_detail_id,work_grade,bid,createuserid,CreateUser,CreateStaff,upid)
select @ID@,@works_flow_code@,@works_flow_name@,@works_flow_param@,@status@,@statusname@,@work_group@,@works_flow_detail_id@,@work_grade@,@bid@,@UserID@,@UserName,@FullName,@time_id@
- insert into s_my_works_flow_log (works_flow_id,works_flow_code,works_flow_name,works_flow_param,status,statusname,works_flow_detail_id,work_group,work_grade,upid)
- select @ID@,@works_flow_code@,@works_flow_name@ ,@works_flow_param@,@status@,@statusname@,@works_flow_detail_id@,@work_group@,@work_grade@,@time_id@
+ insert into s_my_works_flow_log (works_flow_id,works_flow_code,works_flow_name,works_flow_param,status,statusname,works_flow_detail_id,work_group,work_grade,bid,createuserid,CreateUser,CreateStaff,upid)
+ select @ID@,@works_flow_code@,@works_flow_name@ ,@works_flow_param@,@status@,@statusname@,@works_flow_detail_id@,@work_group@,@work_grade@,@bid@,@UserID@,@UserName,@FullName,@time_id@
insert into s_my_works_flow_notice (works_flow_id,works_flow_code,works_flow_detail_id,userid,notice_type,createuserid,CreateUser,CreateStaff,upid)
select @ID@,@works_flow_code@,@works_flow_detail_id@,@userid@,@start_type@,@userid@,@UserName,@FullName,@time_id@
+ 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.approvalMethod === 'countersign' && node.checkIds.length > 1) {
+ let label = ''
+ let field = ''
+ let mark = line.mark || '宸插鏍�'
+ let _declare = []
+ let _select = []
+ let _select2 = []
+ let _where = []
+ let fields = ['statuscharone', 'statuschartwo', 'statuscharthree', 'statuscharfour', 'statuscharfive']
+ node.checkUsers.forEach((user, index) => {
+ if (user.worker_id === userid) {
+ field = fields[index]
+ label = `'${user.parentNames[2] || ''}${user.workername || ''}${mark}'`
+ } else {
+ _declare.push(`@works_flow_${fields[index]} nvarchar(50)`)
+ _select.push(`@works_flow_${fields[index]}=''`)
+ _select2.push(`@works_flow_${fields[index]}=${fields[index]}`)
+ _where.push(`@works_flow_${fields[index]}!=''`)
+ }
+ })
+ _declare = _declare.join(',')
+ _select = _select.join(',')
+ _select2 = _select2.join(',')
+ _where = _where.join(' and ')
+
+ _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=''
+
+ select ${_select2},@works_flow_key_id=id,@s_my_works_flow_log_param=works_flow_param,@s_my_works_flow_log_status=status,@s_my_works_flow_log_statusname=statusname,@s_my_works_flow_log_detail_id=works_flow_detail_id
+ from s_my_works_flow where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0
+
+ if ${_where}
+ begin
+ set @works_flow_key_status='Y'
+ end
+
+ if @works_flow_key_status='Y'
+ begin
+ update s_my_works_flow set ${field}=${label},status=@status@,statusname=@statusname@,works_flow_param=@works_flow_param@,works_flow_detail_id=@works_flow_detail_id@,modifydate=getdate(),upid=@time_id@,modifyuserid=@userid@,modifyuser=@username,modifystaff=@fullname${verify.flowRemark ? ',remark=@' + verify.flowRemark : ''}
+ where id=@works_flow_key_id
+
+ insert into s_my_works_flow_log (works_flow_id,works_flow_code,works_flow_name,works_flow_param,status,statusname,works_flow_detail_id,work_group,work_grade,bid,createuserid,CreateUser,CreateStaff,upid${verify.flowRemark ? ',remark' : ''},${field})
+ select @ID@,@works_flow_code@,@works_flow_name@ ,@works_flow_param@,@status@,@statusname@,@works_flow_detail_id@,@work_group@,@work_grade@,@bid@,@UserID@,@UserName,@FullName,@time_id@${verify.flowRemark ? ',@' + verify.flowRemark : ''},${label}
+
+ 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
+
+ if @check_userids@ != ''
+ begin
+ insert into s_my_works_flow_role (works_flow_id,works_flow_code,userid,works_flow_detail_id,createuserid,CreateUser,CreateStaff,upid)
+ select @ID@,@works_flow_code@,ID,@works_flow_detail_id@,@userid@,@UserName,@FullName,@time_id@ from dbo.SplitComma(@check_userids@)
+ insert into s_my_works_flow_notice (works_flow_id,works_flow_code,works_flow_detail_id,userid,notice_type,createuserid,CreateUser,CreateStaff,upid)
+ select @ID@,@works_flow_code@,@works_flow_detail_id@,ID,@check_type@,@userid@,@UserName,@FullName,@time_id@ from dbo.SplitComma(@check_userids@)
+ end
+ if @notice_userids@ != ''
+ begin
+ update n
+ set deleted=10,modifydate=getdate(),upid=@time_id@,modifyuserid=@userid@,modifyuser=@username,modifystaff=@fullname
+ from (select * from s_my_works_flow_notice where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0) n
+ inner join (select ID from dbo.SplitComma(@notice_userids@)) s
+ on n.userid = s.id
+ insert into s_my_works_flow_notice (works_flow_id,works_flow_code,works_flow_detail_id,userid,notice_type,createuserid,CreateUser,CreateStaff,upid)
+ select @ID@,@works_flow_code@,@works_flow_detail_id@,ID,@notice_type@,@userid@,@UserName,@FullName,@time_id@ from dbo.SplitComma(@notice_userids@)
+ end
+ end
+ else
+ begin
+ update s_my_works_flow set ${field}=${label},modifydate=getdate(),upid=@time_id@,modifyuserid=@userid@,modifyuser=@username,modifystaff=@fullname${verify.flowRemark ? ',remark=@' + verify.flowRemark : ''}
+ where id =@works_flow_key_id
+
+ insert into s_my_works_flow_log (works_flow_id,works_flow_code,works_flow_name,works_flow_param,status,statusname,works_flow_detail_id,work_group,work_grade,bid,createuserid,CreateUser,CreateStaff,upid${verify.flowRemark ? ',remark' : ''},${field})
+ select @ID@,@works_flow_code@,@works_flow_name@ ,@s_my_works_flow_log_param,@s_my_works_flow_log_status,@s_my_works_flow_log_statusname,@s_my_works_flow_log_detail_id,@work_group@,@work_grade@,@bid@,@UserID@,@UserName,@FullName,@time_id@${verify.flowRemark ? ',@' + verify.flowRemark : ''},${label}
+
+ 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 and userid =@userid@
+ end
`
} else {
_sql += `
/* 宸ヤ綔娴侀粯璁ql */
- update s_my_works_flow set status=@status@,statusname=@statusname@,works_flow_param=@works_flow_param@,works_flow_detail_id=@works_flow_detail_id@,modifydate=getdate(),modifyuserid=@userid@,modifyuser=@username,modifystaff=@fullname
+ 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
+
+ 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 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_mk:
+
+ set @retmsg=''
+
+ update s_my_works_flow set status=@status@,statusname=@statusname@,works_flow_param=@works_flow_param@,works_flow_detail_id=@works_flow_detail_id@,modifydate=getdate(),upid=@time_id@,modifyuserid=@userid@,modifyuser=@username,modifystaff=@fullname${verify.flowRemark ? ',remark=@' + verify.flowRemark : ''}
where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0
- insert into s_my_works_flow_log (works_flow_id,works_flow_code,works_flow_name,works_flow_param,status,statusname,works_flow_detail_id,work_group,work_grade,upid)
- select @ID@,@works_flow_code@,@works_flow_name@ ,@works_flow_param@,@status@,@statusname@,@works_flow_detail_id@,@work_group@,@work_grade@,@time_id@
+ insert into s_my_works_flow_log (works_flow_id,works_flow_code,works_flow_name,works_flow_param,status,statusname,works_flow_detail_id,work_group,work_grade,bid,createuserid,CreateUser,CreateStaff,upid${verify.flowRemark ? ',remark' : ''})
+ select @ID@,@works_flow_code@,@works_flow_name@ ,@works_flow_param@,@status@,@statusname@,@works_flow_detail_id@,@work_group@,@work_grade@,@bid@,@UserID@,@UserName,@FullName,@time_id@${verify.flowRemark ? ',@' + verify.flowRemark : ''}
+
+ 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,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@ != ''
begin
- delete s_my_works_flow_role where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0
insert into s_my_works_flow_role (works_flow_id,works_flow_code,userid,works_flow_detail_id,createuserid,CreateUser,CreateStaff,upid)
select @ID@,@works_flow_code@,ID,@works_flow_detail_id@,@userid@,@UserName,@FullName,@time_id@ from dbo.SplitComma(@check_userids@)
insert into s_my_works_flow_notice (works_flow_id,works_flow_code,works_flow_detail_id,userid,notice_type,createuserid,CreateUser,CreateStaff,upid)
@@ -2291,7 +2897,8 @@
end
if @notice_userids@ != ''
begin
- delete n
+ update n
+ set deleted=10,modifydate=getdate(),upid=@time_id@,modifyuserid=@userid@,modifyuser=@username,modifystaff=@fullname
from (select * from s_my_works_flow_notice where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0) n
inner join (select ID from dbo.SplitComma(@notice_userids@)) s
on n.userid = s.id
@@ -2300,46 +2907,30 @@
end
`
}
- } else if (verify.flowSql === 'true') {
- status = 0
- statusName = '寮傚父'
-
- _sql += `
- /* 宸ヤ綔娴佸紓甯竤ql */
- select @ErrorCode='E',@retmsg='${error || '宸ヤ綔娴佹墽琛屽紓甯�'}' goto aaa
- `
}
- if (verify.flowType !== 'start') {
- if (line) {
- let checkIds = []
- let noticeIds = []
- line.mkdata.members && line.mkdata.members.forEach(item => {
- checkIds.push(item.worker_id)
- })
- 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, `''`)
- }
+ if (_backCustomScript) {
+ _sql += _backCustomScript
+ }
+
+ if (verify.flowType === 'start') {
+ _sql = _sql.replace(/@start_type@/ig, `'寮�濮�'`)
} else {
- _sql = _sql.replace(/@check_userids@/ig, `''`)
- _sql = _sql.replace(/@notice_userids@/ig, `''`)
- }
+ _sql = _sql.replace(/@works_flow_sign@/ig, `'${sign}'`)
- _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_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}'`)
+
if (target) {
let label = target.attrs && target.attrs.text && target.attrs.text.text ? target.attrs.text.text : ''
- let msg = {...target.mkdata, label: label, id: target.id}
+ let msg = {...target.mkdata, label: label, id: target.id, checkIds, checkUsers}
_sql = _sql.replace(/@works_flow_param@/ig, `'${window.btoa(window.encodeURIComponent(JSON.stringify(msg)))}'`)
} else {
_sql = _sql.replace(/@works_flow_param@/ig, `''`)
@@ -2348,11 +2939,13 @@
_sql = _sql.replace(/@status@/ig, `'${status}'`)
_sql = _sql.replace(/@statusname@/ig, `'${statusName}'`)
_sql = _sql.replace(/@work_group@/ig, `'${sessionStorage.getItem('work_group') || ''}'`)
- _sql = _sql.replace(/@work_grade@/ig, `'${sessionStorage.getItem('work_grade') || 0}'`)
+ _sql = _sql.replace(/@work_grade@/ig, `'${work_grade}'`)
+ } else if (_backCustomScript) {
+ _sql += _backCustomScript
}
- if (_backCustomScript) {
- _sql += _backCustomScript
+ if (verifyValSql) {
+ _sql += verifyValSql
}
if (window.GLOB.breakpoint) {
@@ -2387,6 +2980,7 @@
_sql = _sql.replace(/@SessionUid@/ig, `'${localStorage.getItem('SessionUid') || ''}'`)
_sql = _sql.replace(/@UserID@/ig, `'${sessionStorage.getItem('UserID') || ''}'`)
_sql = _sql.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
+ _sql = _sql.replace(/@lang@/ig, `'${sessionStorage.getItem('lang')}'`)
_sql = _sql.replace(/@typename@/ig, `'admin'`)
if (window.GLOB.externalDatabase !== null) {
@@ -2400,8 +2994,8 @@
}
if (window.GLOB.debugger === true) {
- console.info('%c' + btn.logLabel, 'color: blue')
- console.info(_sql)
+ window.mkInfo('%c' + btn.logLabel, 'color: blue')
+ window.mkInfo(_sql)
}
if (retmsg) {
@@ -2498,23 +3092,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