From 3fd5c0a8919c5b31efb61860aeffaf932236e4a3 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Thu, 11 Nov 2021 23:43:22 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-beauty-list.html | 60 ++++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 42 insertions(+), 18 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-beauty-list.html b/zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-beauty-list.html
index b2e5261..809c75c 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-beauty-list.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-beauty-list.html
@@ -2,15 +2,15 @@
<!DOCTYPE HTML>
<html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml">
<head>
-<meta charset="utf-8">
-<META HTTP-EQUIV="Pragma" CONTENT="no-cache">
-<meta name="renderer" content="webkit|ie-comp|ie-stand">
-<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-<meta name="viewport"
- content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
-<meta http-equiv="Cache-Control" content="no-siteapp" />
-<LINK rel="Bookmark" href="../images/favicon.ico">
-<!-- 本框架基本脚本和样式 -->
+ <meta charset="utf-8">
+ <META HTTP-EQUIV="Pragma" CONTENT="no-cache">
+ <meta name="renderer" content="webkit|ie-comp|ie-stand">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport"
+ content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
+ <meta http-equiv="Cache-Control" content="no-siteapp" />
+ <LINK rel="Bookmark" href="../images/favicon.ico">
+ <!-- 本框架基本脚本和样式 -->
<script type="text/javascript" th:src="@{/js/systools/MBaseVue.js}"></script>
<script type="text/javascript" th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
<script type="text/javascript" th:src="@{/js/plugin/jquery.query.js}"></script>
@@ -56,9 +56,19 @@
<el-form-item label="会员">
<el-input v-model="form.vipQueryKey"></el-input>
</el-form-item>
+
+ <el-form-item label="门店">
+ <el-select v-model="form.shopId" placeholder="请选择所属门店">
+ <el-option v-for="item in shopList"
+ :key="item.id"
+ :label="item.shopName"
+ :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
<el-button type="primary" @click="search" >搜索</el-button>
<el-button @click="resetForm('form')">重置</el-button>
-<!-- <el-button type="warning" @click="exportExcel">导出</el-button>-->
+ <!-- <el-button type="warning" @click="exportExcel">导出</el-button>-->
</el-form>
</el-row>
<el-row class="table-style">
@@ -73,7 +83,7 @@
<span v-else>否</span>
</template>
</el-table-column>
- <el-table-column label="客流">
+ <el-table-column label="客流" align="center">
<el-table-column prop="orderCnt" label="是否会员">
<template slot-scope="scope">
<span v-if="scope.row.orderCnt > 0">是</span>
@@ -83,20 +93,20 @@
<el-table-column prop="arrivalWay" label="到店途径"></el-table-column>
<el-table-column prop="arriveCnt" label="当月到店次数" width="120"></el-table-column>
</el-table-column>
- <el-table-column label="实操业绩">
- <el-table-column prop="orderType" label="项目->消耗产品" width="130"></el-table-column>
+ <el-table-column label="实操业绩" align="center">
+ <el-table-column prop="projInfo" label="项目->消耗产品" width="230"></el-table-column>
<el-table-column prop="projCnt" label="项目数量"></el-table-column>
<el-table-column prop="ticheng" label="手工费"></el-table-column>
<el-table-column prop="consume" label="耗卡"></el-table-column>
</el-table-column>
- <el-table-column label="现金业绩">
- <el-table-column prop="payMethods" label="消费类型"></el-table-column>
+ <el-table-column label="现金业绩" align="center">
+ <el-table-column prop="payMethods" label="消费类型" width="200"></el-table-column>
<el-table-column prop="orderType" label="特色项目"></el-table-column>
<el-table-column prop="teamPay" label="团购销售"></el-table-column>
<el-table-column prop="tcAndProjCash" label="卡项销售"></el-table-column>
<el-table-column prop="productCash" label="产品销售"></el-table-column>
<el-table-column prop="cardCash" label="会员充值"></el-table-column>
- <el-table-column prop="orderType" label="总业绩"></el-table-column>
+ <el-table-column prop="cashPay" label="总业绩"></el-table-column>
<el-table-column prop="cardPay" label="划卡"></el-table-column>
</el-table-column>
</el-table>
@@ -123,10 +133,12 @@
el : "#app",
data : {
tableData : [],
+ shopList : [],
form : {
timeRange : '',
vipQueryKey : '',
- beaultId : ''
+ beaultId : '',
+ shopId : ''
},
page : {
currentPage : 1,
@@ -136,7 +148,6 @@
},
created : function() {
this.queryTableData();
- this.queryAchieveUsers();
},
methods : {
queryTableData() {
@@ -160,6 +171,9 @@
callback: function (loj) {
_this.tableData = loj.rows;
_this.page.total = loj.total;
+
+ _this.queryAchieveUsers();
+ _this.queryShops();
}
});
},
@@ -184,6 +198,16 @@
search() {
this.queryTableData();
},
+ queryShops() {
+ let _this = this;
+ AjaxProxy.requst({
+ app: _this,
+ url: basePath + '/admin/shopInfo/findAllWithPermi',
+ callback: function (data) {
+ _this.shopList = data.rows;
+ }
+ });
+ },
handleSizeChange(val) {
this.page.size = val;
this.queryTableData();
--
Gitblit v1.9.1