From a5ea07cc5fa16fc88f4d488fcd514e7613af60cd Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Thu, 11 Nov 2021 22:50:23 +0800
Subject: [PATCH] fix
---
zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-beauty-list.html | 45 ++++++++++++++++++++++++++++++++++-----------
zq-erp/src/main/java/com/matrix/system/common/init/InitWebContainer.java | 2 +-
2 files changed, 35 insertions(+), 12 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/common/init/InitWebContainer.java b/zq-erp/src/main/java/com/matrix/system/common/init/InitWebContainer.java
index 1fa4e0e..776da87 100644
--- a/zq-erp/src/main/java/com/matrix/system/common/init/InitWebContainer.java
+++ b/zq-erp/src/main/java/com/matrix/system/common/init/InitWebContainer.java
@@ -122,7 +122,7 @@
List<SysCompany> company=sysCompanyService.findByModel(null);
Map<String, SysCompany> companyMap=new HashMap<>();
for (SysCompany sysCompany : company) {
- companyMap.put(sysCompany.getComWebUrl(), sysCompany);
+ companyMap.put(sysCompany.getComCode(), sysCompany);
}
LocalCache.save("companyMap", companyMap);
}
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 ddbb101..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">
@@ -123,10 +133,12 @@
el : "#app",
data : {
tableData : [],
+ shopList : [],
form : {
timeRange : '',
vipQueryKey : '',
- beaultId : ''
+ beaultId : '',
+ shopId : ''
},
page : {
currentPage : 1,
@@ -161,6 +173,7 @@
_this.page.total = loj.total;
_this.queryAchieveUsers();
+ _this.queryShops();
}
});
},
@@ -185,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