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

# Conflicts:
#	src/router/routes/basic.ts

src/views/erp/customer/components/AttachmentModal.vue

@@ -25,7 +25,7 @@
                 height: '300px'
             }
         });
-        imgList.value = await getFileList({ folderId: data.filePath });
+        imgList.value = await getFileList({ tableId: data.filePath });
     });
 </script>
 <style lang="less" scoped>

src/views/erp/customer/components/CustomerInfo.vue

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

src/views/erp/device/components/AlarmInfomation.vue

@@ -46,7 +46,7 @@
         alarmtInfo.value = await getDeviceAlarmCheck(data.id);
         imgSrc.value = alarmtInfo.value?.state === 0 ? 'check_tip_no1' : 'check_tip_pass1';
         if (alarmtInfo.value.filePath) {
-            imgList.value = await getFileList({ folderId: alarmtInfo.value.filePath });
+            imgList.value = await getFileList({ tableId: alarmtInfo.value.filePath });
         }
     });
 </script>

src/views/erp/device/components/InspectInfomation.vue

@@ -49,7 +49,7 @@
         inspectInfo.value = await getDeviceInspectInfo(data.id);
         imgSrc.value = inspectInfo.value?.state === 0 ? 'check_tip_no' : 'check_tip_pass';
         if (inspectInfo.value.filePath) {
-            imgList.value = await getFileList({ folderId: inspectInfo.value.filePath });
+            imgList.value = await getFileList({ tableId: inspectInfo.value.filePath });
         }
     });
 </script>

src/views/erp/material/components/MaterialInfo.vue

@@ -257,7 +257,7 @@
             }
         ];
         if (baseInfo.value.fileId) {
-            imgList.value = await getFileList({ folderId: baseInfo.value.fileId });
+            imgList.value = await getFileList({ tableId: baseInfo.value.fileId });
         }
     });
 

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 });
         }
     };
 

src/views/erp/sales/components/OrderInfoModal.vue

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