From 3475baedd634790eec2596199591bee35e29d9da Mon Sep 17 00:00:00 2001
From: "DESKTOP-8FGKA8Q\\chunfen" <vivanyyw@126.com>
Date: Tue, 12 Nov 2024 14:26:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8=EF=BC=9A?=
 =?UTF-8?q?=20=E8=AE=A2=E5=8D=95=E9=87=8D=E7=BD=AE=E9=94=80=E9=87=8F=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=AD=9B=E9=80=89=E5=AD=97=E6=AE=B5=E5=89=A9?=
 =?UTF-8?q?=E4=BD=99=E5=BA=93=E5=AD=98=E5=92=8C=E5=9C=A8=E5=94=AE=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/frontend/src/views/goods/goods.vue | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/resources/frontend/src/views/goods/goods.vue b/resources/frontend/src/views/goods/goods.vue
index 380f406..328c89a 100644
--- a/resources/frontend/src/views/goods/goods.vue
+++ b/resources/frontend/src/views/goods/goods.vue
@@ -45,6 +45,14 @@
             style="width: 250px;"
             @change="handleChoose()">
           </el-date-picker>
+        </div> 
+        <div class="row">
+          <span>剩余库存≠：</span>
+          <el-input v-model="form.neq_stock" @keyup.enter.native="handleChoose" placeholder="剩余库存" clearable></el-input>
+        </div>
+        <div class="row">
+          <span>在售库存≠：</span>
+          <el-input v-model="form.neq_sale_stock" @keyup.enter.native="handleChoose" placeholder="在售库存" clearable></el-input>
         </div>
         <div class="row">
           <el-button type="primary" @click="handleChoose()" icon="el-icon-search">筛选</el-button>
@@ -59,6 +67,7 @@
         <div>
             <span>全部商品(共{{ total }}条)</span>
             <div class="btn">
+              <el-button @click="resetOrderCount" icon="el-icon-refresh">订单重置</el-button>
               <el-button type="primary" @click="petchEditStock" icon="el-icon-edit" :disabled="!chooseList.length">批量更新在售库存</el-button>
               <el-button type="primary" v-if="is_admin" @click="addNewgoods" icon="el-icon-plus">新增商品</el-button>
               <el-button type="primary" plain v-if="is_admin" @click="handleImport" icon="el-icon-upload2">在售库存导入</el-button>
@@ -290,8 +299,8 @@
 
 <script>
   import axios from 'axios'
-  import { goods_types, Brand_goods_types } from '@/api/rankingData.js'
-  import { goods, update, singleUpdate, getStockNum, updateSaleStock, goodsSkuExport } from '@/api/goods'
+  import { goods_types } from '@/api/rankingData.js'
+  import { goods, update, singleUpdate, getStockNum, updateSaleStock } from '@/api/goods'
   import { orderRest } from "@/api/shop"
   import Treeselect from '@riophae/vue-treeselect'
   import '@riophae/vue-treeselect/dist/vue-treeselect.css'
@@ -333,6 +342,8 @@
         ],
         form: {
           external_sku_id: '',
+          neq_stock: '',
+          neq_sale_stock: '',
           goods_title: '', // 商品名称
           type_id: null, // 商品种类id
           brand_id: '', // 商品品牌id
@@ -490,13 +501,14 @@
           type: 'warning'
         }).then(() => {
           orderRest().then((res) => {
-            console.log(res)
             this.$message({
               type: 'success',
               message: res.data.message
             })
             this.getList()
           })
+        }).catch(() => {
+          
         })
       },
       // 点击上新