From 050ff0dfc04d4ca2a33ac0e97c98f042b9f95df6 Mon Sep 17 00:00:00 2001 From: li-guang <153605324@qq.com> Date: Wed, 07 Apr 2021 11:56:06 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop --- zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-list-new.html | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-list-new.html b/zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-list-new.html index 0137137..f19c967 100644 --- a/zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-list-new.html +++ b/zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-list-new.html @@ -113,6 +113,8 @@ <el-table-column prop="proName" label="产品" width="200"></el-table-column> <el-table-column prop="cateName" label="产品分类"></el-table-column> <el-table-column prop="zkTotal" label="订单金额"></el-table-column> + <el-table-column prop="goodsCash" label="现金"></el-table-column> + <el-table-column prop="cardCash" label="划扣"></el-table-column> <!-- <el-table-column prop="goodsCash" label="订单业绩"></el-table-column>--> <el-table-column prop="meiliao" label="员工"></el-table-column> <el-table-column v-for="(item, index) in customColumns" width="120" :key="index" :label="item.value"> -- Gitblit v1.9.1