From 958e925a44c9ad2a2fb754b8fd682280e2a73a7c Mon Sep 17 00:00:00 2001
From: "yang.yongquan" <3395816735@qq.com>
Date: Wed, 28 Dec 2022 14:32:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=8F=91=E7=A5=A8?=
 =?UTF-8?q?=E5=A4=9A=E4=B8=AA=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/models/Staff.ts                          |  2 +-
 src/pages/Invoice/mine/InvoiceListView.tsx   | 96 ++++++++++----------
 src/pages/Invoice/mine/InvoiceUploadView.tsx |  4 +
 3 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/src/models/Staff.ts b/src/models/Staff.ts
index 666fed7..0384193 100644
--- a/src/models/Staff.ts
+++ b/src/models/Staff.ts
@@ -95,7 +95,7 @@ export class InvoiceCommit {
     invoiceCheckCode:string
     invoiceRegionCode: Nullable<string>
     invoiceSellerTaxCode:Nullable<string>
-    invoiceExtraInfo:Nullable<string>|[]
+    invoiceExtraInfo:Nullable<string>|[]|Map<any,string>
     constructor() {
         this.invoiceFileName = ""
         this.invoiceNo = ""
diff --git a/src/pages/Invoice/mine/InvoiceListView.tsx b/src/pages/Invoice/mine/InvoiceListView.tsx
index fa69d1b..ccbcb66 100644
--- a/src/pages/Invoice/mine/InvoiceListView.tsx
+++ b/src/pages/Invoice/mine/InvoiceListView.tsx
@@ -167,51 +167,51 @@ class InvoiceSearch extends React.Component<any, any> {
                     </Button>
                 </div>
                 {this.state.complexEnabled&&
-                <div className="complexSearchBar" style={{display: "flex"}}>
-                    <Form name="complexOption" {...formItemLayout} onValuesChange={onValuesChange}>
-                        <Row>
-                            <Form.Item name="upload-time-picker" label="发票上传时间" {...rangeConfig}>
-                                <RangePicker/>
-                            </Form.Item>
+                    <div className="complexSearchBar" style={{display: "flex"}}>
+                        <Form name="complexOption" {...formItemLayout} onValuesChange={onValuesChange}>
+                            <Row>
+                                <Form.Item name="upload-time-picker" label="发票上传时间" {...rangeConfig}>
+                                    <RangePicker/>
+                                </Form.Item>
 
-                            <Form.Item name="invoice-time-picker" label="发票开票日期" {...rangeConfig}>
-                                <RangePicker/>
-                            </Form.Item>
-                        </Row>
-                        <Row style={{display: "flex", flexWrap: "wrap"}}>
-                            <Form.Item
-                                name={`invoice-state`}
-                                label={`发票状态`}
-                                style={{minWidth: 150}}
-                            ><Select defaultValue="全部">
-                                <Option value="全部">全部</Option>
-                                <Option value="0">未使用</Option>
-                                <Option value="1">报销中</Option>
-                                <Option value="2">已报销</Option>
-                            </Select>
-                            </Form.Item>
-                            <Form.Item
-                                name={`invoice-kind`}
-                                label={`发票类型`}
-                                style={{minWidth: 300}}
-                            ><Select defaultValue="全部">
-                                <Option value="全部">全部</Option>
-                                <Option value="增值税普通发票">增值税普通发票</Option>
-                                <Option value="增值税专用发票">增值税专用发票</Option>
-                                <Option value="增值税电子普通发票">增值税电子普通发票</Option>
-                                <Option value="增值税电子专用发票">增值税电子专用发票</Option>
-                                <Option value="定额发票">定额发票</Option>
-                            </Select>
-                            </Form.Item>
-                            <Form.Item
-                                name={`invoice-uploader`}
-                                label={`上传者`}
-                            >
-                                <Input placeholder="任意上传者"/>
-                            </Form.Item>
-                        </Row>
-                    </Form>
-                </div>}
+                                <Form.Item name="invoice-time-picker" label="发票开票日期" {...rangeConfig}>
+                                    <RangePicker/>
+                                </Form.Item>
+                            </Row>
+                            <Row style={{display: "flex", flexWrap: "wrap"}}>
+                                <Form.Item
+                                    name={`invoice-state`}
+                                    label={`发票状态`}
+                                    style={{minWidth: 150}}
+                                ><Select defaultValue="全部">
+                                    <Option value="全部">全部</Option>
+                                    <Option value="0">未使用</Option>
+                                    <Option value="1">报销中</Option>
+                                    <Option value="2">已报销</Option>
+                                </Select>
+                                </Form.Item>
+                                <Form.Item
+                                    name={`invoice-kind`}
+                                    label={`发票类型`}
+                                    style={{minWidth: 300}}
+                                ><Select defaultValue="全部">
+                                    <Option value="全部">全部</Option>
+                                    <Option value="增值税普通发票">增值税普通发票</Option>
+                                    <Option value="增值税专用发票">增值税专用发票</Option>
+                                    <Option value="增值税电子普通发票">增值税电子普通发票</Option>
+                                    <Option value="增值税电子专用发票">增值税电子专用发票</Option>
+                                    <Option value="定额发票">定额发票</Option>
+                                </Select>
+                                </Form.Item>
+                                <Form.Item
+                                    name={`invoice-uploader`}
+                                    label={`上传者`}
+                                >
+                                    <Input placeholder="任意上传者"/>
+                                </Form.Item>
+                            </Row>
+                        </Form>
+                    </div>}
             </div>
         )
 
@@ -269,7 +269,7 @@ class InvoiceListView extends React.Component<any, any> {
             pageNum: 1,
             pageSize: 20,
             totalNum: 2,
-            PaginationKey: -23
+            PaginationKey: -2
         }
         this.searchInvoiceContent()
     }
@@ -310,7 +310,7 @@ class InvoiceListView extends React.Component<any, any> {
     }
 
     handleInvoicesTotalNum(value: Number) {
-        this.setState({totalNum: Number, PaginationKey: -Number})
+        this.setState({totalNum: value, PaginationKey: -value})
     }
 
     handleInvoicesContent = (value: Array<Invoice>) => {
@@ -329,10 +329,6 @@ class InvoiceListView extends React.Component<any, any> {
                     )}
 
                 </div>
-                <Pagination style={{
-                    position: "fixed",
-                    bottom: 20,
-                }} showQuickJumper defaultCurrent={1} total={this.state.totalNum} onChange={this.onChange} />
                 <Pagination style={{
                     position: "fixed",
                     bottom: 20,
diff --git a/src/pages/Invoice/mine/InvoiceUploadView.tsx b/src/pages/Invoice/mine/InvoiceUploadView.tsx
index 00cec81..f966b44 100644
--- a/src/pages/Invoice/mine/InvoiceUploadView.tsx
+++ b/src/pages/Invoice/mine/InvoiceUploadView.tsx
@@ -130,6 +130,10 @@ class InvoiceUploadView extends React.Component<any, any>{
     handleCancel = () => {
         this.setOpen(false);
     };
+
+    handleUploadCanCel = () => {
+        this.setUploadOpen(false);
+    }
     submit=()=>{
         let result=this.formRef.current!.getFieldsValue()
         result.invoiceDate=result.invoiceDate.format("YYYY-MM-DD")