wangqifan %!s(int64=4) %!d(string=hai) anos
pai
achega
979eceb8c3

+ 2 - 0
src/main/java/com/izouma/tcg/domain/orderInfo/OrderInfo.java

@@ -1,6 +1,7 @@
 package com.izouma.tcg.domain.orderInfo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.izouma.tcg.annotations.Searchable;
 import com.izouma.tcg.domain.Address;
 import com.izouma.tcg.domain.BaseEntity;
 import com.izouma.tcg.domain.User;
@@ -29,6 +30,7 @@ import java.util.List;
 @NoArgsConstructor
 @ApiModel(value = "订单", description = "订单")
 public class OrderInfo extends BaseEntity {
+    @Searchable
     private String        transactionId;
     private BigDecimal    total;
     private Integer       boxesCount;

+ 2 - 1
src/main/vue/src/views/OrderInfoList.vue

@@ -44,7 +44,7 @@
         >
             <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
             <el-table-column prop="orderStatus" label="订单状态" :formatter="orderStatusFormatter"> </el-table-column>
-            <el-table-column prop="transactionId" label="订单号" min-width="150"></el-table-column>
+            <el-table-column prop="transactionId" label="订单号" min-width="200"></el-table-column>
             <el-table-column prop="user.nickname" label="用户昵称" width="150"></el-table-column>
             <el-table-column prop="user.avatar" label="头像">
                 <template slot-scope="{ row }">
@@ -223,6 +223,7 @@ export default {
             if (this.orderStatus) {
                 data.query.orderStatus = this.orderStatus;
             }
+            data.search = this.search;
             data.query.del = 0;
             return data;
         },