feature(管理后台): 商品列表

yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuPageReqVO.java

@@ -29,4 +29,19 @@ public class ProductSpuPageReqVO extends PageParam {
     @ApiModelProperty(value = "上下架状态： 0 上架（开启） 1 下架（禁用）")
     private Integer status;
 
+    @ApiModelProperty(value = "销量最小值", example = "1")
+    private Integer salesCountMin;
+
+    @ApiModelProperty(value = "销量最大值", example = "1024")
+    private Integer salesCountMax;
+
+    @ApiModelProperty(value = "市场价最小值", example = "1")
+    private Integer marketPriceMin;
+
+    @ApiModelProperty(value = "市场价最大值", example = "1024")
+    private Integer marketPriceMax;
+
+    @ApiModelProperty(value = "tab 状态 null 全部， 0：销售中（上架） 1：仓库中（下架） 2：预警中", example = "1")
+    private Integer tabStatus;
+
 }

yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/spu/ProductSpuMapper.java

@@ -7,6 +7,8 @@ import cn.iocoder.yudao.module.product.controller.admin.spu.vo.ProductSpuPageReq
 import cn.iocoder.yudao.module.product.dal.dataobject.spu.ProductSpuDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 商品spu Mapper
  *
@@ -20,7 +22,32 @@ public interface ProductSpuMapper extends BaseMapperX<ProductSpuDO> {
                 .likeIfPresent(ProductSpuDO::getName, reqVO.getName())
                 .eqIfPresent(ProductSpuDO::getCategoryId, reqVO.getCategoryId())
                 .eqIfPresent(ProductSpuDO::getStatus, reqVO.getStatus())
+                .leIfPresent(ProductSpuDO::getSalesCount, reqVO.getSalesCountMax())
+                .geIfPresent(ProductSpuDO::getSalesCount, reqVO.getSalesCountMin())
+                .leIfPresent(ProductSpuDO::getMarketPrice, reqVO.getMarketPriceMax())
+                .geIfPresent(ProductSpuDO::getMarketPrice, reqVO.getMarketPriceMin())
                 .orderByDesc(ProductSpuDO::getSort));
     }
 
+    default PageResult<ProductSpuDO> selectPage(ProductSpuPageReqVO reqVO, List<Long> spuIds) {
+        LambdaQueryWrapperX<ProductSpuDO> productSpuDOLambdaQueryWrapperX = new LambdaQueryWrapperX<ProductSpuDO>()
+                .likeIfPresent(ProductSpuDO::getName, reqVO.getName())
+                .eqIfPresent(ProductSpuDO::getCategoryId, reqVO.getCategoryId())
+                .eqIfPresent(ProductSpuDO::getStatus, reqVO.getStatus())
+                .leIfPresent(ProductSpuDO::getSalesCount, reqVO.getSalesCountMax())
+                .geIfPresent(ProductSpuDO::getSalesCount, reqVO.getSalesCountMin())
+                .leIfPresent(ProductSpuDO::getMarketPrice, reqVO.getMarketPriceMax())
+                .geIfPresent(ProductSpuDO::getMarketPrice, reqVO.getMarketPriceMin())
+                .orderByDesc(ProductSpuDO::getSort);
+
+        if(reqVO.getTabStatus()!= null && reqVO.getTabStatus() == 2){
+            productSpuDOLambdaQueryWrapperX.inIfPresent(ProductSpuDO::getId, spuIds);
+        }else{
+            productSpuDOLambdaQueryWrapperX.eqIfPresent(ProductSpuDO::getStatus, reqVO.getTabStatus());
+        }
+
+        return selectPage(reqVO, productSpuDOLambdaQueryWrapperX);
+    }
+
+
 }

yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuService.java

@@ -83,4 +83,11 @@ public interface ProductSkuService {
      */
     void deleteSkuBySpuId(Long spuId);
 
+    /**
+     * 获得商品预警中的spu集合
+     *
+     * @return 商品spuId集合
+     */
+    List<Long> getRemindSpuIds();
+
 }

yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java

@@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.product.service.sku;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.product.controller.admin.property.vo.property.ProductPropertyRespVO;
 import cn.iocoder.yudao.module.product.controller.admin.property.vo.value.ProductPropertyValueRespVO;
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuBaseVO;
@@ -14,6 +15,7 @@ import cn.iocoder.yudao.module.product.enums.ErrorCodeConstants;
 import cn.iocoder.yudao.module.product.enums.spu.ProductSpuSpecTypeEnum;
 import cn.iocoder.yudao.module.product.service.property.ProductPropertyService;
 import cn.iocoder.yudao.module.product.service.property.ProductPropertyValueService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
