From 82a48d71c2c7bb2c355e09bd1b1c9debcc8e80f2 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 16 Mar 2021 21:23:33 +0800
Subject: [PATCH] 新增配置查询5
---
zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-list-new.html | 40 ++++++++++++----------------------------
1 files changed, 12 insertions(+), 28 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..3bcdc67 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
@@ -78,14 +78,14 @@
</div>
<div class="form-group mr-20">
- <label>美疗师</label>
+ <label>业绩归属人</label>
<select class="form-control autoFull select2"
th:data-url="@{/admin/getShopStaffByRoleName?roleName=美疗师}"
data-value="suId"
data-filed="suName"
name="beaultId"
id="beaultId">
- <option value="">--请选择美容师--</option>
+ <option value="">--请选择--</option>
</select>
</div>
@@ -105,31 +105,16 @@
<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="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,11 +124,10 @@
<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>
+ <th data-field="guwen">操作人</th>
<th data-field="shopName">门店</th>
</tr>
--
Gitblit v1.9.1