licailing 5 years ago
parent
commit
4a8fc85901

+ 0 - 25
src/main/java/com/izouma/jiashanxia/converter/StockListConverter.java

@@ -1,25 +0,0 @@
-package com.izouma.jiashanxia.converter;
-
-import com.alibaba.fastjson.JSON;
-import com.izouma.jiashanxia.domain.Stock;
-import org.apache.commons.lang3.StringUtils;
-
-import javax.persistence.AttributeConverter;
-import java.util.List;
-
-public class StockListConverter implements AttributeConverter<List<Stock>, String> {
-    @Override
-    public String convertToDatabaseColumn(List<Stock> list) {
-        if (list != null)
-            return JSON.toJSONString(list);
-        return null;
-    }
-
-    @Override
-    public List<Stock> convertToEntityAttribute(String s) {
-        if (StringUtils.isNotEmpty(s)) {
-            return JSON.parseArray(s, Stock.class);
-        }
-        return null;
-    }
-}

+ 23 - 0
src/main/java/com/izouma/jiashanxia/domain/Coupon.java

@@ -0,0 +1,23 @@
+package com.izouma.jiashanxia.domain;
+
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@ApiModel("优惠券")
+public class Coupon extends BaseEntity {
+    private String name;
+
+    private String brand;
+
+    private BigDecimal price;
+
+    private String content;
+}

+ 12 - 0
src/main/java/com/izouma/jiashanxia/domain/OrderInfo.java

