oa二期内容更新
This commit is contained in:
@@ -296,26 +296,156 @@
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="财务核算" name="third">
|
||||
<el-tab-pane label="财务核算（日期）" name="third">
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="24">
|
||||
<div class="tip-top">
|
||||
<div style="display: flex;justify-content: space-between">
|
||||
<div style="display: flex;justify-content: center;align-items: center;white-space: nowrap">
|
||||
<span> 日期检索：</span>
|
||||
<el-date-picker
|
||||
v-model="value1"
|
||||
type="daterange"
|
||||
range-separator="至"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"
|
||||
@blur="getTimeBlur">
|
||||
</el-date-picker>
|
||||
</div>
|
||||
<span class="sp1">收入：</span>
|
||||
<span class="sp2 cl2">¥ {{ checkByTime.income }} 元</span>
|
||||
<span class="sp1">支出：</span>
|
||||
<span class="sp2 cl1"> ¥ {{ checkByTime.out }} 元</span>
|
||||
<span class="sp1">核算：</span>
|
||||
<span class="sp2 cl3">¥{{ checkByTime.check }}元</span>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="12">
|
||||
<div class="tip">
|
||||
本月核算情况
|
||||
</div>
|
||||
<div class="demo-shadow">
|
||||
<el-row :gutter="5">
|
||||
<el-col :span="8">
|
||||
<div class="shadow-col">
|
||||
<h4>本月收入</h4>
|
||||
<p class="cl2">¥ {{ monthCheck.income }} 元</p>
|
||||
</div>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="8">
|
||||
<div class="shadow-col">
|
||||
<h4>本月支出</h4>
|
||||
<p class="cl1">¥ {{ monthCheck.out }} 元</p>
|
||||
</div>
|
||||
</el-col>
|
||||
|
||||
|
||||
<el-col :span="8">
|
||||
<div class="shadow-col">
|
||||
<h4>本月核算</h4>
|
||||
<p class="cl3">¥ {{ monthCheck.check }} 元</p>
|
||||
</div>
|
||||
</el-col>
|
||||
|
||||
|
||||
</el-row>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<div class="tip">
|
||||
本年核算情况
|
||||
</div>
|
||||
<div class="demo-shadow">
|
||||
<el-row :gutter="5">
|
||||
<el-col :span="8">
|
||||
<div class="shadow-col">
|
||||
<h4>本月收入</h4>
|
||||
<p class="cl2">¥ {{ yearCheck.income }} 元</p>
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<div class="shadow-col">
|
||||
<h4>本月支出</h4>
|
||||
<p class="cl1">¥ {{ yearCheck.out }} 元</p>
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<div class="shadow-col">
|
||||
<h4>本月核算</h4>
|
||||
<p class="cl3">¥ {{ yearCheck.check }} 元</p>
|
||||
</div>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
</el-col>
|
||||
|
||||
|
||||
<el-col :span="24">
|
||||
<div class="date-col">
|
||||
<el-table
|
||||
:data="currentList"
|
||||
style="width: 100%"
|
||||
:header-cell-style="{background:'#50bfff',color:'#ffffff',fontSize:'18px', borderTopRightRadius: '5px', borderTopLeftRadius: '5px'}"
|
||||
:row-class-name="tableRowClassName">
|
||||
<el-table-column
|
||||
prop="onMonth"
|
||||
label="月份(近6个月)"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="financeCome"
|
||||
label="收入">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="financeOut"
|
||||
label="支出"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="count"
|
||||
label="核算">
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
</el-col>
|
||||
|
||||
</el-row>
|
||||
|
||||
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="财务核算（付款类型）" name="fourth">
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="24">
|
||||
<div class="tip-top">
|
||||
<div style="display: flex;justify-content: space-between">
|
||||
<div style="display: flex;justify-content: center;align-items: center;white-space: nowrap">
|
||||
<span> 支付类型：</span>
|
||||
<el-select v-model="payType" placeholder="请选择付款类型" @change = "getFinanceDateByPayType">
|
||||
<el-option
|
||||
v-for="dict in dict.type.sys_pay_type"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
|
||||
:value="parseInt(dict.value)"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</div>
|
||||
<span class="sp1">收入：</span>
|
||||
<span class="sp2 cl2">¥ {{ checkByTime.income }} 元</span>
|
||||
<span class="sp1">支出：</span>
|
||||
<span class="sp2 cl1"> ¥ {{ checkByTime.out }} 元</span>
|
||||
<span class="sp1">核算：</span>
|
||||
<span class="sp2 cl3">¥{{ checkByTime.check }}元</span>
|
||||
</div>
|
||||
|
||||
按日期检索：
|
||||
<el-date-picker
|
||||
v-model="value1"
|
||||
type="daterange"
|
||||
range-separator="至"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"
|
||||
@blur="getTimeBlur">
|
||||
</el-date-picker>
|
||||
<span class="sp1">收入：</span>
|
||||
<span class="sp2 cl2">¥ {{ checkByTime.income }} 元</span>
|
||||
<span class="sp1">支出：</span>
|
||||
<span class="sp2 cl1"> ¥ {{ checkByTime.out }} 元</span>
|
||||
<span class="sp1">核算：</span>
|
||||
<span class="sp2 cl3">¥{{ checkByTime.check }}元</span>
|
||||
</div>
|
||||
</el-col>
|
||||
|
||||
@@ -629,6 +759,8 @@ export default {
|
||||
dicts: ['sys_pay_type'],
|
||||
data() {
|
||||
return {
|
||||
// 支付类型
|
||||
payType:0,
|
||||
// 按钮loading
|
||||
buttonLoading: false,
|
||||
// 遮罩层
|
||||
@@ -745,6 +877,12 @@ export default {
|
||||
|
||||
},
|
||||
methods: {
|
||||
// 获取核算信息通过支付类型
|
||||
getFinanceDateByPayType(){
|
||||
this.getPayTypeBlur()
|
||||
this.currentBlur()
|
||||
this.currentBlurList()
|
||||
},
|
||||
|
||||
updateBigPrice(index, row) {
|
||||
|
||||
@@ -809,7 +947,6 @@ export default {
|
||||
|
||||
|
||||
getListFinance(type) {
|
||||
|
||||
this.loading = true;
|
||||
/*let data = {
|
||||
financeType: type,
|
||||
@@ -860,6 +997,7 @@ export default {
|
||||
//tabs选项卡
|
||||
handleClick(tab, event) {
|
||||
this.nowTab = tab.index
|
||||
this.payType=0
|
||||
if (tab.index == '0') {
|
||||
this.getListFinance('1');
|
||||
}
|
||||
@@ -870,6 +1008,10 @@ export default {
|
||||
this.currentBlur()
|
||||
this.currentBlurList()
|
||||
}
|
||||
if (tab.index == '3') {
|
||||
this.currentBlur()
|
||||
this.currentBlurList()
|
||||
}
|
||||
},
|
||||
// 表单重置
|
||||
reset() {
|
||||
@@ -1168,13 +1310,30 @@ export default {
|
||||
let endTime = e.displayValue[1] + ' 23:59:59'
|
||||
let dataCome = {
|
||||
beginTime: beginTime,
|
||||
endTime: endTime
|
||||
endTime: endTime,
|
||||
payType: this.payType,
|
||||
}
|
||||
findFinance(dataCome).then(res => {
|
||||
this.checkByTime = res.data;
|
||||
|
||||
})
|
||||
},
|
||||
|
||||
getPayTypeBlur(){
|
||||
let now = new Date()
|
||||
var nowMonth = new Date(now.getFullYear(), now.getMonth(), 1); // 获取本月第一天的日期时间（时间为0:0:0）
|
||||
var monthEnd = new Date(now.getFullYear(), now.getMonth() + 1, 0, 23, 59, 59); // 获取本月最后一天的日期时间（时间为23:59:59）
|
||||
//本月收入参数
|
||||
let dataCome = {
|
||||
beginTime: Vue.prototype.parseTime(nowMonth, '{y}-{m}-{d} {h}:{i}:{s}'),
|
||||
endTime: Vue.prototype.parseTime(monthEnd, '{y}-{m}-{d} {h}:{i}:{s}'),
|
||||
payType: this.payType,
|
||||
}
|
||||
findFinance(dataCome).then(res => {
|
||||
this.checkByTime = res.data;
|
||||
|
||||
})
|
||||
},
|
||||
/**
|
||||
* 本年本月核算情况
|
||||
*/
|
||||
@@ -1187,6 +1346,7 @@ export default {
|
||||
let dataCome = {
|
||||
beginTime: Vue.prototype.parseTime(nowMonth, '{y}-{m}-{d} {h}:{i}:{s}'),
|
||||
endTime: Vue.prototype.parseTime(monthEnd, '{y}-{m}-{d} {h}:{i}:{s}'),
|
||||
payType: this.payType,
|
||||
}
|
||||
//本月核算
|
||||
findFinance(dataCome).then(res => {
|
||||
@@ -1206,13 +1366,12 @@ export default {
|
||||
let yearDataCome = {
|
||||
beginTime: Vue.prototype.parseTime(startDate, '{y}-{m}-{d} {h}:{i}:{s}'),
|
||||
endTime: Vue.prototype.parseTime(endDate, '{y}-{m}-{d} {h}:{i}:{s}'),
|
||||
payType: this.payType,
|
||||
}
|
||||
//本年核算
|
||||
findFinance(yearDataCome).then(res => {
|
||||
this.yearCheck = res.data;
|
||||
})
|
||||
|
||||
|
||||
},
|
||||
/**
|
||||
* 最近六个月核算情况，如果显示更多月份，请修改控制器：int[] integers = {0,1, 2, 3, 4, 5};
|
||||
@@ -1410,14 +1569,18 @@ export default {
|
||||
}
|
||||
|
||||
.tip-top .sp1 {
|
||||
margin-left: 100px;
|
||||
white-space: nowrap;
|
||||
font-size: 18px;
|
||||
overflow: hidden;
|
||||
color: #999999;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
|
||||
.tip-top .sp2 {
|
||||
margin-right: 100px;
|
||||
font-size: 32px;
|
||||
|
||||
font-size: 16px;
|
||||
|
||||
|
||||
}
|
||||
|
||||
.date-col {
|
||||
|
||||
Reference in New Issue
Block a user