From 6d0137932fcc8f9848123743c1aad5cff8172d8a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 09 二月 2020 13:09:39 +0800
Subject: [PATCH] 2020-02-09
---
src/utils/utils.js | 162 +++++++++++++++++++++++++++++++++---------------------
1 files changed, 99 insertions(+), 63 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index df4d668..c7540b2 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -448,10 +448,10 @@
static getSysDefaultSql (btn, setting, formdata, param, data, logcolumns) {
let primaryId = param.ID
let BID = param.BID
- let verify = btn.verify
+ let verify = btn.verify || {}
let _formFieldValue = {}
// 闇�瑕佸０鏄庣殑鍙橀噺闆�
- let _vars = ['tbid', 'ErrorCode', 'retmsg', 'BillCode', 'BVoucher', 'FIBVoucherDate', 'FiYear', 'UserName', 'FullName', 'ID', 'BID']
+ let _vars = ['tbid', 'ErrorCode', 'retmsg', 'BillCode', 'BVoucher', 'FIBVoucherDate', 'FiYear', 'UserName', 'FullName', 'ID', 'BID', 'LoginUID', 'SessionUid', 'UserID', 'Appkey']
// 涓婚敭瀛楁
let primaryKey = setting.primaryKey || 'id'
@@ -460,16 +460,79 @@
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)
`
+ let _initvars = ['ID', 'BID', 'LoginUID', 'SessionUid', 'UserID', 'Appkey'] // 宸茶祴鍊煎瓧娈甸泦
+ let _initfields = []
+ let _declarefields = []
+
// 鑾峰彇瀛楁閿�煎
if (formdata) {
formdata.forEach(form => {
_formFieldValue[form.key] = form.value
+
+ if (!_initvars.includes(form.key)) {
+ _initvars.push(form.key)
+ _initfields.push(`@${form.key}='${form.value}'`)
+ }
+
+ if (!_vars.includes(form.key)) {
+ _vars.push(form.key)
+
+ let _type = `nvarchar(${form.fieldlen})`
+
+ if (form.type.match(/date/ig)) {
+ _type = 'datetime'
+ } else if (form.type === 'number') {
+ _type = `decimal(18,${form.fieldlen})`
+ }
+
+ _declarefields.push(`@${form.key} ${_type}`)
+ }
})
}
- // 娣诲姞鏁版嵁涓瓧娈碉紝琛ㄥ崟鍊间紭鍏�
- if (data) {
+ // 娣诲姞鏁版嵁涓瓧娈碉紝琛ㄥ崟鍊间紭鍏�(鎸夐挳涓嶉�夎鏃惰烦杩�)
+ if (data && btn.Ot !== 'notRequired') {
_formFieldValue = {...data, ..._formFieldValue}
+
+ if (logcolumns && logcolumns.length > 0) {
+ logcolumns.forEach(col => {
+ if (!_initvars.includes(col.field)) {
+ _initvars.push(col.field)
+
+ let _val = data.hasOwnProperty(col.field) ? data[col.field] : ''
+ _initfields.push(`@${col.field}='${_val}'`)
+ }
+
+ if (!_vars.includes(col.field)) {
+ _vars.push(col.field)
+
+ let _type = `nvarchar(${col.fieldlength || 50})`
+
+ if (col.type === 'number') {
+ let _length = (col.decimal || col.decimal === 0) ? col.decimal : 18
+ _type = `decimal(18,${_length})`
+ } else if (col.type === 'picture' || col.type === 'textarea') {
+ _type = `nvarchar(${col.fieldlength || 512})`
+ }
+
+ _declarefields.push(`@${col.field} ${_type}`)
+ }
+ })
+ }
+ }
+
+ // 鍙橀噺澹版槑
+ _declarefields = _declarefields.join(',')
+ if (_declarefields) {
+ _sql += `,${_declarefields}
+ `
+ }
+
+ // 鍙橀噺璧嬪��
+ _initfields = _initfields.join(',')
+ if (_initfields) {
+ _sql += `select ${_initfields}
+ `
}
// 娣诲姞鏃朵富閿负绌�
@@ -477,60 +540,29 @@
primaryId = ''
}
- // 澹版槑琛ㄥ崟鍙婂垪琛ㄦ暟鎹瓧娈碉紝鍒濆鍖栬祴鍊�
- let keys = Object.keys(_formFieldValue)
- let _initfields = []
- let _initvars = ['ID', 'BID']
- let _formfields = []
- keys.forEach(key => {
- if (!_initvars.includes(key)) {
- _initvars.push(key)
- _initfields.push(`@${key}='${_formFieldValue[key]}'`)
- }
-
- if (!_vars.includes(key)) {
- _vars.push(key)
- _formfields.push(`@${key} nvarchar(50)`)
- }
- })
-
- _formfields = _formfields.join(',')
- if (_formfields) {
- _sql += `,${_formfields}
- `
- }
-
- _initfields = _initfields.join(',')
- if (_initfields) {
- _sql += `select ${_initfields}
- `
- }
-
// 鍘婚櫎绂佺敤鐨勯獙璇�
- if (verify) {
- if (verify.contrasts) {
- verify.contrasts = verify.contrasts.filter(item => item.status !== 'false')
- }
- if (verify.uniques) {
- verify.uniques = verify.uniques.filter(item => item.status !== 'false')
- }
- if (verify.customverifys) {
- verify.customverifys = verify.customverifys.filter(item => item.status !== 'false')
- }
- if (verify.billcodes) {
- verify.billcodes = verify.billcodes.filter(item => item.status !== 'false')
- }
- if (verify.scripts) {
- verify.scripts = verify.scripts.filter(item => item.status !== 'false')
- }
+ if (verify.contrasts) {
+ verify.contrasts = verify.contrasts.filter(item => item.status !== 'false')
+ }
+ if (verify.uniques) {
+ verify.uniques = verify.uniques.filter(item => item.status !== 'false')
+ }
+ if (verify.customverifys) {
+ verify.customverifys = verify.customverifys.filter(item => item.status !== 'false')
+ }
+ if (verify.billcodes) {
+ verify.billcodes = verify.billcodes.filter(item => item.status !== 'false')
+ }
+ if (verify.scripts) {
+ verify.scripts = verify.scripts.filter(item => item.status !== 'false')
}
// 鍒濆鍖栧嚟璇佸瓧娈�
- _sql += `select @BVoucher='',@FIBVoucherDate='',@FiYear=''
+ _sql += `select @BVoucher='',@FIBVoucherDate='',@FiYear='',@ErrorCode='',@retmsg=''
`
// 鍚敤璐︽湡楠岃瘉
- if (verify && verify.accountdate === 'true') {
+ if (verify.accountdate === 'true') {
_sql += `exec s_FIBVoucherDateCheck @ErrorCode=@ErrorCode OUTPUT,@retmsg=@retmsg OUTPUT
if @ErrorCode!=''
GOTO aaa
@@ -538,7 +570,7 @@
}
// 澶辨晥楠岃瘉锛屾坊鍔犳暟鎹椂涓嶇敤
- if (btn.sqlType !== 'insert' && verify && verify.invalid === 'true' && setting.dataresource) {
+ if (btn.sqlType !== 'insert' && verify.invalid === 'true' && setting.dataresource) {
let datasource = setting.dataresource
if (/\s/.test(datasource)) { // 鎷兼帴鍒悕
datasource = '(' + datasource + ') tb'
@@ -555,7 +587,7 @@
}
// 姣旇緝楠岃瘉
- if (verify && verify.contrasts && verify.contrasts.length > 0) {
+ if (verify.contrasts && verify.contrasts.length > 0) {
verify.contrasts.forEach(item => {
_sql += `If ${item.frontfield} ${item.operator} ${item.backfield}
Begin
@@ -567,7 +599,7 @@
}
// 鍞竴鎬ч獙璇侊紝蹇呴』瀛樺湪琛ㄥ崟锛堣〃鍗曞瓨鍦ㄦ椂锛屼富閿潎涓哄崟鍊硷級,蹇呴』濉啓鏁版嵁婧�
- if (formdata && verify && verify.uniques.length > 0) {
+ if (formdata && verify.uniques && verify.uniques.length > 0) {
verify.uniques.forEach(item => {
let _fieldValue = [] // 琛ㄥ崟閿�煎field=value
let _value = [] // 琛ㄥ崟鍊硷紝鐢ㄤ簬閿欒鎻愮ず
@@ -595,7 +627,7 @@
}
// 鑷畾涔夐獙璇�
- if (verify && verify.customverifys.length > 0) {
+ if (verify.customverifys && verify.customverifys.length > 0) {
verify.customverifys.forEach(item => {
_sql += `select @tbid='', @ErrorCode='',@retmsg=''
select top 1 @tbid='X' from (${item.sql}) a
@@ -609,7 +641,7 @@
}
// 鍗曞彿鐢熸垚锛屼娇鐢ㄤ笂绾d锛圔ID锛夋垨鍒楄〃鏁版嵁锛屽０鏄庡彉閲忥紙妫�楠岋級
- if (verify && verify.billcodes.length > 0) {
+ if (verify.billcodes && verify.billcodes.length > 0) {
verify.billcodes.forEach(item => {
let _ModularDetailCode = ''
if (item.TypeCharOne === 'Lp' || item.TypeCharOne === 'BN') {
@@ -650,7 +682,7 @@
let _updateconfig = ''
// 鍑瘉-鏄剧ず鍒椾腑閫夊彇,蹇呴』閫夎
- if (verify && verify.voucher && verify.voucher.enabled && data) {
+ if (verify.voucher && verify.voucher.enabled && data) {
let _voucher = verify.voucher
_updateconfig = ',BVoucher=@BVoucher,FIBVoucherDate=@FIBVoucherDate,FiYear=@FiYear'
@@ -676,7 +708,7 @@
`
// 娣诲姞銆佷慨鏀广�侀�昏緫鍒犻櫎銆佺墿鐞嗗垹闄�
- if (btn.OpenType === 'pop' && btn.sqlType === 'insert') {
+ if (btn.OpenType === 'pop' && btn.sqlType === 'insert' && verify.default !== 'false') {
let keys = []
let values = []
formdata.forEach(item => {
@@ -696,7 +728,7 @@
values = values.join(',')
_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') {
+ } else if (btn.OpenType === 'pop' && btn.sqlType === 'update' && verify.default !== 'false') {
let _form = []
formdata.forEach(item => {
if (item.type === 'funcvar') {
@@ -709,13 +741,17 @@
})
_form = _form.join(',')
_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') { // 閫昏緫鍒犻櫎
+ } else if ((btn.OpenType === 'prompt' || btn.OpenType === 'exec') && btn.sqlType === 'LogicDelete' && verify.default !== 'false') { // 閫昏緫鍒犻櫎
_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' && verify.default !== 'false') { // 鐗╃悊鍒犻櫎
let _msg = ''
if (data && logcolumns && logcolumns.length > 0) {
+ let _index = 0
logcolumns.forEach(col => {
- _msg += col.label + '=' + data[col.field] + ','
+ if (col.Hide !== 'true' && _index < 4) {
+ _msg += col.label + '=' + data[col.field] + ','
+ _index++
+ }
})
}
_sql += _user
@@ -723,7 +759,7 @@
}
// 鎷兼帴鑷畾涔夎剼鏈�
- if (verify && verify.scripts && verify.scripts.length > 0) {
+ if (verify.scripts && verify.scripts.length > 0) {
let _scripts = ''
verify.scripts.forEach(item => {
_scripts += `
--
Gitblit v1.8.0