From f628f5dbfbc90932399b8b893512441b934bb53b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E5=B0=81=E7=BE=BD?= <2360164671@qq.com>
Date: Mon, 26 Dec 2022 22:50:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A2=E6=95=91=E4=BA=86=E7=88=86=E7=82=B8?=
 =?UTF-8?q?=E7=8E=B0=E5=9C=BA=EF=BC=8C=E6=8E=A5=E5=85=A5=E5=90=8E=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/models/Staff.ts                        |  6 +++---
 src/models/store.ts                        |  1 +
 src/pages/Invoice/mine/InvoiceListView.tsx | 10 +++++-----
 src/utils/axiosInstance.ts                 |  6 +++---
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/models/Staff.ts b/src/models/Staff.ts
index f0f0026..035a8e7 100644
--- a/src/models/Staff.ts
+++ b/src/models/Staff.ts
@@ -25,7 +25,7 @@ export interface Invoice {
     invoiceApprovalOpinion: string;
     invoiceNote: string;
     invoiceKind: string;
-    invoiceAmount: number;
+    invoiceAmountWithoutTax: number;
     reimbursementId: number;
     modified: boolean;
 }
@@ -77,8 +77,8 @@ export class InvoiceSearchOption{
     }
     toString(){
         let res="pageNum="+this.pageNum+"&pageSize="+this.pageSize
-        res+=(this.invoiceNo===null?"":("&invoiceNo="+this.invoiceNo));
-        res+=(this.invoiceCode===null?"":("&invoiceCode="+this.invoiceCode));
+        res+=(this.invoiceNo===null||this.invoiceNo===""?"":("&invoiceNo="+this.invoiceNo));
+        res+=(this.invoiceCode===null||this.invoiceCode===""?"":("&invoiceCode="+this.invoiceCode));
         res+=(this.invoiceUploadTimeStart===null?"":("&invoiceUploadTimeStart="+this.invoiceUploadTimeStart?.toDateString()));
         res+=(this.invoiceUploadTimeEnd===null?"":("&invoiceUploadTimeEnd="+this.invoiceUploadTimeEnd?.toDateString()));
         res+=(this.invoiceState===null?"":("&invoiceState="+this.invoiceState));
diff --git a/src/models/store.ts b/src/models/store.ts
index 054c5ba..895a276 100644
--- a/src/models/store.ts
+++ b/src/models/store.ts
@@ -13,6 +13,7 @@ const tokenSlice = createSlice({
         setToken: (state, action: PayloadAction<Token>) => {
             state.accessToken = action.payload.accessToken
             state.refreshToken = action.payload.refreshToken
+            console.log('action: '+action)
         },
     },
 });
diff --git a/src/pages/Invoice/mine/InvoiceListView.tsx b/src/pages/Invoice/mine/InvoiceListView.tsx
index d56758e..2a00e6a 100644
--- a/src/pages/Invoice/mine/InvoiceListView.tsx
+++ b/src/pages/Invoice/mine/InvoiceListView.tsx
@@ -7,7 +7,7 @@ import {Invoice,InvoiceSearchOption} from "../../../models/Staff"
 import {  Space, Typography } from 'antd';
 import {SizeType} from "antd/es/config-provider/SizeContext";
 import axios from "axios";
-import {baseUrl} from "../../../utils/axiosInstance";
+import axiosInstance, {baseUrl} from "../../../utils/axiosInstance";
 const {Meta} = Card;
 const { Search } = Input;
 let invoices:Array<Invoice>
@@ -31,8 +31,8 @@ class InvoiceSearch extends React.Component<any, any> {
         const {handleSearchData} = this.props
         //const dispatch = useAppDispatch();
         //const navigate = useNavigate();
-        console.log(baseUrl + 'invoice/list?'+this.state.invoiceSearchOption.toString())
-        axios.get(baseUrl + 'invoice/list?'+this.state.invoiceSearchOption.toString()).then(function (this:any,response) {
+        console.log(baseUrl + 'common/invoice/list?'+this.state.invoiceSearchOption.toString())
+        axiosInstance.get(baseUrl + 'common/invoice/list?'+this.state.invoiceSearchOption.toString()).then(function (response) {
             console.log(response.data)
             //console.log(this.state)
             handleSearchData(response.data.records)
@@ -104,7 +104,7 @@ class InvoiceItem extends React.Component<any, any> {
         super(props);
         this.state = {
             invoiceKind: props.invoice.invoiceKind,
-            invoiceAmount: props.invoice.invoiceAmount,
+            invoiceAmountWithoutTax: props.invoice.invoiceAmountWithoutTax,
             invoiceDate: props.invoice.invoiceDate,
             invoiceNo: props.invoice.invoiceNo,
         }
@@ -127,7 +127,7 @@ class InvoiceItem extends React.Component<any, any> {
                 <div style={{marginTop: -20}}>
                     <li style={{fontWeight: "bold", fontSize: 20}}>{this.state.invoiceNo}</li>
                     <li>{this.state.invoiceKind}</li>
-                    <li>¥{this.state.invoiceAmount}</li>
+                    <li>¥{(this.state.invoiceAmountWithoutTax/100.0).toFixed(2)}</li>
                     <li>{this.state.invoiceDate}</li>
                 </div>
             </Card>
diff --git a/src/utils/axiosInstance.ts b/src/utils/axiosInstance.ts
index abf1cfa..a15c920 100644
--- a/src/utils/axiosInstance.ts
+++ b/src/utils/axiosInstance.ts
@@ -2,7 +2,7 @@ import axios, {AxiosRequestConfig, AxiosResponse} from "axios";
 import {store} from "../models/store";
 
 export const baseUrl = "http://101.34.228.45:8080/"
-//export const baseUrl = "https://mock.apifox.cn/m1/2116708-0-ae5ae4e4/"
+//export const baseUrl = "https://mock.apifox.cn/m1/2116708-0-default/"
 
 const axiosInstance = axios.create({
     baseURL: baseUrl,
@@ -11,9 +11,9 @@ const axiosInstance = axios.create({
 
 axiosInstance.interceptors.request.use(
     function (config: AxiosRequestConfig) {
-        console.log(config)
         // @ts-ignore
-        config.headers.Authorization  = "bearer "+store.getState().token.accessToken
+        config.headers.Authorization  = "Bearer "+store.getState().token.accessToken
+        console.log(config)
         return config
     },
     function (error) {