需求变更-7
This commit is contained in:
@@ -12,7 +12,7 @@ export default {
|
|||||||
|
|
||||||
<template>
|
<template>
|
||||||
<section class="AppMultipleStoreBoard">
|
<section class="AppMultipleStoreBoard">
|
||||||
<app-navbar/>
|
<app-navbar class="mb-10"/>
|
||||||
<app-multiple-store-board-filter/>
|
<app-multiple-store-board-filter/>
|
||||||
<app-stores-table class="fill"/>
|
<app-stores-table class="fill"/>
|
||||||
</section>
|
</section>
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ export default {
|
|||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
const {dayjs} = window
|
const {dayjs} = window
|
||||||
const hourNum = new Date().getHours(), groupCodeList = "", interval = 60000
|
const hourNum = new Date().getHours(), groupCodeList = "", interval = 60000
|
||||||
const currentDate = dayjs().format("YYYYMMDD")
|
const currentDate = dayjs().subtract(7, 'day').format("YYYYMMDD")
|
||||||
this.form = {hourNum, groupCodeList, type: "1", changeWay: "1", currentDate, interval}
|
this.form = {hourNum, groupCodeList, type: "1", changeWay: "1", currentDate, interval}
|
||||||
this.$set(this.$multipleStoreBoard, 'search', {hourNum, groupCodeList: [], type: "1", changeWay: "1", categoryId: "", currentDate, interval})
|
this.$set(this.$multipleStoreBoard, 'search', {hourNum, groupCodeList: [], type: "1", changeWay: "1", categoryId: "", currentDate, interval})
|
||||||
}, 500)
|
}, 500)
|
||||||
|
|||||||
@@ -14,11 +14,11 @@ export default {
|
|||||||
columns: {
|
columns: {
|
||||||
品类销售情况: [
|
品类销售情况: [
|
||||||
{label: "品类", prop: "secondCategoryName"},
|
{label: "品类", prop: "secondCategoryName"},
|
||||||
{label: "销售额", prop: "currentSaleAmt", width: 70},
|
{label: "销售额", prop: "currentSaleAmt"},
|
||||||
{label: "库存金额", prop: "currentStockAmt", width: 80},
|
{label: "库存金额", prop: "currentStockAmt"},
|
||||||
{label: "同/环比销售额", prop: "compareSaleAmt", width: 70},
|
// {label: "同/环比销售额", prop: "compareSaleAmt", width: 70},
|
||||||
{label: "同/环比库存金额", prop: "compareStockAmt", width: 70},
|
// {label: "同/环比库存金额", prop: "compareStockAmt", width: 70},
|
||||||
{label: "前四周日均销售额", prop: "avg4WeekSaleAmt", width: 70},
|
// {label: "前四周日均销售额", prop: "avg4WeekSaleAmt", width: 70},
|
||||||
],
|
],
|
||||||
重点单品情况: [
|
重点单品情况: [
|
||||||
{label: "重点单品", prop: "name"},
|
{label: "重点单品", prop: "name"},
|
||||||
@@ -75,7 +75,7 @@ export default {
|
|||||||
methods: {
|
methods: {
|
||||||
getData() {
|
getData() {
|
||||||
const {$http, $waitFor} = window
|
const {$http, $waitFor} = window
|
||||||
const {groupCodeList, type, compareDate} = this.search
|
const { type, compareDate} = this.search
|
||||||
console.log("筛选条件:", this.search)
|
console.log("筛选条件:", this.search)
|
||||||
return $waitFor($http && (type != 3 || compareDate)).then(() => this.getStores())
|
return $waitFor($http && (type != 3 || compareDate)).then(() => this.getStores())
|
||||||
.then(codes => Promise.all([this.getCameras(), this.getStoreKeyGoods(), this.getCategorySales()]).then(() => codes))
|
.then(codes => Promise.all([this.getCameras(), this.getStoreKeyGoods(), this.getCategorySales()]).then(() => codes))
|
||||||
|
|||||||
Reference in New Issue
Block a user