From d388e2788b7ef088d7cd40f901b0acdcec460bc3 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Thu, 01 Apr 2021 00:19:23 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-list-new.html | 85 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 76 insertions(+), 9 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 444302c..0137137 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
@@ -17,6 +17,7 @@
<script type="text/javascript" th:src="@{/plugin/moment.min.js}"></script>
<link rel="stylesheet" th:href="@{/plugin/element-ui/index.css}">
<link th:href="@{/css/styleOne/style.min.css}" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" th:src="@{/js/function/public.js}"></script>
</head>
<style>
.table-style {
@@ -36,6 +37,30 @@
<div id="app" style="">
<el-row class="search-form">
<el-form ref="form" :model="form" inline>
+ <el-form-item label="选择年月">
+ <el-select v-model="form.year" style="width:120px;" placeholder="请选择">
+ <el-option v-for="item in years"
+ :key="item"
+ :label="item"
+ :value="item"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item>
+ <el-select v-model="form.month" style="width:120px;" placeholder="请选择">
+ <el-option v-for="item in months"
+ :key="item"
+ :label="item"
+ :value="item"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item>
+ <el-select v-model="form.day" style="width:120px;" placeholder="请选择">
+ <el-option v-for="item in days"
+ :key="item"
+ :label="item"
+ :value="item"></el-option>
+ </el-select>
+ </el-form-item>
<el-form-item label="日期范围">
<el-date-picker v-model="form.timeRange"
type="datetimerange"
@@ -70,29 +95,39 @@
<el-button type="primary" @click="search" >搜索</el-button>
<el-button @click="resetForm('form')">重置</el-button>
+ <el-button type="warning" @click="exportExcel">导出</el-button>
</el-form>
</el-row>
<el-row class="table-style">
<el-table :data="tableData" style="width: 100%">
- <el-table-column type="index" width="50"></el-table-column>
- <el-table-column prop="datatime" label="时间"></el-table-column>
- <el-table-column prop="orderNo" label="订单编号"></el-table-column>
+ <el-table-column type="index" width="30"></el-table-column>
+ <el-table-column prop="datatime" width="150" label="时间"></el-table-column>
+ <el-table-column prop="orderNo" width="180" label="订单编号">
+ <template slot-scope="scope">
+ <el-link @click="jumpOrder(scope.row.orderType, scope.row.orderNo)" type="primary">{{scope.row.orderNo}}</el-link>
+ </template>
+ </el-table-column>
<el-table-column prop="orderType" label="订单类型"></el-table-column>
<el-table-column prop="vipName" label="会员姓名"></el-table-column>
- <el-table-column prop="proName" label="产品"></el-table-column>
+ <el-table-column prop="proName" label="产品" width="200"></el-table-column>
<el-table-column prop="cateName" label="产品分类"></el-table-column>
<el-table-column prop="zkTotal" label="订单金额"></el-table-column>
- <el-table-column prop="goodsCash" label="订单业绩"></el-table-column>
+<!-- <el-table-column prop="goodsCash" label="订单业绩"></el-table-column>-->
<el-table-column prop="meiliao" label="员工"></el-table-column>
- <el-table-column prop="hisConsume" label="本金消耗"></el-table-column>
- <el-table-column prop="freeConsume" label="赠送消耗"></el-table-column>
-
- <el-table-column v-for="(item, index) in customColumns" :key="index" :label="item.value">
+ <el-table-column v-for="(item, index) in customColumns" width="120" :key="index" :label="item.value">
<template slot-scope="scope">
<span v-if="item.value == scope.row.achieveType">{{scope.row.goodsCash}}</span>
</template>
</el-table-column>
+ <el-table-column prop="hisConsume" label="本金消耗"></el-table-column>
+ <el-table-column prop="freeConsume" label="赠送消耗"></el-table-column>
+ <el-table-column prop="projPercentage" label="服务提成"></el-table-column>
+ <el-table-column prop="numberOfPeople" label="人头"></el-table-column>
+ <el-table-column prop="projNum" label="项目个数"></el-table-column>
+ <el-table-column prop="projTime" label="服务时间"></el-table-column>
+ <el-table-column prop="guwen" label="操作人"></el-table-column>
+ <el-table-column prop="shopName" label="门店"></el-table-column>
</el-table>
<el-row style="margin-top: 10px;">
<el-pagination
@@ -121,7 +156,13 @@
customColumns : [],
shopList : [],
achieveUsers : [],
+ years : [2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021],
+ months : ["01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12"],
+ days : [],
form : {
+ year : '',
+ month : '',
+ day : '',
timeRange : '',
vipQueryKey : '',
beaultId : '',
@@ -134,6 +175,7 @@
}
},
created : function() {
+ this.initDays();
this.queryCustomColumns();
this.queryShops();
this.queryAchieveUsers();
@@ -208,6 +250,31 @@
handleCurrentChange(val) {
this.page.currentPage = val;
this.queryTableData();
+ },
+ initDays() {
+ let _this = this;
+ for (var i = 1; i <= 31 ; i++) {
+ _this.days.push(i);
+ }
+ },
+ getRequestParam() {
+ var form = this.form;
+ var params = form;
+ if (form.timeRange) {
+ params.beginTime = form.timeRange?moment(form.timeRange[0]).format("YYYY-MM-DD HH:mm"):'';
+ params.endTime = form.timeRange?moment(form.timeRange[1]).format("YYYY-MM-DD HH:mm"):'';
+ }
+ return params;
+ },
+ exportExcel() {
+ window.location.href=basePath+"/admin/achieve/exportDailyInfoNew?"+MTools.jsonToUrlParam(this.getRequestParam());
+ },
+ jumpOrder(type, value) {
+ if(type=='服务单') {
+ fnPublci.showServiceOrder(1, value);
+ } else {
+ fnPublci.showOrder(1, value);
+ }
}
}
});
--
Gitblit v1.9.1