From de449eb1fe944e4fdd39884acf37419120158b27 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Fri, 6 Jun 2025 18:18:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=BB=93=E6=9D=9F=E6=8A=A5?=
 =?UTF-8?q?=E4=BF=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/repair/repair.js              | 25 ++++++++
 constant/url.js                   |  2 +
 pages.json                        |  7 +++
 pages/repairOrder/repairEnd.vue   | 50 ++++++++++++++++
 pages/repairOrder/repairOrder.vue | 98 ++++++++++++++++++++-----------
 5 files changed, 147 insertions(+), 35 deletions(-)
 create mode 100644 pages/repairOrder/repairEnd.vue

diff --git a/api/repair/repair.js b/api/repair/repair.js
index 82e2de0..ab85668 100644
--- a/api/repair/repair.js
+++ b/api/repair/repair.js
@@ -381,3 +381,28 @@ export function replyRepairAppraise(_data,_that){
 		})
 	});
 }
+
+/**
+ * 维修任务暂停
+ * @param {Object} _that 上下文对象
+ * @param {Object} _data 请求报文
+ */
+export function repairEnd(_that,_data){
+	console.log(_that,_data)
+	return new Promise(function(reslove,reject){
+		_that.context.post({
+			url: url.repairEnd,
+			data:_data,
+			success: function(res) {
+				reslove(res.data);
+			},
+			fail: function(e) {
+				wx.showToast({
+					title: "服务器异常了",
+					icon: 'none',
+					duration: 2000
+				})
+			}
+		})
+	});
+}
diff --git a/constant/url.js b/constant/url.js
index cc1bf59..205ad1e 100644
--- a/constant/url.js
+++ b/constant/url.js
@@ -63,6 +63,8 @@ export default {
 	repairDispatch: baseUrl + "app/ownerRepair.repairDispatch",
 	//报修办结
 	repairFinish: baseUrl + "app/ownerRepair.repairFinish",
+	repairEnd: baseUrl + "app/ownerRepair.repairEnd",
+	
 	//报修评价
 	appraiseRepair: baseUrl + 'app/repair/appraiseRepair',
 	appraiseRepairNew: baseUrl + 'callComponent/ownerRepair.appraiseRepair',
diff --git a/pages.json b/pages.json
index 4f9d9cd..d27ff3c 100644
--- a/pages.json
+++ b/pages.json
@@ -948,6 +948,13 @@
         	{
         		"navigationBarTitleText" : ""
         	}
+        },
+        {
+        	"path" : "pages/repairOrder/repairEnd",
+        	"style" : 
+        	{
+        		"navigationBarTitleText" : "结束订单"
+        	}
         }
     ],
 	"globalStyle": {
diff --git a/pages/repairOrder/repairEnd.vue b/pages/repairOrder/repairEnd.vue
new file mode 100644
index 0000000..17a7c86
--- /dev/null
+++ b/pages/repairOrder/repairEnd.vue
@@ -0,0 +1,50 @@
+<template>
+	<view>
+		<view class="cu-form-group margin-top">
+			<textarea v-model="content" placeholder="请输入结束原因,比如缺材料"></textarea>
+		</view>
+		<view class="flex flex-direction margin-top">
+			<button class="cu-btn bg-blue margin-tb-sm lg" :disabled="!content" @click="_doEndRepair()">结束工单</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		repairEnd
+	} from '@/api/repair/repair.js'
+	export default {
+		data() {
+			return {
+				repairId: '',
+				content: ''
+			}
+		},
+		onLoad(options) {
+			this.java110Context.onLoad();
+			this.repairId = options.repairId;
+			this.communityId = options.communityId;
+		},
+		methods: {
+			_doEndRepair: async function() {
+				const {code,msg} = await repairEnd(this,{
+					repairId: this.repairId,
+					communityId: this.communityId,
+					context: this.content
+				});
+				if(code != 0 ){
+					uni.showToast({
+						icon:'none',
+						title:msg
+					})
+					return;
+				}
+				uni.navigateBack()
+			}
+		}
+	}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/pages/repairOrder/repairOrder.vue b/pages/repairOrder/repairOrder.vue
index bfc5111..1afe25e 100644
--- a/pages/repairOrder/repairOrder.vue
+++ b/pages/repairOrder/repairOrder.vue
@@ -5,43 +5,58 @@
 				<text class="cuIcon-search"></text>
 				<input type="text" placeholder="输入报修人" v-model="repairName" confirm-type="search"></input>
 			</view>
-			<!-- <view class="search-form round">
+			<view class="search-form round">
 				<text class="cuIcon-search"></text>
 				<picker :value="repairStatesIndex" :range="repairStates" :range-key="'name'" @change="repairStatesChange">
 					<view>{{repairStates[repairStatesIndex].name}}</view>
 				</picker>
-			</view> -->
+			</view>
 			<view class="action">
 				<button class="cu-btn bg-gradual-green shadow-blur round" @tap="$preventClick(_searchRepair)">搜索</button>
 			</view>
 		</view>
 		<view class="margin-top" v-if="noData==false">
-			<view class="text-df text-gray text-right">
+			<view class="text-df text-gray text-right margin-right-sm">
 				共{{totalRecords}}条记录
 			</view>
