1
This commit is contained in:
+1
-1
File diff suppressed because one or more lines are too long
Vendored
+1
-1
@@ -27,7 +27,7 @@
|
|||||||
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
|
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
|
||||||
<link href="https://fonts.googleapis.com/css2?family=Outfit:wght@300;400;500;600;700&display=swap" rel="stylesheet" />
|
<link href="https://fonts.googleapis.com/css2?family=Outfit:wght@300;400;500;600;700&display=swap" rel="stylesheet" />
|
||||||
<title>民众智创</title>
|
<title>民众智创</title>
|
||||||
<script type="module" crossorigin src="/assets/index-DUrk5OjS.js"></script>
|
<script type="module" crossorigin src="/assets/index-B6hD5A9D.js"></script>
|
||||||
<link rel="stylesheet" crossorigin href="/assets/index-DtYH0-uL.css">
|
<link rel="stylesheet" crossorigin href="/assets/index-DtYH0-uL.css">
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
|
|||||||
@@ -483,6 +483,7 @@ const InvoicePage: React.FC = () => {
|
|||||||
message.warning('请选择一个发票抬头');
|
message.warning('请选择一个发票抬头');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
const selectedHeader = allHeadersForSelect.find(h => h.id === selectedHeaderId);
|
||||||
// 优先使用弹窗中填写的邮箱,否则使用抬头中保存的邮箱
|
// 优先使用弹窗中填写的邮箱,否则使用抬头中保存的邮箱
|
||||||
const finalEmail = email.trim() || selectedHeader?.email || '';
|
const finalEmail = email.trim() || selectedHeader?.email || '';
|
||||||
if (!finalEmail) {
|
if (!finalEmail) {
|
||||||
@@ -495,7 +496,6 @@ const InvoicePage: React.FC = () => {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const selectedOrders = Array.from(selectedOrdersMap.values());
|
const selectedOrders = Array.from(selectedOrdersMap.values());
|
||||||
const selectedHeader = allHeadersForSelect.find(h => h.id === selectedHeaderId);
|
|
||||||
const orderIds = selectedOrders.map((o: any) => o.id || o.order_no || o.orderNo);
|
const orderIds = selectedOrders.map((o: any) => o.id || o.order_no || o.orderNo);
|
||||||
|
|
||||||
setSubmitting(true);
|
setSubmitting(true);
|
||||||
@@ -921,29 +921,34 @@ const InvoicePage: React.FC = () => {
|
|||||||
>
|
>
|
||||||
<div style={{ padding: '0 24px 24px' }}>
|
<div style={{ padding: '0 24px 24px' }}>
|
||||||
{/* 邮箱输入 */}
|
{/* 邮箱输入 */}
|
||||||
<div style={{ padding: '16px 0 12px', borderBottom: '1px solid #f1f5f9', marginBottom: 12 }}>
|
{(() => {
|
||||||
<div style={{ display: 'flex', alignItems: 'center', gap: 12 }}>
|
const currentHeader = allHeadersForSelect.find(h => h.id === selectedHeaderId);
|
||||||
<span style={{ color: '#94a3b8', fontSize: 13, whiteSpace: 'nowrap' }}>
|
return (
|
||||||
<span style={{ color: '#ef4444', marginRight: 4 }}>*</span>接收邮箱:
|
<div style={{ padding: '16px 0 12px', borderBottom: '1px solid #f1f5f9', marginBottom: 12 }}>
|
||||||
</span>
|
<div style={{ display: 'flex', alignItems: 'center', gap: 12 }}>
|
||||||
<Input
|
<span style={{ color: '#94a3b8', fontSize: 13, whiteSpace: 'nowrap' }}>
|
||||||
placeholder="发票将发送至该邮箱"
|
<span style={{ color: '#ef4444', marginRight: 4 }}>*</span>接收邮箱:
|
||||||
value={email}
|
</span>
|
||||||
onChange={(e) => setEmail(e.target.value)}
|
<Input
|
||||||
style={{ maxWidth: 360 }}
|
placeholder="发票将发送至该邮箱"
|
||||||
allowClear
|
value={email}
|
||||||
/>
|
onChange={(e) => setEmail(e.target.value)}
|
||||||
{selectedHeader?.email && !email && (
|
style={{ maxWidth: 360 }}
|
||||||
<Button
|
allowClear
|
||||||
type="link"
|
/>
|
||||||
size="small"
|
{currentHeader?.email && !email && (
|
||||||
onClick={() => setEmail(selectedHeader.email || '')}
|
<Button
|
||||||
>
|
type="link"
|
||||||
使用抬头邮箱({selectedHeader.email})
|
size="small"
|
||||||
</Button>
|
onClick={() => setEmail(currentHeader.email || '')}
|
||||||
)}
|
>
|
||||||
|
使用抬头邮箱({currentHeader.email})
|
||||||
|
</Button>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
);
|
||||||
|
})()}
|
||||||
<Table
|
<Table
|
||||||
dataSource={allHeadersForSelect}
|
dataSource={allHeadersForSelect}
|
||||||
columns={[
|
columns={[
|
||||||
|
|||||||
Reference in New Issue
Block a user