Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-web into dev

# Conflicts: # src/router/routes/basic.ts
2025-12-05 10:05:50 +08:00
parent 7454813b2c 2506d02e95
commit d9780c488d
32 changed files with 902 additions and 333 deletions
--- a/src/views/erp/purchase/components/OrderInfoModal.vue
+++ b/src/views/erp/purchase/components/OrderInfoModal.vue
@ -528,7 +528,7 @@
        isReady.value = true;

        if (baseInfo.value.filePath) {
-            imgList.value = await getFileList({ folderId: baseInfo.value.filePath });
+            imgList.value = await getFileList({ tableId: baseInfo.value.filePath });
        }
    };