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

Merge remote-tracking branch 'origin/main' into main

main
wuyize 2023-01-06 15:04:16 +08:00
parent 586c4fa69e 8d02ef7ecc
commit 25f5cf453b
3 changed files with 41 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/pages/reimbursement/mine/MyReimbursement.tsx
View File

@ -89,6 +89,7 @@ class Subpage extends React.Component<any, any> {
store.subscribe(this.handleStoreChange); store.subscribe(this.handleStoreChange);
this.pullDepartment() this.pullDepartment()
} }
handleStoreChange = () => { handleStoreChange = () => {
this.setState({staffId: store.getState().token.staffId}) this.setState({staffId: store.getState().token.staffId})
} }
@ -330,8 +331,13 @@ class Subpage extends React.Component<any, any> {
total: totalRecordLength, total: totalRecordLength,
}); });
}) })
if (response.data.reimbursementSubmitStaff.staffId === store.getState().token.staffId) {
tableListDataSource = await this.converter(response.data, pageSize) tableListDataSource = await this.converter(response.data, pageSize)
totalRecordLength = tableListDataSource.length totalRecordLength = tableListDataSource.length
} else {
tableListDataSource = []
totalRecordLength = 0
}
} }
return Promise.resolve({ return Promise.resolve({
@ -384,7 +390,12 @@ class Subpage extends React.Component<any, any> {
optionRender: ({searchText}, {form}, dom) => { optionRender: ({searchText}, {form}, dom) => {
// console.log(searchConfig, formProps, dom) // console.log(searchConfig, formProps, dom)
return [ return [
<div style={{flexWrap: "nowrap", display: "flex", justifyContent: "flex-end", marginRight:6}}> <div style={{
flexWrap: "nowrap",
display: "flex",
justifyContent: "flex-end",
marginRight: 6
}}>
<Space> <Space>
<Search className="searchBar" <Search className="searchBar"
addonBefore={"报销单号："} addonBefore={"报销单号："}

11
src/pages/reimbursement/mine/ReimbursementDetail.tsx
View File

@ -155,7 +155,7 @@ function displaySteps(reimbursement: ReimbursementDetailModal | undefined | null
} }
items.push({ items.push({
// @ts-ignore // @ts-ignore
title: statusEnum2[i - 1] + "审批", title: statusEnum2[i] + "审批",
status: 'error', status: 'error',
subTitle: approvalSteps[i].approvalTime.replace("T", " "), subTitle: approvalSteps[i].approvalTime.replace("T", " "),
description: description description: description
@ -307,11 +307,14 @@ class ReimbursementDetail extends React.Component<any, any> {
}}/> }}/>
</Row> </Row>
<Row style={{marginTop: 15}}> <Row style={{marginTop: 15}}>
<Radio.Group buttonStyle="solid" style={{width:'100%'}} defaultValue={true} onChange={(value) => { <Radio.Group buttonStyle="solid" style={{width: '100%'}} defaultValue={true}
onChange={(value) => {
this.setState({approvalChecked: value.target.value}) this.setState({approvalChecked: value.target.value})
}}> }}>
<Radio.Button value={true} checked={true} style={{width:'50%',textAlign:"center"}}>通过</Radio.Button> <Radio.Button value={true} checked={true}
<Radio.Button value={false} style={{width:'50%',textAlign:"center"}}>不通过</Radio.Button> style={{width: '50%', textAlign: "center"}}>通过</Radio.Button>
<Radio.Button value={false}
style={{width: '50%', textAlign: "center"}}>不通过</Radio.Button>
</Radio.Group> </Radio.Group>
</Row> </Row>
</> </>

1
src/pages/reimbursement/mine/component/ReimbursementDetailFiles.tsx
View File

@ -101,6 +101,7 @@ function DisplayInvoicesList(props:{departureInvoice: Invoice, destinationInvoic
} }
let invoiceId = Number(keys[0]); let invoiceId = Number(keys[0]);
axiosInstance.get("common/invoice/" + invoiceId).then((res) => { axiosInstance.get("common/invoice/" + invoiceId).then((res) => {
res.data.invoiceAmount/=100.0
setInvoiceDetail(res.data); setInvoiceDetail(res.data);
setDetailModalOpen(true); setDetailModalOpen(true);
}) })