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

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

src/views/formChange/changeLogDetail/components/ChangeRowDetailModal.vue

@@ -103,10 +103,10 @@
                 }
             });
             if (ele1.fieldCode.indexOf('file') > 0 || ele1.fieldCode.indexOf('File') > 0) {
-                const newlist = await getFileList({ folderId: ele1.newValue });
+                const newlist = await getFileList({ tableId: ele1.newValue });
                 fileList.value.push({ id: ele1.newValue, name: newlist.map((item) => item.fileName).join('、') });
 
-                const oldlist = await getFileList({ folderId: ele1.oldValue });
+                const oldlist = await getFileList({ tableId: ele1.oldValue });
                 fileList.value.push({ id: ele1.oldValue, name: oldlist.map((item) => item.fileName).join('、') });
             }
         });

src/views/generator/desktop/components/designer/infos/Image.vue

@@ -45,7 +45,7 @@
     );
     async function getImage() {
         if (props.config.folderId) {
-            let fileList = await getFileList({ folderId: props.config.folderId });
+            let fileList = await getFileList({ tableId: props.config.folderId });
             if (fileList.length) {
                 imageUrl.value = fileList[0].fileUrl;
             }

src/views/generator/desktop/components/designer/properties/Image.vue

@@ -70,24 +70,24 @@
         data.show = true;
     });
     const submitUpload = (file) => {
-        let folderId = data.info.config.folderId;
+        let tableId = data.info.config.folderId;
         uploadMultiApi(
             {
                 name: 'file',
                 file: [file]
             },
-            folderId
+            tableId
         ).then((res) => {
-            data.info.config.folderId = res[0].folderId;
+            data.info.config.folderId = res[0].tableId;
             getImage();
         });
     };
     async function getImage() {
         if (data.info.config.folderId) {
-            let fileList = await getFileList({ folderId: data.info.config.folderId });
+            let fileList = await getFileList({ tableId: data.info.config.folderId });
             if (fileList.length) {
                 imageUrl.value = fileList[0].fileUrl;
-                data.info.config.folderId = fileList[0].folderId;
+                data.info.config.folderId = fileList[0].tableId;
             }
         } else {
             imageUrl.value = '';

src/views/mobileDesign/functionDesign/components/PropertyOption.vue

@@ -1178,15 +1178,15 @@
             };
 
             const submitUpload = (file) => {
-                let folderId = data.value.options.defaultValue;
+                let tableId = data.value.options.defaultValue;
                 uploadMultiApi(
                     {
                         name: 'file',
                         file: [file]
                     },
-                    folderId
+                    tableId
                 ).then((res) => {
-                    data.value.options.defaultValue = res[0].folderId;
+                    data.value.options.defaultValue = res[0].tableId;
                     getImage();
                 });
             };
@@ -1350,10 +1350,10 @@
             }
             async function getImage() {
                 if (data.value.options.defaultValue) {
-                    let fileList = await getFileList({ folderId: data.value.options.defaultValue });
+                    let fileList = await getFileList({ tableId: data.value.options.defaultValue });
                     if (fileList.length) {
                         imageUrl.value = fileList[0].fileUrl;
-                        data.value.options.defaultValue = fileList[0].folderId;
+                        data.value.options.defaultValue = fileList[0].tableId;
                     }
                 } else {
                     imageUrl.value = '';

src/views/sales/Customer/components/certificateModal.vue

@@ -129,7 +129,7 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data
             fileOrg: v.name,
             filePath: v.url,
             fileSize: v.fileSize,
-            xjrFileId: v.folderId
+            xjrFileId: v.tableId
           }
         })
       }