|
|
@@ -1,10 +1,10 @@
|
|
|
<template>
|
|
|
<view class="billall">
|
|
|
- <u-cell-group>
|
|
|
+ <!-- <u-cell-group>
|
|
|
<u-cell :title="mytitle" value="修改" :isLink="true" @click="floorchange">
|
|
|
<u-icon slot="icon" size="40" name="map"></u-icon>
|
|
|
</u-cell>
|
|
|
- </u-cell-group>
|
|
|
+ </u-cell-group> -->
|
|
|
<view class="topbill">
|
|
|
<view class="topbilledit">
|
|
|
<view class="changetime1">
|
|
|
@@ -33,24 +33,6 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
- <!-- 列表 -->
|
|
|
- <!-- <t-table>
|
|
|
- <t-tr>
|
|
|
- <t-th>序号</t-th>
|
|
|
- <t-th>姓名</t-th>
|
|
|
- <t-th>年龄</t-th>
|
|
|
- <t-th>爱好</t-th>
|
|
|
- <t-th>操作</t-th>
|
|
|
- </t-tr>
|
|
|
- <t-tr v-for="item in tableList" :key="item.id">
|
|
|
- <t-td>{{ item.id + 1 }}</t-td>
|
|
|
- <t-td>{{ item.name }}</t-td>
|
|
|
- <t-td>{{ item.age }}</t-td>
|
|
|
- <t-td>{{ item.hobby }}</t-td>
|
|
|
- <t-td align="left"> <u-button @click="edit(item)" size="small" type="primary" :plain="true" text="编辑"></u-button></t-td>
|
|
|
-
|
|
|
- </t-tr>
|
|
|
- </t-table> -->
|
|
|
|
|
|
<view class="u-listdata">
|
|
|
|
|
|
@@ -59,26 +41,37 @@
|
|
|
<u-list-item v-for="(item, index) in indexList" :key="index">
|
|
|
|
|
|
<view class="companylist" @click="seedetail(item)">
|
|
|
- <view class="settled" v-if="item.status==1">
|
|
|
- 已结清
|
|
|
+ <!-- <view class="settled" v-if="item.isSettled==0">
|
|
|
+ 已催费
|
|
|
</view>
|
|
|
- <view class="outstanding" v-if="item.status==0">
|
|
|
- 未结清
|
|
|
+ <view class="outstanding" v-if="item.isSettled==1">
|
|
|
+ 未催费
|
|
|
+ </view> -->
|
|
|
+ <view class="settled" :style="{
|
|
|
+ 'background-color': item.isExpedit == 1 ? '#09C700' : '#FA5555',
|
|
|
+ }">
|
|
|
+ {{ item.isExpedit == 1 ? "已催费" : "未催费" }}
|
|
|
</view>
|
|
|
- <h3>{{item.name}}</h3>
|
|
|
+
|
|
|
+ <h3>{{item.tenantName}}</h3>
|
|
|
<view class="Currentamount">
|
|
|
- 本期金额: <span>￥{{item.feeTotal}}</span>
|
|
|
+ 欠费金额: <span>￥{{item.amount}}</span>
|
|
|
</view>
|
|
|
<view class="Currentamount">
|
|
|
- 欠费天数: {{item.elecAmount}}
|
|
|
+ 计费周期: {{item.costCycle}}
|
|
|
</view>
|
|
|
<view class="Currentamount">
|
|
|
- 账户余额:￥{{item.balance}}
|
|
|
+ 欠费天数:￥{{item.arrearDay}}
|
|
|
</view>
|
|
|
<view class="Currentamount">
|
|
|
- 联系电话: {{item.tel}}
|
|
|
+ 欠费类型: {{item.tel}}
|
|
|
+ </view>
|
|
|
+
|
|
|
+
|
|
|
+ <view class="Currentamount">
|
|
|
+ 联系电话: {{item.phone}}
|
|
|
</view>
|
|
|
- <view class="Callfee" v-if="item.status==0" @click.stop="handleClick(item.id)">
|
|
|
+ <view class="Callfee" @click.stop="handleClick(item.id)">
|
|
|
催费
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -89,73 +82,54 @@
|
|
|
</view>
|
|
|
|
|
|
|
|
|
-
|
|
|
+
|
|
|
|
|
|
<u-picker :show="showtype" :columns="columnstype" keyName="label" @confirm="confirmtype" @cancel='canceltype'>
|
|
|
</u-picker>
|
|
|
- <u-picker :show="showtypes" :columns="columnstypes" keyName="labels" @confirm="confirmtypes" @cancel='canceltypes'>
|
|
|
+ <u-picker :show="showtypes" :columns="columnstypes" keyName="dictLabel" @confirm="confirmtypes"
|
|
|
+ @cancel='canceltypes'>
|
|
|
</u-picker>
|
|
|
- <u-picker :show="showfloor" ref="uPicker" :loading="loading" @confirm="confirmfloor" @cancel='cancelfloor'
|
|
|
- :columns="columns" keyName="orgName" @change="changeHandler"></u-picker>
|
|
|
+
|
|
|
<u-notify ref="uNotify" :show="showdct" message="服务器请求失败"></u-notify>
|
|
|
</view>
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
- // import tTable from '@/components/t-table/t-table.vue';
|
|
|
- // import tTh from '@/components/t-table/t-th.vue';
|
|
|
- // import tTr from '@/components/t-table/t-tr.vue';
|
|
|
- // import tTd from '@/components/t-table/t-td.vue';
|
|
|
+ import {
|
|
|
+ isEmpty,
|
|
|
+ getDictDataList
|
|
|
+ } from "@/utils/index";
|
|
|
export default {
|
|
|
- components: {
|
|
|
- // tTable,
|
|
|
- // tTh,
|
|
|
- // tTr,
|
|
|
- // tTd
|
|
|
- },
|
|
|
+ components: {},
|
|
|
data() {
|
|
|
const currentDate = this.getDate({
|
|
|
format: 'yyyy-mm'
|
|
|
})
|
|
|
return {
|
|
|
setyesno: true,
|
|
|
- // tableList: [{
|
|
|
- // id: 0,
|
|
|
- // name: '张三',
|
|
|
- // age: '19',
|
|
|
- // hobby: '游泳'
|
|
|
- // },
|
|
|
- // {
|
|
|
- // id: 1,
|
|
|
- // name: '李四',
|
|
|
- // age: '21',
|
|
|
- // hobby: '绘画'
|
|
|
- // },
|
|
|
- // ],
|
|
|
indexList: [],
|
|
|
dataList: [],
|
|
|
dataForm: {
|
|
|
- projectId: "",
|
|
|
- buildingId: "",
|
|
|
- storeyId: "",
|
|
|
cycle: "",
|
|
|
- status: "",
|
|
|
+ billType: "",
|
|
|
+ arrearDay: "",
|
|
|
+ isExpedit: "",
|
|
|
page: 1,
|
|
|
limit: 10,
|
|
|
},
|
|
|
- showtypes:false,
|
|
|
+ showtypes: false,
|
|
|
showtype: false,
|
|
|
showdct: false,
|
|
|
mytitle: '',
|
|
|
alldata: [],
|
|
|
- showfloor: false,
|
|
|
+
|
|
|
loading: false,
|
|
|
columns: [],
|
|
|
pd: true,
|
|
|
columnData: [],
|
|
|
myday: '',
|
|
|
mytype: '全部',
|
|
|
- mytypes:"全部",
|
|
|
+ mytypes: "全部",
|
|
|
showPicker: false,
|
|
|
myday: currentDate,
|
|
|
columnstype: [
|
|
|
@@ -164,39 +138,30 @@
|
|
|
id: ''
|
|
|
}, {
|
|
|
label: '水费',
|
|
|
- id: 0
|
|
|
+ id: 'Water'
|
|
|
},
|
|
|
{
|
|
|
label: '电费',
|
|
|
- id: 1
|
|
|
+ id: 'Elec'
|
|
|
},
|
|
|
{
|
|
|
label: '物业费',
|
|
|
- id: 2
|
|
|
- }
|
|
|
- ]
|
|
|
- ],
|
|
|
- columnstypes: [
|
|
|
- [{
|
|
|
- labels: '全部',
|
|
|
- ids: ''
|
|
|
- }, {
|
|
|
- labels: '30天以内',
|
|
|
- ids: 0
|
|
|
- },
|
|
|
- {
|
|
|
- labels: '30天以上',
|
|
|
- ids: 1
|
|
|
+ id: 'PropertyFee'
|
|
|
}
|
|
|
]
|
|
|
],
|
|
|
+ columnstypes: [],
|
|
|
|
|
|
|
|
|
}
|
|
|
},
|
|
|
//监听页面加载，其参数为上个页面传递的数据，参数类型为 Object（用于页面传参
|
|
|
onLoad() {
|
|
|
- this.getfloor();
|
|
|
+ this.columnstypes = [getDictDataList("ArrearageDay")];
|
|
|
+
|
|
|
+
|
|
|
+ console.log('00', getDictDataList("ArrearageDay"), getDictDataList("PayType"), getDictDataList("isExpedit"))
|
|
|
+
|
|
|
// this.loadmore();
|
|
|
},
|
|
|
//监听页面初次渲染完成。注意如果渲染速度快，会在页面进入动画完成前触发
|
|
|
@@ -216,16 +181,11 @@
|
|
|
|
|
|
methods: {
|
|
|
seedetail(e) {
|
|
|
- // console.log('222',e)
|
|
|
- let faltesdata = {
|
|
|
- name: e.name,
|
|
|
- id: e.id,
|
|
|
- cycle: e.cycle
|
|
|
- }
|
|
|
+ console.log('222',e.tenantName)
|
|
|
+
|
|
|
// console.log('111111111111111111',faltesdata)
|
|
|
uni.navigateTo({
|
|
|
- url: "/pages/Workorder/Tenantbill/companybill/companybill?para=" + encodeURIComponent(JSON
|
|
|
- .stringify(faltesdata))
|
|
|
+ url: `/pages/index/Immediatecollection/Chargedetails/Chargedetails?companyOrgId=${e.tenantName}`
|
|
|
})
|
|
|
},
|
|
|
handleClick(e) {
|
|
|
@@ -257,12 +217,12 @@
|
|
|
return
|
|
|
}
|
|
|
},
|
|
|
- typechanges(){
|
|
|
+ typechanges() {
|
|
|
this.showtypes = true;
|
|
|
},
|
|
|
getalldata() {
|
|
|
|
|
|
- this.$api.get('/billinfo/paypage', this.dataForm)
|
|
|
+ this.$api.get('/expeditrecord/apppage', this.dataForm)
|
|
|
.then(res => {
|
|
|
|
|
|
if (res.data.data.list.length != 0) {
|
|
|
@@ -281,18 +241,7 @@
|
|
|
})
|
|
|
},
|
|
|
|
|
|
- loadmore() {
|
|
|
- // for (let i = 0; i < 30; i++) {
|
|
|
- // this.indexList.push({
|
|
|
- // url: this.urls[uni.$u.random(0, this.urls.length - 1)]
|
|
|
- // })
|
|
|
- // }
|
|
|
- },
|
|
|
|
|
|
-
|
|
|
- // edit(item) {
|
|
|
- // console.log('111111111111111111', item)
|
|
|
- // },
|
|
|
canceltype() {
|
|
|
this.showtype = false;
|
|
|
},
|
|
|
@@ -300,15 +249,15 @@
|
|
|
// console.log('111111111111111111', e.value[0])
|
|
|
this.showtype = false;
|
|
|
this.mytype = e.value[0].label;
|
|
|
- this.dataForm.cycle = e.value[0].id;
|
|
|
+ this.dataForm.billType = e.value[0].id;
|
|
|
this.dataForm.page = 1;
|
|
|
this.getalldata();
|
|
|
},
|
|
|
confirmtypes(e) {
|
|
|
- // console.log('111111111111111111', e.value[0])
|
|
|
+ // console.log('22222', e.value[0])
|
|
|
this.showtypes = false;
|
|
|
- this.mytypes = e.value[0].labels;
|
|
|
- this.dataForm.cycle = e.value[0].id;
|
|
|
+ this.mytypes = e.value[0].dictLabel;
|
|
|
+ this.dataForm.arrearDay = e.value[0].dictValue;
|
|
|
this.dataForm.page = 1;
|
|
|
this.getalldata();
|
|
|
},
|
|
|
@@ -319,6 +268,7 @@
|
|
|
this.showtype = true;
|
|
|
},
|
|
|
dateChange(e) {
|
|
|
+ // console.log('3333',e)
|
|
|
this.myday = e.target.value;
|
|
|
this.dataForm.cycle = e.target.value;
|
|
|
this.dataForm.page = 1;
|
|
|
@@ -337,62 +287,10 @@
|
|
|
// day = day > 9 ? day : '0' + day;
|
|
|
return `${year}-${month}`;
|
|
|
},
|
|
|
- getfloor() {
|
|
|
- this.$api.get('/control/getOrgStructureTree/', {})
|
|
|
- .then(res => {
|
|
|
|
|
|
- if (res.data.code == 0) {
|
|
|
- this.dataForm.projectId = res.data.data[0].orgId;
|
|
|
-
|
|
|
- this.mytitle = res.data.data[0].orgName;
|
|
|
- this.alldata = res.data.data[0].childrenList;
|
|
|
- //console.log('111111111111111111', res.data.data[0].childrenList)
|
|
|
- this.columns = [
|
|
|
- res.data.data[0].childrenList,
|
|
|
- res.data.data[0].childrenList[0].childrenList
|
|
|
- ]
|
|
|
- let allfloor = [];
|
|
|
- for (let i = 0; i < res.data.data[0].childrenList.length; i++) {
|
|
|
- allfloor.push(res.data.data[0].childrenList[i].childrenList)
|
|
|
- }
|
|
|
- // console.log('111111111111111111',allfloor)
|
|
|
- this.columnData = allfloor;
|
|
|
- this.dataForm.page = 1;
|
|
|
- this.getalldata();
|
|
|
- } else {
|
|
|
- this.showdct = true
|
|
|
- }
|
|
|
- })
|
|
|
- },
|
|
|
|
|
|
- floorchange() {
|
|
|
- this.showfloor = true;
|
|
|
- },
|
|
|
- changeHandler(e) {
|
|
|
- const {
|
|
|
- columnIndex,
|
|
|
- index,
|
|
|
- // 微信小程序无法将picker实例传出来，只能通过ref操作
|
|
|
- picker = this.$refs.uPicker
|
|
|
- } = e
|
|
|
- if (columnIndex === 0) {
|
|
|
- this.loading = true
|
|
|
- picker.setColumnValues(1, this.columnData[index])
|
|
|
- this.loading = false
|
|
|
- }
|
|
|
- this.getalldata();
|
|
|
- },
|
|
|
- confirmfloor(e) {
|
|
|
- console.log('222222', e.value)
|
|
|
- this.mytitle = e.value[0].orgName + e.value[1].orgName;
|
|
|
- this.dataForm.buildingId = e.value[0].orgId;
|
|
|
- this.dataForm.storeyId = e.value[1].orgId;
|
|
|
- this.showfloor = false;
|
|
|
- this.getalldata();
|
|
|
- },
|
|
|
- cancelfloor() {
|
|
|
- this.showfloor = false;
|
|
|
- },
|
|
|
+
|
|
|
+
|
|
|
|
|
|
|
|
|
}
|
|
|
@@ -429,7 +327,7 @@
|
|
|
.companylist {
|
|
|
margin: 20rpx 30rpx;
|
|
|
background: #fff;
|
|
|
- height: 280rpx;
|
|
|
+ height: 340rpx;
|
|
|
border-radius: 10px;
|
|
|
position: relative;
|
|
|
|
