diff --git a/src/views/property/carPort.vue b/src/views/property/carPort.vue
index 776d0a4..4b017d9 100644
--- a/src/views/property/carPort.vue
+++ b/src/views/property/carPort.vue
@@ -18,6 +18,7 @@
+
@@ -67,6 +68,7 @@
+
@@ -81,6 +83,11 @@
+
+
+
+
+
@@ -114,6 +121,7 @@
+
@@ -100,75 +77,45 @@
import { propertyFeeData } from '@/api/reportform'
import moment from 'moment'
export default {
- name: 'ExpireReport',
+ name: 'ChangeRate',
data() {
return {
cidList:JSON.parse(localStorage.cid) || [], // 园区列表
- role:localStorage.role,
- // 数据列表
- dataList: [],
- dataBuildList: [],
- // 遍历表头
- // headers: [],
- // headersBuild: [],
- // 遮罩层
- loading: true,
- // 总条数
- total: 0,
- // 查询参数
- queryParams: {
+ role:localStorage.role, // 角色
+ activeName: 'first', // 选项卡绑定值
+ dataList: [], //园区物业费基本信息
+ dataParkList: [], //园区物业费收费率
+ dataBuildList: [], //楼栋物业费收费率
+ loading: true, // 遮罩层
+ total: 0, // 总条数
+ queryParams: { // 查询参数
cid: undefined,
- startDate: moment().subtract(1,'M').format('YYYY-MM'),
- endDate: moment().format('YYYY-MM'),
+ startDate: moment().format('YYYY'),
},
- currentDate: moment().format('YYYY-MM-DD')
+ currentDate: moment().format('YYYY-MM-DD'), // 当前日期
}
},
created() {
this.getList()
},
methods: {
- /** 查询角色列表 */
+ // 查询角色列表
getList() {
this.loading = true
- propertyFeeData(this.queryParams).then(
- response => {
- this.dataList = response.data.cat_arr
- this.dataBuildList = response.data.build_arr
- // this.headers = [
- // 'cidname',
- // 'totalhouseholds',
- // 'constructionarea',
- // 'unitprice',
- // 'start_date',
- // 'end_date',
- // 'length_date',
- // 'expect_money',
- // 'receivable_money',
- // 'percent'
- // ]
- // this.headersBuild = [
- // 'buildingname',
- // 'totalhouseholds',
- // 'constructionarea',
- // 'unitprice',
- // 'start_date',
- // 'end_date',
- // 'length_date',
- // 'expect_money',
- // 'receivable_money',
- // 'percent',
- // 'difference_value'
- // ]
- this.loading = false
- }
- )
+ propertyFeeData(this.queryParams).then(({code, data}) => {
+ if (code == 200) {
+ this.dataList = data['build_arr'] || []
+ this.dataParkList = data['park_statistics'] || []
+ this.dataBuildList = data['building_statistics'] || []
+ }
+ this.loading = false
+ })
},
- /** 搜索按钮操作 */
+ // 搜索按钮操作
handleQuery() {
- if (!this.queryParams.startDate || !this.queryParams.endDate) {
+ if (!this.queryParams.startDate) {
this.$message({
- message: '请选择开始日期和结束日期',
+ message: '请选择年份',
type: 'error'
})
return
diff --git a/src/views/reportform/monthCharge.vue b/src/views/reportform/monthCharge.vue
index 4ca8761..92b42c6 100644
--- a/src/views/reportform/monthCharge.vue
+++ b/src/views/reportform/monthCharge.vue
@@ -8,17 +8,11 @@
:key="item.cid"
:label="item.descr"
:value="item.cid"
- clear="false"
- />
+ clear="false" />
-
+
@@ -29,48 +23,27 @@
placeholder="请选择"
clearable
size="small"/>
-
-
-
-
-
-
搜索
-
-
- {{ chenQianCharge }} 元
-
-
- {{ currentCharge }} 元
-
-
- {{ prepayCharge }} 元
-
-
- {{ paidInCharge }} 元
-
+ {{ chenQianCharge }} 元
+ {{ currentCharge }} 元
+ {{ prepayCharge }} 元
+ {{ paidInCharge }} 元
-
+
{{ getValue(scope.row[item]) }}
- {{ scope.row[item] === 2 ? '电梯卡费' : scope.row[item] === 3 ? '车位费' : '物业费' }}
- {{ scope.row[item] === 0 ? '已缴费' : '未缴费' }}
- {{ parseTime(scope.row.createtime) }}
- {{ parseTime(scope.row.createtime) }}
+ {{ feesTypeEcho(scope.row[item]) }}
{{ scope.row[item] }}
@@ -90,34 +63,36 @@
import { chargeTotalPage } from '@/api/reportform'
import moment from 'moment'
export default {
- name: 'ExpireReport',
+ name: 'monthCharge',
data() {
return {
- cidList:JSON.parse(localStorage.cid) || [], // 园区列表
- role:localStorage.role,
- // 数据列表
- dataList: [],
- // 遍历表头
- headers: [],
- // 遮罩层
- loading: true,
- // 总条数
- total: 0,
+ cidList: JSON.parse(localStorage.cid) || [], // 园区列表
+ role: localStorage.role, // 角色
+ dataList: [], // 数据列表
+ headers1: [ // 物业费展示的字段
+ 'cid','chargetype','chargetime','propertyid','begdate','enddate','lengthdate','constructionarea','unitprice',
+ 'realMoney','oweMoney','NowMoney','prepayMoney'],
+ headers2: [ // 电梯卡费展示的字段
+ 'cid','chargetype','chargetime','propertyid','accesscardid','begdate','enddate','lengthdate',
+ 'unitprice','realMoney','oweMoney','NowMoney','prepayMoney'],
+ headers3: [ // 车位费展示的字段
+ 'cid','chargetype','chargetime','propertyid','carportid','begdate','enddate','lengthdate','unitprice',
+ 'allUnitprice','rentoutPrice','allRentoutPrice','realMoney','oweMoney','NowMoney','prepayMoney'],
+ headers: [],
+ loading: false, // 遮罩层
+ total: 0, // 总条数
chenQianCharge: 0, // 陈欠收费金额
currentCharge: 0, // 当期收费金额
prepayCharge: 0, // 预缴收费金额
paidInCharge: 0, // 实缴金额
- // 查询参数
- queryParams: {
+ queryParams: { // 查询参数
cid: undefined,
chargetype: 1,
startDate: moment().format('yyyy-MM'),
- owe: 3,
- prepay: 12,
pageIndex: 1,
pageSize: 10,
},
- feesType: [
+ feesType: [ // 缴费类型
{ value: 1, label: '物业费' },
{ value: 2, label: '电梯卡费' },
{ value: 3, label: '车位费' }
@@ -128,27 +103,39 @@ export default {
this.getList()
},
methods: {
- /** 查询角色列表 */
+ // 查询角色列表
getList() {
+ this.headers = []
+ if (this.queryParams.chargetype == 1) { // 物业费
+ this.headers = this.headers1
+ } else if (this.queryParams.chargetype == 2) { // 电梯卡费
+ this.headers = this.headers2
+ } else { // 车位费
+ this.headers = this.headers3
+ }
this.loading = true
- chargeTotalPage(this.queryParams).then(
- response => {
- this.dataList = response.data.data
- this.total = response.data.count
- this.chenQianCharge = response.data.total.oweMoneyTotal
- this.currentCharge = response.data.total.NowMoneyTotal
- this.prepayCharge = response.data.total.prepayMoneyTotal
- this.paidInCharge = response.data.total.realMoneyTotal
- if (this.dataList.length > 0) this.headers = Object.keys(this.dataList[0])
- this.loading = false
- }
- )
+ chargeTotalPage(this.queryParams).then(({code, data}) => {
+ if (code === 200) {
+ this.dataList = data.data || []
+ this.total = data.count
+ this.chenQianCharge = data.total.oweMoneyTotal
+ this.currentCharge = data.total.NowMoneyTotal
+ this.prepayCharge = data.total.prepayMoneyTotal
+ this.paidInCharge = data.total.realMoneyTotal
+ }
+ this.loading = false
+ })
},
- /** 搜索按钮操作 */
+ // 搜索按钮操作
handleQuery() {
this.queryParams.pageIndex = 1
this.getList()
},
+ // 缴费类型字段映射
+ feesTypeEcho(data) {
+ const item = this.feesType.find(e=> e.value == data)
+ return item ? item.label : data
+ }
}
}