12

property_ui/api/work/manage.js

@@ -226,3 +226,51 @@ export function staffTrainTime(data) {
     'data': data
   })
 }
+
+// 物业费管理-列表wuYe:fee:list
+export function feeList(data) {
+  return request({
+    url: '/wuYe/fee/list',
+    method: 'get',
+    'data': data
+  })
+}
+// 物业费管理-详情wuYe:fee:query
+export function feeDet(data) {
+  return request({
+    url: '/wuYe/fee/'+data,
+    method: 'get',
+  })
+}
+// 物业费管理-统计wuYe:fee:statistics
+export function feeCount(data) {
+  return request({
+    url: '/wuYe/fee/statistics',
+    method: 'get',
+    'data': data
+  })
+}
+// 物业费管理-催缴wuYe:fee:callPayment
+export function feecallPaymentId(data) {
+  return request({
+    url: '/wuYe/fee/callPayment/'+data,
+    method: 'get',
+  })
+}
+// 物业费管理-一键催缴wuYe:fee:callPaymentAll
+export function feecallPaymentAll(data) {
+  return request({
+    url: '/wuYe/fee/callPaymentAll',
+    method: 'get',
+    'data': data
+  })
+}
+
+
+
+
+
+
+
+
+

property_ui/car/pages/carku.vue

@@ -11,7 +11,7 @@
 		</view>
 		<!-- 列表 -->
 		<view class="carlists">
-			<car-list :datainfo="list" :topval="tabval" :wtdt="wtdt" type='carku'></car-list>
+			<car-list :datainfo="list" :wtdt="wtdt" type='carku'></car-list>
 		</view>
 		<loading></loading>
 	</view>

property_ui/health/components/box/list.vue

@@ -86,12 +86,6 @@
 					return 0
 				}
 			},
