Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui

manager/src/components/lili-dialog/goods-dialog.vue

@@ -38,6 +38,7 @@
             type="primary"
             @click="
               goodsData = [];
+              goodsParams.pageNumber = 1;
               getQueryGoodsList();
             "
             icon="ios-search"

seller/src/views/goods/goods-seller/alertQuantity.vue

@@ -0,0 +1,419 @@
+<template>
+    <div class="search">
+      <Card>
+  
+        <Row @keydown.enter.native="handleSearch">
+          <Form
+            ref="searchForm"
+            :model="searchForm"
+            inline
+            :label-width="70"
+            class="search-form"
+          >
+            <Form-item label="商品名称" prop="goodsName">
+              <Input
+                type="text"
+                v-model="searchForm.goodsName"
+                placeholder="请输入商品名称"
+                clearable
+                style="width: 200px"
+              />
+            </Form-item>
+            <Form-item label="商品分类" prop="category">
+                <Cascader
+                    v-model="category"
+                    placeholder="请选择商品分类"
+                    style="width: 200px"
+                    :data="categoryList"
+                ></Cascader>
+            </Form-item>
+
+            <Button @click="handleSearch" type="primary" class="search-btn">搜索</Button>
+            <Button @click="handleReset" class="search-btn">重置</Button>
+          </Form>
+        </Row>
+        <Tabs @on-click="switchTabs" value="updateStock" v-model="stockType">
+            <TabPane label="预警商品" name="warnList">
+                <Table
+                    class="mt_10"
+                    border
+                    :loading="loading"
+                    :columns="columns"
+                    :data="warnData"
+                    ref="table"
+                >
+                </Table>
+            </TabPane>
+            <TabPane label="设置预警" name="warnSetting">
+                <Table
+                    class="mt_10"
+                    border
+                    :loading="loading"
+                    :columns="settingColumns"
+                    :data="skuAllData"
+                    ref="table"
+                >
+                    <template slot="alertQuantitySlot" slot-scope="{ row }">
+                        <Input type="number" v-model="row.alertQuantity" clearable placeholder="请输入预警库存" @on-blur="updateWarnStock(row)" @on-change="checkVal(row)" />
+                    </template>
+                </Table>
+            </TabPane>
+        </Tabs>
+        <Row type="flex" justify="end" class="mt_10">
+          <Page
+            :current="searchForm.pageNumber"
+            :total="total"
+            :page-size="searchForm.pageSize"
+            @on-change="changePage"
+            @on-page-size-change="changePageSize"
+            :page-size-opts="[10, 20, 50]"
+            size="small"
+            show-total
+            show-elevator
+            show-sizer
+          ></Page>
+        </Row>
+      </Card>
+  
+      <Modal
+        title="更新库存"
+        v-model="updateStockModalVisible"
+        :mask-closable="false"
+        :width="610"
+      >
+        <Table
+            class="mt_10"
+            :columns="updateStockColumns"
+            :data="stockList"
+            border
+        ></Table>
+        <div slot="footer">
+          <Button type="text" @click="updateStockModalVisible = false">取消</Button>
+          <Button type="primary" @click="updateStock">更新</Button>
+        </div>
+      </Modal>
+    </div>
+  </template>
+  
+  <script>
+  import {
+    getGoodsSkuListDataSeller,
+    getGoodsListDataByStockSeller,
+    updateGoodsAlertStocks,
+    updateGoodsSkuStocks,
+    getGoodsCategoryAll
+  } from "@/api/goods";
+  import * as API_Shop from "@/api/shops";
+  export default {
+    name: "goods",
+    data() {
+      return {
+        id: "", //要操作的id
+        loading: true, // 表单加载状态
+        updateStockModalVisible: false, // 更新库存模态框显隐
+        stockAllUpdate: undefined, // 更新库存数量
+        stockType: 'warnList',
+        searchForm: {
+          // 搜索框初始化对象
+          pageNumber: 1, // 当前页数
+          pageSize: 10, // 页面大小
+          sort: "create_time", // 默认排序字段
+          order: "desc", // 默认排序方式
+        },
+        checkFlag: false, //检测成功标志
+        // 表单验证规则
+        formValidate: {},
+        //修改库存的数据
+        stockList: [],
+        //列表名称
+        columns: [
+          {
+            title: "商品名称",
+            key: "goodsName",
+            midwidth: 400,
+            tooltip: true,
+          },
+          {
+            title: "库存",
+            key: "quantity",
+            midwidth: 280,
+            render: (h, params) => {
+              if (params.row.quantity) {
+                return h("div", params.row.quantity);
+              } else {
+                return h("div", 0);
+              }
+            },
+          },
+          {
+            title: "预警值",
+            key: "alertQuantity",
+            midwidth: 280,
+            render: (h, params) => {
+              if (params.row.alertQuantity) {
+                return h("div", params.row.alertQuantity);
+              } else {
+                return h("div", 0);
+              }
+            },
+          },
+          {
+            title: "操作",
+            key: "action",
+            align: "center",
+            fixed: "right",
+            width: 200,
+            render: (h, params) => {
+              return h("div", [
+                h(
+                    "Button",
+                  {
+                    props: {
+                      type: "default",
+                      size: "small",
+                    },
+                    style: {
+                      marginRight: "5px",
+                    },
+                    on: {
+                      click: () => {
+                        this.openUpdataStockModal(params.row);
+                      },
+                    },
+                  },
+                  "库存"
+                ),
+              ]);
+            },
+          },
+        ],
+        settingColumns: [
+          {
+            title: "商品名称",
+            key: "goodsName",
+          },
+          {
+            title: "库存",
+            key: "quantity",
+            width: 400,
+            render: (h, params) => {
+              if (params.row.quantity) {
+                return h("div", params.row.quantity);
+              } else {
+                return h("div", 0);
+              }
+            },
+          },
+          {
+            title: "预警值",
+            key: "alertQuantity",
+            width: 400,
+            slot: 'alertQuantitySlot',
+          },
+        ],
+        updateStockColumns: [
+            {
+            title: "sku规格",
+            key: "sn",
+            minWidth: 120,
+            render: (h, params) => {
+                return h("div", {}, params.row.simpleSpecs);
+            },
+            },
+            {
+            title: "审核状态",
+            key: "authFlag",
+            width: 130,
+            render: (h, params) => {
+                if (params.row.authFlag == "TOBEAUDITED") {
+                return h("Tag", { props: { color: "blue" } }, "待审核");
+                } else if (params.row.authFlag == "PASS") {
+                return h("Tag", { props: { color: "green" } }, "通过");
+                } else if (params.row.authFlag == "REFUSE") {
+                return h("Tag", { props: { color: "red" } }, "审核拒绝");
+                }
+            },
+            },
+            {
+            title: "操作",
+            key: "action",
+            align: "center",
+            width: 200,
+            render: (h, params) => {
+                let vm = this;
+                return h("InputNumber", {
+                props: {
+                    value: params.row.quantity,
+                },
+                on: {
+                    "on-change": (event) => {
+                    vm.stockList[params.index].quantity = event;
+                    },
+                },
+                });
+            },
+            },
+        ],
+        warnData: [], // 表单数据
+        skuAllData: [], //SKU数据
+        total: 0, //sku数据总数
+        categoryList: [], //分类列表
+        category: '', //选中分类
+        selectedSku: {},
+      };
+    },
+    methods: {
+      init() {
+        // 初始化数据
+        this.getDataList();
+        this.deepGroup();
+      },
+      openUpdataStockModal(row){
+        this.stockList = []
+        this.selectedSku = JSON.parse(JSON.stringify(row));
+        this.stockList.push(this.selectedSku);
+        this.updateStockModalVisible = true;
+      },
+      // 更新库存
+      updateStock () {
+        let updateStockList = this.stockList.map((i) => {
+          let j = { skuId: i.id, quantity: i.quantity };
+          return j;
+        });
+        updateGoodsSkuStocks(updateStockList).then((res) => {
+          if (res.success) {
+            this.updateStockModalVisible = false;
+            this.$Message.success("更新库存成功");
+            this.getDataList();
+          }
+        });
+      },
+      //修改预警值
+      updateWarnStock(row){
+        if(this.checkFlag){
+            let submit = { skuId: row.id, alertQuantity: row.alertQuantity }
+            updateGoodsAlertStocks(submit).then(res => {
+                if(res.success){
+                    this.$Message.success('更新成功')
+                }
+            })
+        }
+      },
+      //检测输入值是否正确
+      checkVal(row){
+        if (
+          !/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/.test(row.alertQuantity) ||
+          parseInt(row.alertQuantity) < 0 ||
+          parseInt(row.alertQuantity) > 99999999
+        ) {
+          // 校验未通过 进行提示
+          this.$Message.error("请输入0~99999999之间的数字值")
+          this.checkFlag = false;
+          return;
+        }
+        this.checkFlag = true;
+      },
+      //切换分页
+      switchTabs(){
+        this.handleReset();
+        this.getDataList();
+      },
+      // 改变页数
+      changePageSize(v) {
+        this.searchForm.pageSize = v;
+        this.getDataList();
+      },
+      //改变页码
+      changePage(v) {
+        this.searchForm.pageNumber = v;
+        this.getDataList();
+        this.clearSelectAll();
+      },
+      // 搜索
+      handleSearch() {
+        this.searchForm.pageNumber = 1;
+        this.searchForm.pageSize = 10;
+        this.searchForm.categoryPath = this.category.join(",")
+        this.getDataList();
+      },
+      // 重置搜索条件
+      handleReset() {
+        this.searchForm = {};
+        this.category = [];
+        this.searchForm.pageNumber = 1;
+        this.searchForm.pageSize = 10;
+        // 重新加载数据
+        this.getDataList();
+      },
+      // 获取商品列表数据
+      getDataList() {
+        this.loading = true;
+        // 带多条件搜索参数获取表单数据
+        if(this.stockType == 'warnList'){
+            //调用预警库存
+            getGoodsListDataByStockSeller(this.searchForm).then(res => {
+                if(res.success){
+                    this.warnData = res.result.records
+                    this.total = res.result.total
+                    this.loading = false;
+                }
+            })
+        }else if(this.stockType == 'warnSetting'){
+            //调用获取全部sku
+            getGoodsSkuListDataSeller(this.searchForm).then(res => {
+                if(res.success){
+                    this.skuAllData = res.result.records
+                    this.total = res.result.total
+                    this.loading = false;
+                }
+            })
+        }
+      },
+      //组织分类树
+      deepGroup() {
+        getGoodsCategoryAll().then(res =>{
+            if(res.success){
+                res.result.forEach((item) => {
+                let childWay = []; //第二级
+                // 第二层
+                if (item.children) {
+                item.children.forEach((child) => {
+                    // // 第三层
+                    if (child.children) {
+                    child.children.forEach((grandson, index, arr) => {
+                        arr[index] = {
+                        value: grandson.id,
+                        label: grandson.name,
+                        children: "",
+                        };
+                    });
+                    }
+                    let children = {
+                    value: child.id,
+                    label: child.name,
+                    children: child.children,
+                    };
+                    childWay.push(children);
+                });
+                }
+                // 第一层
+                let way = {
+                value: item.id,
+                label: item.name,
+                children: childWay,
+                };
+                this.categoryList.push(way);
+            });
+            }
+        })
+      },
+    },
+    mounted() {
+      this.init();
+    },
+  };
+  </script>
+  <style lang="scss" scoped>
+  @import "@/styles/table-common.scss";
+  </style>
+  

