diff --git a/src/pages/reimbursement/mine/MyReimbursement.tsx b/src/pages/reimbursement/mine/MyReimbursement.tsx index 34a607a..73362f3 100644 --- a/src/pages/reimbursement/mine/MyReimbursement.tsx +++ b/src/pages/reimbursement/mine/MyReimbursement.tsx @@ -84,13 +84,14 @@ class Subpage extends React.Component { searchWord: "", onCreated: false, detailedReimbursement: undefined, - staffId:store.getState().token.staffId, + staffId: store.getState().token.staffId, } store.subscribe(this.handleStoreChange); this.pullDepartment() } - handleStoreChange=()=>{ - this.setState({staffId:store.getState().token.staffId}) + + handleStoreChange = () => { + this.setState({staffId: store.getState().token.staffId}) } createRef = React.createRef(); columns: ProColumns[] = [ @@ -282,7 +283,7 @@ class Subpage extends React.Component { let params: any = { pageNum: current - 1, pageSize: pageSize, - reimbursementSubmitStaffId:store.getState().token.staffId, + reimbursementSubmitStaffId: store.getState().token.staffId, } if (filter.status !== undefined && filter.status !== null && filter.status.length !== 0) { params['reimbursementStatuses'] = "" @@ -330,8 +331,13 @@ class Subpage extends React.Component { total: totalRecordLength, }); }) - tableListDataSource = await this.converter(response.data, pageSize) - totalRecordLength = tableListDataSource.length + if (response.data.reimbursementSubmitStaff.staffId === store.getState().token.staffId) { + tableListDataSource = await this.converter(response.data, pageSize) + totalRecordLength = tableListDataSource.length + } else { + tableListDataSource = [] + totalRecordLength = 0 + } } return Promise.resolve({ @@ -384,7 +390,12 @@ class Subpage extends React.Component { optionRender: ({searchText}, {form}, dom) => { // console.log(searchConfig, formProps, dom) return [ -
+
+ destinationInvoice={reimbursement.reimbursementDestinationInvoice} + otherInvoices={reimbursement.invoices}/> ) @@ -155,7 +155,7 @@ function displaySteps(reimbursement: ReimbursementDetailModal | undefined | null } items.push({ // @ts-ignore - title: statusEnum2[i - 1] + "审批", + title: statusEnum2[i] + "审批", status: 'error', subTitle: approvalSteps[i].approvalTime.replace("T", " "), description: description @@ -233,11 +233,11 @@ class ReimbursementDetail extends React.Component { approve = () => { let params = {approvalOpinion: this.state.approvalOpinion} - axiosInstance.put("approval/" + this.state.reimbursement.reimbursementId.toString() + "/"+(this.state.approvalChecked?"1":"0"), params).then((res) => { + axiosInstance.put("approval/" + this.state.reimbursement.reimbursementId.toString() + "/" + (this.state.approvalChecked ? "1" : "0"), params).then((res) => { openNotification("审核成功"); this.props.closeDetail(); }).catch((err) => { - openNotification(err.response.data.msg==null?"操作失败,请稍后重试":err.response.data.msg); + openNotification(err.response.data.msg == null ? "操作失败,请稍后重试" : err.response.data.msg); console.log(err); }) } @@ -247,7 +247,7 @@ class ReimbursementDetail extends React.Component { openNotification("已终止申请"); this.props.closeDetail(); }).catch((err) => { - openNotification(err.response.data.msg==null?"操作失败,请稍后重试":err.response.data.msg); + openNotification(err.response.data.msg == null ? "操作失败,请稍后重试" : err.response.data.msg); console.log(err); }) } @@ -299,20 +299,23 @@ class ReimbursementDetail extends React.Component { this.state.reimbursement.reimbursementStatus >= 1 && this.state.reimbursement.reimbursementStatus <= 4) { return (<> -