liwei2496 2 سال پیش
والد
کامیت
e189f52036

+ 47 - 30
pages.json

@@ -1,5 +1,7 @@
 {
 	"pages": [ 
+
+
 		{
 			"path": "pages/login/login",
 			"style": {
@@ -29,25 +31,25 @@
 				"navigationBarTitleText": "首页"
 			}
 		}, 
-		{
-			"path": "pages/equipment/equipment",
-			"style": {
-				"navigationBarTitleText": "设备"
-			}
+		// {
+		// 	"path": "pages/equipment/equipment",
+		// 	"style": {
+		// 		"navigationBarTitleText": "设备"
+		// 	}
 		
-		},
+		// },
 		{
 			"path": "pages/Workorder/Workorder",
 			"style": {
 				"navigationBarTitleText": "工作台"
 			}
 		},
-		{
-			"path": "pages/Energyconsumption/Energyconsumption",
-			"style": {
-				"navigationBarTitleText": "能耗"
-			}
-		},
+		// {
+		// 	"path": "pages/Energyconsumption/Energyconsumption",
+		// 	"style": {
+		// 		"navigationBarTitleText": "能耗"
+		// 	}
+		// },
 		{
 			"path": "pages/my/my",
 			"style": {
@@ -151,11 +153,7 @@
             "style" :                                                                                    
             {
                 "navigationBarTitleText": "远程管控",
-                "enablePullDownRefresh": false,
-				"navigationStyle": "custom",
-				"app-plus": {
-					
-				}
+                "enablePullDownRefresh": false
             }
             
         }
@@ -194,7 +192,26 @@
 								"navigationStyle": "custom" // 隐藏系统导航栏
 		            }
 		            
-		        }
+		        },				
+        {
+            "path" : "pages/index/Workordertodone/Workordertodone",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "工单待办",
+                "enablePullDownRefresh": false
+            }
+            
+        },				
+        {
+            "path" : "pages/index/Workordertodone/Workorderdetails/Workorderdetails",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "详情",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+       
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
@@ -218,24 +235,24 @@
 							"selectedIconPath": "static/tab/h2.png",
 				"text": "首页"
 			},
-			{
-				"pagePath": "pages/equipment/equipment",
-				"iconPath": "static/tab/s1.png",
-							"selectedIconPath": "static/tab/s2.png",
-				"text": "设备"
-			},
+			// {
+			// 	"pagePath": "pages/equipment/equipment",
+			// 	"iconPath": "static/tab/s1.png",
+			// 				"selectedIconPath": "static/tab/s2.png",
+			// 	"text": "设备"
+			// },
 			{
 				"pagePath": "pages/Workorder/Workorder",
 				"iconPath": "static/tab/w1.png",
 							"selectedIconPath": "static/tab/w2.png",
 				"text": "工作台"
 			},			
-			{
-				"pagePath": "pages/Energyconsumption/Energyconsumption",
-				"iconPath": "static/tab/e1.png",
-							"selectedIconPath": "static/tab/e2.png",
-				"text": "能耗"
-			},
+			// {
+			// 	"pagePath": "pages/Energyconsumption/Energyconsumption",
+			// 	"iconPath": "static/tab/e1.png",
+			// 				"selectedIconPath": "static/tab/e2.png",
+			// 	"text": "能耗"
+			// },
 			{
 				"pagePath": "pages/my/my",
 				"iconPath": "static/tab/y1.png",

+ 9 - 8
pages/Workorder/Tenantbill/Tenantbill.vue

@@ -189,15 +189,16 @@
 
 		methods: {
 			seedetail(e) {
-				  console.log('222',e)
-let faltesdata={
-	name:e.name,
-	id:e.id,
-	cycle:e.cycle
-}
-  console.log('111111111111111111',faltesdata)
+				//  console.log('222',e)
+				let faltesdata = {
+					name: e.name,
+					id: e.id,
+					cycle: e.cycle
+				}
+				// console.log('111111111111111111',faltesdata)
 				uni.navigateTo({
-					url: "/pages/Workorder/Tenantbill/companybill/companybill?para=" + encodeURIComponent(JSON.stringify(faltesdata))
+					url: "/pages/Workorder/Tenantbill/companybill/companybill?para=" + encodeURIComponent(JSON
+						.stringify(faltesdata))
 				})
 			},
 			handleClick(e) {

+ 1 - 1
pages/Workorder/Tenantbill/companybill/companybill.vue

@@ -257,7 +257,7 @@
 								duration: 1500
 							})
 							this.pd=false;
-							this.jfnodata=true
+							//this.jfnodata=true
 						}									
 								
 					})

