Sfoglia il codice sorgente

筛选/订单导出

licailing 4 anni fa
parent
commit
e79d93a871

+ 2 - 2
src/main/java/com/izouma/nineth/web/OrderController.java

@@ -60,9 +60,9 @@ public class OrderController extends BaseController {
         orderRepo.softDelete(id);
     }
 
-    @GetMapping("/excel")
+    @PostMapping("/excel")
     @ResponseBody
-    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+    public void excel(HttpServletResponse response, @RequestBody PageQuery pageQuery) throws IOException {
         List<Order> data = all(pageQuery).getContent();
         ExcelUtils.export(response, data.stream().map(order -> {
             OrderDTO dto = new OrderDTO();

+ 4 - 2
src/main/vue/src/views/ActivityList.vue

@@ -21,6 +21,7 @@
             </el-button>
         </page-title>
         <div class="filters-container">
+            <created-at-picker v-model="createdAt" @input="getData" name="创建" style="margin-right:10px"></created-at-picker>
             <el-input
                 placeholder="搜索..."
                 v-model="search"
@@ -108,7 +109,8 @@ export default {
             multipleMode: false,
             search: '',
             url: '/activity/all',
-            downloading: false
+            downloading: false,
+            createdAt: ''
         };
     },
     computed: {
@@ -118,7 +120,7 @@ export default {
     },
     methods: {
         beforeGetData() {
-            return { search: this.search, query: { del: false } };
+            return { search: this.search, query: { del: false, createdAt: this.createdAt } };
         },
         toggleMultipleMode(multipleMode) {
             this.multipleMode = multipleMode;

+ 3 - 2
src/main/vue/src/views/OrderList.vue

@@ -181,10 +181,11 @@ export default {
         },
         download() {
             this.downloading = true;
+            let params = this.beforeGetData();
+            params.size = 10000;
             this.$axios
-                .get('/order/excel', {
+                .post('/order/excel', params, {
                     responseType: 'blob',
-                    params: { size: 10000 }
                 })
                 .then(res => {
                     console.log(res);

+ 4 - 2
src/main/vue/src/views/UserList.vue

@@ -9,6 +9,7 @@
             </el-button>
         </page-title>
         <div class="filters-container">
+            <created-at-picker v-model="createdAt" @input="getData" name="创建" style="margin-right:10px"></created-at-picker>
             <el-input placeholder="搜索..." v-model="search" clearable class="filter-item search">
                 <el-button @click="getData" slot="append" icon="el-icon-search"> </el-button>
             </el-input>
@@ -76,7 +77,8 @@ export default {
             multipleMode: false,
             search: '',
             url: '/user/all',
-            downloading: false
+            downloading: false,
+            createdAt: ''
         };
     },
     computed: {
@@ -87,7 +89,7 @@ export default {
     },
     methods: {
         beforeGetData() {
-            return { search: this.search, query: {} };
+            return { search: this.search, query: {createdAt: this.createdAt} };
         },
         afterGetData(res) {
             // let i = this.tableData.findIndex(i => i.username === 'root');