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-erp/statistics/daily-list-new.html | 101 +++++++++++++++++++++++++-------------------------
1 files changed, 51 insertions(+), 50 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/daily-list-new.html b/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/daily-list-new.html
index 43018b0..ced4453 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/daily-list-new.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/daily-list-new.html
@@ -26,7 +26,7 @@
<div class="col-sm-8">
<button onclick="myGrid.serchData()" type="button" class="btn btn-info btn-sm"><i class="fa fa-search" ></i> 搜索</button>
<button onclick="myGrid.resetForm()" type="button" class="btn btn-default btn-sm"><i class="fa fa-refresh " ></i> 重置</button>
- <button matrix:btn="ygyjbbZb-exportExcel" onclick="exportExcel()" type="button" class="btn btn-default btn-sm"><i class="fa fa-download" ></i> 导出</button>
+ <button matrix:btn="ygyjbb-exportExcel" onclick="exportExcel()" type="button" class="btn btn-default btn-sm"><i class="fa fa-download" ></i> 导出</button>
</div>
</div>
<div class="form-group mr-20">
@@ -71,12 +71,29 @@
<input name="beginTime" type="text" class="form-control datetimepicker" id="beginTime">-
<input name="endTime" type="text" class="form-control datetimepicker" id="endTime">
</div>
+
<div class="form-group mr-20">
- <label >所属门店</label> <select id="select_id"
- class="form-control autoFull"
- th:data-url="@{/admin/shopInfo/findShops}" data-value="id"
- data-filed="shopName" data-def="${obj.shopId}" name="shopId">
- <option value="">--请选择所属门店--</option>
+ <label>会员</label>
+ <input autocomplete="off" placeholder="姓名/编号/电话" name="vipQueryKey" type="text" class="form-control" >
+ </div>
+
+ <div class="form-group mr-20">
+ <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>
+ </select>
+ </div>
+
+ <div class="form-group mr-20">
+ <label>门店</label>
+ <select class="form-control autoFull" data-filed="shopName" name="shopId" id="shopId"
+ th:data-url="@{/admin/shopInfo/findAllWithPermi}">
+ <option value=''>--请选择部所属门店--</option>
</select>
</div>
</form>
@@ -87,32 +104,18 @@
<tr>
<th data-formatter="MGrid.indexfn" data-align="center"
data-width="30px" data-footer-formatter="footCountTitle">序号</th>
- <th data-field="datatime" >时间</th>
+ <th data-field="datatime">时间</th>
+ <th data-field="orderNo" data-formatter="buildOpenDetail" >订单编号</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="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>
@@ -122,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>
@@ -144,7 +145,7 @@
}
MTools.ininDatetimepicker(initParam);
//限制结束时间不小于开始时间
- MTools.limitStartEndTime({});
+ MTools.limitStartEndTime({});
var date = new Date();
var year = date.getFullYear();
@@ -163,6 +164,20 @@
$(this).attr("selected", true);
}
});
+
+ function buildOpenDetail(value, row, index){
+ var html = [];
+ if(row.orderType=='服务单'){
+ html[0] = '<a onClick="fnPublci.showServiceOrder(1 , \'' + value +'\')" class="text-primary " >'+value+'</a>'
+ }else{
+ html[0] = '<a onClick="fnPublci.showOrder(1 , \'' + value +'\')" class="text-primary " >'+value+'</a>'
+ }
+
+ return html.join("");
+ }
+
+
+
$(function() {
MTools.autoFullSelect();
@@ -188,7 +203,6 @@
});
-
function footCountTitle(data) {
return "<b>合计</b>";
};
@@ -204,25 +218,12 @@
function exportExcel(){
+
var param=MForm.toUrlParam("#serchform");
window.location.href=basePath+"/admin/achieve/exportDailyInfoNew?"+param;
}
-
- function buildOpenDetail(value, row, index){
- var html = [];
- if(row.orderType=='服务单'){
- html[0] = '<a onClick="fnPublci.showServiceOrder(1 , \'' + value +'\')" class="text-primary " >'+value+'</a>'
- }else{
- html[0] = '<a onClick="fnPublci.showOrder(1 , \'' + value +'\')" class="text-primary " >'+value+'</a>'
- }
-
- return html.join("");
- }
-
-
-
-
+
</script>
</body>
</html>
--
Gitblit v1.9.1