From e005d48d5602df7c9140ea633567182989ade25b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E5=B0=81=E7=BE=BD?= <2360164671@qq.com>
Date: Wed, 28 Dec 2022 11:07:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86extraInfo=EF=BC=8C?=
 =?UTF-8?q?=E5=BE=85=E5=AE=9E=E7=8E=B0=E6=8F=90=E4=BA=A4=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/models/Staff.ts                          |  5 +--
 src/pages/Invoice/mine/InvoiceUploadView.tsx | 40 ++++++++++++++++----
 2 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/src/models/Staff.ts b/src/models/Staff.ts
index 0b25b2e..666fed7 100644
--- a/src/models/Staff.ts
+++ b/src/models/Staff.ts
@@ -95,8 +95,7 @@ export class InvoiceCommit {
     invoiceCheckCode:string
     invoiceRegionCode: Nullable<string>
     invoiceSellerTaxCode:Nullable<string>
-
-    invoiceExtraInfo: []
+    invoiceExtraInfo:Nullable<string>|[]
     constructor() {
         this.invoiceFileName = ""
         this.invoiceNo = ""
@@ -108,7 +107,7 @@ export class InvoiceCommit {
         this.invoiceCheckCode = "000000"
         this.invoiceRegionCode = null
         this.invoiceSellerTaxCode = null
-        this.invoiceExtraInfo = []
+        this.invoiceExtraInfo = null
     }
     setValue(props: FormData) {
         console.log("1111"+props.toString())
diff --git a/src/pages/Invoice/mine/InvoiceUploadView.tsx b/src/pages/Invoice/mine/InvoiceUploadView.tsx
index 06c8df4..00cec81 100644
--- a/src/pages/Invoice/mine/InvoiceUploadView.tsx
+++ b/src/pages/Invoice/mine/InvoiceUploadView.tsx
@@ -90,7 +90,7 @@ class InvoiceUploadView extends React.Component<any, any>{
         let data= new FormData();
         data.append('invoiceFile',tempFile)
         axiosInstance({
-            url: '/invoice/identify',//123131',//FIXME
+            url: 'common/invoice/identify',
             method: 'POST',
             data: data
         }).then(response => {
@@ -103,7 +103,10 @@ class InvoiceUploadView extends React.Component<any, any>{
             result.invoiceCheckCode = response.data.invoiceCheckCode
             result.invoiceKind = response.data.invoiceKind
             result.invoiceFileName = response.data.invoiceFileName
-            result.invoiceExtraInfo = response.data.invoiceExtraInfo.toString()
+            result.invoiceExtraInfo = ""
+            for(let i=0;i<response.data.invoiceExtraInfo.length;i++){
+                result.invoiceExtraInfo+=(response.data.invoiceExtraInfo[i].name+": "+response.data.invoiceExtraInfo[i].value+"\n")
+            }
             this.setState({invoiceCommit:result})
             this.formRef.current!.setFieldsValue(result);
         }).catch(function (error) {
@@ -128,6 +131,27 @@ class InvoiceUploadView extends React.Component<any, any>{
         this.setOpen(false);
     };
     submit=()=>{
+        let result=this.formRef.current!.getFieldsValue()
+        result.invoiceDate=result.invoiceDate.format("YYYY-MM-DD")
+        let extraInfo=[]
+        let line = result.invoiceExtraInfo.split('\n')
+        for(let i=0;i<line.length;i++){
+            let tmp = line[i].split(": ")
+            if(tmp.length===2){
+                extraInfo.push({name:tmp[0],value:tmp[1]})
+            }
+        }
+        result.invoiceExtraInfo=extraInfo
+        axiosInstance({
+            url: 'common/invoice/submit',
+            method: 'POST',
+            data: result
+        }).then(response => {
+            //TODO
+            console.log(response.data)
+        }).catch(function (error) {
+            console.log(error)
+        })
 
     }
     render() {
@@ -200,12 +224,12 @@ class InvoiceUploadView extends React.Component<any, any>{
                         >
                             <Input />
                         </Form.Item>
-                        <Form.Item
-                            name={`invoiceAmountWithoutTax`}
-                            label={`非税金额`}
-                        >
-                            <Input/>
-                        </Form.Item>
+                        {/*<Form.Item*/}
+                        {/*    name={`invoiceAmountWithoutTax`}*/}
+                        {/*    label={`非税金额`}*/}
+                        {/*>*/}
+                        {/*    <Input/>*/}
+                        {/*</Form.Item>*/}
                         <Form.Item
                             name={`invoiceDate`}
                             label={`开票日期`}