seller/src/views/goods/goods-seller/goods.vue

@@ -162,12 +162,6 @@
         <TabPane label="批量规格更新" name="stockAll">
           <Input type="number" v-model="stockAllUpdate" placeholder="统一规格修改" />
         </TabPane>
-        <!--<TabPane label="手动库存预警更新" name="alertQuantity">-->
-          <!--<Table class="mt_10" :columns="alertQuantityColumns" :data="alertQuantityList" border></Table>-->
-        <!--</TabPane>-->
-        <!--<TabPane label="批量库存预警更新" name="alertQuantityAll">-->
-          <!--<Input type="number" v-model="stockAllAlertQuantity" placeholder="统一库存预警修改" />-->
-        <!--</TabPane>-->
       </Tabs>
 
       <div slot="footer">
@@ -221,7 +215,6 @@ import {
   getGoodsListDataSeller,
   getGoodsSkuListDataSeller,
   updateGoodsSkuStocks,
-  updateGoodsAlertStocks,
   upGoods,
   lowGoods,
   deleteGoods,
@@ -248,7 +241,6 @@ export default {
       logisticsTemplate: [], // 物流列表
       updateStockModalVisible: false, // 更新库存模态框显隐
       stockAllUpdate: undefined, // 更新库存数量
-      stockAllAlertQuantity: undefined, // 更新规格预警数量
       searchForm: {
         // 搜索框初始化对象
         pageNumber: 1, // 当前页数
@@ -257,7 +249,6 @@ export default {
         order: "desc", // 默认排序方式
       },
       stockList: [], // 库存列表
-      alertQuantityList: [],  // 库存预警列表
       form: {
         // 添加或编辑表单对象初始化数据
         goodsName: "",
@@ -309,49 +300,6 @@ export default {
           },
         },
       ],
-      alertQuantityColumns: [
-        {
-          title: "库存预警",
-          key: "sn",
-          minWidth: 120,
-          render: (h, params) => {
-            return h("div", {}, params.row.simpleSpecs);
-          },
-        },
-        {
-          title: "审核状态",
-          key: "authFlag",
-          width: 130,
-          render: (h, params) => {
-            if (params.row.authFlag == "TOBEAUDITED") {
-              return h("Tag", { props: { color: "blue" } }, "待审核");
-            } else if (params.row.authFlag == "PASS") {
-              return h("Tag", { props: { color: "green" } }, "通过");
-            } else if (params.row.authFlag == "REFUSE") {
-              return h("Tag", { props: { color: "red" } }, "审核拒绝");
-            }
-          },
-        },
-        {
-          title: "操作",
-          key: "action",
-          align: "center",
-          width: 200,
-          render: (h, params) => {
-            let vm = this;
-            return h("InputNumber", {
-              props: {
-                value: params.row.alertQuantity,
-              },
-              on: {
-                "on-change": (event) => {
-                  vm.alertQuantityList[params.index].alertQuantity = event;
-                },
-              },
-            });
-          },
-        },
-      ],
       // 表单验证规则
       formValidate: {},
       submitLoading: false, // 添加或编辑提交状态
@@ -587,8 +535,6 @@ export default {
           this.updateStockType = 'updateStock';
           this.stockAllUpdate = undefined;
           this.stockList = res.result.records;
-          this.stockAllAlertQuantity = undefined;
-          this.alertQuantityList = res.result.records;
         }
       });
     },
