|
|
@@ -3,10 +3,12 @@
|
|
|
import {
|
|
|
CloseCircleOutlined,
|
|
|
DownloadOutlined,
|
|
|
+ DownOutlined,
|
|
|
EyeOutlined,
|
|
|
ReloadOutlined,
|
|
|
SearchOutlined,
|
|
|
UndoOutlined,
|
|
|
+ UpOutlined,
|
|
|
} from "@ant-design/icons";
|
|
|
import {
|
|
|
App,
|
|
|
@@ -78,6 +80,9 @@ const OrderListPage: React.FC = () => {
|
|
|
const [currentCancelOrder, setCurrentCancelOrder] =
|
|
|
useState<SkillOrderAdminDTO | null>(null);
|
|
|
|
|
|
+ // 更多筛选项展开/收起(默认收起)
|
|
|
+ const [filterExpanded, setFilterExpanded] = useState(false);
|
|
|
+
|
|
|
// 加载分页数据
|
|
|
const loadPageData = async () => {
|
|
|
setLoading(true);
|
|
|
@@ -126,6 +131,11 @@ const OrderListPage: React.FC = () => {
|
|
|
values.refundApply === "" || values.refundApply === undefined
|
|
|
? undefined
|
|
|
: values.refundApply,
|
|
|
+ firstOrderDiscount:
|
|
|
+ values.firstOrderDiscount === "" ||
|
|
|
+ values.firstOrderDiscount === undefined
|
|
|
+ ? undefined
|
|
|
+ : values.firstOrderDiscount,
|
|
|
type:
|
|
|
values.type === "" || values.type === undefined
|
|
|
? undefined
|
|
|
@@ -473,35 +483,55 @@ const OrderListPage: React.FC = () => {
|
|
|
<Select.Option value={8}>用户取消</Select.Option>
|
|
|
</Select>
|
|
|
</Form.Item>
|
|
|
- <Form.Item label="退款申请中" name="refundApply">
|
|
|
- <Select
|
|
|
- placeholder="是否退款申请中"
|
|
|
- allowClear
|
|
|
- style={{ width: 180 }}
|
|
|
- >
|
|
|
- <Select.Option value={true}>是</Select.Option>
|
|
|
- <Select.Option value={false}>否</Select.Option>
|
|
|
- </Select>
|
|
|
- </Form.Item>
|
|
|
- <Form.Item label="下单类型" name="type">
|
|
|
- <Select
|
|
|
- placeholder="请选择下单类型"
|
|
|
- allowClear
|
|
|
- style={{ width: 180 }}
|
|
|
+ <Form.Item>
|
|
|
+ <Button
|
|
|
+ type="link"
|
|
|
+ className="p-0"
|
|
|
+ onClick={() => setFilterExpanded((v) => !v)}
|
|
|
+ icon={filterExpanded ? <UpOutlined /> : <DownOutlined />}
|
|
|
>
|
|
|
- <Select.Option value={0}>常规下单</Select.Option>
|
|
|
- <Select.Option value={1}>通用码下单</Select.Option>
|
|
|
- <Select.Option value={2}>特定码下单</Select.Option>
|
|
|
- </Select>
|
|
|
- </Form.Item>
|
|
|
- <Form.Item label="品类" name="bizCategoryCode">
|
|
|
- <BizCategoryTreeSelect
|
|
|
- placeholder="请选择品类"
|
|
|
- allowClear
|
|
|
- style={{ width: 220 }}
|
|
|
- allowAllLevels
|
|
|
- />
|
|
|
+ {filterExpanded ? "收起筛选项" : "展开筛选项"}
|
|
|
+ </Button>
|
|
|
</Form.Item>
|
|
|
+ {filterExpanded && (
|
|
|
+ <>
|
|
|
+ <Form.Item label="退款申请中" name="refundApply">
|
|
|
+ <Select
|
|
|
+ placeholder="是否退款申请中"
|
|
|
+ allowClear
|
|
|
+ style={{ width: 180 }}
|
|
|
+ >
|
|
|
+ <Select.Option value={true}>是</Select.Option>
|
|
|
+ <Select.Option value={false}>否</Select.Option>
|
|
|
+ </Select>
|
|
|
+ </Form.Item>
|
|
|
+ <Form.Item label="是否首单一折订单" name="firstOrderDiscount">
|
|
|
+ <Select placeholder="请选择" allowClear style={{ width: 180 }}>
|
|
|
+ <Select.Option value={true}>是</Select.Option>
|
|
|
+ <Select.Option value={false}>否</Select.Option>
|
|
|
+ </Select>
|
|
|
+ </Form.Item>
|
|
|
+ <Form.Item label="下单类型" name="type">
|
|
|
+ <Select
|
|
|
+ placeholder="请选择下单类型"
|
|
|
+ allowClear
|
|
|
+ style={{ width: 180 }}
|
|
|
+ >
|
|
|
+ <Select.Option value={0}>常规下单</Select.Option>
|
|
|
+ <Select.Option value={1}>通用码下单</Select.Option>
|
|
|
+ <Select.Option value={2}>特定码下单</Select.Option>
|
|
|
+ </Select>
|
|
|
+ </Form.Item>
|
|
|
+ <Form.Item label="品类" name="bizCategoryCode">
|
|
|
+ <BizCategoryTreeSelect
|
|
|
+ placeholder="请选择品类"
|
|
|
+ allowClear
|
|
|
+ style={{ width: 220 }}
|
|
|
+ allowAllLevels
|
|
|
+ />
|
|
|
+ </Form.Item>
|
|
|
+ </>
|
|
|
+ )}
|
|
|
<Form.Item label="下单时间" name="orderTimeRange">
|
|
|
<RangePicker
|
|
|
showTime
|