+ 87 - 0
pages/index/Workordertodone/Workorderdetails/Workorderdetails.vue

@@ -0,0 +1,87 @@
+<template>
+	<view class="OutermostLayer">
+			<u-cell-group>				
+				<u-cell icon="integral-fill" title="任务名称" value="电力设备监测" >
+					<u-icon slot="icon" size="40" name="order"></u-icon>					
+				</u-cell>
+				<u-cell icon="integral-fill" title="办结日期" value="2023-05-15" >
+					<u-icon slot="icon" size="40" name="calendar"></u-icon>					
+				</u-cell>
+				<u-cell icon="integral-fill" title="任务类型" value="监测" >
+					<u-icon slot="icon" size="40" name="grid"></u-icon>					
+				</u-cell>
+				<u-cell icon="integral-fill" title="紧急程度" value="一般" >
+					<u-icon slot="icon" size="40" name="pushpin"></u-icon>					
+				</u-cell>
+				<u-cell icon="integral-fill" title="办理人员" value="杨刚" >
+					<u-icon slot="icon" size="40" name="man-add"></u-icon>					
+				</u-cell>
+			</u-cell-group>
+		<view class="description">
+			<view class="taskdetals1">
+				<u-icon name="list-dot"  size="35"></u-icon>
+			</view>
+			<view class="taskdetals2">
+				请在5月15号之前,把B栋所有楼层的灯光设备检查完毕,并详细记录每层楼道的灯光寿命情况,把损坏的灯泡上报维修部。				
+			</view>
+		</view>
+		
+		<view class="guidang">
+			
+			<view class="queding">
+				<u-button type="primary" :plain="true" text="返回" @click="returndata"></u-button>
+			</view>
+			<view class="queding">
+				<u-button type="primary" text="修改" @click="editdata"></u-button>
+			</view>
+		</view>
+		</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			editdata(){
+				uni.navigateTo({
+					url: '/pages/my/Mydistribution/distributionedit/distributionedit'
+				})
+			},
+			returndata(){
+				uni.navigateBack({
+					delta: 1
+				});
+			},
+		}
+	}
+</script>
+
+<style>
+	.description {
+		display: flex;
+		align-items: center;
+		width: 100%;
+		margin-top: 30rpx;
+	}
+	.taskdetals1 {}
+	
+	.taskdetals2 {
+		font-size: 25rpx;
+		padding-left: 15rpx;
+	}
+	.guidang {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		margin-top: 40rpx;
+		padding: 30rpx;
+	}
+	
+	.queding {
+		width: 40%;
+	}
+</style>

+ 422 - 0
pages/index/Workordertodone/Workordertodone.vue

