From d5ce81026882ada34e5d49411be7c90ee96cc102 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 17 一月 2023 18:20:11 +0800
Subject: [PATCH] 2023-01-17
---
src/templates/zshare/verifycard/index.jsx | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/templates/zshare/verifycard/index.jsx b/src/templates/zshare/verifycard/index.jsx
index 8b7680b..ab8d74c 100644
--- a/src/templates/zshare/verifycard/index.jsx
+++ b/src/templates/zshare/verifycard/index.jsx
@@ -626,7 +626,7 @@
_fields.push(...group.sublist)
})
resolve(_fields)
- } else if (card.modal) {
+ } else if (card.modal && (card.OpenType === 'pop' || !card.OpenType)) {
_fields = card.modal.fields || []
resolve(_fields)
} else if (card.OpenType === 'pop') {
@@ -840,10 +840,10 @@
let _arr = []
_fields.forEach(item => {
- if (!item.field || item.writein === 'false') return
+ if (!item.field || item.writein === 'false' || item.uuid === 'BID') return
_arr.push(item.field.toLowerCase())
- if (item.field.toLowerCase() === 'bid' && item.uuid === 'BID') {
+ if (item.field.toLowerCase() === 'bid') {
_form.push(item.field + '=@BID@')
} else {
_form.push(item.field + '=@' + item.field)
@@ -921,10 +921,10 @@
if (_verify.voucher && _verify.voucher.enabled) {
_voucher = ',BVoucher=@BVoucher,FIBVoucherDate=@FIBVoucherDate,FiYear=@FiYear'
}
- _defaultsql = `update ${card.sql} set deleted=1,modifydate=getdate(),modifyuser=@username,modifyuserid=@userid@${_voucher} where ${_primaryKey}${card.Ot !== 'requiredOnce' ? '=@ID@' : ' in (select ID from dbo.SplitComma(@ID@))'};`
+ _defaultsql = `update ${card.sql} set deleted=1,modifydate=getdate(),modifyuser=@username,modifystaff=@fullname,modifyuserid=@userid@${_voucher} where ${_primaryKey}${card.Ot !== 'requiredOnce' ? '=@ID@' : ' in (select ID from dbo.SplitComma(@ID@))'};`
} else if (card.sqlType === 'delete') {
let _msg = ''
- if (columns && columns.length > 0 && card.Ot !== 'notRequired' && card.Ot !== 'requiredOnce') {
+ if (columns && columns.length > 0 && card.Ot !== 'notRequired') {
let _index = 0
columns.forEach(col => {
if (!col.field || col.Hide === 'true' || _index >= 4) return
--
Gitblit v1.8.0