From 5733fc7e386a51217ba6d07e272ca8bd95045abc Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 16 一月 2025 10:14:35 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/templates/zshare/verifycard/index.jsx | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/templates/zshare/verifycard/index.jsx b/src/templates/zshare/verifycard/index.jsx
index 1027840..6846474 100644
--- a/src/templates/zshare/verifycard/index.jsx
+++ b/src/templates/zshare/verifycard/index.jsx
@@ -1357,13 +1357,13 @@
arr.push(_key)
if (_key === 'bid') {
- _val = BID
+ _val = `'${BID}'`
} else {
_val = `@${_field}`
}
if (_key === 'bid') {
- _val2 = `' + ${BID} + '`
+ _val2 = BID
} else {
_val2 = `' + @${_field} + '`
}
@@ -1431,7 +1431,7 @@
_sql += `
/* 鍒涘缓鍑瘉 */
exec s_BVoucher_Create
- @Bill ='0',
+ @Bill = @${_voucher.linkField},
@BVoucherType ='${_voucher.BVoucherType}',
@VoucherTypeOne ='${_voucher.VoucherTypeOne}',
@VoucherTypeTwo ='${_voucher.VoucherTypeTwo}',
@@ -2447,12 +2447,12 @@
changeUniques = (uniques) => {
const { card } = this.props
- const { verify, fields, columnsFields } = this.state
+ const { verify, unionFields, columnsFields } = this.state
let _fields = []
let change = {}
if (card.Ot !== 'requiredOnce') {
- _fields = fields
+ _fields = unionFields
} else {
_fields = columnsFields
}
@@ -2650,7 +2650,7 @@
/>
<EditTable actions={['move']} data={verify.customverifys} columns={customColumns} onChange={(customverifys) => {this.setState({verify: {...verify, customverifys}})}}/>
</TabPane> : null}
- {verifyInter === 'system' ? <TabPane tab={
+ {verifyInter === 'system' && (['form', 'pop'].includes(card.OpenType) || !card.OpenType) ? <TabPane tab={
<span>
鍗曞彿鐢熸垚
{verify.billcodes.length ? <span className="count-tip">{verify.billcodes.length}</span> : null}
@@ -2668,7 +2668,7 @@
/>
<EditTable actions={['move']} data={verify.billcodes} columns={orderColumns} onChange={(billcodes) => {this.setState({verify: {...verify, billcodes}})}}/>
</TabPane> : null}
- {verifyInter === 'system' ? <TabPane tab={
+ {verifyInter === 'system' && (card.Ot === 'requiredOnce' || (['form', 'pop'].includes(card.OpenType) || !card.OpenType)) ? <TabPane tab={
<span>
{card.Ot !== 'requiredOnce' ? '鍞竴鎬ч獙璇�' : '鍚岀被鏁版嵁楠岃瘉'}
{verify.uniques.length ? <span className="count-tip">{verify.uniques.length}</span> : null}
@@ -2682,11 +2682,11 @@
<EditTable actions={['edit', 'move', 'del', 'status', 'sql']} data={verify.uniques} columns={card.Ot !== 'requiredOnce' ? uniqueColumns : onceUniqueColumns} onChange={this.changeUniques}/>
</TabPane> : null}
{verifyInter === 'system' ? <TabPane tab={
- <span>
+ <span title={card.Ot === 'requiredOnce' ? '澶氳鎷兼帴鏃朵笉鍙敤' : ''}>
鍒涘缓鍑瘉
{verify.voucher && verify.voucher.enabled ? <span className="count-tip">1</span> : null}
</span>
- } key="voucher">
+ } key="voucher" disabled={card.Ot === 'requiredOnce'}>
<VoucherForm
voucher={voucher}
columns={columns}
--
Gitblit v1.8.0