@@ -131,6 +133,12 @@ public class ProductSkuServiceImpl implements ProductSkuService {
         productSkuMapper.deleteBySpuId(spuId);
     }
 
+    @Override
+    public List<Long> getRemindSpuIds() {
+        List<ProductSkuDO> productSkuDOS = productSkuMapper.selectList(new QueryWrapper<ProductSkuDO>().apply("stock <= warn_stock"));
+        return productSkuDOS.stream().map(ProductSkuDO::getSpuId).distinct().collect(Collectors.toList());
+    }
+
     @Override
     @Transactional
     public void updateProductSkus(Long spuId, List<ProductSkuCreateOrUpdateReqVO> skus) {

yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java

@@ -3,8 +3,8 @@ package cn.iocoder.yudao.module.product.service.spu;
 import cn.hutool.core.bean.BeanUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
-import cn.iocoder.yudao.module.product.controller.admin.property.vo.property.ProductPropertyRespVO;
 import cn.iocoder.yudao.module.product.controller.admin.property.vo.ProductPropertyViewRespVO;
+import cn.iocoder.yudao.module.product.controller.admin.property.vo.property.ProductPropertyRespVO;
 import cn.iocoder.yudao.module.product.controller.admin.property.vo.value.ProductPropertyValueRespVO;
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuBaseVO;
 import cn.iocoder.yudao.module.product.controller.admin.sku.vo.ProductSkuCreateOrUpdateReqVO;
@@ -190,16 +190,15 @@ public class ProductSpuServiceImpl implements ProductSpuService {
 
     @Override
     public PageResult<ProductSpuRespVO> getSpuPage(ProductSpuPageReqVO pageReqVO) {
-        PageResult<ProductSpuRespVO> spuVOs = ProductSpuConvert.INSTANCE.convertPage(ProductSpuMapper.selectPage(pageReqVO));
+        List<Long> remindSpuIds= null;
-        // 查询 sku 的信息
+        // todo @yunai 预警类型的判断应该可以优化，看下怎么处理
-//        List<Long> spuIds = spuVOs.getList().stream().map(ProductSpuRespVO::getId).collect(Collectors.toList());
+        if(pageReqVO.getTabStatus() != null && pageReqVO.getTabStatus() == 2){
-//        List<ProductSkuRespVO> skus = ProductSkuConvert.INSTANCE.convertList(productSkuService.getSkusBySpuIds(spuIds));
+            remindSpuIds= productSkuService.getRemindSpuIds();
-        // TODO @franky：使用 CollUtil 里的方法替代哈
+            if(remindSpuIds.isEmpty()){
-        // TODO 芋艿：临时注释
+                remindSpuIds.add(null);
-//        Map<Long, List<ProductSkuRespVO>> skuMap = skus.stream().collect(Collectors.groupingBy(ProductSkuRespVO::getSpuId));
+            }
-//        // 将 spu 和 sku 进行组装
+        }
-//        spuVOs.getList().forEach(p -> p.setSkus(skuMap.get(p.getId())));
+        return ProductSpuConvert.INSTANCE.convertPage(ProductSpuMapper.selectPage(pageReqVO, remindSpuIds));
-        return spuVOs;
     }
 
     @Override

yudao-ui-admin/src/views/mall/product/property/value.vue

@@ -24,7 +24,8 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                   v-hasPermi="['system:dict:create']">新增</el-button>
+                   v-hasPermi="['system:dict:create']">新增
+        </el-button>
       </el-col>
       <!-- <el-col :span="1.5">
         <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
@@ -50,9 +51,11 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                     v-hasPermi="['system:dict:update']">修改</el-button>
+                     v-hasPermi="['system:dict:update']">修改
+          </el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                     v-hasPermi="['system:dict:delete']">删除</el-button>
+                     v-hasPermi="['system:dict:delete']">删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -89,8 +92,15 @@
 </template>
 
 <script>
-import { getPropertyList, getPropertyValuePage, createPropertyValue, updatePropertyValue, getPropertyValue, deletePropertyValue } from '@/api/mall/product/property'
+import {
-import {  getProperty } from "@/api/mall/product/property";
+  createPropertyValue,
+  deletePropertyValue,
+  getProperty,
+  getPropertyList,
+  getPropertyValue,
+  getPropertyValuePage,
+  updatePropertyValue
+} from '@/api/mall/product/property'
 
 export default {
   name: "PropertyValue",
@@ -237,7 +247,8 @@ export default {
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => {
+      });
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -248,7 +259,8 @@ export default {
       }).then(response => {
         this.$download.excel(response, '字典数据.xls');
         this.exportLoading = false;
-      }).catch(() => {});
+      }).catch(() => {
+      });
     }
   }
 };

