From baa79615425b71521e67ec8a9344b88ce53fc5de Mon Sep 17 00:00:00 2001 From: jyy <935090232@qq.com> Date: Fri, 12 Mar 2021 13:47:21 +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 | 36 ++++++++++-------------------------- 1 files changed, 10 insertions(+), 26 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 e833811..ced4453 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 @@ -105,31 +105,17 @@ <th data-formatter="MGrid.indexfn" data-align="center" data-width="30px" data-footer-formatter="footCountTitle">序号</th> <th data-field="datatime">时间</th> - <th data-field="orderType">订单类型</th> <th data-field="orderNo" data-formatter="buildOpenDetail" >订单编号</th> - <th data-field="levelName">会员级别</th> - <th data-field="vipName">姓名</th> - <th data-field="proName">项目名称</th> - <th data-field="zkTotal" data-footer-formatter="countColumn">总现金业绩 - <i data-toggle="tooltip" data-placement="top" title="总现金业绩=售卡+项目+产品" class="fa fa-question-circle"></i> - </th> - - <th data-field="cardCash" data-footer-formatter="countColumn" >售卡业绩 - <i data-toggle="tooltip" data-placement="top" title="售卡业绩：现金购买充值卡,套餐,充值的收款金额" class="fa fa-question-circle"></i> - </th> - - <th data-field="projCash" data-footer-formatter="countColumn">项目业绩 - <i data-toggle="tooltip" data-placement="top" title="项目业绩：现金购买单个项目的业绩" class="fa fa-question-circle"></i> - </th> - - <th data-field="goodsCash" data-footer-formatter="countColumn">产品业绩 - <i data-toggle="tooltip" data-placement="top" title="产品业绩：现金购买产品的业绩" class="fa fa-question-circle"></i> - </th> - - <th data-field="consume" data-footer-formatter="countColumn">余额划扣业绩 - <i data-toggle="tooltip" data-placement="top" title="余额划扣业绩：从客户的充值卡余额中划扣消费的金额" class="fa fa-question-circle"></i> - </th> - + <th data-field="orderType">订单类型</th> + <th data-field="vipName">会员姓名</th> + <th data-field="proName">产品</th> + <th data-field="cateName">产品分类</th> + <th data-field="zkTotal" data-footer-formatter="countColumn">订单金额</th> + <th data-field="goodsCash" data-footer-formatter="countColumn">订单业绩</th> + <th data-field="payMethod">收款方式</th> + <th data-field="achieveType">业绩类型</th> + <th data-field="guwen">顾问</th> + <th data-field="meiliao">美疗师</th> <th data-field="hisConsume" data-footer-formatter="countColumn">本金消耗 <i data-toggle="tooltip" data-placement="top" title="消耗金额：客户做服务时划扣的本金" class="fa fa-question-circle"></i> </th> @@ -139,8 +125,6 @@ <th data-field="projPercentage" data-footer-formatter="countColumn">服务提成 <i data-toggle="tooltip" data-placement="top" title="服务提成：为美疗师手动设置的项目服务提成" class="fa fa-question-circle"></i> </th> - <th data-field="guwen">顾问</th> - <th data-field="meiliao">美疗师</th> <th data-field="numberOfPeople" data-footer-formatter="countColumn">人头</th> <th data-field="projNum" data-footer-formatter="countColumn">项目个数</th> <th data-field="projTime" data-footer-formatter="countColumn">项目时间</th> -- Gitblit v1.9.1