diff --git a/src/pages/store/storeDesktopNumber/components/CreateForm.jsx b/src/pages/store/storeDesktopNumber/components/CreateForm.jsx index 4362291..37c9b2b 100644 --- a/src/pages/store/storeDesktopNumber/components/CreateForm.jsx +++ b/src/pages/store/storeDesktopNumber/components/CreateForm.jsx @@ -38,12 +38,13 @@ const CreateForm = (props) => { { - + }} onFinish={async (value) => props.onFinish(value)}> + diff --git a/src/pages/store/storeDesktopNumber/index.jsx b/src/pages/store/storeDesktopNumber/index.jsx index af1dda5..de58b62 100644 --- a/src/pages/store/storeDesktopNumber/index.jsx +++ b/src/pages/store/storeDesktopNumber/index.jsx @@ -31,13 +31,13 @@ const storeDesktopNumber = () => { }, []) - const showQRCode = (record, store) => { + const showQRCode = (record) => { var config = { - title: `${store.name} ${record.number}号桌`, + title: `${record.storeName} ${record.desktopNumber}号桌`, okText: '下载', cancelText: '取消', onOk() { - changeCanvasToPic(`${store.name} ${record.number}号桌`); + changeCanvasToPic(`${record.storeName} ${record.desktopNumber}号桌`); }, content: ( // { {`${store.name}`})} + title={({`${record.storeName}`})} headStyle={{ border: '0px', textAlign: 'center' }} cover={ { /> }> - {`${record.number}号桌`} + {`${record.desktopNumber}号桌`} ), @@ -96,7 +96,7 @@ const storeDesktopNumber = () => { }, { title: '桌号', - dataIndex: 'number', + dataIndex: 'desktopNumber', align: 'center', search: false, render: item => ( @@ -110,19 +110,16 @@ const storeDesktopNumber = () => { { title: '适用店铺', align: 'center', - dataIndex: 'storeList', - search: false, - render: tags => ( - <> - {tags.map(tag => { - return ( - - {tag.name} - - ); - })} - > - ), + dataIndex: 'storeName', + // render: tags => ( + // <> + // {return ( + // + // {tag.storeName} + // + // );} + // > + // ), }, { title: '创建时间', dataIndex: 'createAt', @@ -133,9 +130,8 @@ const storeDesktopNumber = () => { dataIndex: 'option', valueType: 'option', render: (_, record) => [ - record.storeList.map(item => { - return ( { showQRCode(record, item) }} type="link">{item.name}); - }), { + { showQRCode(record) }} type="link">{record.storeName}, + { DeleteDesktopNumber([record.id]).then((r) => { if (r.data) { message.success('删除成功');