From 8d6f1d97f1f9d8c81313a2b27802be6426436518 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 04 二月 2020 20:07:19 +0800
Subject: [PATCH] 2020-02-04
---
src/utils/utils.js | 48 ++++++++++++++++++++++++++++++------------------
1 files changed, 30 insertions(+), 18 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index c8a9f07..231c169 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -457,15 +457,20 @@
})
}
+ let _vars = ['tbid', 'ErrorCode', 'retmsg', 'BillCode', 'BVoucher', 'FIBVoucherDate', 'FiYear', 'UserName', 'FullName']
+
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)
+ let _sql = `Declare @tbid nvarchar(50),@ErrorCode nvarchar(50),@retmsg nvarchar(4000),@BillCode nvarchar(50),@BVoucher nvarchar(50),@FIBVoucherDate nvarchar(50), @FiYear nvarchar(50), @UserName nvarchar(50),@FullName nvarchar(50)
`
if (verify && verify.scripts && verify.scripts.length > 0 && formdata) {
- let _formfields = formdata.filter(form => !['tbid', 'ErrorCode', 'retmsg', 'BillCode', 'BVoucher', 'FIBVoucherDate', 'FiYear'].includes(form.key))
- _formfields = _formfields.map(form => `@${form.key} nvarchar(50)`)
+ let _formfields = formdata.filter(form => !_vars.includes(form.key))
+ _formfields = _formfields.map(form => {
+ _vars.push(form.key)
+ return `@${form.key} nvarchar(50)`
+ })
_formfields = _formfields.join(',')
- _sql += `${_formfields}
+ _sql += `,${_formfields}
`
}
@@ -572,7 +577,13 @@
_ModularDetailCode = item.ModularDetailCode
}
- _sql += `Declare @${item.field} nvarchar(50)
+ let _declare = ''
+ if (!_vars.includes(item.field)) {
+ _declare = `Declare @${item.field} nvarchar(50)`
+ }
+ _vars.push(item.field)
+
+ _sql += `${_declare}
select @BillCode='', @${item.field}=''
exec s_get_BillCode
@ModularDetailCode='${_ModularDetailCode}',
@@ -612,6 +623,9 @@
`
}
+ let _user = `select @UserName=UserName,@FullName=FullName from SUsers where UID=@UserID
+ `
+
if (btn.OpenType === 'pop' && btn.sqlType === 'insert') {
let keys = []
let values = []
@@ -630,10 +644,8 @@
keys = keys.join(',')
values = values.join(',')
- _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},@userid,@username,@fullname,@BID`
+ _sql += _user
+ _sql += `insert into ${btn.sql} (${keys},createuserid,CreateUser,CreateStaff,BID) select ${values},@userid,@username,@fullname,@BID;`
} else if (btn.OpenType === 'pop' && btn.sqlType === 'update') {
let _form = []
formdata.forEach(item => {
@@ -646,25 +658,25 @@
}
})
_form = _form.join(',')
- _sql += `update ${btn.sql} set ${_form},modifydate=getdate(),modifyuserid=@userid${_updateconfig} 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}`
+ _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') { // 鐗╃悊鍒犻櫎
- _sql += `insert into snote (remark,createuserid) select '鍒犻櫎琛�:${btn.sql} 鏁版嵁: ${primaryKey}='+@${primaryKey},@userid,@username,@fullname delete ${btn.sql} where ${primaryKey}=@${primaryKey}`
+ _sql += _user
+ _sql += `insert into snote (remark,createuserid) select '鍒犻櫎琛�:${btn.sql} 鏁版嵁: ${primaryKey}='+@${primaryKey},@userid,@username,@fullname delete ${btn.sql} where ${primaryKey}=@${primaryKey};`
}
if (verify && verify.scripts && verify.scripts.length > 0) {
let _scripts = ''
verify.scripts.forEach(item => {
- _scripts += `${item.sql}
- `
+ _scripts += `
+ ${item.sql}`
})
- _sql += `
- ${_scripts}`
+ _sql += `${_scripts}`
}
- _sql += `aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg
- `
+ _sql += `
+ aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg`
console.log(_sql)
return _sql
}
--
Gitblit v1.8.0