Merge branch 'VERSIONS-menJin' into leb-web-dev

src/views/safetyCheck/components/exportComponent/exportComponent.vue

@@ -89,13 +89,21 @@
               cancelButtonText: "取消",
               type: "warning"
             }).then(async () => {
-              let ids = self.exportConfig.ids.join(',');
-              let obj = {
-                ids :ids
+              let obj = JSON.parse(JSON.stringify(self.exportConfig.screenData));
+              if(obj.page){
+                delete obj.page;
               }
-              if(self.exportConfig.customKey){
-                obj[self.exportConfig.customKey] = self.exportConfig.customValue
+              if(obj.pageSize){
+                delete obj.pageSize;
               }
+              obj.ids = self.exportConfig.ids.join(',');
+              // let ids = self.exportConfig.ids.join(',');
+              // let obj = {
+              //   ids :ids
+              // }
+              // if(self.exportConfig.customKey){
+              //   obj[self.exportConfig.customKey] = self.exportConfig.customValue
+              // }
               self.download(self.exportConfig.api,obj, self.exportConfig.fileName+currentDate+'.xlsx')
               if(self.$parent.$refs['table-box']){
                 self.$parent.$refs['table-box'].clearSelection();