Merge pull request 'fix:修复：文件归还的弹窗异常' (#19) from develop into main

Reviewed-on: #19

src/pages/contract/contract_borrows/modals/Show.tsx

@@ -63,11 +63,13 @@ export default function Show(props: MyBetaModalFormProps) {
                   {data?.borrow_reason}
                 </ProDescriptions.Item>
                 <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>
-                      {data.borrow_files.map((file: any, index: number) => (
+                      {data.contract_archive_borrow_files.map(
+                        (file: any, index: number) => (
                           <div
                             key={index}
                             style={{
@@ -77,8 +79,11 @@ export default function Show(props: MyBetaModalFormProps) {
                               borderRadius: 4,
                             }}
                           >
-                          <div style={{ fontWeight: 'bold', marginBottom: 4 }}>
+                            <div
-                            文件 {index + 1}: {file?.file?.name}
+                              style={{ fontWeight: 'bold', marginBottom: 4 }}
+                            >
+                              文件 {index + 1}:
+                              {file?.contract_archive_file?.name}
                             </div>
                             <div>借阅数量: {file?.borrow_number}</div>
                             {/* {file?.return_status && (
@@ -102,7 +107,8 @@ export default function Show(props: MyBetaModalFormProps) {
                               <div>损坏描述: {file?.damaged_description}</div>
                             )}
                           </div>
-                      ))}
+                        ),
+                      )}
                     </div>
                   )}
                 </ProDescriptions.Item>

src/pages/contract/contract_borrows/modals/Update.tsx

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