From 0bb14cace6c3eeb3d1ee6903324b15fdb0c6e562 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 15 九月 2024 14:00:41 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/utils/utils-custom.js | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/utils/utils-custom.js b/src/utils/utils-custom.js
index 968cc1c..b2de0d7 100644
--- a/src/utils/utils-custom.js
+++ b/src/utils/utils-custom.js
@@ -3698,6 +3698,7 @@
item.field.split(',').forEach((_field, index) => {
let _key = _field.toLowerCase()
let _val = ''
+ let _val2 = ''
arr.push(_key)
if (_key === 'bid') { // 琛ㄥ崟涓病鏈塨id鍒欎娇鐢ㄧ郴缁焍id鍙橀噺
@@ -3707,7 +3708,14 @@
}
_fieldValue.push(`${_key}=${_val}`)
- _value.push(`${_labels[index] || ''}锛�${_val || ''}`)
+
+ if (_key === 'bid') { // 琛ㄥ崟涓病鏈塨id鍒欎娇鐢ㄧ郴缁焍id鍙橀噺
+ _val2 = `' + ${BID} + '`
+ } else {
+ _val2 = `@mk_${_key}_mk@`
+ }
+
+ _value.push(`${_labels[index] || ''}锛�${_val2}`)
})
if (!arr.includes(primaryKey.toLowerCase())) {
@@ -4781,7 +4789,7 @@
arr_field='${arr_field}',tabid='${tabid}',parid='${parid}',sub_name='${sub_name}',sub_field='${sub_field}'
`
- _tailScript += `${_tailScript}
+ _tailScript = `${_tailScript}
select @ErrorCode as ErrorCode,@retmsg as retmsg
${callback}
`
@@ -4791,7 +4799,7 @@
arr_field='${arr_field}',tabid='${tabid}',parid='${parid}',sub_name='${sub_name}',sub_field='${sub_field}'
`
- _tailScript += `${_tailScript}
+ _tailScript = `${_tailScript}
select @ErrorCode as ErrorCode,@retmsg as retmsg
`
}
--
Gitblit v1.8.0