From 90fff0ec484bbb3a10248f389cb9c4bddeff93ed Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期二, 31 一月 2023 18:10:44 +0800 Subject: [PATCH] 2023-01-31 --- src/menu/components/module/voucher/index.jsx | 64 ++++++++++++++++++++------------ 1 files changed, 40 insertions(+), 24 deletions(-) diff --git a/src/menu/components/module/voucher/index.jsx b/src/menu/components/module/voucher/index.jsx index def62fe..f1ac625 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: 'edit' }, + wrap: { name: '鍑瘉', title: '', width: card.width || 12, type: 'createVoucher' }, style: { marginLeft: '8px', marginRight: '8px', marginTop: '8px', marginBottom: '8px', paddingBottom: '20px' }, headerStyle: {}, columns: [], @@ -84,7 +84,7 @@ changeStyle = () => { const { card } = this.state - MKEmitter.emit('changeStyle', ['background', 'border', 'padding', 'margin', 'shadow', 'clear'], card.style, this.getStyle) + MKEmitter.emit('changeStyle', ['background', 'border', 'padding', 'margin', 'shadow', 'clear', 'minHeight'], card.style, this.getStyle) } getStyle = (style) => { @@ -101,7 +101,6 @@ updateWrap = (res) => { let _card = {...this.state.card, wrap: res} - _card.switchable = res.type !== 'edit' this.updateComponent(_card) } @@ -123,31 +122,48 @@ <ToolOutlined /> </Popover> <div className="voucher-box"> - <div className="voucher-header"> - <Button className="add-background header-btn">鏂板</Button> + {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="system-background header-btn">瀵煎叆</Button> - <Button className="out-background header-btn">瀵煎嚭</Button> - </div> + <Button className="out-background header-btn">鏇村</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> + </div> : null} <div className="voucher-body"> - <div className="pre-wrap"> - <div className="voucher-code"> - <div>璁�<DownOutlined/></div> - <div>1</div> - 鍙� - </div> - <div className="voucher-date"> - 鏃ユ湡锛�<div>璇烽�夋嫨鏃ユ湡 <CalendarOutlined /></div> - </div> - <div className="voucher-affix"> - 闄勫崟鎹� <div>2</div> 寮� - <Button type="link" className="">闄勪欢</Button> - <Button type="link" className="">澶囨敞</Button> - </div> + {card.wrap.type === 'createVoucher' || card.wrap.type === 'checkVoucher' ? <div className="pre-wrap"> + <div className="voucher-code"> + <div>璁�<DownOutlined/></div> + <div>1</div> + 鍙� + </div> + <div className="voucher-date"> + 鏃ユ湡锛�<div>璇烽�夋嫨鏃ユ湡 <CalendarOutlined /></div> + </div> + <div className="voucher-affix"> + 闄勫崟鎹� <div>2</div> 寮� + <Button type="link" className="">闄勪欢</Button> + <Button type="link" className="">澶囨敞</Button> + </div> + </div> : null} + {card.wrap.type === 'createTemp' || card.wrap.type === 'checkTemp' ? <div className="pre-wrap"> + <div className="temp-code"> + 妯℃澘鍚嶇О: + <div> </div> + </div> + <div className="temp-code"> + 妯℃澘绫诲瀷: + <div>鏃ュ父鏀嚭<DownOutlined/></div> + </div> + <Button className="out-background header-btn">鍏抽棴</Button> + <Button className="add-background header-btn">淇濆瓨</Button> + </div> : null} + <VoucherTable config={card}/> + {card.wrap.type === 'createVoucher' || card.wrap.type === 'checkVoucher' ? <div className="user">鍒跺崟浜猴細</div> : null} </div> - <VoucherTable config={card}/> - </div> </div> </div> ) -- Gitblit v1.8.0