From f3d4db769ba9b51b799d981511a710fd443d0e08 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 四月 2025 12:18:03 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/module/voucher/index.jsx | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/src/menu/components/module/voucher/index.jsx b/src/menu/components/module/voucher/index.jsx
index f1ac625..4d26cc9 100644
--- a/src/menu/components/module/voucher/index.jsx
+++ b/src/menu/components/module/voucher/index.jsx
@@ -39,7 +39,7 @@
name: '鍑瘉',
subtype: card.subtype,
// setting: { interType: 'system' },
- wrap: { name: '鍑瘉', title: '', width: card.width || 12, type: 'createVoucher' },
+ wrap: { name: '鍑瘉', title: '', width: card.width || 12, type: 'createVoucher', space: 30 },
style: { marginLeft: '8px', marginRight: '8px', marginTop: '8px', marginBottom: '8px', paddingBottom: '20px' },
headerStyle: {},
columns: [],
@@ -122,18 +122,19 @@
<ToolOutlined />
</Popover>
<div className="voucher-box">
- {card.wrap.type === 'createVoucher' ? <div className="voucher-header">
- <Button className="add-background header-btn">淇濆瓨骞舵柊澧�</Button>
- <Button className="add-background header-btn">淇濆瓨</Button>
- <Button className="print-background header-btn">鎵撳嵃</Button>
- <Button className="out-background header-btn">鏇村</Button>
+ {card.wrap.type === 'createVoucher' ? <div className="voucher-header" style={{padding: `10px ${card.wrap.space || 0}px`}}>
+ <Button>淇濆瓨骞舵柊澧�</Button>
+ <Button>淇濆瓨</Button>
+ <Button>鎵撳嵃</Button>
+ <Button>鏇村</Button>
</div> : null}
- {card.wrap.type === 'checkVoucher' ? <div className="voucher-header">
- <Button className="add-background header-btn">淇濆瓨</Button>
- <Button className="print-background header-btn">鎵撳嵃</Button>
- <Button className="out-background header-btn">鍏抽棴</Button>
+ {card.wrap.type === 'checkVoucher' ? <div className="voucher-header" style={{padding: `10px ${card.wrap.space || 0}px`}}>
+ <Button>淇濆瓨</Button>
+ <Button>鎵撳嵃</Button>
+ <Button>瀹℃牳</Button>
+ <Button>鍏抽棴</Button>
</div> : null}
- <div className="voucher-body">
+ <div className="voucher-body" style={{padding: `0px ${card.wrap.space || 0}px`}}>
{card.wrap.type === 'createVoucher' || card.wrap.type === 'checkVoucher' ? <div className="pre-wrap">
<div className="voucher-code">
<div>璁�<DownOutlined/></div>
@@ -158,8 +159,8 @@
妯℃澘绫诲瀷:
<div>鏃ュ父鏀嚭<DownOutlined/></div>
</div>
- <Button className="out-background header-btn">鍏抽棴</Button>
- <Button className="add-background header-btn">淇濆瓨</Button>
+ <Button>鍏抽棴</Button>
+ <Button>淇濆瓨</Button>
</div> : null}
<VoucherTable config={card}/>
{card.wrap.type === 'createVoucher' || card.wrap.type === 'checkVoucher' ? <div className="user">鍒跺崟浜猴細</div> : null}
--
Gitblit v1.8.0