BigC
/
FinancialReimbursementSystem_frontend
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

main
白封羽 2023-01-03 15:49:46 +08:00
parent d08fd60427 0a522d1fe6
commit eb0d64b251
4 changed files with 88 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/models/Invoice.ts
View File

@ -40,6 +40,8 @@ export class InvoiceSearchOption {
invoiceDateEnd: Nullable<string>
invoiceNote: Nullable<string>
invoiceUploaderId: Nullable<string>
invoiceUploaderIdFuzzy: Nullable<string>
invoiceUploaderNameFuzzy: Nullable<string>
pageNum: number
pageSize: number
@ -60,6 +62,8 @@ export class InvoiceSearchOption {
this.invoiceDateEnd = null
this.invoiceNote = null
this.invoiceUploaderId = null
this.invoiceUploaderIdFuzzy = null
this.invoiceUploaderNameFuzzy = null
this.pageNum = 0
this.pageSize = 20
}

69
src/pages/Invoice/InvoiceDetailModal.tsx
View File

@ -1,5 +1,5 @@
import React, {useEffect, useState} from "react";
import {Button, DatePicker, Form, Input, InputNumber, Modal, Select, Typography} from "antd";
import {Button, DatePicker, Form, Input, InputNumber, Modal, Select, Typography, Image} from "antd";
import {
InvoiceDetail,
InvoiceIdentifyResponse,
@ -7,7 +7,7 @@ import {
invoiceTypeItemsMap,
invoiceTypeNameMap, invoiceTypeShowItemsMap
} from "../../models/Invoice";
import axiosInstance from "../../utils/axiosInstance";
import axiosInstance, {baseUrl} from "../../utils/axiosInstance";
import TextArea from "antd/es/input/TextArea";
import dayjs, {Dayjs} from "dayjs";
import qs from "qs";
@ -50,6 +50,7 @@ function InvoiceDetailModal(props: any) {
key={index}
name={item}
label={invoiceItemsMap.get(item)}
style={{marginBottom: 10}}
>
{inputComponent(item)}
</Form.Item>
@ -99,29 +100,49 @@ function InvoiceDetailModal(props: any) {
open={props.open}
title="发票详情"
onCancel={handleCancel}
footer={ <Button key="next" type="primary" danger loading={loading} onClick={withDraw}
>
撤回
</Button> }
>
{
<Form layout="horizontal" labelCol={{span: 4}}
>
<Form.Item
name={`invoiceKind`}
label={`发票类型`}
>
<Text>{invoiceTypeNameMap.get(props.invoiceDetail?.invoiceKind)}</Text>
</Form.Item>
{formItems}
<Form.Item
name={`invoiceNote`}
label={`备注`}
>
<Paragraph style={{marginTop: 5}}>{props.invoiceDetail?.invoiceNote}</Paragraph>
</Form.Item>
</Form>
footer={
<div style={{width: '100%', display: "flex", flexDirection: "row", justifyContent: "space-between"}}>
<Text>{props.invoiceDetail?.modified ? '发票信息经过手动修改' : ''}</Text>
<div>
{props.invoiceDetail?.invoiceState === 0 && <Button danger loading={loading} onClick={withDraw}
>
撤回
</Button>}
<Button type="primary" href={baseUrl + props.invoiceDetail?.invoiceFileUri} download
>
下载
</Button>
</div>
</div>
}
>
<Form layout="horizontal" labelCol={{span: 4}} size={'small'}
>
<Form.Item
name={`invoiceKind`}
label={`发票类型`}
style={{marginBottom: 10, marginTop: 10}}
>
<Text>{invoiceTypeNameMap.get(props.invoiceDetail?.invoiceKind)}</Text>
</Form.Item>
{formItems}
<Form.Item
name={`invoiceNote`}
label={`备注`}
style={{marginBottom: 10}}
>
<Paragraph style={{marginTop: 5}}>{props.invoiceDetail?.invoiceNote}</Paragraph>
</Form.Item>
</Form>
<Image
width={'100%'}
src={baseUrl + props.invoiceDetail?.invoiceFileUri}
/>
{/* <div style={{ position:"absolute", left:0, top: 50, paddingRight: 20,width: '100%', display: "flex", flexDirection: "column", alignItems: "flex-end"}}>
</div>*/}
</Modal>
)

47
src/pages/Invoice/management/InvoiceManagement.tsx
View File

@ -74,7 +74,7 @@ function InvoiceSearch(props: { handleSearchData: any; }) {
const items: MenuProps['items'] = [
{
key: '1',
label: (<a className="simpleSearchOption" onClick={() => {
label: (<a onClick={() => {
invoiceSearchOption.clear();
setActivatedOption("发票代码")
}}>
@ -83,13 +83,33 @@ function InvoiceSearch(props: { handleSearchData: any; }) {
},
{
key: '2',
label: (<a className="simpleSearchOption" onClick={() => {
label: (<a onClick={() => {
invoiceSearchOption.clear();
setActivatedOption("发票编号")
}}>
发票编号
</a>)
},
{
key: '3',
label: (<a onClick={() => {
invoiceSearchOption.clear();
setActivatedOption("上传者姓名")
}}>
上传者姓名
</a>)
},
{
key: '4',
label: (<a onClick={() => {
invoiceSearchOption.clear();
setActivatedOption("上传者工号")
}}>
上传者工号
</a>)
}
];
const onValuesChange = (changedValues: any, allValues: any) => {
@ -120,12 +140,23 @@ function InvoiceSearch(props: { handleSearchData: any; }) {
if (!complexEnabled)
invoiceSearchOption.clear()
console.log(invoiceSearchOption)
if (activatedOption === "发票代码") {
invoiceSearchOption.invoiceCode = value;
invoiceSearchOption.invoiceNo = null;
} else {
invoiceSearchOption.invoiceNo = value;
invoiceSearchOption.invoiceCode = null;
invoiceSearchOption.invoiceCode = null
invoiceSearchOption.invoiceNo = null
invoiceSearchOption.invoiceUploaderNameFuzzy = null
invoiceSearchOption.invoiceUploaderIdFuzzy = null
switch (activatedOption) {
case "发票代码":
invoiceSearchOption.invoiceCode = value
break;
case "发票编号":
invoiceSearchOption.invoiceNo = value
break;
case "上传者姓名":
invoiceSearchOption.invoiceUploaderNameFuzzy = value
break;
case "上传者工号":
invoiceSearchOption.invoiceUploaderIdFuzzy = value
break;
}
props.handleSearchData(invoiceSearchOption)

13
src/pages/Invoice/mine/InvoiceListView.css
View File

@ -1,13 +0,0 @@
.simpleSearchBar{
height:40px;
width:100%;
position: center;
text-align: center;
}
.simpleSearch{
text-align: left;
}
.uploadButton{
}