diff --git a/src/stores/Invoice.js b/src/stores/Invoice.js index f756b73..6358b51 100644 --- a/src/stores/Invoice.js +++ b/src/stores/Invoice.js @@ -30,11 +30,11 @@ class Invoice { onDateRangeChange = dates => { console.log(dates); - this.search_date_start = dates[0]; - this.search_date_end = dates[1]; + this.search_date_start = dates==null? null: dates[0]; + this.search_date_end = dates==null? null: dates[1]; }; - fetchInvoiceList(VEI_SN, GroupNo, DateStart, DateEnd) { + fetchInvoiceList(VEI_SN, GroupNo, DateStart, DateEnd,OrderType) { this.loading = true; const fetchUrl = prepareUrl(HT_HOST + "/service-cusservice/PTSearchGMBPageList") .append("VEI_SN", VEI_SN) @@ -50,6 +50,7 @@ class Invoice { .append("TotalNum", 0) .append("PageSize", 2000) .append("PageIndex", 1) + .append("PayState",OrderType) .append("token",this.root.authStore.login.token) .build(); diff --git a/src/views/invoice/Index.jsx b/src/views/invoice/Index.jsx index 6e1ee9e..498fca0 100644 --- a/src/views/invoice/Index.jsx +++ b/src/views/invoice/Index.jsx @@ -2,7 +2,7 @@ import { NavLink, useNavigate } from "react-router-dom"; import { useEffect, useState } from "react"; import { observer } from "mobx-react"; import { toJS } from "mobx"; -import { Row, Col, Space, Button, Table, Input, DatePicker, Typography, App, Steps } from "antd"; +import { Row, Col, Space, Button, Table, Input, DatePicker, Typography, App, Steps ,Select } from "antd"; import { useStore } from "@/stores/StoreContext.js"; import * as config from "@/config"; import { formatDate, isNotEmpty } from "@/utils/commons"; @@ -14,6 +14,7 @@ function Index() { const { authStore, invoiceStore } = useStore(); const { invoiceList, search_date_start, search_date_end } = invoiceStore; const [groupNo, onGroupNoChange] = useState(""); + const [OrderType, onOrderTypeChange] = useState(0); //订单状态搜索 const navigate = useNavigate(); const { notification } = App.useApp(); const showTotal = total => `Total ${invoiceList.length} items`; @@ -76,7 +77,7 @@ function Index() { - + { @@ -84,17 +85,53 @@ function Index() { }} /> + + +