yudao-ui-admin/src/views/mall/product/spu/index.vue

@@ -1,20 +1,15 @@
 <template>
   <div class="app-container">
-    <!-- 搜索工作栏 -->
-    <!-- TODO @Luowenfeng：参考界面；https://v5.niuteam.cn/shop/goods/lists.html
-      商品名称、商品编码、商品分类、商品品牌
-      商品销量、商品价格
-     -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="商品名称" prop="name">
         <el-input v-model="queryParams.name" placeholder="请输入商品名称" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
 
       <el-form-item label="商品编码" prop="code">
-        <el-input v-model="queryParams.code" placeholder="请输入商品名称" clearable @keyup.enter.native="handleQuery"/>
+        <el-input v-model="queryParams.code" placeholder="请输入商品编码" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
 
-      <el-form-item label="商品分类" prop="categoryId">
+      <el-form-item label="商品分类" prop="categoryIds">
         <el-cascader v-model="queryParams.categoryIds" placeholder="请输入商品分类"
                      :options="categoryList" :props="propName" clearable ref="category"/>
       </el-form-item>
@@ -25,6 +20,58 @@
         </el-select>
       </el-form-item>
 
+      <el-form-item label="商品销量">
+        <el-col
+          :span="6"
+          style="padding-left:0"
+        >
+          <el-form-item prop="salesCountMin">
+            <el-input v-model="queryParams.salesCountMin" placeholder="最小值" clearable
+                      @keyup.enter.native="handleQuery"/>
+          </el-form-item>
+        </el-col>
+        <el-col
+          :span="1"
+        >
+          -
+        </el-col>
+        <el-col
+          :span="6"
+          style="padding-left:0"
+        >
+          <el-form-item prop="salesCountMax">
+            <el-input v-model="queryParams.salesCountMax" placeholder="最大值" clearable
+                      @keyup.enter.native="handleQuery"/>
+          </el-form-item>
+        </el-col>
+      </el-form-item>
+
+      <el-form-item label="商品价格" prop="code">
+        <el-col
+          :span="6"
+          style="padding-left:0"
+        >
+          <el-form-item prop="marketPriceMin">
+            <el-input v-model="queryParams.marketPriceMin" placeholder="最小值" clearable
+                      @keyup.enter.native="handleQuery"/>
+          </el-form-item>
+        </el-col>
+        <el-col
+          :span="1"
+        >
+          -
+        </el-col>
+        <el-col
+          :span="6"
+          style="padding-left:0"
+        >
+          <el-form-item prop="marketPriceMax">
+            <el-input v-model="queryParams.marketPriceMax" placeholder="最大值" clearable
+                      @keyup.enter.native="handleQuery"/>
+          </el-form-item>
+        </el-col>
+      </el-form-item>
+
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
@@ -35,21 +82,18 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                   v-hasPermi="['product:spu:create']">新增</el-button>
+                   v-hasPermi="['product:spu:create']">新增
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"/>
     </el-row>
 
+    <el-tabs v-model="activeTabs" type="card" @tab-click="handleClick">
+      <!-- 全部 -->
+      <el-tab-pane label="全部" name="all">
         <!-- 列表 -->
         <el-table v-loading="loading" :data="list">
-      <!--
-      TODO @Luowenfeng：参考界面；
-       https://v5.niuteam.cn/shop/goods/lists.html
-       1. 字段：商品信息、价格、库存、销量、排序、创建时间、状态、操作；
-       2. tab 分成全部、销售中、仓库中、预警中
-       -->
           <el-table-column label="商品信息" align="center" width="260">
-
             <template slot-scope="scope">
               <div class="product-info">
                 <img
@@ -80,27 +124,164 @@
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
               <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                     v-hasPermi="['product:spu:update']">修改</el-button>
