pay/pay-company
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: pay:36c0675e292d5141f7468303a60338458cd10f17
Branches Tags
pay:main
pay:develop
..
compare: pay:e6d6129635c85ab5c8330497476d895e18bb6890
Branches Tags
pay:main
pay:develop

No commits in common. "36c0675e292d5141f7468303a60338458cd10f17" and "e6d6129635c85ab5c8330497476d895e18bb6890" have entirely different histories.
36c0675e29 ... e6d6129635

2 changed files with 35 additions and 43 deletions
Show Stats Expand all files Collapse all files

66
src/pages/contract/contract_borrows/modals/Show.tsx
View File

@ -63,30 +63,25 @@ export default function Show(props: MyBetaModalFormProps) {
{data?.borrow_reason}
</ProDescriptions.Item>
<ProDescriptions.Item label="借阅文件" span={2}>
{!data?.contract_archive_borrow_files ||
!data.contract_archive_borrow_files.length ? (
{!data?.borrow_files || data.borrow_files.length === 0 ? (
'-'
) : (
<div>
{data.contract_archive_borrow_files.map(
(file: any, index: number) => (
<div
key={index}
style={{
marginBottom: 8,
padding: 8,
border: '1px solid #f0f0f0',
borderRadius: 4,
}}
>
<div
style={{ fontWeight: 'bold', marginBottom: 4 }}
>
文件 {index + 1}:
{file?.contract_archive_file?.name}
</div>
<div>借阅数量: {file?.borrow_number}</div>
{/* {file?.return_status && (
{data.borrow_files.map((file: any, index: number) => (
<div
key={index}
style={{
marginBottom: 8,
padding: 8,
border: '1px solid #f0f0f0',
borderRadius: 4,
}}
>
<div style={{ fontWeight: 'bold', marginBottom: 4 }}>
文件 {index + 1}: {file?.file?.name}
</div>
<div>借阅数量: {file?.borrow_number}</div>
{/* {file?.return_status && (
<div>
归还状态:{' '}
{ContractArchiveFileReturnStatusEnum[
@ -94,21 +89,20 @@ export default function Show(props: MyBetaModalFormProps) {
]?.text || file.return_status}
</div>
)} */}
{file?.lost_number > 0 && (
<div>遗失数量: {file?.lost_number}</div>
)}
{file?.damaged_number > 0 && (
<div>损坏数量: {file?.damaged_number}</div>
)}
{file?.lost_description && (
<div>遗失描述: {file?.lost_description}</div>
)}
{file?.damaged_description && (
<div>损坏描述: {file?.damaged_description}</div>
)}
</div>
),
)}
{file?.lost_number > 0 && (
<div>遗失数量: {file?.lost_number}</div>
)}
{file?.damaged_number > 0 && (
<div>损坏数量: {file?.damaged_number}</div>
)}
{file?.lost_description && (
<div>遗失描述: {file?.lost_description}</div>
)}
{file?.damaged_description && (
<div>损坏描述: {file?.damaged_description}</div>
)}
</div>
))}
</div>
)}
</ProDescriptions.Item>

12
src/pages/contract/contract_borrows/modals/Update.tsx
View File

@ -37,13 +37,11 @@ export default function Update(props: MyBetaModalFormProps) {
onOpenChange={(open: any) => {
if (open && props.item) {
form.setFieldsValue({
files: props.item?.contract_archive_borrow_files?.map(
(res: any) => ({
id: res?.id,
name: res?.contract_archive_file?.name,
borrow_number: res?.borrow_number,
}),
),
files: props.item?.borrow_files?.map((res: any) => ({
id: res?.id,
name: res?.file?.name,
borrow_number: res?.borrow_number,
})),
});
}
}}