From 7ea1c5f53702951fc4df60e969fc67ef5d7af4dd Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 14 一月 2020 10:13:05 +0800
Subject: [PATCH] 2020-01-14
---
src/utils/utils.js | 68 +++++++++++++++++++++++++---------
1 files changed, 50 insertions(+), 18 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 2a52009..ff237b6 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -433,7 +433,11 @@
if (item.type === 'link') {
sql = 'select ' + item.valueField + ',' + item.valueText + ',' + item.linkField + ' from ' + _datasource
} else {
- sql = 'select ' + item.valueField + ',' + item.valueText + ' from ' + _datasource
+ let _linkSubField = '' // 涓嬫媺鑿滃崟鍏宠仈琛ㄥ崟
+ if (item.linkSubField && item.linkSubField.length > 0) {
+ _linkSubField = ',' + item.linkSubField.join(',')
+ }
+ sql = 'select ' + item.valueField + ',' + item.valueText + _linkSubField + ' from ' + _datasource
}
if (item.orderBy) {
@@ -448,7 +452,9 @@
* @return {String} type 鎵ц绫诲瀷
* @return {String} table 琛ㄥ悕
*/
- static getSysDefaultSql (btn, setting, formdata, primaryId, data) {
+ static getSysDefaultSql (btn, setting, formdata, param, data) {
+ let primaryId = param.ID
+ let BID = param.BID
let verify = btn.verify
let _formFieldValue = {}
@@ -461,7 +467,7 @@
let primaryKey = setting.primaryKey || 'id' // 涓婚敭瀛楁
// 绯荤粺鍙橀噺澹版槑涓庤缃垵濮嬪��
let _sql = `Declare @tbid nvarchar(50), @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@BillCode nvarchar(50),@BVoucher nvarchar(50),@FIBVoucherDate nvarchar(50), @FiYear nvarchar(50)
- Select @tbid='', @ErrorCode='',@retmsg='',@BVoucher='',@FIBVoucherDate='',@FiYear=''
+ Select @BVoucher='',@FIBVoucherDate='',@FiYear=''
`
if (verify && verify.accountdate === 'true') { // 鍚敤璐︽湡楠岃瘉
@@ -470,34 +476,42 @@
GOTO aaa
`
}
- if (btn.sqlType !== 'insert' && verify && verify.invalid === 'true') { // 澶辨晥楠岃瘉锛屾坊鍔犳暟鎹椂涓嶇敤
- _sql += `Select @tbid=${primaryKey} from ${btn.sql} where ${primaryKey} ='${primaryId}'
+ if (btn.sqlType !== 'insert' && verify && verify.invalid === 'true' && setting.dataresource) { // 澶辨晥楠岃瘉锛屾坊鍔犳暟鎹椂涓嶇敤
+ let datasource = setting.dataresource
+ if (/\s/.test(datasource)) { // 鎷兼帴鍒悕
+ datasource = '(' + datasource + ') tb'
+ }
+
+ _sql += `Select @tbid='', @ErrorCode='',@retmsg=''
+ Select @tbid=${primaryKey} from ${datasource} where ${primaryKey} ='${primaryId}'
If @tbid=''
Begin
- Setect @ErrorCode='E',@retmsg='鏁版嵁宸插け鏁�'
+ select @ErrorCode='E',@retmsg='鏁版嵁宸插け鏁�'
goto aaa
end
`
}
- if (formdata && verify && verify.uniques.length > 0) { // 鍞竴鎬ч獙璇侊紝蹇呴』瀛樺湪琛ㄥ崟锛堣〃鍗曞瓨鍦ㄦ椂锛屼富閿潎涓哄崟鍊硷級
+ if (formdata && verify && verify.uniques.length > 0) { // 鍞竴鎬ч獙璇侊紝蹇呴』瀛樺湪琛ㄥ崟锛堣〃鍗曞瓨鍦ㄦ椂锛屼富閿潎涓哄崟鍊硷級,蹇呴』濉啓鏁版嵁婧�
let _primaryId = primaryId
if (btn.sqlType === 'insert') {
_primaryId = ''
}
+
verify.uniques.forEach(item => {
let _fieldValue = [] // 琛ㄥ崟閿�煎field=value
let _value = [] // 琛ㄥ崟鍊硷紝鐢ㄤ簬閿欒鎻愮ず
+ let _labels = item.fieldlabel.split(',')
- item.field.split(',').forEach(_field => {
+ item.field.split(',').forEach((_field, index) => {
_fieldValue.push(`${_field}='${_formFieldValue[_field]}'`)
- _value.push(_formFieldValue[_field])
+ _value.push(`${_labels[index] || ''}锛�${_formFieldValue[_field] || ''}`)
})
_sql += `Select @tbid='', @ErrorCode='',@retmsg=''
Select @tbid='X' from ${btn.sql} where ${_fieldValue.join(' and ')} and ${primaryKey} !='${_primaryId}'
If @tbid!=''
Begin
- Setect @ErrorCode='${item.errorCode}',@retmsg='${item.fieldlabel || ''}锛�${_value.join(' ')} 宸插瓨鍦�'
+ select @ErrorCode='${item.errorCode}',@retmsg='${_value.join(', ')} 宸插瓨鍦�'
goto aaa
end
`
@@ -505,6 +519,11 @@
}
if (verify && verify.customverifys.length > 0) { // 鑷畾涔夐獙璇�
+ let _primaryId = primaryId
+ if (btn.sqlType === 'insert') {
+ _primaryId = ''
+ }
+
verify.customverifys.forEach(item => {
let _cuSql = item.sql
if (data) {
@@ -514,15 +533,22 @@
keys = keys.sort((a, b) => {
return b.length - a.length
})
+
keys.forEach(key => {
- _cuSql.replace('@' + key, _formFieldValue[key])
+ let reg = new RegExp('@' + key, 'ig')
+ _cuSql = _cuSql.replace(reg, `'${_formFieldValue[key]}'`)
})
+ let idreg = new RegExp('@ID', 'ig')
+ _cuSql = _cuSql.replace(idreg, `'${_primaryId}'`)
+
+ let bidreg = new RegExp('@BID', 'ig')
+ _cuSql = _cuSql.replace(bidreg, `'${BID}'`)
_sql += `Select @tbid='', @ErrorCode='',@retmsg=''
Select top 1 @tbid='X' from (${_cuSql}) a
- If @tbid ${item.result === 'true' ? '=' : '!='}''
+ If @tbid ${item.result === 'true' ? '!=' : '='}''
Begin
- Setect @ErrorCode='${item.errorCode}',@retmsg='${item.errmsg}'
+ select @ErrorCode='${item.errorCode}',@retmsg='${item.errmsg}'
goto aaa
end
`
@@ -554,8 +580,12 @@
})
}
+ let _updateconfig = ''
+
if (verify && verify.voucher && verify.voucher.enabled) { // 鍑瘉-鏄剧ず鍒椾腑閫夊彇,蹇呴』閫夎
let _voucher = verify.voucher
+
+ _updateconfig = ',BVoucher=@BVoucher,FIBVoucherDate=@FIBVoucherDate,FiYear=@FiYear'
_sql += `exec s_BVoucher_Create
@Bill ='${data[_voucher.linkField]}',
@@ -587,8 +617,10 @@
})
keys = keys.join(',')
values = values.join(',')
-
- _sql += `insert into ${btn.sql} (${keys}, createuserid, BID) select ${values},@BID,@userid`
+ _sql += `declare @UserName nvarchar(50),@FullName nvarchar(50)
+ select @UserName=UserName,@FullName=FullName from SUsers where UID=@UserID
+ `
+ _sql += `insert into ${btn.sql} (${keys},createuserid,CreateUser,CreateStaff,BID) select ${values},@BID,@userid,@username,@fullname`
} else if (btn.OpenType === 'pop' && btn.sqlType === 'update') {
let _form = []
formdata.forEach(item => {
@@ -599,15 +631,15 @@
}
})
_form = _form.join(',')
- _sql += `update ${btn.sql} set ${_form},modifydate=getdate(),modifyuserid=@userid,BVoucher=@BVoucher,FIBVoucherDate=@FIBVoucherDate,FiYear=@FiYear where ${primaryKey}=@${primaryKey}`
+ _sql += `update ${btn.sql} set ${_form},modifydate=getdate(),modifyuserid=@userid${_updateconfig} where ${primaryKey}=@${primaryKey}`
} else if ((btn.OpenType === 'prompt' || btn.OpenType === 'exec') && btn.sqlType === 'LogicDelete') { // 閫昏緫鍒犻櫎
_sql += `update ${btn.sql} set deleted=1,modifydate=getdate(),modifyuserid=@userid where ${primaryKey}=@${primaryKey}`
- } else if ((btn.OpenType === 'prompt' || btn.OpenType === 'exec') && btn.sqlType === 'delete') {
+ } else if ((btn.OpenType === 'prompt' || btn.OpenType === 'exec') && btn.sqlType === 'delete') { // 鐗╃悊鍒犻櫎
_sql += `insert into snote (remark,createuserid) select '鍒犻櫎琛�:${btn.sql} 鏁版嵁: ${primaryKey}='+@${primaryKey},@userid delete ${btn.sql} where ${primaryKey}=@${primaryKey}`
}
_sql += `
aaa:
- select @ErrorCode= as ErrorCode,@retmsg as ErrorCode
+ select @ErrorCode as ErrorCode,@retmsg as retmsg
`
console.log(_sql)
return _sql
--
Gitblit v1.8.0