@@ -55,6 +55,9 @@ public class OrderInfo extends BaseEntity {
     @ApiModelProperty(value = "充值套餐")
     private Long packageId;
 
+    @ApiModelProperty(value = "规格")
+    private String specification;
+
     @ApiModelProperty(value = "价钱")
     private BigDecimal price;
 
@@ -68,6 +71,15 @@ public class OrderInfo extends BaseEntity {
 
     private boolean isUse;
 
+    private Long parentUserId;
+
     @ApiModelProperty(value = "多次使用")
     private boolean repeatedly;
+
+    @ApiModelProperty(value = "物流")
+    private String logistic;
+
+    @ApiModelProperty(value = "物流单号")
+    private String trackingNumber;
+
 }

+ 0 - 1
src/main/java/com/izouma/jiashanxia/domain/Package.java

@@ -1,7 +1,6 @@
 package com.izouma.jiashanxia.domain;
 
 import com.izouma.jiashanxia.converter.StringArrayConverter;
-import com.izouma.jiashanxia.enums.PackageType;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

+ 28 - 0
src/main/java/com/izouma/jiashanxia/domain/Snack.java

@@ -1,9 +1,37 @@
 package com.izouma.jiashanxia.domain;
 
+import com.izouma.jiashanxia.converter.SpecificationListConverter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Column;
+import javax.persistence.Convert;
 import java.math.BigDecimal;
+import java.util.List;
 
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@ApiModel("零食")
 public class Snack extends BaseEntity {
     private String name;
 
     private BigDecimal price;
+
+    @ApiModelProperty(value = "库存")
+    private long inventory;
+
+    private String img;
+
+    @ApiModelProperty(value = "规格")
+    @Column(columnDefinition = "TEXT")
+    @Convert(converter = SpecificationListConverter.class)
+    private List<Specification> specifications;
+
+    private String content;
 }

+ 18 - 2
src/main/java/com/izouma/jiashanxia/domain/Stock.java

@@ -1,13 +1,29 @@
 package com.izouma.jiashanxia.domain;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.persistence.Entity;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 @Data
+@AllArgsConstructor
 @NoArgsConstructor
-public class Stock {
+@Builder
+@Entity
+@ApiModel(value = "销量库存")
+public class Stock extends BaseEntity {
+    private Long          packageId;
+    @ApiModelProperty(value = "规格")
+    private String        specification;
+    @ApiModelProperty(value = "日期")
     private LocalDateTime day;
-    private int inventory;
+    @ApiModelProperty(value = "库存")
+    private int           inventory;
+    private BigDecimal    price;
 }

+ 26 - 0
src/main/java/com/izouma/jiashanxia/domain/UserCoupon.java

@@ -0,0 +1,26 @@
+package com.izouma.jiashanxia.domain;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@ApiModel("用户优惠券")
+public class UserCoupon extends BaseEntity {
+    private Long userId;
+
+    private Long couponId;
+
+    @ApiModelProperty(value = "有效期")
+    private LocalDateTime period;
+
+
+}

+ 16 - 0
src/main/java/com/izouma/jiashanxia/repo/StockRepo.java

@@ -0,0 +1,16 @@
+package com.izouma.jiashanxia.repo;
+
+import com.izouma.jiashanxia.domain.Stock;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+import javax.transaction.Transactional;
+
+public interface StockRepo extends JpaRepository<Stock, Long>, JpaSpecificationExecutor<Stock> {
+    @Query("update Stock t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+}

+ 2 - 1
src/main/java/com/izouma/jiashanxia/repo/WxFeeRepo.java

@@ -2,6 +2,7 @@ package com.izouma.jiashanxia.repo;
 
 import com.izouma.jiashanxia.domain.WxFee;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
 
 import java.math.BigDecimal;
@@ -9,7 +10,7 @@ import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Optional;
 
-public interface WxFeeRepo extends JpaRepository<WxFee, String> {
+public interface WxFeeRepo extends JpaRepository<WxFee, String>, JpaSpecificationExecutor<WxFee> {
 
     @Query(nativeQuery = true, value = "SELECT SUM(amount) FROM wx_fee WHERE is_refund=false")
     BigDecimal sumByAmount();

+ 14 - 32
src/main/java/com/izouma/jiashanxia/service/StatisticService.java

@@ -1,16 +1,13 @@
 package com.izouma.jiashanxia.service;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.StrUtil;
 import com.izouma.jiashanxia.domain.OrderInfo;
 import com.izouma.jiashanxia.domain.Withdraw;
 import com.izouma.jiashanxia.domain.WxFee;
-import com.izouma.jiashanxia.dto.PageQuery;
 import com.izouma.jiashanxia.dto.StatisticDTO;
 import com.izouma.jiashanxia.enums.OrderInfoStatus;
 import com.izouma.jiashanxia.enums.WithdrawStatus;
 import com.izouma.jiashanxia.repo.*;
-import com.izouma.jiashanxia.utils.JpaUtils;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -33,7 +30,6 @@ public class StatisticService {
     private final WxFeeRepo        wxFeeRepo;
     private final WithdrawRepo     withdrawRepo;
     private final UserService      userService;
-    private final OrderInfoService orderInfoService;
 
     /*
     数据总揽
@@ -107,22 +103,6 @@ public class StatisticService {
         LocalDateTime now = LocalDateTime.now();
         LocalDateTime start = LocalDateTime.of(now.toLocalDate().minusDays(day - 1), LocalTime.MIN);
         List<OrderInfo> orderInfos = orderInfoRepo.findAllByPaidAtBetweenAndStatus(start, now, OrderInfoStatus.PAID);
-
-//        List<StatisticDTO> dtos = new ArrayList<>();
-//        while (day > 0) {
-//            LocalDateTime end = start.plusDays(1);
-//            LocalDateTime finalStart = start;
-//            long order = orderInfos.stream()
-//                    .filter(orderInfo -> !finalStart.isAfter(orderInfo.getPaidAt()) && end.isAfter(orderInfo.getPaidAt()))
-//                    .count();
-//            dtos.add(StatisticDTO.builder()
-//                    .date(finalStart.toLocalDate())
-//                    .dayOrder(order)
-//                    .build());
-//            day--;
-//            start = end;
-//        }
-//        return dtos;
         return this.getDTOS(orderInfos, start, day);
     }
 
@@ -146,6 +126,15 @@ public class StatisticService {
         LocalDateTime start = LocalDateTime.of(year, month, 1, 0, 0);
         LocalDateTime end = start.plusMonths(1);
         long day = end.toLocalDate().toEpochDay() - start.toLocalDate().toEpochDay() - 1;
+        List<Long> childrenId = userService.childrenId(userId);
+        List<WxFee> wxFeeList = wxFeeRepo.findAll(((root, criteriaQuery, criteriaBuilder) -> {
+            List<Predicate> and = new ArrayList<>();
+            and.add(root.get("userId").in(childrenId));
+            and.add(criteriaBuilder.greaterThanOrEqualTo(root.get("paidAt"), start));
+            and.add(criteriaBuilder.lessThan(root.get("paidAt"), end));
+            return criteriaBuilder.and(and.toArray(new Predicate[0]));
+        }));
+
         Map<Integer, List<WxFee>> collect = wxFeeRepo.findAllByCreatedAtBetweenAndUserId(start, end, userId)
                 .stream()
                 .collect(Collectors.groupingBy(WxFee::getAction));
@@ -155,8 +144,8 @@ public class StatisticService {
         if (CollUtil.isNotEmpty(wxFees1)) {
             refunds = wxFees1;
         }
-        List<Withdraw> withdraws = withdrawRepo.findAllByStatusAndUserId(WithdrawStatus.SUCCESS, userId);
-        return getDTOS2(wxFees, refunds, withdraws, start, (int) day);
+
+        return getDTOS2(wxFees, refunds, start, (int) day);
     }
 
     public List<StatisticDTO> getDTOS(List<OrderInfo> orderInfos, LocalDateTime start, int day) {
@@ -177,15 +166,13 @@ public class StatisticService {
         return dtos;
     }
 
-    public List<StatisticDTO> getDTOS2(List<WxFee> wxFees, List<WxFee> refunds, List<Withdraw> withdraws,
+    public List<StatisticDTO> getDTOS2(List<WxFee> wxFees, List<WxFee> refunds,
                                        LocalDateTime start, int day) {
         List<StatisticDTO> dtos = new ArrayList<>();
         while (day > 0) {
             LocalDateTime end = start.plusDays(1);
             LocalDateTime finalStart = start;
-//            long order = orderInfos.stream()
-//                    .filter(orderInfo -> !finalStart.isAfter(orderInfo.getPaidAt()) && end.isAfter(orderInfo.getPaidAt()))
-//                    .count();
+
 //            BigDecimal fee = wxFees.stream()
 //                    .filter(wxFee -> !finalStart.isAfter(wxFee.getCreatedAt()) && end.isAfter(wxFee.getCreatedAt()))
 //                    .map(WxFee::getAmount)
@@ -194,16 +181,11 @@ public class StatisticService {
 //                    .filter(wxFee -> !finalStart.isAfter(wxFee.getCreatedAt()) && end.isAfter(wxFee.getCreatedAt()))
 //                    .map(WxFee::getAmount)
 //                    .reduce(BigDecimal.ZERO, BigDecimal::add);
-            BigDecimal withdraw = withdraws.stream()
-                    .filter(wxFee -> !finalStart.isAfter(wxFee.getAuditTime()) && end.isAfter(wxFee.getAuditTime()))
-                    .map(Withdraw::getAmount)
-                    .reduce(BigDecimal.ZERO, BigDecimal::add);
+
 
             dtos.add(StatisticDTO.builder()
                     .date(finalStart.toLocalDate())
-//                    .dayOrder(order)
 //                    .dayFee(fee)
-                    .dayWithdraw(withdraw)
 //                    .dayRefund(refund)
                     .build());
             day--;

+ 20 - 0
src/main/java/com/izouma/jiashanxia/service/StockService.java

@@ -0,0 +1,20 @@
+package com.izouma.jiashanxia.service;
+
+import com.izouma.jiashanxia.domain.Stock;
+import com.izouma.jiashanxia.dto.PageQuery;
+import com.izouma.jiashanxia.repo.StockRepo;
+import com.izouma.jiashanxia.utils.JpaUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class StockService {
+
+    private StockRepo stockRepo;
+
+    public Page<Stock> all(PageQuery pageQuery) {
+        return stockRepo.findAll(JpaUtils.toSpecification(pageQuery, Stock.class), JpaUtils.toPageRequest(pageQuery));
+    }
+}

+ 60 - 0
src/main/java/com/izouma/jiashanxia/web/StockController.java

@@ -0,0 +1,60 @@
+package com.izouma.jiashanxia.web;
+import com.izouma.jiashanxia.domain.Stock;
+import com.izouma.jiashanxia.service.StockService;
+import com.izouma.jiashanxia.dto.PageQuery;
+import com.izouma.jiashanxia.exception.BusinessException;
+import com.izouma.jiashanxia.repo.StockRepo;
+import com.izouma.jiashanxia.utils.ObjUtils;
+import com.izouma.jiashanxia.utils.excel.ExcelUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+@RestController
+@RequestMapping("/stock")
+@AllArgsConstructor
+public class StockController extends BaseController {
+    private StockService stockService;
+    private StockRepo stockRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public Stock save(@RequestBody Stock record) {
+        if (record.getId() != null) {
+            Stock orig = stockRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return stockRepo.save(orig);
+        }
+        return stockRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/all")
+    public Page<Stock> all(@RequestBody PageQuery pageQuery) {
+        return stockService.all(pageQuery);
+    }
+
+    @GetMapping("/get/{id}")
+    public Stock get(@PathVariable Long id) {
+        return stockRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        stockRepo.softDelete(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<Stock> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+}
+

+ 1 - 0
src/main/resources/genjson/Stock.json

@@ -0,0 +1 @@
+{"tableName":"Stock","className":"Stock","remark":"库存","genTable":true,"genClass":true,"genList":true,"genForm":true,"genRouter":true,"javaPath":"/Users/qiufangchao/Desktop/project/jiashanxia/src/main/java/com/izouma/jiashanxia","viewPath":"/Users/qiufangchao/Desktop/project/jiashanxia/src/main/vue/src/views","routerPath":"/Users/qiufangchao/Desktop/project/jiashanxia/src/main/vue/src","resourcesPath":"/Users/qiufangchao/Desktop/project/jiashanxia/src/main/resources","dataBaseType":"Mysql","fields":[{"name":"packageId","modelName":"packageId","remark":"packageId","showInList":true,"showInForm":true,"formType":"select","required":true,"apiFlag":"2","optionsMethod":"/package/allList","optionsValue":"id","optionsLabel":"name"},{"name":"specification","modelName":"specification","remark":"规格","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"day","modelName":"day","remark":"日期","showInList":true,"showInForm":true,"formType":"datetime"},{"name":"inventory","modelName":"inventory","remark":"库存","showInList":true,"showInForm":true,"formType":"number"},{"name":"price","modelName":"price","remark":"价格","showInList":true,"showInForm":true,"formType":"number","required":true}],"readTable":false,"dataSourceCode":"dataSource","genJson":"","subtables":[],"update":false,"basePackage":"com.izouma.jiashanxia","tablePackage":"com.izouma.jiashanxia.domain.Stock"}

+ 16 - 0
src/main/vue/src/router.js

@@ -398,6 +398,22 @@ const router = new Router({
                     meta: {
                         title: '分类管理'
                     }
+                },
+                {
+                    path: '/stockEdit',
+                    name: 'StockEdit',
+                    component: () => import(/* webpackChunkName: "stockEdit" */ '@/views/StockEdit.vue'),
+                    meta: {
+                        title: '库存编辑'
+                    }
+                },
+                {
+                    path: '/stockList',
+                    name: 'StockList',
+                    component: () => import(/* webpackChunkName: "stockList" */ '@/views/StockList.vue'),
+                    meta: {
+                        title: '库存'
+                    }
                 }
                 /**INSERT_LOCATION**/
             ]

+ 150 - 0
src/main/vue/src/views/StockEdit.vue

@@ -0,0 +1,150 @@
+<template>
+    <div class="edit-view">
+        <el-form
+            :model="formData"
+            :rules="rules"
+            ref="form"
+            label-width="92px"
+            label-position="right"
+            size="small"
+            style="max-width: 500px;"
+        >
+            <el-form-item prop="packageId" label="packageId">
+                <el-select v-model="formData.packageId" clearable filterable placeholder="请选择">
+                    <el-option
+                        v-for="item in packageIdOptions"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                    >
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item prop="specification" label="规格">
+                <el-input v-model="formData.specification"></el-input>
+            </el-form-item>
+            <el-form-item prop="day" label="日期">
+                <el-date-picker
+                    v-model="formData.day"
+                    type="datetime"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                    placeholder="选择日期时间"
+                >
+                </el-date-picker>
+            </el-form-item>
+            <el-form-item prop="inventory" label="库存">
+                <el-input-number type="number" v-model="formData.inventory"></el-input-number>
+            </el-form-item>
+            <el-form-item prop="price" label="价格">
+                <el-input-number type="number" v-model="formData.price"></el-input-number>
+            </el-form-item>
+            <el-form-item>
+                <el-button @click="onSave" :loading="saving" type="primary">保存</el-button>
+                <el-button @click="onDelete" :loading="saving" type="danger" v-if="formData.id">删除 </el-button>
+                <el-button @click="$router.go(-1)">取消</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+<script>
+export default {
+    name: 'StockEdit',
+    created() {
+        if (this.$route.query.id) {
+            this.$http
+                .get('stock/get/' + this.$route.query.id)
+                .then(res => {
+                    this.formData = res;
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.$message.error(e.error);
+                });
+        }
+        this.$http
+            .get('/package/allList', { size: 1000, query: { del: false } })
+            .then(res => {
+                if (res.content.length > 0) {
+                    res.content.forEach(item => {
+                        this.packageIdOptions.push({
+                            label: item.name,
+                            value: item.id
+                        });
+                    });
+                }
+            })
+            .catch(e => {
+                console.log(e);
+                this.$message.error(e.error);
+            });
+    },
+    data() {
+        return {
+            saving: false,
+            formData: {},
+            rules: {
+                packageId: [
+                    {
+                        required: true,
+                        message: '请输入packageId',
+                        trigger: 'blur'
+                    }
+                ],
+                price: [
+                    {
+                        required: true,
+                        message: '请输入价格',
+                        trigger: 'blur'
+                    }
+                ]
+            },
+            packageIdOptions: []
+        };
+    },
+    methods: {
+        onSave() {
+            this.$refs.form.validate(valid => {
+                if (valid) {
+                    this.submit();
+                } else {
+                    return false;
+                }
+            });
+        },
+        submit() {
+            let data = { ...this.formData };
+
+            this.saving = true;
+            this.$http
+                .post('/stock/save', data, { body: 'json' })
+                .then(res => {
+                    this.saving = false;
+                    this.$message.success('成功');
+                    this.$router.go(-1);
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.saving = false;
+                    this.$message.error(e.error);
+                });
+        },
+        onDelete() {
+            this.$alert('删除将无法恢复,确认要删除么?', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/stock/del/${this.formData.id}`);
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.$router.go(-1);
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        console.log(e);
+                        this.$message.error(e.error);
+                    }
+                });
+        }
+    }
+};
+</script>
+<style lang="less" scoped></style>

+ 160 - 0
src/main/vue/src/views/StockList.vue

@@ -0,0 +1,160 @@
+<template>
+    <div class="list-view">
+        <div class="filters-container">
+            <el-input placeholder="输入关键字" v-model="search" clearable class="filter-item"></el-input>
+            <el-button @click="getData" type="primary" icon="el-icon-search" class="filter-item">搜索 </el-button>
+            <el-button @click="addRow" type="primary" icon="el-icon-plus" class="filter-item">添加 </el-button>
+            <el-button
+                @click="download"
+                type="primary"
+                icon="el-icon-download"
+                :loading="downloading"
+                class="filter-item"
+                >导出EXCEL
+            </el-button>
+        </div>
+        <el-table
+            :data="tableData"
+            row-key="id"
+            ref="table"
+            header-row-class-name="table-header-row"
+            header-cell-class-name="table-header-cell"
+            row-class-name="table-row"
+            cell-class-name="table-cell"
+            :height="tableHeight"
+        >
+            <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
+            <el-table-column prop="id" label="ID" width="100"> </el-table-column>
+            <el-table-column prop="packageId" label="packageId"> </el-table-column>
+            <el-table-column prop="specification" label="规格"> </el-table-column>
+            <el-table-column prop="day" label="日期"> </el-table-column>
+            <el-table-column prop="inventory" label="库存"> </el-table-column>
+            <el-table-column prop="price" label="价格"> </el-table-column>
+            <el-table-column label="操作" align="center" fixed="right" min-width="150">
+                <template slot-scope="{ row }">
+                    <el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button>
+                    <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="pagination-wrapper">
+            <!-- <div class="multiple-mode-wrapper">
+                <el-button v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
+                <el-button-group v-else>
+                    <el-button @click="operation1">批量操作1</el-button>
+                    <el-button @click="operation2">批量操作2</el-button>
+                    <el-button @click="toggleMultipleMode(false)">取消</el-button>
+                </el-button-group>
+            </div> -->
+            <el-pagination
+                background
+                @size-change="onSizeChange"
+                @current-change="onCurrentChange"
+                :current-page="page"
+                :page-sizes="[10, 20, 30, 40, 50]"
+                :page-size="pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="totalElements"
+            >
+            </el-pagination>
+        </div>
+    </div>
+</template>
+<script>
+import { mapState } from 'vuex';
+import pageableTable from '@/mixins/pageableTable';
+
+export default {
+    name: 'StockList',
+    mixins: [pageableTable],
+    data() {
+        return {
+            multipleMode: false,
+            search: '',
+            url: '/stock/all',
+            downloading: false
+        };
+    },
+    computed: {
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        beforeGetData() {
+            return { search: this.search };
+        },
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
+            }
+        },
+        addRow() {
+            this.$router.push({
+                path: '/stockEdit',
+                query: {
+                    ...this.$route.query
+                }
+            });
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/stockEdit',
+                query: {
+                    id: row.id
+                }
+            });
+        },
+        download() {
+            this.downloading = true;
+            this.$axios
+                .get('/stock/excel', {
+                    responseType: 'blob',
+                    params: { size: 10000 }
+                })
+                .then(res => {
+                    console.log(res);
+                    this.downloading = false;
+                    const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
+                    const link = document.createElement('a');
+                    link.href = downloadUrl;
+                    link.setAttribute('download', res.headers['content-disposition'].split('filename=')[1]);
+                    document.body.appendChild(link);
+                    link.click();
+                    link.remove();
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.downloading = false;
+                    this.$message.error(e.error);
+                });
+        },
+        operation1() {
+            this.$notify({
+                title: '提示',
+                message: this.selection
+            });
+        },
+        operation2() {
+            this.$message('操作2');
+        },
+        deleteRow(row) {
+            this.$alert('删除将无法恢复,确认要删除么?', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/stock/del/${row.id}`);
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.getData();
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        this.$message.error(e.error);
+                    }
+                });
+        }
+    }
+};
+</script>
+<style lang="less" scoped></style>