Merge branch 'master' of http://47.92.161.104:10080/shuzhan/smart-bus-portal

src/views/base/orderInfo-list.vue

@@ -93,6 +93,9 @@
       </el-form-item>
     </el-form>
     <el-divider></el-divider>
+    <el-row class="button-group">
+    <el-button type="primary" size="small" plain icon="el-icon-circle-plus" @click="exportXls">导出数据</el-button>
+    </el-row>
     <el-table
       ref="formTable"
       :data="tableData"
@@ -337,7 +340,7 @@ export default {
       showModal: false,
       modalTitle: "",
       businessKey: "",
-      tableHeight: 300,
+      tableHeight: 450,
       showDeviceModal: false,
       companyId: "",
       qrCode: "",
@@ -375,7 +378,7 @@ export default {
     this.changePage(1);
   },
   methods: {
-    changePage(pageIndex) {
+    changePage(pageIndex,exportFlag) {
       var self = this;
 
       self.loading = true;
@@ -384,7 +387,14 @@ export default {
       var formData = new FormData();
 
       formData.append("pageIndex", self.pageIndex);
-      formData.append("pageSize", self.pageSize);
+
+      if(exportFlag!=null) {        
+        formData.append("exportFlag", 1);
+        formData.append("pageSize", 10000);
+      }
+      else{
+          formData.append("pageSize", self.pageSize);
+      }
 
       if(self.queryModel.companyId!=null){
           formData.append("companyId", self.queryModel.companyId);
@@ -405,15 +415,40 @@ export default {
         .then(function (response) {
           self.loading = false;
 
-          var jsonData = response.data.data;
+          var jsonData = response.data;
+
+          if(jsonData.result) {
+            if(exportFlag){
+              //导出
+              self.$message({
+                showClose: true,
+                type: "success",
+                message: `报表已生成，<a href="${jsonData.data}">请点击链接下载</a>`,
+                dangerouslyUseHTMLString: true,
+                duration: 30000
+              });
+            }
+            else{
+              //分页查看
+              var page = jsonData.data;
+
+              self.tableData = page.data;
+              self.totalPages = page.totalPages;
+              self.totalElements = page.recordsTotal;
+            }
+          }
+          else{
+            self.$message.warning(jsonData.message + "");
+          }
+
 
-          self.tableData = jsonData.data;
-          self.totalPages = jsonData.totalPages;
-          self.totalElements = jsonData.recordsTotal;
-          //45为分页栏的高度
-          //页面高度-列表上面的高度-分页栏高度
-          self.tableHeight =
-            window.innerHeight - self.$refs.formTable.$el.offsetTop - 100;
+          // self.tableData = jsonData.data;
+          // self.totalPages = jsonData.totalPages;
+          // self.totalElements = jsonData.recordsTotal;
+          // //45为分页栏的高度
+          // //页面高度-列表上面的高度-分页栏高度
+          // self.tableHeight =
+          //   window.innerHeight - self.$refs.formTable.$el.offsetTop - 100;
         })
         .catch((error) => {
           self.loading = false;
@@ -592,6 +627,9 @@ export default {
         } 个文件`
       );
     },
+    exportXls() {
+      this.changePage(1,true);
+    }
 
   },
   mounted: function () {},