From fb64bcf1fab18b33d21470c83f28d4cda8d309ce Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 26 十月 2022 12:15:59 +0800
Subject: [PATCH] 2022-10-26
---
src/utils/utils.js | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 746d8ad..293b254 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -1369,17 +1369,16 @@
* @return {Object} param 璇锋眰鍙傛暟
* @return {Array} data 鍒楄〃琛屾暟鎹�
* @return {Array} columns 鏄剧ず鍒�
- * @return {Object} tab 鏍囩淇℃伅
* @return {Boolean} retmsg 鏄惁闇�瑕佹暟鎹繑鍥�
*/
-export function getSysDefaultSql (btn, setting, formdata, param, data, columns, tab, retmsg = false, moduleParams, getOptions) {
+export function getSysDefaultSql (btn, setting, formdata, param, data, columns, retmsg = false, moduleParams, getOptions) {
let primaryId = param.ID
- let BID = param.BID
+ let BID = param.BID || ''
let verify = btn.verify || {}
let datavars = {} // 澹版槑鐨勫彉閲忥紝琛ㄥ崟鍙婃樉绀哄垪
let _actionType = null
let _callbacksql = ''
- let foreignKey = tab && tab.foreignKey ? tab.foreignKey.toLowerCase() : ''
+ let foreignKey = setting.foreignKey ? setting.foreignKey.toLowerCase() : ''
if (verify.default !== 'false') { // 鍒ゆ柇鏄惁浣跨敤榛樿sql
_actionType = btn.sqlType
@@ -1555,7 +1554,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}', @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}', @bid='${BID}', @BillCode='', @ModularDetailCode=''
`
// 琛ㄥ崟鍙橀噺璧嬪��
@@ -2091,7 +2090,7 @@
}
_sql = _sql.replace(/@ID@/ig, `'${primaryId || ''}'`)
- _sql = _sql.replace(/@BID@/ig, `'${BID || ''}'`)
+ _sql = _sql.replace(/@BID@/ig, `'${BID}'`)
_sql = _sql.replace(/@LoginUID@/ig, `'${sessionStorage.getItem('LoginUID') || ''}'`)
_sql = _sql.replace(/@SessionUid@/ig, `'${localStorage.getItem('SessionUid') || ''}'`)
_sql = _sql.replace(/@UserID@/ig, `'${sessionStorage.getItem('UserID') || ''}'`)
@@ -2104,7 +2103,7 @@
if (retmsg) {
_callbacksql = _callbacksql.replace(/@ID@/ig, `'${primaryId || ''}'`)
- _callbacksql = _callbacksql.replace(/@BID@/ig, `'${BID || ''}'`)
+ _callbacksql = _callbacksql.replace(/@BID@/ig, `'${BID}'`)
_callbacksql = _callbacksql.replace(/@LoginUID@/ig, `'${sessionStorage.getItem('LoginUID') || ''}'`)
_callbacksql = _callbacksql.replace(/@SessionUid@/ig, `'${localStorage.getItem('SessionUid') || ''}'`)
_callbacksql = _callbacksql.replace(/@UserID@/ig, `'${sessionStorage.getItem('UserID') || ''}'`)
--
Gitblit v1.8.0