From 2ac84ea838aec3b9a3821d2bcf5945c640a7f65f Mon Sep 17 00:00:00 2001
From: "DESKTOP-8FGKA8Q\\chunfen" <vivanyyw@126.com>
Date: Mon, 19 Aug 2024 16:39:53 +0800
Subject: [PATCH] =?UTF-8?q?yyw=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/dataCenter/gmvStatistics.vue    | 37 +++++++++++++++++--
 .../src/views/dataCenter/lossStatistics.vue   |  2 +-
 .../src/views/dataCenter/skuStatistics.vue    |  2 +-
 .../src/views/dataCenter/spuStatistics.vue    |  2 +-
 resources/frontend/src/views/goods/goods.vue  | 10 ++++-
 5 files changed, 44 insertions(+), 9 deletions(-)

diff --git a/resources/frontend/src/views/dataCenter/gmvStatistics.vue b/resources/frontend/src/views/dataCenter/gmvStatistics.vue
index f4a1a19..185ad1f 100644
--- a/resources/frontend/src/views/dataCenter/gmvStatistics.vue
+++ b/resources/frontend/src/views/dataCenter/gmvStatistics.vue
@@ -2,7 +2,7 @@
   <div>
     <div class="cardBox">
       <div class="searchBox">
-        <div class="row">
+        <div class="row" style="width: 100%;">
           <span>统计时间：</span>
           <el-select v-model="time_type" style="width: 100px;margin-right: 5px;" @change="changeTimeType">
             <el-option v-for="item in timeTypeList" :key="item.value" :label="item.label" :value="item.value">
@@ -65,6 +65,16 @@
             <span v-else>{{ startTime }}~{{ endTime }}</span>
           </div>
         </div>
+        <div class="row">
+          <span>规格：</span>
+          <el-select v-model="sku_id" filterable remote clearable reserve-keyword placeholder="请选择具体规格" :remote-method="remoteMethod"
+            :loading="remoteLoading">
+            <el-option v-for="it in skusList" :key="it.id" :label="it.title" :value="it.id"></el-option>
+          </el-select>
+        </div>
+        <div class="row">
+          <el-button type="primary" @click="handleSearch()" icon="el-icon-search">筛选</el-button>
+        </div>
       </div>
     </div>
 
@@ -76,6 +86,7 @@
 
 <script>
 import { getGmvCount } from "@/api/dataCenter.js"
+import { getGoodsFilter } from "@/api/goods.js"
 import dayjs from 'dayjs'
 import * as echarts from 'echarts'
 
@@ -102,7 +113,9 @@ export default {
       SaleCount: [],
       myChart: null,
       dayTimeList: [],
-      sku_id: ''
+      sku_id: '',
+      skusList: [],
+      remoteLoading: false
     }
   },
   mounted() {
@@ -152,13 +165,15 @@ export default {
           type: 1,
           interval: 60,
           start_time: this.startTime,
-          end_time: this.endTime
+          end_time: this.endTime,
+          sku_id: this.sku_id || 0
         }
       } else {
         params = {
           type: 2,
           start_day: this.startTime,
-          end_day: this.endTime
+          end_day: this.endTime,
+          sku_id: this.sku_id || 0
         }
       }
       getGmvCount(params).then((res) => {
@@ -282,6 +297,20 @@ export default {
       this.startTime = time + ' ' + this.dayTimeList[0]
       this.endTime = time + ' ' + this.dayTimeList[1]
       this.fetchData()
+    },
+    handleSearch() {
+      this.fetchData()
+    },
+    remoteMethod(query) {
+      if(query) {
+        this.remoteLoading = true
+        getGoodsFilter(query).then((res) => {
+          this.skusList = res.data.data
+          this.remoteLoading = false
+        })
+      } else {
+        this.skusList = []
+      }
     }
   },
   beforeDestroy() {
diff --git a/resources/frontend/src/views/dataCenter/lossStatistics.vue b/resources/frontend/src/views/dataCenter/lossStatistics.vue
index 6ee1c55..d6eca7c 100644
--- a/resources/frontend/src/views/dataCenter/lossStatistics.vue
+++ b/resources/frontend/src/views/dataCenter/lossStatistics.vue
@@ -67,7 +67,7 @@
         </div>
         <div class="row">
           <span>规格：</span>
-          <el-select v-model="sku_id" filterable remote reserve-keyword placeholder="请选择具体规格" :remote-method="remoteMethod"
+          <el-select v-model="sku_id" filterable remote clearable reserve-keyword placeholder="请选择具体规格" :remote-method="remoteMethod"
             :loading="remoteLoading">
             <el-option v-for="it in skusList" :key="it.id" :label="it.title" :value="it.id"></el-option>
           </el-select>
diff --git a/resources/frontend/src/views/dataCenter/skuStatistics.vue b/resources/frontend/src/views/dataCenter/skuStatistics.vue
index fde76a8..8bbaedd 100644
--- a/resources/frontend/src/views/dataCenter/skuStatistics.vue
+++ b/resources/frontend/src/views/dataCenter/skuStatistics.vue
@@ -67,7 +67,7 @@
         </div>
         <div class="row">
           <span>规格：</span>
-          <el-select v-model="sku_id" filterable remote reserve-keyword placeholder="请选择具体规格" :remote-method="remoteMethod"
+          <el-select v-model="sku_id" filterable remote clearable reserve-keyword placeholder="请选择具体规格" :remote-method="remoteMethod"
             :loading="remoteLoading">
             <el-option v-for="it in skusList" :key="it.id" :label="it.title" :value="it.id"></el-option>
           </el-select>
diff --git a/resources/frontend/src/views/dataCenter/spuStatistics.vue b/resources/frontend/src/views/dataCenter/spuStatistics.vue
index 061f94e..2f6b2d6 100644
--- a/resources/frontend/src/views/dataCenter/spuStatistics.vue
+++ b/resources/frontend/src/views/dataCenter/spuStatistics.vue
@@ -67,7 +67,7 @@
         </div>
         <div class="row">
           <span>规格：</span>
-          <el-select v-model="sku_id" filterable remote reserve-keyword placeholder="请选择具体规格" :remote-method="remoteMethod"
+          <el-select v-model="sku_id" filterable remote clearable reserve-keyword placeholder="请选择具体规格" :remote-method="remoteMethod"
             :loading="remoteLoading">
             <el-option v-for="it in skusList" :key="it.id" :label="it.title" :value="it.id"></el-option>
           </el-select>
diff --git a/resources/frontend/src/views/goods/goods.vue b/resources/frontend/src/views/goods/goods.vue
index dbbf0f1..488f105 100644
--- a/resources/frontend/src/views/goods/goods.vue
+++ b/resources/frontend/src/views/goods/goods.vue
@@ -241,9 +241,15 @@
               </template>
             </el-table-column>
 
-            <el-table-column label="销存比例" align="center">
+            <el-table-column align="center">
+              <template slot="header" slot-scope="scope">
+                <span>销存比例</span>
+                <el-tooltip class="item" effect="dark" content="当前库存/当天7点盘点的库存" placement="top">
+                  <i class="el-icon-question"></i>
+                </el-tooltip>
+              </template>
               <template slot-scope="scope">
-                <span :class="scope.row.sale_ratio * 1 < 20 ? 'red' : ''">{{ scope.row.sale_ratio }}</span>
+                <span :class="scope.row.sale_ratio * 1 < 20 ? 'red' : ''">{{ scope.row.sale_ratio }}%</span>
               </template>
             </el-table-column>