From d880dead46e9b4e8ec593ebeac8833be400eb4cc Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Mon, 15 Mar 2021 10:30:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/java/com/matrix/system/hive/statistics/AchieveAction.java | 4 ++--
zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-list-new.html | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/statistics/AchieveAction.java b/zq-erp/src/main/java/com/matrix/system/hive/statistics/AchieveAction.java
index bdfbd01..95ac4ed 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/statistics/AchieveAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/statistics/AchieveAction.java
@@ -94,7 +94,7 @@
String title = "每日单据明细";
orderSheet.setSheetName(title);
orderSheet.setTitle(title);
- String[] header = {"年", "月", "日", "订单编号", "订单类型", "会员姓名", "项目名称", "订单金额", "订单业绩", "收款方式", "业绩类型", "顾问", "美疗师", "本金消耗", "赠消", "提成", "人头", "项目个数", "项目时间", "门店"};
+ String[] header = {"年", "月", "日", "订单编号", "订单类型", "会员姓名", "项目名称", "订单金额", "订单业绩", "收款方式", "业绩类型", "员工", "本金消耗", "赠消", "提成", "人头", "项目个数", "项目时间", "顾问", "门店"};
orderSheet.setHeaders(header);
SysUsers sysUsers = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
if(!AppConstance.ZONGDIAN.equals(sysUsers.getShopName())){
@@ -117,7 +117,6 @@
temp.add(item.getZkTotal());
temp.add(item.getGoodsCash());
temp.add(item.getPayMethod());
- temp.add(item.getGuwen());
temp.add(item.getMeiliao());
temp.add(item.getHisConsume());
temp.add(item.getFreeConsume());
@@ -125,6 +124,7 @@
temp.add(item.getNumberOfPeople());
temp.add(item.getProjNum());
temp.add(item.getProjTime());
+ temp.add(item.getGuwen());
temp.add(item.getShopName());
list.add(temp);
}
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 ced4453..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>
@@ -114,8 +114,7 @@
<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="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>
@@ -128,6 +127,7 @@
<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