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) => { 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 @@ -31,8 +31,8 @@ class InvoiceSearch extends React.Component { 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 { 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 {
  • {this.state.invoiceNo}
  • {this.state.invoiceKind}
  • -
  • ¥{this.state.invoiceAmount}
  • +
  • ¥{(this.state.invoiceAmountWithoutTax/100.0).toFixed(2)}
  • {this.state.invoiceDate}
  • 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) {