From c3d1e454e6f6de261fe362a9fbccc14c5df7d9cd Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Thu, 22 Jan 2026 13:57:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 applications/task-work-order/src/views/orderView/orderManage/orderManage/index.vue |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/applications/task-work-order/src/views/orderView/orderManage/orderManage/index.vue b/applications/task-work-order/src/views/orderView/orderManage/orderManage/index.vue
index 1198ba4..b741d35 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/orderManage/index.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/orderManage/index.vue
@@ -1,6 +1,6 @@
 <template>
 	<basic-container>
-		<el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
+		<el-tabs class="gd-tabs" v-model="activeName" @tab-click="tabsClick">
 			<el-tab-pane label="全部 " name="all"></el-tab-pane>
 			<el-tab-pane label="我的任务工单" name="my"></el-tab-pane>
 		</el-tabs>
@@ -108,7 +108,7 @@
 						</template>
 					</el-table-column>
 					<el-table-column prop="serviceParty" show-overflow-tooltip label="服务方名称" />
-					<el-table-column prop="createDeptName" show-overflow-tooltip label="需求方名称" />
+					<el-table-column prop="createUserName" show-overflow-tooltip label="需求方名称" />
 					<el-table-column prop="createTime" show-overflow-tooltip label="工单创建时间" />
 					<el-table-column label="操作" class-name="operation-btns">
 						<template v-slot="{ row }">
@@ -193,7 +193,7 @@
 			...searchParams.value,
 			startTime: range[0],
 			endTime: range[1],
-			createUser: activeName.value === 'user' ? store.state.user.userInfo.user_id : '',
+			createUser: activeName.value === 'my' ? store.state.user.userInfo.user_id : '',
 		})
 		list.value = res?.data?.data?.records ?? []
 		total.value = res?.data?.data?.total ?? 0
@@ -216,7 +216,9 @@
 	getList()
 }
 
-function handleClick(tab,event) {
+function tabsClick(tab, event) {
+	activeName.value = tab.props.name
+	resetForm()
 	handleSearch()
 }
 

--
Gitblit v1.9.3