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 |   61 +++++++++++++++++++++++++-----
 1 files changed, 50 insertions(+), 11 deletions(-)

diff --git a/src/menu/components/module/voucher/index.jsx b/src/menu/components/module/voucher/index.jsx
index 329d64d..4d26cc9 100644
--- a/src/menu/components/module/voucher/index.jsx
+++ b/src/menu/components/module/voucher/index.jsx
@@ -1,18 +1,17 @@
 import React, {Component} from 'react'
 import PropTypes from 'prop-types'
 import { is, fromJS } from 'immutable'
-import { Popover } from 'antd'
-import { EditOutlined, ToolOutlined, DeleteOutlined, FontColorsOutlined } from '@ant-design/icons'
+import { Popover, Button } from 'antd'
+import { EditOutlined, ToolOutlined, DeleteOutlined, FontColorsOutlined, DownOutlined, CalendarOutlined } from '@ant-design/icons'
 
-// import asyncComponent from '@/utils/asyncComponent'
 import asyncIconComponent from '@/utils/asyncIconComponent'
 import MKEmitter from '@/utils/events.js'
 import getWrapForm from './options'
+import VoucherTable from './voucherTable'
 
 import './index.scss'
 
 const NormalForm = asyncIconComponent(() => import('@/components/normalform'))
-// const NormalHeader = asyncComponent(() => import('@/menu/components/share/normalheader'))
 
 class Voucher extends Component {
   static propTpyes = {
@@ -39,9 +38,9 @@
         width: card.width || 12,
         name: '鍑瘉',
         subtype: card.subtype,
-        setting: { interType: 'system' },
-        wrap: { name: '鍑瘉', title: '', width: card.width || 12, type: 'edit' },
-        style: { marginLeft: '8px', marginRight: '8px', marginTop: '8px', marginBottom: '8px' },
+        // setting: { interType: 'system' },
+        wrap: { name: '鍑瘉', title: '', width: card.width || 12, type: 'createVoucher', space: 30 },
+        style: { marginLeft: '8px', marginRight: '8px', marginTop: '8px', marginBottom: '8px', paddingBottom: '20px' },
         headerStyle: {},
         columns: [],
         scripts: [],
@@ -85,7 +84,7 @@
   changeStyle = () => {
     const { card } = this.state
 
-    MKEmitter.emit('changeStyle', ['background', 'border', 'padding', 'margin', 'shadow'], card.style, this.getStyle)
+    MKEmitter.emit('changeStyle', ['background', 'border', 'padding', 'margin', 'shadow', 'clear', 'minHeight'], card.style, this.getStyle)
   }
 
   getStyle = (style) => {
@@ -102,7 +101,6 @@
 
   updateWrap = (res) => {
     let _card = {...this.state.card, wrap: res}
-    _card.switchable = res.type !== 'edit'
 
     this.updateComponent(_card)
   }
@@ -112,7 +110,6 @@
 
     return (
       <div className="menu-voucher-box" style={card.style} id={card.uuid}>
-        {/* <NormalHeader config={card} updateComponent={this.updateComponent}/> */}
         <Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
           <div className="mk-popover-control">
             <NormalForm title="鍩烘湰璁剧疆" width={800} update={this.updateWrap} getForms={this.getWrapForms}>
@@ -125,7 +122,49 @@
           <ToolOutlined />
         </Popover>
         <div className="voucher-box">
-          jjj
+          {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" style={{padding: `10px ${card.wrap.space || 0}px`}}>
+            <Button>淇濆瓨</Button>
+            <Button>鎵撳嵃</Button>
+            <Button>瀹℃牳</Button>
+            <Button>鍏抽棴</Button>
+          </div> : null}
+          <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>
+                <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>&nbsp;</div>
+              </div>
+              <div className="temp-code">
+                妯℃澘绫诲瀷:
+                <div>鏃ュ父鏀嚭<DownOutlined/></div>
+              </div>
+              <Button>鍏抽棴</Button>
+              <Button>淇濆瓨</Button>
+            </div> : null}
+            <VoucherTable config={card}/>
+            {card.wrap.type === 'createVoucher' || card.wrap.type === 'checkVoucher' ? <div className="user">鍒跺崟浜猴細</div> : null}
+          </div>
         </div>
       </div>
     )

--
Gitblit v1.8.0