-			topval:{
-				type:String,
-				default () {
-					return ''
-				}
-			}
 		},
 		data(){
 			return{

property_ui/manage/components/car/list.vue

@@ -276,8 +276,8 @@
 					<view class="stabox flexc">
 						<view class="time flex1">{{ite.publishTime}}</view>
 						<view class="btns flexc">
-							<!-- <image :src="star" class="imga"></image>42 -->
-							<image :src="stara" class="imga"></image>42
+							<image :src="star" class="imga" v-if="ite.isStars=='Y'"></image>
+							<image :src="stara" class="imga" v-else></image>{{ite.starsCount||0}}
 						</view>
 						<view class="btns flexc">
 							<image :src="eye" class="imgb"></image>{{ite.viewCount}}
@@ -454,8 +454,8 @@
 				housea:require("@/work/static/manage/housea.png"),
 				home:require("@/service/static/service/home.png"),
 				upimg:require("@/static/images/home/up.png"),
-				star:require('@/manage/static/community/star.png'),
-				stara:require('@/manage/static/community/stara.png'),
+				star:require('@/manage/static/news/starb.png'),
+				stara:require('@/manage/static/news/stara.png'),
 				eye:require('@/manage/static/community/eye.png'),
 				baseUrl:config.baseUrl,
 				delBtnWidth:66,//左滑默认宽度

property_ui/manage/pages/community/newsadd.vue

@@ -14,7 +14,7 @@
 					<uni-forms-item label="是否启用" name="status">
 						<view class="flexc" @click="getChangeFn">
 							<view class="flex1"></view>
-							<image :src="check" v-if="datainfo.status=='0'" class="checkimg"></image>
+							<image :src="check" v-if="datainfo.status=='1'" class="checkimg"></image>
 							<image :src="ncheck" v-else class="checkimg"></image>
 						</view>
 					</uni-forms-item>
@@ -126,7 +126,7 @@
 					"manualTitle":"",//员工培训手册标题
 					"manualType":"1",//员工培训手册类型（1：图片 2:视频）
 					"manualContent":"",//员工培训手册内容
-					"status":"0",//员工培训手册状态
+					"status":"1",//员工培训手册状态
 					"publishTime":"",//发布时间
 					// "videoUrl":"视频地址URL",
 					// "coverImage":"封面图片",
@@ -190,10 +190,10 @@
 				if(this.isdisabled){
 					return
 				}
-				if(this.datainfo.status=='0'){
-					this.datainfo.status='1'
+				if(this.datainfo.status=='1'){
+					this.datainfo.status='2'
 				}else{
-					this.datainfo.status='0'
+					this.datainfo.status='1'
 				}
 			},
 			init(){

property_ui/manage/pages/community/newsadddj.vue

@@ -23,7 +23,7 @@
 					<uni-forms-item label="是否启用" name="status">
 						<view class="flexc" @click="getChangeFn">
 							<view class="flex1"></view>
-							<image :src="check" v-if="datainfo.status=='Y'" class="checkimg"></image>
+							<image :src="check" v-if="datainfo.status=='1'" class="checkimg"></image>
 							<image :src="ncheck" v-else class="checkimg"></image>
 						</view>
 					</uni-forms-item>
@@ -142,7 +142,7 @@
 					"partyTitle":"",//建资讯标题
 					"partyType":"",//建资讯类型（1：党建活动 2：党建学习3：党建知识）
 					"partyContent":"",//建资讯内容
-					"status":"0",//建资讯状态（0正常 1关闭）
+					"status":"1",//建资讯状态（1正常 2关闭）
 					"publishTime":"",//发布时间
 					// "coverImage":"封面图片",
 					// "author":"作者",
@@ -206,10 +206,10 @@
 				if(this.isdisabled){
 					return
 				}
-				if(this.datainfo.status=='Y'){
-					this.datainfo.status='N'
+				if(this.datainfo.status=='1'){
+					this.datainfo.status='2'
 				}else{
-					this.datainfo.status='Y'
+					this.datainfo.status='1'
 				}
 			},
 			init(){

property_ui/manage/pages/community/newsaddsq.vue

@@ -23,7 +23,7 @@
 					<uni-forms-item label="是否启用" name="status">
 						<view class="flexc" @click="getChangeFn">
 							<view class="flex1"></view>
-							<image :src="check" v-if="datainfo.status=='0'" class="checkimg"></image>
+							<image :src="check" v-if="datainfo.status=='1'" class="checkimg"></image>
 							<image :src="ncheck" v-else class="checkimg"></image>
 						</view>
 					</uni-forms-item>
@@ -143,7 +143,7 @@
 					"communityTitle":"",//社区资讯标题
 					"communityType":"",//社区资讯类型（1：公告 2：通知 3：资讯）
 					"communityContent":"",//社区资讯内容
-					"status":"0",//社区资讯状态（0正常 1关闭）
+					"status":"1",//社区资讯状态（1正常 2关闭）
 	//				"publishTime":"",//发布时间
 					// "coverImage":"封面图片",
 					// "author":"作者",
@@ -207,10 +207,10 @@
 				if(this.isdisabled){
 					return
 				}
-				if(this.datainfo.status=='0'){
-					this.datainfo.status='1'
+				if(this.datainfo.status=='1'){
+					this.datainfo.status='2'
 				}else{
-					this.datainfo.status='0'
+					this.datainfo.status='1'
 				}
 			},
 			init(){

property_ui/manage/pages/community/newsaddvideo.vue

@@ -14,7 +14,7 @@
 					<uni-forms-item label="是否启用" name="status">
 						<view class="flexc" @click="getChangeFn">
 							<view class="flex1"></view>
-							<image :src="check" v-if="datainfo.status=='0'" class="checkimg"></image>
+							<image :src="check" v-if="datainfo.status=='1'" class="checkimg"></image>
 							<image :src="ncheck" v-else class="checkimg"></image>
 						</view>
 					</uni-forms-item>
@@ -109,7 +109,7 @@
 					"manualTitle":"",//员工培训手册标题
 					"manualType":"2",//员工培训手册类型（1：图片 2:视频）
 					"manualContent":"",//员工培训手册内容
-					"status":"0",//员工培训手册状态（0正常 1关闭）
+					"status":"1",//员工培训手册状态（1正常 2关闭）
 					"publishTime":"",//发布时间
 					"videoUrl":"",//视频地址URL
 					// "coverImage":"封面图片",
@@ -163,10 +163,10 @@
 					return
 				}
 				console.log(this.datainfo.status)
-				if(this.datainfo.status=='0'){
-					this.datainfo.status='1'
+				if(this.datainfo.status=='1'){
+					this.datainfo.status='2'
 				}else{
-					this.datainfo.status='0'
+					this.datainfo.status='1'
 				}
 			},
 			// 上传

property_ui/manage/pages/community/newssq.vue

@@ -10,7 +10,7 @@
 		</view>
 		<!-- 列表 -->
 		<view class="carlists">
-			<car-list :datainfo="list" :wzlxList="wzlxList" :topval="tabval" :wtdt="wtdt" type='newssq' @getDetail="getDetail" @getDelFn="getDelFn" @getPut="getPut"></car-list>
+			<car-list :datainfo="list" :wzlxList="wzlxList"  :wtdt="wtdt" type='newssq' @getDetail="getDetail" @getDelFn="getDelFn" @getPut="getPut"></car-list>
 		</view>
 		<view class="rfbtn" @click="getAddFn">发布</view>
 		<loading></loading>

property_ui/manage/pages/community/readcount.vue

@@ -34,7 +34,7 @@
 		</view>
 		<!-- 列表 -->
 		<view class="carlists">
-			<car-list :datainfo="list" :topval="tabval" :wtdt="wtdt" type='readcount' @getDetail="getDetail"></car-list>
+			<car-list :datainfo="list" :wtdt="wtdt" type='readcount' @getDetail="getDetail"></car-list>
 		</view>
 		<loading></loading>
 	</view>

property_ui/manage/pages/community/readlist.vue

@@ -24,7 +24,7 @@
 		</view>
 		<!-- 列表 -->
 		<view class="carlists">
-			<car-list :datainfo="list" :topval="tabval" :wtdt="wtdt" type='readlist' @getDetail="getDetail"></car-list>
+			<car-list :datainfo="list" :wtdt="wtdt" type='readlist' @getDetail="getDetail"></car-list>
 		</view>
 		<loading></loading>
 	</view>

property_ui/service/components/car/list.vue

@@ -55,7 +55,7 @@
 							<!-- <view class="txt coa" v-if="ite.type==3">已完成</view>
 							<view class="txt co28" v-if="ite.type==2">处理中</view> -->
 						</view>
-						<view class="walist"><view class="tit">小区名称</view>：{{ite.portalId}}</view>
+						<view class="walist"><view class="tit">小区名称</view>：{{ite.communityName}}</view>
 						<view class="walist"><view class="tit">报修门户</view>：{{ite.houseAddress}}</view>
 						<view class="walist"><view class="tit">报修时间</view>：{{ite.repairTime}}</view>
 						<view class="walist" v-if="ite.type==3"><view class="tit" >完成时间</view>：{{ite.completionTime}}</view>

property_ui/service/pages/service/complaint.vue

@@ -21,7 +21,7 @@
 		</view>
 		<!-- 列表 -->
 		<view class="carlists">
-			<car-list :datainfo="list" :tsjyList="tsjyList" :topval="tabval" :wtdt="wtdt" type='complaint' @getDetail="getDetail" @getDelFn="getDelFn"></car-list>
+			<car-list :datainfo="list" :tsjyList="tsjyList"  :wtdt="wtdt" type='complaint' @getDetail="getDetail" @getDelFn="getDelFn"></car-list>
 		</view>
 		<loading></loading>
 	</view>

property_ui/service/pages/service/warrantydetail.vue

@@ -49,7 +49,7 @@
 					<view>基础信息</view>
 					<view class="flex1"></view>
 				</view>
-				<view class="walist watxt"><view class="wtit">小区名称</view><view class="wtxt">幸福小区</view></view>
+				<view class="walist watxt"><view class="wtit">小区名称</view><view class="wtxt">{{datainfo.communityName}}</view></view>
 				<view class="walist watxt"><view class="wtit">报修门户</view><view class="wtxt">{{datainfo.houseAddress}}</view></view>
 				<view class="walist watxt"><view class="wtit">报修时间</view><view class="wtxt">{{datainfo.repairTime}}</view></view>
 				<view class="walist watxt"><view class="wtit">联系方式</view><view class="wtxt">{{datainfo.phoneNumber}}</view></view>

property_ui/static/style.css

@@ -49,6 +49,7 @@ font-weight: bold;font-size: 26rpx;color: #FFFFFF;background: #0256FD;border-rad
 .co02{color: #0256FD;}
 .cof6{color: #FF6161;}
 .co06{color: #06C770;}
+.co16{color: #16BE7F;}
 
 .pdlr12{padding: 0 24rpx;}
 .plr15{padding: 0 30rpx;}

property_ui/work/components/car/list.vue

@@ -51,15 +51,15 @@
 				<view class="delleft" style="padding: 0 24rpx;">
 					<view class="carltop flexc">
 						<view class="flex1">
-							<view class="tit mb6" :class="ite.vehicleType==1?'co01':'co16'">{{ite.plateNumber}}</view>
+							<view class="tit mb6" :class="ite.vehicleType=='新能源'?'co16':'co01'">{{ite.plateNumber}}</view>
 							<view class="txt flexc">
-								<!-- {{ite.plateNumber}} -->
-								<view class="txtbtn flexcc">{{kaType(ite.vehicleBrand,clcxList)}}</view>
+								{{kaType(ite.vehicleBrand,clcxList)}}
+								<view class="txtbtn flexcc">{{ite.vehicleType}}</view>
 								<!-- <view class="txtbtn flexcc" v-if="ite.vehicleType==2">新能源</view> -->
 							</view>
 						</view>
-						<image :src="cara" class="cara" v-if="ite.vehicleType==1"></image>
-						<image :src="carb" class="carb" v-if="ite.vehicleType==2"></image>
+						<image :src="carb" class="carb" v-if="ite.vehicleType=='新能源'"></image>
+						<image :src="cara" class="cara" v-else></image>
 					</view>
 					<view class="carlf">
 						<view class="clflist">发动机号码 ：{{ite.engineNumber}}</view>
@@ -76,22 +76,22 @@
 		</block>
 		<!-- 物业费管理 -->
 		<block v-if="type=='money'">
-			<view class="carlist peolist" v-for="(ite,idx) in datainfo" :key="idx" @click="getDetail">
+			<view class="carlist peolist" v-for="(ite,idx) in datainfo" :key="idx" @click="getDetail(ite.propertyId)">
 				<view class="ctop flexc" style="padding: 26rpx 24rpx 24rpx;">
 					<image :src="hicoa" class="imgs"></image>
-					<view class="tit">幸福小区12#301</view>
+					<view class="tit">{{ite.detailedAddress}}</view>
 					<view class="flex1"></view>
-					<view class="txta">2024/01 -2024/12</view>
+					<view class="txta">{{ite.year}}/01 -{{ite.year}}/12</view>
 				</view>
 				<view class="clists flexc">
 					<view class="mlistl">
 						<view class="mltit">应缴总额 /元</view>
-						<view class="mltxt">4307.20</view>
+						<view class="mltxt">{{ite.totalExpense}}</view>
 					</view>
 					<view class="mlistr">
-						<view class="clist"><view class="tit">物业费用：</view>3247.20元</view>
-						<view class="clist"><view class="tit">车位费用：</view>960.00元</view>
-						<view class="clist"><view class="tit">能耗费用：</view>100.00元</view>
+						<view class="clist"><view class="tit">物业费用：</view>{{ite.tenementExpense}}元</view>
+						<view class="clist"><view class="tit">车位费用：</view>{{ite.parkingExpense}}元</view>
+						<view class="clist"><view class="tit">能耗费用：</view>{{ite.energyExpense}}元</view>
 					</view>
 				</view>
 			</view>
@@ -101,21 +101,21 @@
 			<view class="carlist peolist" v-for="(ite,idx) in datainfo" :key="idx">
 				<view class="ctop flexc" style="padding: 26rpx 24rpx 24rpx;">
 					<image :src="time" class="imgs"></image>
-					<view class="tit">2024/01 -2024/12</view>
-					<view class="btn btnbgb" v-if="ite.type==1">已缴费</view>
+					<view class="tit">{{ite.year}}/01 {{ite.year}}/12</view>
+					<view class="btn btnbgb" v-if="ite.isExpense=='Y'">已缴费</view>
 					<view class="btn btnbgc" v-else>未缴费</view>
 					<view class="flex1"></view>
-					<view class="txta">1号楼3单元1102</view>
+					<view class="txta">{{ite.detailedAddress}}</view>
 				</view>
 				<view class="clists flexc">
 					<view class="mlistl">
 						<view class="mltit">应缴总额 /元</view>
-						<view class="mltxt">4307.20</view>
+						<view class="mltxt">{{ite.totalExpense}}</view>
 					</view>
 					<view class="mlistr">
-						<view class="clist"><view class="tit">物业费用：</view>3247.20元</view>
-						<view class="clist"><view class="tit">车位费用：</view>960.00元</view>
-						<view class="clist"><view class="tit">能耗费用：</view>100.00元</view>
+						<view class="clist"><view class="tit">物业费用：</view>{{ite.tenementExpense}}元</view>
+						<view class="clist"><view class="tit">车位费用：</view>{{ite.parkingExpense}}元</view>
+						<view class="clist"><view class="tit">能耗费用：</view>{{ite.energyExpense}}元</view>
 					</view>
 				</view>
 			</view>
@@ -255,12 +255,6 @@
 					return 0
 				}
 			},
-			topval:{
-				type:String,
-				default () {
-					return ''
-				}
-			},
 				
 			clcxList:{
 				type:Array,
@@ -273,8 +267,8 @@
 			return{
 				noiconpimg:require("@/static/nodata.png"),
 				car:require("@/car/static/car/car.png"),
-				cara:require("@/car/static/car/cara.png"),
-				carb:require("@/car/static/car/carb.png"),
+				cara:require("@/car/static/car/carba.png"),
+				carb:require("@/car/static/car/carbb.png"),
 				hicoa:require("@/people/static/people/hicoa.png"),
 				hicob:require("@/people/static/people/hicob.png"),
 				man:require("@/people/static/people/man.png"),
@@ -329,6 +323,21 @@
 				// this.datainfo.splice(idx,1,obj);
 				this.datainfo[idx].zhanflag=!this.datainfo[idx].zhanflag
 			},
+			getDelFn(id){
+				var that=this;
+				uni.showModal({
+					title: '确认删除',
+					content: "是否确认删除",
+					cancelText: '取消',
+					confirmText: '确认',
+					success: function(res) {
+						if (res.confirm) {
+							that.$emit('getDelFn',id)
+						} else if (res.cancel) {
+						}
+					}
+				});
+			},
 			getPreview(idx,arr) {
 				var newArr=[];
 				arr.forEach(ite=>{

property_ui/work/pages/manage/addhouse.vue

@@ -123,9 +123,9 @@
 							</view>
 						</picker>
 					</uni-forms-item>
-					<uni-forms-item label="车位号" name="phonenumber">
+					<uni-forms-item label="车位号" name="parkingNumber">
 						<view class="flexc">
-							<uni-easyinput :disabled="isdisabled" v-model="datainfo.phonenumber" :inputBorder='false' placeholder="请输入车位号" />
+							<uni-easyinput :disabled="isdisabled" v-model="datainfo.parkingNumber" :inputBorder='false' placeholder="请输入车位号" />
 							<view class="rimg"></view>
 						</view>
 					</uni-forms-item>
@@ -225,7 +225,8 @@
 					 "detailedAddress":"",//房屋的详细门牌号
 					 "hasParkingSpace":"",//是否有车位，Y表示有，N表示无
 					 "communityName":"",//房屋所在小区名称
-					 "houseStatus":""//房屋状态：1-自住，2-出租，3-空闲，4-待售
+					 "houseStatus":"",//房屋状态：1-自住，2-出租，3-空闲，4-待售
+					 "parkingNumber":'',//车位号
 				},
 				rules: {
 				  location: {rules: [{required: true,errorMessage: '请输入房屋坐落位置' }]},

property_ui/work/pages/manage/money.vue

@@ -5,7 +5,7 @@
 				<image :src="reset" class="resetimg" @click="getReset"></image>
 				<picker mode="date"  fields="year"  @change='bindDateChangea'>
 					<view class="chekt flexc">
-						<view>{{cxrq|| "选择日期"}}</view>
+						<view>{{year+'年度'|| "选择年度"}}</view>
 						<image :src="up"></image>
 					</view>
 				</picker>
@@ -22,23 +22,23 @@
 					<view class="mcontb">
 						<view class="w50">
 							<view class="mctit">已缴物业费 /元</view>
-							<view class="mctxt over">1,482,800</view>
+							<view class="mctxt over">{{infoCount.yjwyf}}</view>
 						</view>
 						<view class="w50">
 							<view class="mctit">未缴物业费 /元</view>
-							<view class="mctxt over">281,600</view>
+							<view class="mctxt over">{{infoCount.wjwyf}}</view>
 						</view>
 					</view>
 					<view class="mcontc">
 						<view class="w50">
 							<view class="mctit mb10">车位费 /元</view>
-							<view class="mctxta">已缴费：<text>626,400</text></view>
-							<view class="mctxta">未缴费：<text>626,400</text></view>
+							<view class="mctxta">已缴费：<text>{{infoCount.yjcwf}}</text></view>
+							<view class="mctxta">未缴费：<text>{{infoCount.wjcwf}}</text></view>
 						</view>
 						<view class="w50">
 							<view class="mctit mb10">能耗费 /元</view>
-							<view class="mctxta">已缴费：<text>626,400</text></view>
-							<view class="mctxta">未缴费：<text>626,400</text></view>
+							<view class="mctxta">已缴费：<text>{{infoCount.yjnhf}}</text></view>
+							<view class="mctxta">未缴费：<text>{{infoCount.wjnhf}}</text></view>
 						</view>
 					</view>
 				</view>
@@ -49,9 +49,12 @@
 		</view>
 		<!-- 列表 -->
 		<view class="carlists">
-			<car-list :datainfo="list" :topval="tabval" :wtdt="wtdt" type='money' @getDetail="getDetail"></car-list>
+			<car-list :datainfo="list" :wtdt="wtdt" type='money' @getDetail="getDetail"></car-list>
 		</view>
-		<view class="rfbtn" @click="getAddFn">一键催缴</view>
+		<block v-if="checkPermi(['wuYe:fee:callPaymentAll'])">
+			<view style="height: 100rpx;"></view>
+			<view class="rfbtn" @click="getcallPayFn">一键催缴</view>
+		</block>
 		<loading></loading>
 	</view>
 </template>
@@ -60,6 +63,7 @@
 	import config from '@/config'
 	const baseUrl = config.baseUrl
 	import carList from "@/work/components/car/list.vue"
+	import {feeCount,feeList,feecallPaymentAll} from "@/api/work/manage.js"
 	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
 	export default{
 		components:{carList},
@@ -69,19 +73,23 @@
 				contbg:require('@/work/static/manage/contbg.png'),
 				search:require('@/car/static/car/search.png'),
 				up:require('@/car/static/car/up.png'),
-				cxrq:"",
+				year:"",
 				text:'',
-				list:[{tit:'皖A IC520',type:1},{tit:'晋E KD783',type:2},],
+				list:[],
 				pageSize: 10,
 				pageNum: 1,
 				reachflag: true,
 				wtdt:'',
-				tabval:'0',
-				tablist:[{tit:'未缴费',val:0},{tit:'已缴费',val:1},]
+				tabval:'N',
+				tablist:[{tit:'未缴费',val:'N'},{tit:'已缴费',val:'Y'},],
+				infoCount:'',
 			}
 		},
 		onLoad: function() {
-		
+			var date = new Date();
+			this.year=date.getFullYear();
+			this.getfeeCount()
+			this.getDataFn()
 		},
 		// 上拉触底加载更多触发事件
 		onReachBottom() {
@@ -92,17 +100,18 @@
 		},
 		methods:{
 			checkPermi, checkRole,
-			getDetail(){
-				this.$tab.navigateTo("/work/pages/manage/moneydetail")
+			gettime(){
+				var date = new Date();
+				var y = date.getFullYear();
+				this.year=date.getFullYear();
 			},
-			getAddFn(){
-				
+			getDetail(id){
+				this.$tab.navigateTo("/work/pages/manage/moneydetail?id="+id)
 			},
 			getConfirm(){
 				this.getrefreshData()
 			},
 			getReset(){
-				this.cxrq='';
 				this.text='';
 				this.getrefreshData()
 			},
@@ -110,22 +119,55 @@
 				this.pageNum=1;
 				this.list=[];
 				this.reachflag=true;
-				this.getDataFn()
+				this.getDataFn();
+				this.getfeeCount()
 			},
 			getTabFn(val){
-				this.tabval=val
+				this.tabval=val;
+				this.pageNum=1;
+				this.list=[];
+				this.reachflag=true;
+				this.getDataFn();
 			},
 			bindDateChangea(e){
 				var val=e.detail.value;
-				this.cxrq=val;
+				this.year=val;
+				this.getrefreshData();
+			},
+			getfeeCount(){
+				var params={
+					year:this.year
+				}
+				if(this.text){
+					params.detailedAddress=this.text
+				}
+				feeCount(params).then(res=>{
+					if(res.code==200){
+						this.infoCount=res.data
+					}
+				})
+			},
+			getcallPayFn(){
+				var params={
+					year:this.year
+				}
+				feecallPaymentAll(params).then(res=>{
+					if(res.code==200){
+						this.$toast(res.msg)
+					}
+				})
 			},
 			getDataFn(){
 				var params={
 					pageSize:this.pageSize,
 					pageNum: this.pageNum,
+					isExpense:this.tabval,
+					year:this.year
+				}
+				if(this.text){
+					params.detailedAddress=this.text
 				}
-				params.noticeType=this.tabidx
-				getNoticeList(params).then(res=>{
+				feeList(params).then(res=>{
 					if(res.code==200){
 						if (res.rows.length < this.pageSize) {
 							this.reachflag = false
@@ -158,7 +200,7 @@
 	page{background: #F3F3F0;}
 </style>
 <style lang="scss" scoped>
-.car{padding: 624rpx 0 110rpx;}
+.car{padding: 624rpx 0 10rpx;}
 .cartop{position: fixed;left: 0;right: 0;top: 0;background-color: #ffffff;z-index: 2;
 	.topa{padding: 20rpx ;
 		.resetimg{width: 36rpx;height: 36rpx;margin-right: 24rpx;flex: 0 0 auto;}

property_ui/work/pages/manage/moneybill.vue

@@ -21,9 +21,12 @@
 		</view>
 		<!-- 列表 -->
 		<view class="carlists">
-			<car-list :datainfo="list" :topval="tabval" :wtdt="wtdt" type='moneybill' @getDetail="getDetail"></car-list>
+			<car-list :datainfo="list"  :wtdt="wtdt" type='moneybill' @getDetail="getDetail"></car-list>
 		</view>
-		<view class="rfbtn" @click="getAddFn">催缴</view>
+		<block v-if="checkPermi(['wuYe:fee:callPaymentAll'])">
+			<view style="height: 100rpx;"></view>
+			<view class="rfbtn" @click="getcallPayFn">一键催缴</view>
+		</block>
 		<loading></loading>
 	</view>
 </template>
@@ -32,6 +35,7 @@
 	import config from '@/config'
 	const baseUrl = config.baseUrl
 	import carList from "@/work/components/car/list.vue"
+	import {feeList,feecallPaymentAll} from "@/api/work/manage.js"
 	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
 	export default{
 		components:{carList},
@@ -42,17 +46,17 @@
 				// up:require('@/car/static/car/up.png'),
 				cxrq:"",
 				text:'',
-				list:[{tit:'皖A IC520',type:1},{tit:'晋E KD783',type:2},],
+				list:[],
 				pageSize: 10,
 				pageNum: 1,
 				reachflag: true,
 				wtdt:'',
 				tabval:'0',
-				tablist:[{tit:'全部',val:0},{tit:'未缴费',val:1},{tit:'已缴费',val:2},]
+				tablist:[{tit:'全部',val:0},{tit:'未缴费',val:'N'},{tit:'已缴费',val:'Y'},]
 			}
 		},
 		onLoad: function() {
-		
+			this.getDataFn()
 		},
 		// 上拉触底加载更多触发事件
 		onReachBottom() {
@@ -84,19 +88,32 @@
 				this.getDataFn()
 			},
 			getTabFn(val){
-				this.tabval=val
+				this.tabval=val;
+				this.getrefreshData()
 			},
 			bindDateChangea(e){
 				var val=e.detail.value;
 				this.cxrq=val;
 			},
+			getcallPayFn(){
+				var params={
+					year:this.year
+				}
+				feecallPaymentAll(params).then(res=>{
+					if(res.code==200){
+						this.$toast(res.msg)
+					}
+				})
+			},
 			getDataFn(){
 				var params={
 					pageSize:this.pageSize,
 					pageNum: this.pageNum,
 				}
-				params.noticeType=this.tabidx
-				getNoticeList(params).then(res=>{
+				if(this.tabval!='0'){
+					params.isExpense=this.tabval
+				}
+				feeList(params).then(res=>{
 					if(res.code==200){
 						if (res.rows.length < this.pageSize) {
 							this.reachflag = false
@@ -129,7 +146,7 @@
 	page{background: #F3F3F0;}
 </style>
 <style lang="scss" scoped>
-.car{padding: 148rpx 0 110rpx;}
+.car{padding: 148rpx 0 10rpx;}
 .cartop{position: fixed;left: 0;right: 0;top: 0;background-color: #ffffff;z-index: 2;
 	.topa{padding: 20rpx ;
 		.resetimg{width: 36rpx;height: 36rpx;margin-right: 24rpx;flex: 0 0 auto;}

property_ui/work/pages/manage/moneydetail.vue

@@ -3,32 +3,32 @@
 		<image :src="mbg" class="mbg"></image>
 		<view class="mdbox">
 			<view class="mdtop">
-				<view class="mdttit">2024/01 - 2024/12  应缴总额/元</view>
-				<view class="mdttxt">4307.20</view>
+				<view class="mdttit">{{datainfo.year}}/01 - {{datainfo.year}}/12  应缴总额/元</view>
+				<view class="mdttxt">{{datainfo.totalExpense}}</view>
 			</view>
 			<view class="mdmain">
 				<view class="mdmit">业主信息</view>
 				<view class="mdlist">
 					<view class="mdltit">户主姓名</view>
-					<view>王宇宁</view>
+					<view>{{datainfo.ownerName}}</view>
 				</view>
 				<view class="mdlist">
 					<view class="mdltit">房号</view>
-					<view>1号楼3单元1204</view>
+					<view>{{datainfo.detailedAddress}}</view>
 				</view>
 				
 				<view class="mdmit">缴费详情</view>
 				<view class="mdlist">
 					<view class="mdltit">物业费用(元)</view>
-					<view>3247.20</view>
+					<view>{{datainfo.tenementExpense}}</view>
 				</view>
 				<view class="mdlist">
 					<view class="mdltit">车位费用(元)</view>
-					<view>960.00</view>
+					<view>{{datainfo.parkingExpense}}</view>
 				</view>
 				<view class="mdlist">
 					<view class="mdltit">能耗费用(元)</view>
-					<view>100.00</view>
+					<view>{{datainfo.energyExpense}}</view>
 				</view>
 			</view>
 		</view>
@@ -38,14 +38,18 @@
 				<image :src="rimg"></image>
 			</view>
 		</view>
-		
+		<block v-if="datainfo.isExpense=='N'">
+			<view style="height: 100rpx;"></view>
+			<view class="rfbtn" @click="getcallPayFn">催缴</view>
+		</block>
 	<loading></loading>	
 	</view>
 </template>
 
 <script>
 	import config from '@/config'
-	const baseUrl = config.baseUrl
+	const baseUrl = config.baseUrl;
+	import {feeDet,feecallPaymentId} from "@/api/work/manage.js"
 	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
 	export default{
 		components:{},
@@ -53,13 +57,31 @@
 			return{
 				mbg:require('@/work/static/manage/mbg.png'),
 				rimg:require('@/static/images/home/rimg.png'),
+				id:'',
+				datainfo:{}
 			}
 		},
-		onLoad: function() {
-		
+		onLoad: function(e) {
+			this.id=e.id;
+			this.getDataFn()
 		},
 		methods:{
 			checkPermi, checkRole,
+			getDataFn(){
+				feeDet(this.id).then(res=>{
+					if(res.code==200){
+						this.datainfo=res.data
+					}
+				})
+			},
+			getcallPayFn(){
+				var id=this.datainfo.houseId
+				feecallPaymentId(id).then(res=>{
+					if(res.code==200){
+						this.$toast(res.msg)
+					}
+				})
+			},
 			getBillFn(){
 				this.$tab.navigateTo("/work/pages/manage/moneybill")
 			},