zouling 2 mēneši atpakaļ
vecāks
revīzija
98b9c95847

+ 5 - 5
property_ui/api/work/manage.js

@@ -406,7 +406,7 @@ export function feecallPaymentAll(data) {
   })
 }
 
-// 物业费设置-新增wuYe:fee:settings:add
+// 物业费设置-新增wuYe:feeSettings:add
 export function feesetAdd(data) {
   return request({
     url: '/wuYe/fee/settings',
@@ -414,7 +414,7 @@ export function feesetAdd(data) {
     'data': data
   })
 }
-// 物业费设置-修改wuYe:fee:settings:edit
+// 物业费设置-修改wuYe:feeSettings:edit
 export function feesetPut(data) {
   return request({
     url: '/wuYe/fee/settings/put',
@@ -422,14 +422,14 @@ export function feesetPut(data) {
     'data': data
   })
 }
-// 物业费设置-删除wuYe:fee:settings:remove
+// 物业费设置-删除wuYe:feeSettings:remove
 export function feesetDel(data) {
   return request({
     url: '/wuYe/fee/settings/delete/'+data,
     method: 'get',
   })
 }
-//物业费设置-列表wuYe:fee:settings:list
+//物业费设置-列表wuYe:feeSettings:list
 export function feesetList(data) {
   return request({
     url: '/wuYe/fee/settings/list',
@@ -437,7 +437,7 @@ export function feesetList(data) {
     'data': data
   })
 }
-// 物业费设置-详情wuYe:fee:settings:list
+// 物业费设置-详情wuYe:feeSettings:query
 export function feesetDet(data) {
   return request({
     url: '/wuYe/fee/settings/'+data,

+ 36 - 23
property_ui/pages/index/index.vue

@@ -43,50 +43,50 @@
 				<notice :noticelist="noticelist"  :autoplay='autoplay' @getNoticeDet="getNoticeDet"></notice>
 			</view>
 			<!-- 统计 -->
-			<view class="contbox" v-if="checkPermi(['wuYe:statistics:num:app'])">
+			<view class="contbox" v-if="checkPermi(['wuYe:statistics:app'])">
 				<view class="cont flexc">
 					<image :src="conta"></image>
 					<view>今日数据统计</view>
 				</view>
 				<view class="lists">
-					<view class="list">
+					<view class="list" @click="getCarKuFn">
 						<view class="tit">{{count.kxcw||0}}</view>
 						<view class="txt">空闲车位</view>
 					</view>
-					<view class="list">
+					<view class="list" @click="getCarKuFn">
 						<view class="tit">{{count.kxcdz||0}}</view>
 						<view class="txt">空闲充电桩</view>
 					</view>
-					<view class="list">
+					<view class="list" @click="getCarFn">
 						<view class="tit">{{count.jrcl||0}}</view>
 						<view class="txt">进入车辆</view>
 					</view>
-					<view class="list">
+					<view class="list" @click="getCarFn">
 						<view class="tit">{{count.lkcl||0}}</view>
 						<view class="txt">离开车辆</view>
 					</view>
-					<view class="list">
+					<view class="list" @click="getCarCheckFn">
 						<view class="tit">{{count.wlcl||0}}</view>
 						<view class="txt">外来车辆</view>
 					</view>
-					<view class="list">
+					<view class="list" @click="getillegalParkFn">
 						<view class="tit">{{count.wtdj||0}}</view>
 						<view class="txt">违停登记</view>
 					</view>
-					<view class="list">
+					<view class="list" @click="getCarCheckFn">
 						<view class="tit">{{count.wlry||0}}</view>
 						<view class="txt">外来人员</view>
 					</view>
-					<view class="list">
+					<view class="list" @click="getCarCheckFn">
 						<view class="tit">{{count.jrry||0}}</view>
 						<view class="txt">进入人员</view>
 					</view>
 					<block v-if="zhanflag">
-						<view class="list">
+						<view class="list" @click="getPatrolFn(2)">
 							<view class="tit ca">{{count.yxg||0}}</view>
 							<view class="txt">已巡更</view>
 						</view>
-						<view class="list">
+						<view class="list" @click="getPatrolFn(1)">
 							<view class="tit ca">{{count.wxg||0}}</view>
 							<view class="txt">未巡更</view>
 						</view>
@@ -98,19 +98,19 @@
 							<view class="tit cb">{{count.wcdd||0}}</view>
 							<view class="txt">完成订单</view>
 						</view>
-						<view class="list">
+						<view class="list" @click="getWarrantyFn(1)">
 							<view class="tit cc">{{count.jrbx||0}}</view>
 							<view class="txt">今日报修</view>
 						</view>
-						<view class="list">
+						<view class="list" @click="getWarrantyFn(2)">
 							<view class="tit cc">{{count.ypbx||0}}</view>
 							<view class="txt">已派报修</view>
 						</view>
-						<view class="list">
+						<view class="list" @click="getComplaintFn(1)">
 							<view class="tit cc">{{count.tsjy||0}}</view>
 							<view class="txt">投诉建议</view>
 						</view>
-						<view class="list">
+						<view class="list" @click="getComplaintFn(2)">
 							<view class="tit cc">{{count.yhjy||0}}</view>
 							<view class="txt">已回投诉</view>
 						</view>
@@ -189,7 +189,7 @@
 						</view>
 						<view class="txt">员工管理</view>
 					</view>
-					<view class="list bimga" @click="getComplaintFn" v-if="checkPermi(['wuYe:suggestion:applist'])">
+					<view class="list bimga" @click="getComplaintFn()" v-if="checkPermi(['wuYe:suggestion:applist'])">
 						<view class="imgs"><image :src="htabl" class="imga"></image><view class="tips">
 							<block v-if="countTips.complaintSuggestion>98">99+</block>
 							<block v-else>{{countTips.complaintSuggestion||0}}</block>
@@ -322,7 +322,7 @@ const Clientid = config.Clientid
 			}
 		})
 		this.gettenantList()
-		if(checkPermi(['wuYe:statistics:num:app'])){
+		if(checkPermi(['wuYe:statistics:app'])){
 			this.getCount()
 		}
 		if(checkPermi(['wuYe:statistics:wuYeTips'])){
@@ -467,11 +467,19 @@ const Clientid = config.Clientid
 		getMoneyFn(){//物业费管理
 			this.$tab.navigateTo(`/work/pages/manage/money`) 
 		},
-		getPatrolFn(){//今日巡更
-			this.$tab.navigateTo(`/service/pages/service/patrol`) 
+		getPatrolFn(type){//今日巡更
+			if(type){
+				this.$tab.navigateTo(`/service/pages/service/patrol?type=${type}`) 
+			}else{
+				this.$tab.navigateTo(`/service/pages/service/patrol`) 
+			}
 		},
-		getWarrantyFn(){//报修管理
-			this.$tab.navigateTo(`/service/pages/service/warranty`) 
+		getWarrantyFn(type){//报修管理
+			if(type){
+				this.$tab.navigateTo(`/service/pages/service/warranty?type=${type}`) 
+			}else{
+				this.$tab.navigateTo(`/service/pages/service/warranty`) 
+			}	
 		},
 		getStaffFn(){//维修人员管理
 			this.$tab.navigateTo(`/people/pages/people/staff`)
@@ -479,8 +487,13 @@ const Clientid = config.Clientid
 		getHouseFn(){//房屋管理
 			this.$tab.navigateTo(`/work/pages/manage/house`)
 		},
-		getComplaintFn(){//投诉建议
-			this.$tab.navigateTo(`/service/pages/service/complaint`)
+		getComplaintFn(type){//投诉建议
+			if(type){
+				this.$tab.navigateTo(`/service/pages/service/complaint?type=${type}`)
+			}else{
+				this.$tab.navigateTo(`/service/pages/service/complaint`)
+			}
+			
 		},
 		getNewsdjFn(){//党建资讯
 			this.$tab.navigateTo(`/manage/pages/community/newsdj`)

+ 1 - 1
property_ui/pages/mine/index.vue

@@ -74,7 +74,7 @@
 					<view class="tit flex1">报修管理</view>
 					<image :src="rimg" class="rimg"></image>
 				</view>
-				<view class="flexc mine_list" @click="getFeeSet" v-if="checkPermi(['wuYe:fee:settings:list'])">
+				<view class="flexc mine_list" @click="getFeeSet" v-if="checkPermi(['wuYe:feeSettings:list'])">
 					<view class="limg">
 						<image :src="listimgj" class="imga"></image>
 					</view>

+ 4 - 1
property_ui/service/pages/service/complaint.vue

@@ -60,10 +60,13 @@
 		onUnload() {
 			uni.$off('refSuggestion')
 		},
-		onLoad: function() {
+		onLoad: function(e) {
 			uni.$on('refSuggestion',(res)=>{
 				this.getrefreshData()
 			})
+			if(e.type){
+				this.tabval=e.type
+			}
 			this.init()
 			this.getDataFn()
 		},

+ 4 - 1
property_ui/service/pages/service/patrol.vue

@@ -104,12 +104,15 @@
 				this.getDataFn()
 			}
 		},
-		onLoad: function() {
+		onLoad: function(e) {
 			uni.getSystemInfo({
 				success: (e) => {
 					this.nvaHeight = Number(e.statusBarHeight)+44;
 				}
 			})
+			if(e.type){
+				this.tabval=e.type
+			}
 			this.getCount();
 			this.init()
 			this.getDataFn()

+ 4 - 1
property_ui/service/pages/service/warranty.vue

@@ -69,10 +69,13 @@
 		onUnload() {
 			uni.$off('repairList')
 		},
-		onLoad: function() {
+		onLoad: function(e) {
 			uni.$on('repairList',(res)=>{
 				this.getrefreshData()
 			})
+			if(e.type){
+				this.tabval=e.type
+			}
 			this.init()
 			this.getDataFn();
 			this.getstafflistNoPage()

+ 1 - 1
property_ui/work/pages/fee/index.vue

@@ -4,7 +4,7 @@
 		<view class="carlists">
 			<car-list :datainfo="list"  :wtdt="wtdt" type='feeset' @getDetail="getDetail" @getDelFn="getDelFn"></car-list>
 		</view>
-		<block v-if="checkPermi(['wuYe:fee:settings:add'])">
+		<block v-if="checkPermi(['wuYe:feeSettings:add'])">
 			<view style="height: 100rpx;"></view>
 			<view class="rfbtn" @click="getFeeSetFn">添加设置</view>
 		</block>

+ 1 - 0
property_ui/work/pages/manage/house.vue

@@ -94,6 +94,7 @@
 					userId:info.userId,
 					tenantId:info.tenantId,
 					houseId:info.houseId,
+					examine:info.examine,
 				}
 				deleteResident(params).then(res=>{
 					if(res.code==200){