From 02a05c4e82e74c290e80ae7710fbb394ed7cac7a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 15 四月 2020 12:51:04 +0800
Subject: [PATCH] 2020-04-15
---
src/utils/utils.js | 76 +++++++++++++++++++++++++++----------
1 files changed, 55 insertions(+), 21 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 73bfa58..4b68be0 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -164,8 +164,8 @@
})
// 1銆佹浛鎹�%绗︼紙鏁版嵁搴撲腑瑙ｆ瀽鍚巗ql鎶ラ敊锛夛紝2銆佸幓闄ゆ敹灏惧浣欑┖鏍�
- value = value.replace(/%/ig, 'mpercent')
- value = value.replace(/(^\s|\s$)/ig, '')
+ value = value.replace(/%/ig, ' mpercent ')
+ // value = value.replace(/(^\s|\s$)/ig, '')
// 1銆乪ncode缂栫爜锛堜腑鏂囧瓧绗﹁秴鍑篵ase64鍔犲瘑鑼冨洿锛夛紝2銆乥ase64鍔犲瘑
value = window.btoa(window.encodeURIComponent(value))
@@ -505,7 +505,7 @@
})
}
} else if (/^int/ig.test(col.type)) {
- if (!val) {
+ if (!val && val !== 0) {
let _error = _position + dict['main.excel.content.emptyerror']
errors.push(_error)
} else {
@@ -523,7 +523,7 @@
}
}
} else if (/^Decimal/ig.test(col.type)) {
- if (!val) {
+ if (!val && val !== 0) {
let _error = _position + dict['main.excel.content.emptyerror']
errors.push(_error)
} else {
@@ -667,11 +667,17 @@
* @return {String} type 鎵ц绫诲瀷
* @return {String} table 琛ㄥ悕
*/
- static getSysDefaultSql (btn, setting, formdata, param, data, logcolumns) {
+ static getSysDefaultSql (btn, setting, formdata, param, data, logcolumns, tab) {
let primaryId = param.ID
let BID = param.BID
let verify = btn.verify || {}
let _formFieldValue = {}
+ let _actionType = null
+
+ if (verify.default !== 'false') { // 鍒ゆ柇鏄惁浣跨敤榛樿sql
+ _actionType = btn.sqlType
+ }
+
// 闇�瑕佸０鏄庣殑鍙橀噺闆�
// let _vars = ['tbid', 'ErrorCode', 'retmsg', 'BillCode', 'BVoucher', 'FIBVoucherDate', 'FiYear', 'UserName', 'FullName', 'ID', 'BID', 'LoginUID', 'SessionUid', 'UserID', 'Appkey']
let _vars = ['tbid', 'errorcode', 'retmsg', 'billcode', 'bvoucher', 'fibvoucherdate', 'fiyear', 'username', 'fullname', 'modulardetailcode']
@@ -901,15 +907,16 @@
}
// 鍗曞彿鐢熸垚锛屼娇鐢ㄤ笂绾d锛圔ID锛夋垨鍒楄〃鏁版嵁锛屽０鏄庡彉閲忥紙妫�楠岋級
+ let _billcodesSql = ''
if (verify.billcodes && verify.billcodes.length > 0) {
verify.billcodes.forEach(item => {
let _ModularDetailCode = ''
let _lpline = ''
if (item.TypeCharOne === 'Lp') {
if (item.linkField === 'BID' && BID) { // 鏇挎崲bid
- _lpline = `set @ModularDetailCode= 'Lp'+ right('${btn.uuid}'+@BID@,48)`
+ _lpline = `set @ModularDetailCode= 'Lp'+ right('${item.mark || btn.uuid}'+@BID@,48)`
} else {
- _lpline = `set @ModularDetailCode= 'Lp'+ right('${btn.uuid}'+@${item.linkField},48)`
+ _lpline = `set @ModularDetailCode= 'Lp'+ right('${item.mark || btn.uuid}'+@${item.linkField},48)`
}
_ModularDetailCode = '@ModularDetailCode'
} else if (item.TypeCharOne === 'BN') {
@@ -932,7 +939,7 @@
_vars.push(_key)
}
- _sql += `${_declare}
+ _billcodesSql += `${_declare}
select @BillCode='', @${_key}='', @ModularDetailCode=''
${_lpline}
exec s_get_BillCode
@@ -948,6 +955,10 @@
set @${_key}=@BillCode
`
})
+
+ if (_actionType !== 'insertOrUpdate') {
+ _sql += _billcodesSql
+ }
}
let hasvoucher = false
@@ -964,6 +975,9 @@
@VoucherTypeOne ='${_voucher.VoucherTypeOne}',
@VoucherTypeTwo ='${_voucher.VoucherTypeTwo}',
@Type =${_voucher.Type},
+ @UserID=@UserID@,
+ @Username=@Username,
+ @FullName=@FullName,
@BVoucher =@BVoucher OUTPUT ,
@FIBVoucherDate =@FIBVoucherDate OUTPUT ,
@FiYear =@FiYear OUTPUT ,
@@ -976,14 +990,8 @@
let primaryKeyName = ['id', 'bid', 'loginuid', 'sessionuid', 'userid', 'appkey'].includes(primaryKey.toLowerCase()) ? primaryKey + '@' : primaryKey
- let _actionType = null
-
- if (verify.default !== 'false') { // 鍒ゆ柇鏄惁浣跨敤榛樿sql
- _actionType = btn.sqlType
- }
-
- // 娣诲姞銆佷慨鏀广�侀�昏緫鍒犻櫎銆佺墿鐞嗗垹闄�
- if (_actionType === 'insert') {
+ let _insertsql = ''
+ if (_actionType === 'insert' || _actionType === 'insertOrUpdate') { // 娣诲姞璇彞
let keys = []
let values = []
@@ -1017,14 +1025,21 @@
values.push('@fullname')
}
if (!keys.includes('bid')) {
- keys.push('bid')
+ if (tab && tab.foreignKey && !keys.includes(tab.foreignKey.toLowerCase())) {
+ keys.push(tab.foreignKey)
+ } else {
+ keys.push('bid')
+ }
values.push('@BID@')
}
keys = keys.join(',')
values = values.join(',')
- _sql += `insert into ${btn.sql} (${keys}) select ${values};`
- } else if (_actionType === 'update') {
+ _insertsql = `insert into ${btn.sql} (${keys}) select ${values};`
+ }
+
+ let _updatesql = ''
+ if (_actionType === 'update' || _actionType === 'insertOrUpdate') { // 淇敼璇彞
let _form = []
let _arr = []
@@ -1057,9 +1072,15 @@
_form.push('FiYear=@FiYear')
}
}
-
_form = _form.join(',')
- _sql += `update ${btn.sql} set ${_form} where ${primaryKey}=@${primaryKeyName};`
+ _updatesql = `update ${btn.sql} set ${_form} where ${primaryKey}=@${primaryKeyName};`
+ }
+
+ // 娣诲姞銆佷慨鏀广�侀�昏緫鍒犻櫎銆佺墿鐞嗗垹闄�
+ if (_actionType === 'insert') {
+ _sql += _insertsql
+ } else if (_actionType === 'update') {
+ _sql += _updatesql
} else if (_actionType === 'LogicDelete') { // 閫昏緫鍒犻櫎
_sql += `update ${btn.sql} set deleted=1,modifydate=getdate(),modifyuserid=@userid@ where ${primaryKey}=@${primaryKeyName};`
@@ -1075,6 +1096,19 @@
})
}
_sql += `insert into snote (remark,createuserid,CreateUser,CreateStaff) select '鍒犻櫎琛�:${btn.sql} 鏁版嵁: ${_msg}${primaryKey}='+@${primaryKeyName},@userid@,@username,@fullname delete ${btn.sql} where ${primaryKey}=@${primaryKeyName};`
+ } else if (_actionType === 'insertOrUpdate') {
+ _sql += `select @tbid=''
+ select @tbid='X' from ${btn.sql} where ${primaryKey}=@ID@
+ if @tbid=''
+ begin
+ ${_billcodesSql}
+ ${_insertsql}
+ end
+ else
+ begin
+ ${_updatesql}
+ end
+ `
}
// 鎷兼帴鑷畾涔夎剼鏈�
--
Gitblit v1.8.0