@@ -642,23 +588,7 @@ export default {
     },
     // 更新库存
     updateStock () {
-      if (this.updateStockType === 'alertQuantity' || this.updateStockType === 'alertQuantityAll') {
+      if (this.updateStockType === 'updateStock' || this.updateStockType === 'stockAll') {
-        // alertQuantity 手动库存预警更新，alertQuantityAll 批量库存预警更新
-        let updateAlertQuantityList = this.alertQuantityList.map((i) => {
-          let j = { skuId: i.id, alertQuantity: i.alertQuantity };
-          if (this.stockAllAlertQuantity) {
-            j.alertQuantity = this.stockAllAlertQuantity;
-          }
-          return j;
-        });
-        updateGoodsAlertStocks(updateAlertQuantityList).then((res) => {
-          if (res.success) {
-            this.updateStockModalVisible = false;
-            this.$Message.success("更新库存预警成功");
-            this.getDataList();
-          }
-        });
-      } else if (this.updateStockType === 'updateStock' || this.updateStockType === 'stockAll') {
         // updateStock 手动规格更新，stockAll 批量规格更新
         let updateStockList = this.stockList.map((i) => {
           let j = { skuId: i.id, quantity: i.quantity };

seller/src/views/home/home.vue

@@ -111,12 +111,12 @@
                 投诉
               </div>
             </div>
-            <div class="detail-item" @click="navigateTo('goods')">
+            <div class="detail-item" >
-              <div>
+              <div @click="navigateTo('alert-goods-quantity')">
-                <span>{{ homeData.waitUpper || 0 }}</span>
+                <span>{{ homeData.alertQuantityNum || 0 }}</span>
-                <div>待上架</div>
+                <div>库存预警</div>
               </div>
-              <div>
+              <div @click="navigateTo('goods')">
                 <span>{{ homeData.waitAuth || 0 }}</span>
                 <div>审核中</div>
               </div>

seller/src/views/lili-dialog/goods-dialog.vue

@@ -4,14 +4,14 @@
       <div class="query-wrapper">
         <div class="query-item">
           <div>搜索范围</div>
-          <Input placeholder="商品名称" @on-clear="goodsData=[]; goodsParams.goodsName='';  getQueryGoodsList()" @on-enter="()=>{goodsData=[]; getQueryGoodsList();}" clearable style="width: 150px"
+          <Input placeholder="商品名称" @on-clear="goodsData=[]; goodsParams.goodsName=''; goodsParams.pageNumber = 1;  getQueryGoodsList()" @on-enter="()=>{goodsData=[]; goodsParams.pageNumber = 1; getQueryGoodsList();}" clearable style="width: 150px"
             v-model="goodsParams.goodsName" />
         </div>
         <div class="query-item">
           <Cascader v-model="category" placeholder="请选择商品分类" style="width: 150px" :data="cateList"></Cascader>
         </div>
         <div class="query-item">
-          <Button type="primary" @click="goodsData=[]; getQueryGoodsList();" icon="ios-search">搜索</Button>
+          <Button type="primary" @click="goodsData=[]; goodsParams.pageNumber = 1; getQueryGoodsList();" icon="ios-search">搜索</Button>
         </div>
       </div>
       <div >