+                         v-hasPermi="['product:spu:update']">修改
+              </el-button>
               <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                     v-hasPermi="['product:spu:delete']">删除</el-button>
+                         v-hasPermi="['product:spu:delete']">删除
+              </el-button>
             </template>
           </el-table-column>
         </el-table>
+      </el-tab-pane>
+
+      <!-- 销售中 -->
+      <el-tab-pane label="销售中" name="on">
+        <!-- 列表 -->
+        <el-table v-loading="loading" :data="list">
+          <el-table-column label="商品信息" align="center" width="260">
+            <template slot-scope="scope">
+              <div class="product-info">
+                <img
+                  v-if="scope.row.picUrls"
+                  :src="scope.row.picUrls[0]"
+                  alt="分类图片"
+                  class="img-height"
+                />
+                <div class="message">{{ scope.row.name }}</div>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="价格" align="center" prop="marketPrice" :formatter="unitConversion"/>
+          <el-table-column label="库存" align="center" prop="totalStock"/>
+          <el-table-column label="销量" align="center" prop="salesCount"/>
+          <el-table-column label="排序" align="center" prop="sort"/>
+          <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.createTime) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="状态" align="center" prop="status">
+            <template slot-scope="scope">
+              <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status"/>
+            </template>
+          </el-table-column>
+
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+            <template slot-scope="scope">
+              <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+                         v-hasPermi="['product:spu:update']">修改
+              </el-button>
+              <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                         v-hasPermi="['product:spu:delete']">删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-tab-pane>
+
+      <!-- 仓库中 -->
+      <el-tab-pane label="仓库中" name="off">
+        <!-- 列表 -->
+        <el-table v-loading="loading" :data="list">
+          <el-table-column label="商品信息" align="center" width="260">
+            <template slot-scope="scope">
+              <div class="product-info">
+                <img
+                  v-if="scope.row.picUrls"
+                  :src="scope.row.picUrls[0]"
+                  alt="分类图片"
+                  class="img-height"
+                />
+                <div class="message">{{ scope.row.name }}</div>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="价格" align="center" prop="marketPrice" :formatter="unitConversion"/>
+          <el-table-column label="库存" align="center" prop="totalStock"/>
+          <el-table-column label="销量" align="center" prop="salesCount"/>
+          <el-table-column label="排序" align="center" prop="sort"/>
+          <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.createTime) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="状态" align="center" prop="status">
+            <template slot-scope="scope">
+              <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status"/>
+            </template>
+          </el-table-column>
+
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+            <template slot-scope="scope">
+              <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+                         v-hasPermi="['product:spu:update']">修改
+              </el-button>
+              <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                         v-hasPermi="['product:spu:delete']">删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-tab-pane>
+
+      <!-- 预警中 -->
+      <el-tab-pane label="预警中" name="remind">
+        <!-- 列表 -->
+        <el-table v-loading="loading" :data="list">
+          <el-table-column label="商品信息" align="center" width="260">
+            <template slot-scope="scope">
+              <div class="product-info">
+                <img
+                  v-if="scope.row.picUrls"
+                  :src="scope.row.picUrls[0]"
+                  alt="分类图片"
+                  class="img-height"
+                />
+                <div class="message">{{ scope.row.name }}</div>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="价格" align="center" prop="marketPrice" :formatter="unitConversion"/>
+          <el-table-column label="库存" align="center" prop="totalStock"/>
+          <el-table-column label="销量" align="center" prop="salesCount"/>
+          <el-table-column label="排序" align="center" prop="sort"/>
+          <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.createTime) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="状态" align="center" prop="status">
+            <template slot-scope="scope">
+              <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status"/>
+            </template>
+          </el-table-column>
+
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+            <template slot-scope="scope">
+              <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+                         v-hasPermi="['product:spu:update']">修改
+              </el-button>
+              <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                         v-hasPermi="['product:spu:delete']">删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-tab-pane>
+    </el-tabs>
     <!-- 分页组件 -->
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
                 @pagination="getList"/>
 
-    <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body destroy-on-close :close-on-click-modal="false" >
+    <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body destroy-on-close
+               :close-on-click-modal="false">
       <save @closeDialog="closeDialog" :obj="dialogObj" v-if="open"/>
     </el-dialog>
   </div>
 </template>
 
 <script>
