From 1424bd59f250fd3b5cc316711054a4756c8d47fe Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 16 一月 2025 11:00:48 +0800
Subject: [PATCH] Merge branch 'positec' into dms
---
src/menu/debug/index.jsx | 41 ++++++++++++++++++++---------------------
1 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/src/menu/debug/index.jsx b/src/menu/debug/index.jsx
index c2bf056..2df2119 100644
--- a/src/menu/debug/index.jsx
+++ b/src/menu/debug/index.jsx
@@ -1157,17 +1157,6 @@
// 鍞竴鎬ч獙璇侊紝蹇呴』瀛樺湪琛ㄥ崟锛堣〃鍗曞瓨鍦ㄦ椂锛屼富閿潎涓哄崟鍊硷級,蹇呴』濉啓鏁版嵁婧愶紝澶氳鎷兼帴鏃朵笉鍙敤
if (formdata && verify.uniques && verify.uniques.length > 0 && btn.Ot !== 'requiredOnce') {
- let dateForms = []
- let numForms = []
- formdata.forEach(form => {
- let _key = form.key.toLowerCase()
- if (form.type === 'date') {
- dateForms.push(_key)
- } else if (form.type === 'number' || form.type === 'rate') {
- numForms.push(_key)
- }
- })
-
verify.uniques.forEach(item => {
let _fieldValue = [] // 琛ㄥ崟閿�煎field=value
let _value = [] // 琛ㄥ崟鍊硷紝鐢ㄤ簬閿欒鎻愮ず
@@ -1177,21 +1166,26 @@
item.field.split(',').forEach((_field, index) => {
let _key = _field.toLowerCase()
let _val = ''
+ let _val2 = ''
arr.push(_key)
- if (_key === 'bid') { // 琛ㄥ崟涓病鏈塨id鍒欎娇鐢ㄧ郴缁焍id鍙橀噺
- _val = BID
- } else if (numForms.includes(_key)) {
- _val = '1'
- } else if (dateForms.includes(_key)) {
- _val = '1949-10-01'
+ if (_key === 'bid') {
+ _val = `'${BID}'`
+ } else {
+ _val = `@${_field}`
}
- _fieldValue.push(`${_key}='${_val}'`)
- _value.push(`${_labels[index] || ''}锛�${_val || ''}`)
+ if (_key === 'bid') {
+ _val2 = BID
+ } else {
+ _val2 = `' + @${_field} + '`
+ }
+
+ _fieldValue.push(`${_key}=${_val}`)
+ _value.push(`${_labels[index] || ''}锛�${_val2}`)
})
- if (!arr.includes(primaryKey.toLowerCase())) {
+ if (!arr.includes(primaryKey.toLowerCase()) && btn.Ot !== 'notRequired') {
_fieldValue.push(`${primaryKey} !='${primaryId}'`)
}
@@ -1250,7 +1244,7 @@
_sql += `
/* 鍒涘缓鍑瘉 */
exec s_BVoucher_Create
- @Bill ='0',
+ @Bill = @${_voucher.linkField},
@BVoucherType ='${_voucher.BVoucherType}',
@VoucherTypeOne ='${_voucher.VoucherTypeOne}',
@VoucherTypeTwo ='${_voucher.VoucherTypeTwo}',
@@ -2075,6 +2069,11 @@
{ reg: /@datam@/ig, value: `''` },
]
+ let process = this.props.config.process === 'true'
+ if (process) {
+ regs.push({ reg: /@works_flow_code@/ig, value: `'1949-10-01 15:00:00'` })
+ }
+
let sql = this.formatDataSource(item, regs)
return sql
--
Gitblit v1.8.0