-			<view class="cu-list menu-avatar " v-for="(item,index) in repairOrders" :key="index" @tap="_toRepairDetail(item)">
-				<view class="cu-item arrow">
-					<view class="content content-left">
-						<view class="text-grey">
-							<text class="cuIcon-notification text-cut text-green margin-right-xs"></text>
-							<text class="ellip">{{item.repairObjName}}-{{item.stateName}}({{item.repairSettingTypeName}})</text>
-						</view>
-						<view class="text-gray text-sm flex">
-							<view class="text-cut">
-								报修人：{{item.repairName}}-{{item.tel}}
-							</view>
-						</view>
-					</view>
-					<view v-if="item.state == 1000 && checkAuth('502019101946430010')" class="rob-order text-df text-white bg-green text-center" @tap.stop="dealRepair(item,'DISPATCH')">
-						派单
-					</view>
-					<view v-if="item.repairWay == 100 && item.state == 1000 && checkAuth('502021012099350016')" class="rob-order text-df text-white bg-green text-center" @tap.stop="_robOrder(item)">
-						抢单
-					</view>
-					<view v-else class="action">
-						<view class="text-grey text-xs">{{item.appointmentTime}}
-							<text class="lg text-gray cuIcon-right margin-left-xs"></text>
-						</view>
+			<view v-for="(item,index) in repairOrders" :key="index" class="bg-white margin-bottom-sm margin-right-sm radius margin-left-sm padding">
+				<view class="flex padding-bottom-xs solid-bottom justify-between">
+					<view>{{item.repairId}}</view>
+					<view class="text-gray">{{item.stateName}}</view>
+				</view>
+				<view class="flex margin-top justify-between">
+					<view class="text-gray">报修类型</view>
+					<view class="text-gray">{{item.repairTypeName}}</view>
+				</view>
+				<view class="flex margin-top-xs justify-between">
+					<view class="text-gray">报修人</view>
+					<view class="text-gray">{{item.repairName}}({{item.tel}})</view>
+				</view>
+				<view class="flex margin-top-xs justify-between">
+					<view class="text-gray">位置</view>
+					<view class="text-gray">{{item.repairObjName}}</view>
+				</view>
+				<view class="flex margin-top-xs justify-between">
+					<view class="text-gray">预约时间</view>
+					<view class="text-gray">{{item.appointmentTime }}</view>
+				</view>
+				<view class="flex margin-top-xs justify-between">
+					<view class="text-gray">报修内容</view>
+					<view class="text-gray">{{item.context}}</view>
+				</view>
+				<view class="solid-top flex justify-end margin-top padding-top-sm ">
+					<button class="cu-btn sm line-gray" @click="_toRepairDetail(item)">详情</button>
+					<view>
+						<button class="cu-btn sm bg-orange margin-left" 
+						v-if="item.state == 1000 && checkAuth('502019101946430010')" 
+						@click="dealRepair(item,'DISPATCH')">派单</button>
+						<button class="cu-btn sm bg-red margin-left"
+						v-if="item.state != '1700' && item.state != '1800' && item.state != '1900' && checkAuth('502019101946430010')" 
+						@click="endRepair(item)">结束</button>
+						<button class="cu-btn sm bg-orange margin-left" 
+						v-if="item.repairWay == 100 && item.state == 1000 && checkAuth('502021012099350016')" 
+						@click="_robOrder(item)">抢单</button>
+						
 					</view>
 				</view>
 			</view>
@@ -79,12 +94,12 @@
 					contentrefresh: '加载中',
 					contentnomore: '没有更多'
 				},
-				totalRecords: 0
-				// repairStates: [{
-				// 	name: '请选择'
-				// }],
-				// repairStatesIndex: 0,
-				// repairState: '',
+				totalRecords: 0,
+				repairStates: [{
+					name: '请选择'
+				}],
+				repairStatesIndex: 0,
+				repairState: '',
 			}
 		},
 		components: {
@@ -93,7 +108,7 @@
 		},
 		onLoad() {
 			this.java110Context.onLoad();
-			// this.loadRepairState();
+			 this.loadRepairState();
 		},
 		onShow() {
 			let _userInfo = this.java110Context.getUserInfo();
@@ -149,7 +164,7 @@
 					userId: _userInfo.userId,
 					communityId: getCurrentCommunity().communityId,
 					repairName: _that.repairName,
-					// state: _that.repairState,
+					state: _that.repairState,
 					reqSource: 'mobile'
 				};
 				this.java110Context.request({
@@ -267,13 +282,26 @@
 						"&preStaffName=" + item.preStaffName +
 						"&repairObjType=" + item.repairObjType
 				});
+			},
+			endRepair:function(repair){
+				uni.navigateTo({
+					url: '/pages/repairOrder/repairEnd?repairId=' + repair.repairId +
+						"&communityId=" + repair.communityId
+				});
 			}
 
 		}
 	}
 </script>
 
-<style>
+<style lang="scss">
+	.cu-list{
+		
+		border-radius: 10px;
+		.cu-item{
+			margin:20px
+		}
+	}
 	.cu-list.menu-avatar>.cu-item .content-left {
 		left: 30upx;
 	}