@@ -0,0 +1,422 @@
+<template>
+	<view class="">
+		
+		<view class="subsection">
+			<u-subsection :list="list" :current="current" @change="sectionChange"></u-subsection>
+		</view>
+		
+
+		<!-- 待派送 -->
+		<view class="" v-show="cdshow==0">
+			
+					
+			<view class="u-listdata" >
+				<u-list  @scrolltolower="scrolltolower" :pagingEnabled='true'>
+					<u-list-item v-for="(item, index) in indexList" :key="index">
+						<view class="paisong"  @click="Workorderdetails(item)">
+							<h3>{{item.repairPosition}}</h3>
+							<view class="Currentamount1" v-if='item.repairType==1'>
+								报修类型: 水
+							</view>
+							<view class="Currentamount1" v-if='item.repairType==2'>
+								报修类型: 电
+							</view>
+							<view class="Currentamount1" v-if='item.repairType==3'>
+								报修类型: 其他
+							</view>
+							
+							<view class="Currentamount1">
+								报修时间: {{item.createDate}}
+							</view>				
+						</view>	
+				
+					</u-list-item>
+				</u-list>				
+			</view>		
+		</view>
+		<!-- 已派送(待维修) -->
+		<view class="" v-show="cdshow==1">		
+		<!-- 	列表 -->
+			<view class="u-listdata" >								
+				<u-list  @scrolltolower="scrolltolower" :pagingEnabled='true'>
+					<u-list-item v-for="(item, index) in indexList" :key="index">
+						
+						<view class="paisong"  @click="Workorderdetails(item)">
+							<view class="settled1" v-if="item.urgency==1">
+								非常紧急
+							</view>
+							<view class="settled2" v-if="item.urgency==2">
+								紧急
+							</view>
+							<view class="settled3" v-if="item.urgency==3">
+								普通
+							</view>
+							
+							<h3>{{item.repairPosition}}</h3>
+							<view class="Currentamount1" v-if='item.repairType==1'>
+								报修类型: 水
+							</view>
+							<view class="Currentamount1" v-if='item.repairType==2'>
+								报修类型: 电
+							</view>
+							<view class="Currentamount1" v-if='item.repairType==3'>
+								报修类型: 其他
+							</view>
+							<view class="Currentamount1">
+								派送时间:{{ item.updateDate }}
+							</view>
+							
+						</view>
+				
+					</u-list-item>
+				</u-list>				
+			</view>
+			
+		</view>
+
+<!--已维修 -->
+		<view class="" v-show="cdshow==2">		
+		<!-- 	列表 -->
+			<view class="u-listdata" >
+				<u-list  @scrolltolower="scrolltolower" :pagingEnabled='true'>
+					<u-list-item v-for="(item, index) in indexList" :key="index">
+						
+						<view class="paisong"  @click="Workorderdetails(item)">
+							<view class="settled1" v-if="item.urgency==1">
+								非常紧急
+							</view>
+							<view class="settled2" v-if="item.urgency==2">
+								紧急
+							</view>
+							<view class="settled3" v-if="item.urgency==3">
+								普通
+							</view>
+							
+							<h3>{{item.repairPosition}}</h3>
+							<view class="Currentamount1" v-if='item.repairType==1'>
+								报修类型: 水
+							</view>
+							<view class="Currentamount1" v-if='item.repairType==2'>
+								报修类型: 电
+							</view>
+							<view class="Currentamount1" v-if='item.repairType==3'>
+								报修类型: 其他
+							</view>
+							<view class="Currentamount1">
+								维修完成时间:{{ item.repairFinishTime }}
+							</view>
+							
+						</view>
+				
+					</u-list-item>
+				</u-list>				
+			</view>
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	import { isEmpty, getDictDataList } from "@/utils/index";
+	
+	export default {
+		data() {
+			return {
+				jfnodata:false,
+				showtype: false,
+				cdshow: 0,
+				fatherparameter: {},
+				expensedata:'全部',
+				list: ['待派送', '已派送(待维修)','已维修' ],
+				current: 0,
+				dataForm: {
+					status: "1",
+					page: 1,
+					limit: 10,
+				},
+				indexList: [],
+				payStatusList: [],
+				nodata:true,
+				pd:true,
+				columnstype: [],
+				repairTypeList:[],
+				UrgencyTypelist:[],
+			}
+		},
+		//监听页面加载,其参数为上个页面传递的数据,参数类型为 Object(用于页面传参
+		onLoad: function(options) { //option为object类型,会序列化上个页面传递的参数
+			
+			
+			this.getRepairTypeList();
+	
+			this.getpaisongdata();
+		
+		},
+		//监听页面初次渲染完成。注意如果渲染速度快,会在页面进入动画完成前触发
+		onReady() {},
+
+		//监听页面隐藏
+		onHide() {},
+		//监听窗口尺寸变化
+		onResize() {},
+		//监听页面卸载
+		onUnload() {},
+		//监听用户下拉动作,一般用于下拉刷新
+		onPullDownRefresh() {},
+
+
+		methods: {
+			   getRepairTypeList() {
+				   //  console.log('9999', getDictDataList("UrgencyType"))
+					// this.UrgencyTypelist=getDictDataList("UrgencyType");
+					//   console.log('888', getDictDataList("RepairType"))
+			   //   this.repairTypeList = getDictDataList("RepairType");
+			    },
+			Workorderdetails(e){
+				  console.log('111111111111111111',e)
+				   uni.navigateTo({
+				             url: `/pages/index/Workordertodone/Workorderdetails/Workorderdetails?id=e.id`
+				          });
+			},
+						
+			sectionChange(index) {
+				this.current = index;
+				if (index == 0) {
+					this.cdshow = 0;
+					 this.indexList=[];
+					 this.dataForm.page = 1;
+					 this.dataForm.status = 1;
+					 this.getpaisongdata();
+				} else if(index == 1) {
+					this.cdshow = 1;
+					this.indexList=[];
+					this.dataForm.page = 1;
+					this.dataForm.status = 2;
+					this.getpaisongdata();
+				} else if(index == 2) {
+					this.cdshow = 2;
+					this.indexList=[];
+					this.dataForm.page = 1;
+					this.dataForm.status = 3;
+					this.getpaisongdata();
+				}
+				
+			},
+			scrolltolower() {
+				if(this.pd){
+					this.getpaisongdata();
+				}else{
+					 return
+				}
+			},
+			    // dict_filter(val, list) {
+			    //   if (isEmpty(val)) {
+			    //     return {};
+			    //   }
+			    //   return this[list].find((item) => item.dictValue == val);
+			    // },
+			getpaisongdata(){
+				this.$api.get('/repairorder/page', this.dataForm)
+					.then(res => {
+						//  console.log('111111111111111111',res.data.data.list)						 					 
+						//  this.repairTypeList 
+						if (res.data.data.list.length != 0) {
+							this.indexList.push(...res.data.data.list);										
+								this.dataForm.page = this.dataForm.page + 1;
+								this.pd=true;
+								this.jfnodata=false;
+						} else {
+							uni.showToast({
+								title:'暂无更多数据了',
+								icon: 'none',
+								duration: 1500
+							})
+							this.pd=false;
+							//this.jfnodata=true
+						}									
+								
+					})
+			},
+			
+			
+		
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	.nodata{
+		text-align: center;
+		padding-top: 400rpx;
+		
+	}
+	.paisong{
+		display: flex;
+		flex-direction: column;
+		justify-content:center;
+		height:170rpx;
+		background-color: #fff;
+		margin: 30rpx;
+		border-radius: 9rpx;
+		position: relative;
+		h3 {
+			height: 70rpx;
+			line-height: 70rpx;
+			padding-left: 30rpx;
+		}
+	}
+	
+	
+	.companylist {
+		margin: 20rpx 30rpx;
+		background: #fff;
+		height: 280rpx;
+		border-radius: 10px;
+		position: relative;
+	
+		h3 {
+			height: 70rpx;
+			line-height: 70rpx;
+			padding-left: 30rpx;
+		}
+	}
+	.settled1 {
+		background-color: #ED3A25;
+		width: 100rpx;
+		height: 40rpx;
+		text-align: center;
+		line-height: 40rpx;
+		color: #fff;
+		font-size: 14rpx;
+		position: absolute;
+		top: 0px;
+		right: 0px;
+		border-top-right-radius: 10rpx;
+		border-bottom-left-radius: 10rpx;
+	}
+	.settled2 {
+		background-color: #FF9C27;
+		width: 100rpx;
+		height: 40rpx;
+		text-align: center;
+		line-height: 40rpx;
+		color: #fff;
+		font-size: 14rpx;
+		position: absolute;
+		top: 0px;
+		right: 0px;
+		border-top-right-radius: 10rpx;
+		border-bottom-left-radius: 10rpx;
+	}
+	.settled3 {
+		background-color: #30D3A2;
+		width: 100rpx;
+		height: 40rpx;
+		text-align: center;
+		line-height: 40rpx;
+		color: #fff;
+		font-size: 14rpx;
+		position: absolute;
+		top: 0px;
+		right: 0px;
+		border-top-right-radius: 10rpx;
+		border-bottom-left-radius: 10rpx;
+	}
+	
+	
+	
+	.Currentamount {
+		padding-left: 30rpx;
+		height: 50rpx;
+		line-height: 50rpx;
+		color: #BCB3A7;
+	
+		span {
+			color: #FA5555;
+			padding-left: 9rpx;
+		}
+	}
+	
+	.Currentamount1 {
+		padding-left: 30rpx;
+		height: 40rpx;
+		line-height: 40rpx;
+		color: #BCB3A7;
+	
+		span {
+			color: #FA5555;
+			padding-left: 9rpx;
+		}
+	}
+	
+	.records1{
+		background-color: #FA5555;
+		width: 100rpx;
+		height: 40rpx;
+		text-align: center;
+		line-height: 40rpx;
+		color: #fff;
+		font-size: 14rpx;
+		position: absolute;
+		top: 0px;
+		right: 0px;
+		border-top-right-radius: 10rpx;
+		border-bottom-left-radius: 10rpx;
+	}
+	.records{
+		display: flex;
+		flex-direction: column;
+		// justify-content: center;
+		position: relative;
+		width: 690rpx;
+		height: 210rpx;
+		background: #fff;
+		margin: 0 auto;
+		border-radius: 9rpx;
+	}
+	.onerecord{
+		width: 750rpx;
+		height: 90rpx;
+		line-height: 90rpx;
+		padding-left: 30rpx;
+		color: #999;
+		span{
+			color: red;
+		}
+	}
+	.topbilledit {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		background: #fff;
+		height: 60rpx;
+	}
+
+	.changetime2 {
+		padding-left: 10rpx;
+	}
+
+	.subsection {
+		padding: 30rpx;
+		background: #fff;
+	}
+
+	.topname {
+		height: 44px;
+		width: 750rpx;
+		display: flex;
+		align-items: center;
+	}
+
+	.topname1 {
+		width: 50rpx;
+		padding-left: 10rpx;
+	}
+
+	.topname2 {
+		width: 700rpx;
+		text-align: center;
+		font-weight: bold;
+	}
+</style>

+ 23 - 17
pages/index/index.vue

@@ -7,7 +7,7 @@
 						<view><img src="@/static/index/repair-online.svg" alt="" style="margin-left: 5rpx;"></view>
 						<view style="font-size: 20rpx;">线上报修</view>
 					</view>
-					<view class="record"  @click="Inspectionrecord">
+					<view class="record" @click="Inspectionrecord">
 						<view><img src="@/static/index/check-review.svg" alt="" style="margin-left: 5rpx;"></view>
 						<view style="font-size: 20rpx;">巡检记录</view>
 					</view>
@@ -25,7 +25,7 @@
 						<span style="font-size: 30rpx;">工单待办</span>
 					</view>
 					<view class="processing">
-						<view class="immediately">
+						<view class="immediately" @click="Workordertodone">
 							<span style="font-size: 25rpx; color: #5c8fff; ">立即处理</span>
 							<u-icon name="arrow-right" color="#5c8fff" size="16rpx"></u-icon>
 						</view>
@@ -142,21 +142,27 @@
 
 		},
 		methods: {
-Onlinewarranty(){
-	uni.navigateTo({
-		url: '/pages/index/Onlinewarranty/Onlinewarranty'
-	})
-},
-Inspectionrecord(){
-	uni.navigateTo({
-		url: '/pages/index/Inspectionrecord/Inspectionrecord'
-	})
-},
-Withholdingrecord(){
-	uni.navigateTo({
-		url: '/pages/index/Withholdingrecord/Withholdingrecord'
-	})
-},
+
+			Workordertodone() {
+				uni.navigateTo({
+					url: '/pages/index/Workordertodone/Workordertodone'
+				})
+			},
+			Onlinewarranty() {
+				uni.navigateTo({
+					url: '/pages/index/Onlinewarranty/Onlinewarranty'
+				})
+			},
+			Inspectionrecord() {
+				uni.navigateTo({
+					url: '/pages/index/Inspectionrecord/Inspectionrecord'
+				})
+			},
+			Withholdingrecord() {
+				uni.navigateTo({
+					url: '/pages/index/Withholdingrecord/Withholdingrecord'
+				})
+			},