1

pages/Workorder/Tenantbill/Tenantbill.vue

@@ -64,9 +64,9 @@
 						<view class="Currentamount">
 							本期金额: <span>￥{{item.feeTotal}}</span>
 						</view>
-						<view class="Currentamount">
+					<!-- 	<view class="Currentamount">
 							欠费天数: {{item.elecAmount}}
-						</view>
+						</view> -->
 						<view class="Currentamount">
 							账户余额:￥{{item.balance}}
 						</view>
@@ -262,10 +262,10 @@
 				this.showtype = false;
 			},
 			confirmtype(e) {
-				//	console.log('111111111111111111', e.value[0])
+					console.log('111111111111111111', e.value[0])
 				this.showtype = false;
 				this.mytype = e.value[0].label;
-				this.dataForm.cycle = e.value[0].id;
+				this.dataForm.status = e.value[0].id;
 				this.indexList = [];
 				this.dataForm.page = 1;
 				this.getalldata();
@@ -283,7 +283,7 @@
 			getDate(type) {
 				const date = new Date();
 				let year = date.getFullYear();
-				let month = date.getMonth() + 1;
+				let month = date.getMonth() ;
 				if (type === 'start') {
 					year = year - 60;
 				} else if (type === 'end') {
@@ -388,7 +388,7 @@
 	.companylist {
 		margin: 20rpx 30rpx;
 		background: #fff;
-		height: 280rpx;
+		height: 230rpx;
 		border-radius: 10px;
 		position: relative;
 

pages/index/Immediatecollection/Immediatecollection.vue

@@ -49,6 +49,11 @@
 						              }">
 							{{ item.isExpedit == 1 ? "已催费" : "未催费" }}
 						</view>
+	<view class="outstanding" :style="{
+						                'background-color': item.isSettled == 1 ? '#09C700' : '#FA5555',
+						              }">
+							{{ item.isSettled == 1 ? "已结清" : "未结清" }}
+						</view>
 
 						<h3>{{item.tenantName}}</h3>
 						<view class="Currentamount">
@@ -66,7 +71,7 @@
 						<view class="Currentamount">
 							联系电话: {{item.phone}}
 						</view>
-						<view class="Callfee"  @click.stop="handleClick(item.id)">
+						<view class="Callfee" v-if="item.isSettled == 0"  @click.stop="handleClick(item.id)">
 							催费
 						</view>
 					</view>
@@ -288,13 +293,23 @@
 				this.getalldata();
 			},
 			confirmtypes(e) {
-				// console.log('22222', e.value[0])
-				this.showtypes = false;
-				this.mytypes = e.value[0].dictLabel;
-				this.dataForm.arrearDay = e.value[0].dictValue;
-				this.dataForm.page = 1;
-				this.indexList=[];
-				this.getalldata();
+				 console.log('22222', e.value[0])
+				 if(e.value[0].dictValue=='all'){
+					 
+					 this.showtypes = false;
+					 this.mytypes = e.value[0].dictLabel;
+					 this.dataForm.arrearDay = '';
+					 this.dataForm.page = 1;
+					 this.indexList=[];
+					 this.getalldata();
+				 }else{
+					 this.showtypes = false;
+					 this.mytypes = e.value[0].dictLabel;
+					 this.dataForm.arrearDay = e.value[0].dictValue;
+					 this.dataForm.page = 1;
+					 this.indexList=[];
+					 this.getalldata();
+				 }
 			},
 			canceltypes() {
 				this.showtypes = false;
@@ -398,7 +413,7 @@
 		color: #fff;
 		font-size: 14rpx;
 		position: absolute;
-		top: 0px;
+		top: 90rpx;
 		right: 0px;
 		border-top-right-radius: 10rpx;
 		border-bottom-left-radius: 10rpx;