Skip to content

S
SuperMan
Commit 733dd2c2 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

‘新增简易报表页面@@@@@’

parent ccdd3368
Hide whitespace changes
Inline Side-by-side
Showing with 472 additions and 10 deletions
src/assets/css/cssReset.css
View file @ 733dd2c2
......@@ -482,6 +482,24 @@ vertical-align:middle
.column-cell-class-name-test .v-table-body-cell{
background-color: yellow;
}
.column-cell-class-name-test-pink .v-table-body-cell{
background-color: #FFCCFF;
}
.column-cell-class-name-test-greed .v-table-body-cell{
background-color: #C2D69A;
}
.column-cell-class-name-test-gray .v-table-body-cell{
background-color:#E5E0EC;
}
.column-cell-class-name-test-pink-t .v-table-body-cell{
background-color:#FCD5B4;
}
.column-cell-class-name-test-t .v-table-body-cell{
background-color: #FFFF99;
}
.column-cell-class-name-test-greed-s .v-table-body-cell{
background-color: #92D050;
}
.column-cell-class-name-test .v-table-body-cell:hover span{
color: #000000
}
......
src/components/FinancialModule/ReportForm/EasyReport.vue 0 → 100644
View file @ 733dd2c2
<style>
.page_EasyReport_set{
position: relative;
}
.page_EasyReport_set button{
position: absolute;
}
.page_EasyReport_set button.page_EasyReport_export{
right: 0;
top: 15px;
}
.page_EasyReport_set button.page_EasyReport_search{
bottom: 27px;
left: 1020px;
}
.page_EasyReport_form{
width: 1000px;
float: left;
}
.page_EasyReport_form .el-date-editor.el-input,.page_EasyReport_form .el-date-editor.el-input__inner{width: 100% !important;}
</style>
<template>
<div class="page_EasyReport">
<div class="page_EasyReport_set clearfix">
<el-form class="clearfix page_EasyReport_form" label-width="110px">
<el-row style="padding:15px 0 0 0;">
<el-col :span="6">
<el-form-item label="年份：">
<el-date-picker
v-model="year"
type="year"
value-format="yyyy"
placeholder="选择年">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row >
<el-col :span="6" v-for="(month, index) in monthList" :key="index">
<el-form-item :label="`${month.name}：`">
<el-input v-model="month.value" @change="MonthIndex = month.id" type="number"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<button class="normalBtn page_EasyReport_export" @click="exportExcel">导出EXCEL</button>
<button class="normalBtn page_EasyReport_search" @click="getData">确定</button>
</div>
<div style="margin-bottom:25px;" v-loading='loading'>
<v-table
is-horizontal-resize
column-width-drag
:show-vertical-border="true"
style="width:100%"
:columns="columns"
:table-data="DataList"
:filter-method="filterMethod"
:row-height="30"
:column-cell-class-name="columnCellClass"
@on-custom-comp="customCompFunc"
@sort-change="sortChange"
>
</v-table>
</div>
</div>
</template>
<script>
export default {
data() {
return {
year: new Date().getFullYear().toString(),
monthList: [],
msg: {
Year: '',
Month: 0,
Money: '',
},
data: [],
DataList: [],
MonthIndex: 0,
pageSize: 18,
pageIndex: 1,
multipleSort: false,
loading: false,
columns: [
{
field: "ID",
title: "合计",
width: 80,
titleAlign: "left",
columnAlign: "left",
isResize: true,
result: [],
type: "select",
isFrozen: false
},
{
field: "ZhaiYao",
title: "摘要",
width: 80,
titleAlign: "left",
columnAlign: "left",
isResize: true,
result: [],
type: "select",
isFrozen: false
},
{
field: "YiYue",
title: "一月",
width: 80,
titleAlign: "left",
columnAlign: "left",
isResize: true,
result: [],
type: "select",
isFrozen: false
},
{
field: "ErYue",
title: "二月",
width: 80,
titleAlign: "left",
columnAlign: "left",
isResize: true,
result: [],
type: "select",
isFrozen: false
},
{
field: "SanYue",
title: "三月",
width: 80,
titleAlign: "left",
columnAlign: "left",
isResize: true,
result: [],
type: "select",
isFrozen: false
},
{
field: "DiYiJiDu",
title: "第一季度",
width: 80,
titleAlign: "left",
columnAlign: "left",
isResize: true,
result: [],
type: "select",
isFrozen: false
},
{
field: "SiYue",
title: "四月",
width: 80,
titleAlign: "left",
columnAlign: "left",
isResize: true,
result: [],
type: "select",
isFrozen: false
},
{
field: "WuYue",
title: "五月",
width: 80,
titleAlign: "left",
columnAlign: "left",
isResize: true,
result: [],
type: "select",
isFrozen: false
},
{
field: "LiuYue",
title: "六月",
width: 80,
titleAlign: "left",
columnAlign: "left",
isResize: true,
result: [],
type: "select",
isFrozen: false
},
{
field: "DiErJiDu",
title: "第二季度",
width: 80,
titleAlign: "left",
columnAlign: "left",
isResize: true,
result: [],
type: "select",
isFrozen: false
},
{
field: "ShangBanNianBao",
title: "上半年报",
width: 80,
titleAlign: "left",
columnAlign: "left",
isResize: true,
result: [],
type: "select",
isFrozen: false
},
{
field: "QiYue",
title: "七月",
width: 80,
titleAlign: "left",
columnAlign: "left",
isResize: true,
result: [],
type: "select",
isFrozen: false
},
{
field: "BaYue",
title: "八月",
width: 80,
titleAlign: "left",
columnAlign: "left",
isResize: true,
result: [],
type: "select",
isFrozen: false
},
{
field: "JiuYue",
title: "九月",
width: 80,
titleAlign: "left",
columnAlign: "left",
isResize: true,
result: [],
type: "select",
isFrozen: false
},
{
field: "DiSanJiDu",
title: "第三季度",
width: 80,
titleAlign: "left",
columnAlign: "left",
isResize: true,
result: [],
type: "select",
isFrozen: false
},
{
field: "ShiYue",
title: "十月",
width: 80,
titleAlign: "left",
columnAlign: "left",
isResize: true,
result: [],
type: "select",
isFrozen: false
},
{
field: "ShiYiYue",
title: "十一月",
width: 80,
titleAlign: "left",
columnAlign: "left",
isResize: true,
result: [],
type: "select",
isFrozen: false
},
{
field: "ShiErYue",
title: "十二月",
width: 80,
titleAlign: "left",
columnAlign: "left",
isResize: true,
result: [],
type: "select",
isFrozen: false
},
{
field: "DiSiJiDu",
title: "第四季度",
width: 80,
titleAlign: "left",
columnAlign: "left",
isResize: true,
result: [],
type: "select",
isFrozen: false
},
{
field: "XiaBanNianBao",
title: "下半年报",
width: 80,
titleAlign: "left",
columnAlign: "left",
isResize: true,
result: [],
type: "select",
isFrozen: false
},
{
field: "ZongJi",
title: "总计",
width: 80,
titleAlign: "left",
columnAlign: "left",
isResize: true,
result: [],
type: "select",
isFrozen: false
},
]
}
},created(){
let arr = ["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"]
for (let i = 0; i < 12; i++) {
this.monthList.push({
id: i + 1,
name: arr[i],
value: '',
})
}
},mounted(){
this.getData()
},methods:{
filterMethod: function(filters) {
},
sortChange: function (param) {
},
customCompFunc: function(param) {
console.log(param);
},
columnCellClass: function(rowIndex, columnName, rowData) {
// 设置列class
if (columnName === "ZongJi") {
return "column-cell-class-name-test-pink";
}
if (columnName === "DiYiJiDu" || columnName === "DiErJiDu" || columnName === "ShangBanNianBao" || columnName === "DiSanJiDu" || columnName === "DiSiJiDu" || columnName === "XiaBanNianBao") {
return "column-cell-class-name-test";
}
if (rowIndex === 1 && (columnName === "DiYiJiDu" || columnName === "DiErJiDu" || columnName === "ShangBanNianBao" || columnName === "DiSanJiDu" || columnName === "DiSiJiDu" || columnName === "XiaBanNianBao")) {
return "column-cell-class-name-test";
}
if (rowData.ID === 9 || rowData.ID === 10 || rowData.ID === 11 || rowData.ID === 41 || rowData.ID === 44 || rowData.ID === 48 || rowData.ID === 49) {
return "column-cell-class-name-test-greed";
}
if (rowData.ID === 14) {
return "column-cell-class-name-test-gray";
}
if (rowData.ID === 51) {
return "column-cell-class-name-test-pink-t";
}
if (rowData.ID === 53) {
return "column-cell-class-name-test-t";
}
if (rowData.ID === 52) {
return "column-cell-class-name-test-greed-s";
}
},
exportExcel: function () {
},
getData: function () {
this.loading = true;
this.msg.Year = parseInt(this.year)
this.apipost('financestatistics_post_GetEasyReportList', this.msg, res=>{
if (res.data.resultCode == 1) {
let data = res.data.data;
data.sharelist.forEach((x, i) => {
this.monthList[i].value = x.Money
});
this.DataList = data.list
this.loading = false
return
for (let i = 0; i<=18; i++) {
this.DataList.push({
ID: i+1,
ZhaiYao: parseInt(Math.random(1000) * 1000 + 1),
YiYue: parseInt(Math.random(1000) * 1000 + 1),
ErYue: parseInt(Math.random(1000) * 1000 + 1),
SanYue: parseInt(Math.random(1000) * 1000 + 1),
DiYiJiDu: parseInt(Math.random(1000) * 1000 + 1),
SiYue: parseInt(Math.random(1000) * 1000 + 1),
WuYue: parseInt(Math.random(1000) * 1000 + 1),
LiuYue: parseInt(Math.random(1000) * 1000 + 1),
DiErJiDu: parseInt(Math.random(1000) * 1000 + 1),
ShangBanNianBao: parseInt(Math.random(1000) * 1000 + 1),
QiYue: parseInt(Math.random(1000) * 1000 + 1),
BaYue: parseInt(Math.random(1000) * 1000 + 1),
JiuYue: parseInt(Math.random(1000) * 1000 + 1),
DiSanJiDu: parseInt(Math.random(1000) * 1000 + 1),
ShiYue: parseInt(Math.random(1000) * 1000 + 1),
ShiYiYue: parseInt(Math.random(1000) * 1000 + 1),
ShiErYue: parseInt(Math.random(1000) * 1000 + 1),
DiSiJiDu: parseInt(Math.random(1000) * 1000 + 1),
XiaBanNianBao: parseInt(Math.random(1000) * 1000 + 1),
ZongJi: parseInt(Math.random(1000) * 1000 + 1),
})
}
} else {
this.loading = false
this.$message.error(res.data.message)
}
}, null)
}
}
}
</script>
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @ 733dd2c2
......@@ -386,6 +386,24 @@ tr._item_list td:last-child {
._TCIDAndTCNUMList {
display: flex;
}
.other_report{
padding: 0 28px 15px 28px;
}
.other_report li{
float: left;
color: #fff;
background-color: #b00;
border-color: #b00;
min-width: 80px;
padding: 4px 12px;
margin-bottom: 0;
font-size: 14px;
font-weight: normal;
text-align: center;
cursor: pointer;
border-radius: 4px;
margin-bottom: 10px;
}
</style>
<template>
......@@ -472,14 +490,17 @@ tr._item_list td:last-child {
</el-form>
<ul class="clearfix">
<li class="hight_query">
<button class="normalBtn" @click="openKaiQiZzBox('一键开启')">一键开启</button>
<button class="hollowFixedBtn" @click="openKaiQiZzBox('一键关闭')">一键关闭</button>
<!-- <button class="normalBtn" @click="openKaiQiZzBox('一键开启')">一键开启</button>
<button class="hollowFixedBtn" @click="openKaiQiZzBox('一键关闭')">一键关闭</button> -->
<button class="normalBtn" @click="resetPageIndex(),getPageList()">{{$t('pub.searchBtn')}}</button>
<button class="hollowFixedBtn" @click="method5()">导出</button>
<!--<button class="hollowFixedBtn" @click="exportExcelCurrentPage">导出2</button>-->
</li>
</ul>
</div>
<ul class="other_report clearfix">
<li>简易报表</li>
</ul>
<div class="_fnDm_content" v-loading="loading">
<v-table
is-horizontal-resize
......@@ -620,7 +641,7 @@ export default {
userId: 0,
msg: {
pageIndex: 1,
pageSize: 18,
pageSize: 16,
OutBranchId: "",
StartCityId: "",
LineId: "",
......@@ -1216,7 +1237,7 @@ export default {
allH = document.documentElement.clientHeight;
allW = document.documentElement.clientWidth;
cW = allW - 90;
cH = allH - 350;
cH = allH - 350 -52;
this.msg.pageSize = parseInt(cH / 30) - 1;
let userInfo = this.getLocalStorage();
this.getCompanyMsg.RB_Group_Id = userInfo.RB_Group_id; //集团ID
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ 733dd2c2
......@@ -1479,7 +1479,7 @@
<tr v-if='orderList.length>0' v-for="(item2,index2) in orderList" :key="index2">
<td>{{item2.FrID}}</td>
<td>
<span v-if="isUpdateOrder">{{item2.PayMoney}}</span>
<span v-if="item.isOwn==1 || userId==1||userId==5 || isUpdateOrder">{{item2.PayMoney}}</span>
<span v-else>******</span>
</td>
<td>{{item2.TypeName}}</td>
......@@ -1490,21 +1490,21 @@
</tr>
</table>
</div>
<span v-if='item.isEnd==0 && isUpdateOrder' style="cursor: pointer;" @click="getOrderDetail(item)" slot="reference">{{item.income}}</span>
<span v-else-if='item.isEnd!=0 && isUpdateOrder' style="cursor: pointer;color: #e95252;" @click="getOrderDetail(item)" slot="reference">{{item.income}}</span>
<span v-if='item.isEnd==0 || isUpdateOrder' style="cursor: pointer;" @click="getOrderDetail(item)" slot="reference">{{item.income}}</span>
<span v-else-if='item.isEnd!=0 || isUpdateOrder' style="cursor: pointer;color: #e95252;" @click="getOrderDetail(item)" slot="reference">{{item.income}}</span>
<span v-else>******</span>
</el-popover>
</td>
<td>
<span v-if="isUpdateOrder">{{item.refund}}</span>
<span v-if="item.isOwn==1 || userId==1||userId==5 || isUpdateOrder">{{item.refund}}</span>
<span v-else>******</span>
</td>
<td>
<span v-if="isUpdateOrder">{{item.platformTax}}</span>
<span v-if="item.isOwn==1 || userId==1||userId==5 || isUpdateOrder">{{item.platformTax}}</span>
<span v-else>******</span>
</td>
<td>
<span v-if="isUpdateOrder" :class="{color_red_order:item.dueInMoney!==item.preferPrice}">{{item.dueInMoney}}</span>
<span v-if="item.isOwn==1 || userId==1||userId==5 || isUpdateOrder" :class="{color_red_order:item.dueInMoney!==item.preferPrice}">{{item.dueInMoney}}</span>
<span v-else>******</span>
</td>
<td class="fz12" :style="item.orderState===3?'color: #e95252;':''">{{item.statsstr}}</td>
......
src/router/config.js
View file @ 733dd2c2
......@@ -2252,6 +2252,13 @@ export default {
meta: {
title: '联运收入'
},
}, { //财务 报表 简易报表
path: '/EasyReport',
name: 'EasyReport',
component: resolve => require(['@/components/FinancialModule/ReportForm/EasyReport'], resolve),
meta: {
title: '联运收入'
},
}, { // 销售 制作广告
path: '/advert',
name: 'advert',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment