Merge pull request '数据统计平均值，商品规格可多选' (#2) from yyw into master

Reviewed-on: http://192.168.9.51:3001/cf_cloud/myERP/pulls/2

src/views/commodity/sku.vue

@@ -4,7 +4,7 @@
       <div class="row">
         <span class="span">商品：</span>
         <div class="right">
-          <el-select v-model="filter.goods_id" placeholder="请选择" clearable filterable class="wid100">
+          <el-select v-model="goodsIds" placeholder="请选择" clearable filterable class="wid100" multiple collapse-tags>
             <el-option v-for="it in goodsList" :key="it.id" :label="it.title" :value="it.id" />
           </el-select>
         </div>
@@ -167,7 +167,8 @@ export default {
       warehouseList: [],
       goodsList: [],
       itemInfo: {},
-      role: localStorage.getItem('roleName') == '爆品运营'
+      role: localStorage.getItem('roleName') == '爆品运营',
+      goodsIds: []
     })
 
     function handleSearch() {
@@ -181,7 +182,8 @@ export default {
         page: data.page,
         pageSize: data.pageSize,
         service_id: data.service_id,
-        ...data.filter
+        ...data.filter,
+        goods_ids: data.goodsIds.join(',')
       }
       get(`/api/goods-skus`, params).then((res) => {
         data.tableList = res.data

src/views/statistics/index.vue

@@ -194,6 +194,7 @@
           </div>
         </el-form-item>
         <el-form-item label="总计："><span style="color: #f00;">{{ sumDaily }}</span></el-form-item>
+        <el-form-item label="平均值："><span style="color: #f00;">{{ avg }}</span></el-form-item>
       </el-form>
       <div id="trendChart" style="width: 100%;height:500px;" v-loading="loading1"></div>
     </el-dialog>
@@ -274,6 +275,7 @@ export default {
       sort: 'number',
       showTrend: false,
       sumDaily: 0,
+      avg: 0,
       trendTime: [],
       chartTime: [],
       showOrderTrend: false,
@@ -460,6 +462,7 @@ export default {
           data.dataLineX.push(item.date)
           data.dataLineY.push(item.number)
         })
+        data.avg = res.avg
         data.sumDaily = res.sum
         data.showTrend = true
         setTimeout(() => {