diff --git a/src/views/system/orderrows/index.vue b/src/views/system/orderrows/index.vue index 30221ce..b231530 100644 --- a/src/views/system/orderrows/index.vue +++ b/src/views/system/orderrows/index.vue @@ -32,6 +32,9 @@ + + + @@ -50,7 +53,7 @@ - + 佣金统计 @@ -367,6 +370,7 @@ export default { unionId: null, orderId: null, skuName: null, + skuId: null, validCode: null, statusGroup: null, // 新增 orderBy: null, // 排序字段 @@ -725,21 +729,11 @@ export default { /** 搜索按钮操作 */ handleQuery() { this.queryParams.pageNum = 1; - console.log(this.queryParams.validCode); - - // 合并项转为原始code数组 if (this.queryParams.statusGroup) { - this.queryParams.validCodes = this.statusValueMap[this.queryParams.statusGroup].map(code => Number(code)); - } else if (this.queryParams.validCodes && Array.isArray(this.queryParams.validCodes)) { - this.queryParams.validCodes = this.queryParams.validCodes.map(code => Number(code)); + const codes = this.statusValueMap[this.queryParams.statusGroup] + this.queryParams.validCodes = codes && codes.length ? codes.map(code => Number(code)) : null } else { - this.queryParams.validCodes = null; - } - // 打印类型检查 - if (this.queryParams.validCode) { - this.queryParams.validCode = this.queryParams.validCode.map(item => Number(item)); - console.log('validCode值:', this.queryParams.validCodes); - console.log('validCode类型:', this.queryParams.validCodes.map(item => typeof item)); + this.queryParams.validCodes = null } this.getList(); }, @@ -747,7 +741,7 @@ export default { resetQuery() { this.dateRange = []; this.resetForm("queryForm"); - this.queryParams.validCodes = []; + this.queryParams.validCodes = null; // 重置时恢复默认分页条数 this.queryParams.pageSize = 10; this.queryParams.pageNum = 1; diff --git a/src/views/system/orderrows/statistics.vue b/src/views/system/orderrows/statistics.vue index bf415d3..7b1ff22 100644 --- a/src/views/system/orderrows/statistics.vue +++ b/src/views/system/orderrows/statistics.vue @@ -1,9 +1,19 @@ - + - - - + + + + + + + + - + style="width: 260px" + @change="handleDateRangeChange" + /> - + - + :value="dict.value" + /> - + - + style="width: 160px" + @keyup.enter.native="handleQuery" + /> - 搜索 + 查询 重置 - - - - - - 总订单数 - - - {{ statistics.totalOrders || 0 }} - 累计订单数量 - - - - - - - 总佣金 - - - ¥{{ formatMoney(statistics.totalCommission) }} - 累计佣金收入 - - - - - - - 总商品数 - - - {{ statistics.totalSkuNum || 0 }} - 累计商品数量 - - - - - - - 实际费用 - - - ¥{{ formatMoney(statistics.totalActualFee) }} - 累计实际费用 + + + + + + {{ item.title }} + + ¥{{ item.display }} + {{ item.display }} + + {{ item.hint }} - - - - + + + + 订单状态分布 - + - - - - 佣金分布 + + + + 佣金分布(预估口径) - + - - + + - - + + 订单状态详情 - - - - - - - ¥{{ formatMoney(scope.row.commission) }} - + + + + + + ¥{{ formatMoney(scope.row.commission) }} - - - ¥{{ formatMoney(scope.row.actualFee) }} - + + ¥{{ formatMoney(scope.row.actualFee) }} - - - {{ scope.row.percentage }}% - + + {{ scope.row.percentage }}% @@ -146,86 +120,173 @@ \ No newline at end of file + +.chart-el { + width: 100%; + height: 300px; +} + +@media (max-width: 768px) { + .filter-card ::v-deep .el-form--inline .el-form-item { + display: block; + margin-right: 0; + } +} +
累计订单数量
累计佣金收入
累计商品数量
累计实际费用