|
|
|
@ -22,7 +22,7 @@
|
|
|
|
</el-tabs>
|
|
|
|
</el-tabs>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
<div class="table-tree1" v-if="activeName==='todo'">
|
|
|
|
<div class="table-tree1" v-if="activeName==='todo'">
|
|
|
|
<el-table :data="list" border class="v-table" style="width: 100%; margin-bottom: 20px;height:220px">
|
|
|
|
<el-table :data="list" border class="v-table" style="width: 100%; margin-bottom: 20px;height:260px">
|
|
|
|
<el-table-column type="index" label="序号" align="center" />
|
|
|
|
<el-table-column type="index" label="序号" align="center" />
|
|
|
|
<el-table-column prop="type" width="100" label="类型" align="center" :formatter="typeFormatter" />
|
|
|
|
<el-table-column prop="type" width="100" label="类型" align="center" :formatter="typeFormatter" />
|
|
|
|
<el-table-column prop="content" label="内容" align="left" show-overflow-tooltip />
|
|
|
|
<el-table-column prop="content" label="内容" align="left" show-overflow-tooltip />
|
|
|
|
@ -58,7 +58,7 @@
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
<div v-if="isShowNoPay && activeName==='todolist'">
|
|
|
|
<div v-if="isShowNoPay && activeName==='todolist'">
|
|
|
|
<xy-table :cell-style="nopayCellStyle" :height="270" :list="nopay" :table-item="nopayTable">
|
|
|
|
<xy-table :cell-style="nopayCellStyle" :height="300" :list="nopay" :table-item="nopayTable">
|
|
|
|
<template v-slot:btns />
|
|
|
|
<template v-slot:btns />
|
|
|
|
</xy-table>
|
|
|
|
</xy-table>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
@ -105,8 +105,8 @@
|
|
|
|
<div class="progress-card-item">
|
|
|
|
<div class="progress-card-item">
|
|
|
|
<MyProgress
|
|
|
|
<MyProgress
|
|
|
|
ref="MyProgress"
|
|
|
|
ref="MyProgress"
|
|
|
|
width="145px"
|
|
|
|
width="300px"
|
|
|
|
height="145px"
|
|
|
|
height="165px"
|
|
|
|
title="执行率"
|
|
|
|
title="执行率"
|
|
|
|
:chart-data="[{value:statistic.progress.use_money_total,name:'已用金额'},{value:statistic.progress.money_total_2 ? statistic.progress.money_total_2 : statistic.progress.money_total_1,name:'合计金额'}]"
|
|
|
|
:chart-data="[{value:statistic.progress.use_money_total,name:'已用金额'},{value:statistic.progress.money_total_2 ? statistic.progress.money_total_2 : statistic.progress.money_total_1,name:'合计金额'}]"
|
|
|
|
/>
|
|
|
|
/>
|
|
|
|
@ -145,7 +145,7 @@
|
|
|
|
</el-row>
|
|
|
|
</el-row>
|
|
|
|
<div v-for="(sitem, index) in typeList">
|
|
|
|
<div v-for="(sitem, index) in typeList">
|
|
|
|
<template v-if="sitem[0]&&sitem[1]">
|
|
|
|
<template v-if="sitem[0]&&sitem[1]">
|
|
|
|
<el-col v-if="sitem[0]" :span="12">
|
|
|
|
<el-col v-if="sitem[0]" :span="12" style="padding-right:10px">
|
|
|
|
<el-card class="box-card">
|
|
|
|
<el-card class="box-card">
|
|
|
|
<div slot="header" class="box-card-header">
|
|
|
|
<div slot="header" class="box-card-header">
|
|
|
|
<SvgIcon style="color: #2D8cF0;width: 24px;height: 24px;" icon-class="caidan" />
|
|
|
|
<SvgIcon style="color: #2D8cF0;width: 24px;height: 24px;" icon-class="caidan" />
|
|
|
|
@ -178,15 +178,15 @@
|
|
|
|
<div class="progress-card-item">
|
|
|
|
<div class="progress-card-item">
|
|
|
|
<MyProgress
|
|
|
|
<MyProgress
|
|
|
|
ref="MyProgress1"
|
|
|
|
ref="MyProgress1"
|
|
|
|
width="145px"
|
|
|
|
width="300px"
|
|
|
|
height="145px"
|
|
|
|
height="165px"
|
|
|
|
title="执行率"
|
|
|
|
title="执行率"
|
|
|
|
:chart-data="[{value:parseFloat(sitem[0].use_money_total),name:'已用金额'},{value:parseFloat(sitem[0].money_total_2) ? parseFloat(sitem[0].money_total_2) : parseFloat(sitem[0].money_total_1),name:'合计金额'}]"
|
|
|
|
:chart-data="[{value:parseFloat(sitem[0].use_money_total),name:'已用金额'},{value:parseFloat(sitem[0].money_total_2) ? parseFloat(sitem[0].money_total_2) : parseFloat(sitem[0].money_total_1),name:'合计金额'}]"
|
|
|
|
/>
|
|
|
|
/>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
<xy-table :height="380" :list="sitem[0].departments" :table-item="departmentTable">
|
|
|
|
<xy-table :height="560" :list="sitem[0].departments" :table-item="departmentTable">
|
|
|
|
<template v-slot:btns>
|
|
|
|
<template v-slot:btns>
|
|
|
|
<el-table-column :width="80" fixed="right" label="操作" header-align="center" align="center">
|
|
|
|
<el-table-column :width="80" fixed="right" label="操作" header-align="center" align="center">
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<template slot-scope="scope">
|
|
|
|
@ -201,7 +201,7 @@
|
|
|
|
</el-card>
|
|
|
|
</el-card>
|
|
|
|
</el-col>
|
|
|
|
</el-col>
|
|
|
|
|
|
|
|
|
|
|
|
<el-col v-if="sitem[1]" :span="12">
|
|
|
|
<el-col v-if="sitem[1]" :span="12" style="padding-left:10px">
|
|
|
|
<el-card class="box-card">
|
|
|
|
<el-card class="box-card">
|
|
|
|
<div slot="header" class="box-card-header">
|
|
|
|
<div slot="header" class="box-card-header">
|
|
|
|
<SvgIcon style="color: #2D8cF0;width: 24px;height: 24px;" icon-class="caidan" />
|
|
|
|
<SvgIcon style="color: #2D8cF0;width: 24px;height: 24px;" icon-class="caidan" />
|
|
|
|
@ -234,15 +234,15 @@
|
|
|
|
<div class="progress-card-item">
|
|
|
|
<div class="progress-card-item">
|
|
|
|
<MyProgress
|
|
|
|
<MyProgress
|
|
|
|
ref="MyProgress2"
|
|
|
|
ref="MyProgress2"
|
|
|
|
width="145px"
|
|
|
|
width="300px"
|
|
|
|
height="145px"
|
|
|
|
height="165px"
|
|
|
|
title="执行率"
|
|
|
|
title="执行率"
|
|
|
|
:chart-data="[{value:parseFloat(sitem[1].use_money_total),name:'已用金额'},{value:parseFloat(sitem[1].money_total_2) ? parseFloat(sitem[1].money_total_2) : parseFloat(sitem[1].money_total_1),name:'合计金额'}]"
|
|
|
|
:chart-data="[{value:parseFloat(sitem[1].use_money_total),name:'已用金额'},{value:parseFloat(sitem[1].money_total_2) ? parseFloat(sitem[1].money_total_2) : parseFloat(sitem[1].money_total_1),name:'合计金额'}]"
|
|
|
|
/>
|
|
|
|
/>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
<xy-table :height="380" :list="sitem[1].departments" :table-item="departmentTable">
|
|
|
|
<xy-table :height="253" :list="sitem[1].departments" :table-item="departmentTable">
|
|
|
|
<template v-slot:btns>
|
|
|
|
<template v-slot:btns>
|
|
|
|
<el-table-column
|
|
|
|
<el-table-column
|
|
|
|
:width="80"
|
|
|
|
:width="80"
|
|
|
|
@ -260,6 +260,33 @@
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
</xy-table>
|
|
|
|
</xy-table>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<div>
|
|
|
|
|
|
|
|
<div slot="header" class="box-card-header" style="padding-bottom:11px">
|
|
|
|
|
|
|
|
<SvgIcon style="color: #2D8cF0;width: 24px;height: 24px;" icon-class="caidan" />
|
|
|
|
|
|
|
|
<span style="padding-left:10px;">{{ sitem[2].type_text }}</span>
|
|
|
|
|
|
|
|
<i class="el-icon-more" style="margin-left: auto; font-size: 20px" />
|
|
|
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
<xy-table :height="254" :list="sitem[2].departments" :table-item="departmentTable">
|
|
|
|
|
|
|
|
<template v-slot:btns>
|
|
|
|
|
|
|
|
<el-table-column
|
|
|
|
|
|
|
|
:width="80"
|
|
|
|
|
|
|
|
fixed="right"
|
|
|
|
|
|
|
|
label="操作"
|
|
|
|
|
|
|
|
header-align="center"
|
|
|
|
|
|
|
|
align="center"
|
|
|
|
|
|
|
|
>
|
|
|
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
|
|
|
<router-link
|
|
|
|
|
|
|
|
:to="`/statisticalReport/budgetProgress?departmentId=${scope.row.department_id}&type=${sitem[2].type}`"
|
|
|
|
|
|
|
|
>查看
|
|
|
|
|
|
|
|
</router-link>
|
|
|
|
|
|
|
|
</template>
|
|
|
|
|
|
|
|
</el-table-column>
|
|
|
|
|
|
|
|
</template>
|
|
|
|
|
|
|
|
</xy-table>
|
|
|
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
|
|
</el-card>
|
|
|
|
</el-card>
|
|
|
|
</el-col>
|
|
|
|
</el-col>
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
@ -1320,7 +1347,7 @@ export default {
|
|
|
|
this.statistic = res
|
|
|
|
this.statistic = res
|
|
|
|
if (res.typeList) {
|
|
|
|
if (res.typeList) {
|
|
|
|
var arr = []
|
|
|
|
var arr = []
|
|
|
|
for (var i = 0; i < res.typeList.length; i = i + 2) {
|
|
|
|
for (var i = 0; i < res.typeList.length; i = i + 3) {
|
|
|
|
if (res.typeList[i]) {
|
|
|
|
if (res.typeList[i]) {
|
|
|
|
res.typeList[i].per = this.getPer(res.typeList[i])
|
|
|
|
res.typeList[i].per = this.getPer(res.typeList[i])
|
|
|
|
// arr.push(res.typeList[i])
|
|
|
|
// arr.push(res.typeList[i])
|
|
|
|
@ -1328,15 +1355,20 @@ export default {
|
|
|
|
if (res.typeList[i + 1]) {
|
|
|
|
if (res.typeList[i + 1]) {
|
|
|
|
res.typeList[i + 1].per = this.getPer(res.typeList[i + 1])
|
|
|
|
res.typeList[i + 1].per = this.getPer(res.typeList[i + 1])
|
|
|
|
// arr.push(res.typeList[i + 1])
|
|
|
|
// arr.push(res.typeList[i + 1])
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if (res.typeList[i + 2]) {
|
|
|
|
|
|
|
|
res.typeList[i + 2].per = this.getPer(res.typeList[i + 2])
|
|
|
|
|
|
|
|
// arr.push(res.typeList[i + 1])
|
|
|
|
}
|
|
|
|
}
|
|
|
|
arr.push([res.typeList[i], res.typeList[i + 1]])
|
|
|
|
arr.push([res.typeList[i], res.typeList[i + 1],res.typeList[i + 2]])
|
|
|
|
}
|
|
|
|
}
|
|
|
|
this.typeList = arr
|
|
|
|
this.typeList = arr
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if(res.departmentList){
|
|
|
|
if(res.departmentList){
|
|
|
|
this.statistic.departmentList = res.departmentList?.sort((a, b) => a.plan_department.sortnumber - b.plan_department.sortnumber)
|
|
|
|
this.statistic.departmentList = res.departmentList?.sort((a, b) => a.plan_department.sortnumber - b.plan_department.sortnumber)
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
console.log("this.statistic.typeList",this.typeList)
|
|
|
|
// this.split = Array.from({ length: Math.ceil(this.typeList/2) },() => 0.5)
|
|
|
|
// this.split = Array.from({ length: Math.ceil(this.typeList/2) },() => 0.5)
|
|
|
|
},
|
|
|
|
},
|
|
|
|
getPer(row) {
|
|
|
|
getPer(row) {
|
|
|
|
@ -1532,15 +1564,17 @@ export default {
|
|
|
|
flex-wrap: wrap;
|
|
|
|
flex-wrap: wrap;
|
|
|
|
align-items: center;
|
|
|
|
align-items: center;
|
|
|
|
justify-content: space-between;
|
|
|
|
justify-content: space-between;
|
|
|
|
height:280px;
|
|
|
|
height:310px;
|
|
|
|
margin-top:10px;
|
|
|
|
margin-top:10px;
|
|
|
|
&-item {
|
|
|
|
&-item {
|
|
|
|
min-width: 120px;
|
|
|
|
min-width: 120px;
|
|
|
|
margin: 10px;
|
|
|
|
// margin: 10px;
|
|
|
|
|
|
|
|
margin-bottom: 10px;
|
|
|
|
display: flex;
|
|
|
|
display: flex;
|
|
|
|
flex-direction: column;
|
|
|
|
flex-direction: column;
|
|
|
|
align-items: center;
|
|
|
|
align-items: center;
|
|
|
|
text-align: center;
|
|
|
|
text-align: center;
|
|
|
|
|
|
|
|
flex-basis: 50%;
|
|
|
|
|
|
|
|
|
|
|
|
&__label {
|
|
|
|
&__label {
|
|
|
|
font-size: 15px;
|
|
|
|
font-size: 15px;
|
|
|
|
@ -1626,7 +1660,7 @@ export default {
|
|
|
|
|
|
|
|
|
|
|
|
.table-tree1 {
|
|
|
|
.table-tree1 {
|
|
|
|
margin-top: 10px;
|
|
|
|
margin-top: 10px;
|
|
|
|
height:280px;
|
|
|
|
height:310px;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
.v-text {
|
|
|
|
.v-text {
|
|
|
|
|