-import {
+import {deleteSpu, getSpuPage,} from "@/api/mall/product/spu";
-  deleteSpu,
-  getSpuPage,
-} from "@/api/mall/product/spu";
 import {getProductCategoryList} from "@/api/mall/product/category";
 import {getBrandList} from "@/api/mall/product/brand";
 import Editor from "@/components/Editor";
@@ -119,6 +300,7 @@ export default {
   },
   data() {
     return {
+      activeTabs: "all",
       propName: {
         checkStrictly: true,
         label: "name",
@@ -153,6 +335,11 @@ export default {
         categoryId: null,
         brandId: null,
         status: null,
+        salesCountMin: null,
+        salesCountMax: null,
+        marketPriceMin: null,
+        marketPriceMax: null,
+        tabStatus: null,
       },
       tagIndex: 0,
     };
@@ -182,6 +369,8 @@ export default {
       this.loading = true;
       // 处理查询参数
       let params = {...this.queryParams};
+      params.marketPriceMin = this.queryParams.marketPriceMin === null ? null : params.marketPriceMin * 100;
+      params.marketPriceMax = this.queryParams.marketPriceMax === null ? null : params.marketPriceMax * 100;
       params.categoryId = this.queryParams.categoryIds[this.queryParams.categoryIds.length - 1];
       this.addBeginAndEndTime(params, this.dateRangeCreateTime, "createTime");
       // 执行查询
@@ -209,9 +398,8 @@ export default {
     resetQuery() {
       this.dateRangeCreateTime = [];
       this.$refs.category.$refs.panel.checkedValue = [];//也可以是指定的值，默认返回值是数组，也可以返回单个值
-  　　this.$refs.category.$refs.panel.activePath = [];
+      this.$refs.category.$refs.panel.activePath = [];
-  　　this.$refs.category.$refs.panel.syncActivePath();
+      this.$refs.category.$refs.panel.syncActivePath();
-      this.queryParams.categoryIds = [];
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -244,10 +432,26 @@ export default {
           this.getList();
           this.$modal.msgSuccess("删除成功");
         })
-        .catch(() => {});
+        .catch(() => {
+        });
     },
     unitConversion(row, column, cellValue) {
       return this.divide(cellValue, 100);
+    },
+    // 选中tab
+    handleClick(val) {
+      if (val.name === "all") {
+        this.queryParams.tabStatus = null;
+      } else if (val.name === "on") {
+        this.queryParams.tabStatus = 0;
+      } else if (val.name === "off") {
+        this.queryParams.tabStatus = 1;
+      } else if (val.name === "remind") {
+        this.queryParams.tabStatus = 2;
+      } else {
+        this.queryParams.tabStatus = null;
+      }
+      this.getList();
     }
   },
 };
@@ -274,10 +478,12 @@ export default {
 
   .product-info {
     display: flex;
+
     .img-height {
       height: 50px;
       width: 50px;
     }
+
     .message {
       margin-left: 10px;
       text-overflow: ellipsis;

yudao-ui-admin/src/views/mall/product/spu/save.vue

@@ -59,7 +59,8 @@
                 </template>
               </div>
             </div>
-            <el-button type="primary" @click="dynamicSpec.push({specValue: []}); ratesForm.rates = []">添加规格项目</el-button>
+            <el-button type="primary" @click="dynamicSpec.push({specValue: []}); ratesForm.rates = []">添加规格项目
+            </el-button>
           </div>
 
           <!-- 规格明细 -->
@@ -82,7 +83,8 @@
               <template v-if="this.activeSwitch">
                 <el-table-column label="sku名称" :render-header="addRedStar" key="91">
                   <template slot-scope="scope">
-                    <el-form-item :prop="'rates.'+ scope.$index + '.name'" :rules="[{required: true, trigger: 'change'}]">
+                    <el-form-item :prop="'rates.'+ scope.$index + '.name'"
+                                  :rules="[{required: true, trigger: 'change'}]">
                       <el-input v-model="scope.row.name"/>
                     </el-form-item>
                   </template>
@@ -90,7 +92,8 @@
               </template>
               <el-table-column label="市场价(元)" :render-header="addRedStar" key="92">
                 <template slot-scope="scope">
-                  <el-form-item :prop="'rates.'+ scope.$index + '.marketPrice'" :rules="[{required: true, trigger: 'change'}]">
+                  <el-form-item :prop="'rates.'+ scope.$index + '.marketPrice'"
+                                :rules="[{required: true, trigger: 'change'}]">
                     <el-input v-model="scope.row.marketPrice"
                               oninput="value= value.match(/\d+(\.\d{0,2})?/) ? value.match(/\d+(\.\d{0,2})?/)[0] : ''"/>
                   </el-form-item>
@@ -98,14 +101,17 @@
               </el-table-column>
               <el-table-column label="销售价(元)" :render-header="addRedStar" key="93">
                 <template slot-scope="scope">
-                 <el-form-item :prop="'rates.'+ scope.$index + '.price'" :rules="[{required: true, trigger: 'change'}]">
+                  <el-form-item :prop="'rates.'+ scope.$index + '.price'"
-                  <el-input v-model="scope.row.price" oninput="value= value.match(/\d+(\.\d{0,2})?/) ? value.match(/\d+(\.\d{0,2})?/)[0] : ''"></el-input>
+                                :rules="[{required: true, trigger: 'change'}]">
+                    <el-input v-model="scope.row.price"
+                              oninput="value= value.match(/\d+(\.\d{0,2})?/) ? value.match(/\d+(\.\d{0,2})?/)[0] : ''"></el-input>
                   </el-form-item>
                 </template>
               </el-table-column>
               <el-table-column label="成本价" :render-header="addRedStar" key="94">
                 <template slot-scope="scope">
-                <el-form-item :prop="'rates.'+ scope.$index + '.costPrice'" :rules="[{required: true, trigger: 'change'}]">
+                  <el-form-item :prop="'rates.'+ scope.$index + '.costPrice'"
+                                :rules="[{required: true, trigger: 'change'}]">
                     <el-input
                       v-model="scope.row.costPrice"
                       oninput="value= value.match(/\d+(\.\d{0,2})?/) ? value.match(/\d+(\.\d{0,2})?/)[0] : ''"
@@ -115,7 +121,8 @@
               </el-table-column>
               <el-table-column label="库存" :render-header="addRedStar" key="95">
                 <template slot-scope="scope">
-                  <el-form-item :prop="'rates.'+ scope.$index + '.stock'" :rules="[{required: true, trigger: 'change'}]">
+                  <el-form-item :prop="'rates.'+ scope.$index + '.stock'"
+                                :rules="[{required: true, trigger: 'change'}]">
                     <el-input v-model="scope.row.stock" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')"></el-input>
                   </el-form-item>
                 </template>
@@ -143,15 +150,20 @@
               <template v-if="this.activeSwitch">
                 <el-table-column fixed="right" label="操作" width="50" key="100">
                   <template slot-scope="scope">
-                    <el-button @click="scope.row.status = 1" type="text" size="small" v-show="scope.row.status == undefined || scope.row.status == 0 ">禁用</el-button>
+                    <el-button @click="scope.row.status = 1" type="text" size="small"
-                    <el-button @click="scope.row.status = 0" type="text" size="small" v-show="scope.row.status == 1">启用</el-button>
+                               v-show="scope.row.status == undefined || scope.row.status == 0 ">禁用
+                    </el-button>
+                    <el-button @click="scope.row.status = 0" type="text" size="small" v-show="scope.row.status == 1">
+                      启用
+                    </el-button>
                   </template>
                 </el-table-column>
               </template>
             </el-table>
           </el-form-item>
           <el-form-item label="虚拟销量" prop="virtualSalesCount">
-            <el-input v-model="baseForm.virtualSalesCount" placeholder="请输入虚拟销量" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')"/>
+            <el-input v-model="baseForm.virtualSalesCount" placeholder="请输入虚拟销量"
+                      oninput="value=value.replace(/^(0+)|[^\d]+/g,'')"/>
           </el-form-item>
         </el-form>
       </el-tab-pane>
@@ -193,7 +205,7 @@
 
 import {getBrandList} from "@/api/mall/product/brand";
 import {getProductCategoryList} from "@/api/mall/product/category";
-import {createSpu, updateSpu, getSpuDetail} from "@/api/mall/product/spu";
+import {createSpu, getSpuDetail, updateSpu} from "@/api/mall/product/spu";
 import {getPropertyListAndValue,} from "@/api/mall/product/property";
 import Editor from "@/components/Editor";
 import ImageUpload from "@/components/ImageUpload";
@@ -563,6 +575,7 @@ export default {
     height: 80px;
     line-height: 90px;
   }
+
   .el-upload-list__item {
     width: 80px;
     height: 80px;