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

Compare commits

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

2 Commits
e6d6129635 ... 36c0675e29

Author SHA1 Message Date
zsq
36c0675e29 Merge pull request 'fix:修复：文件归还的弹窗异常' (#19) from develop into main
All checks were successful
Build and Push Docker Image / build (push) Successful in 5m2s
Details 
Reviewed-on: #19
 2026-04-28 11:20:25 +08:00
Your Name
544abaa4ea fix:修复：文件归还的弹窗异常
All checks were successful
Build and Push Docker Image / build (push) Successful in 5m2s
Details
2026-04-28 11:14:20 +08:00
2 changed files with 43 additions and 35 deletions
Show Stats Expand all files Collapse all files

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

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

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

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