From ac9379ab8af541c1c14eb7fc372403dbbbab8c88 Mon Sep 17 00:00:00 2001
From: Zy <1448159279@qq.com>
Date: Thu, 21 May 2026 10:55:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E5=88=86=E9=85=8D=EF=BC=8C?=
 =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E4=BA=BA=E5=91=98=EF=BC=8C=E6=8A=A5=E4=BF=AE?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wuye-manager-uniapp/api/ticket.js             |  29 +++-
 wuye-manager-uniapp/jsdoc.types.js            |   1 -
 .../pageSubPack/complaint/Details.vue         |   9 +-
 .../pageSubPack/complaint/handle.vue          |  19 +-
 .../pageSubPack/complaint/handleUser.vue      |  53 ++++--
 .../inspection/inspection_record.vue          |  19 +-
 .../inspection/toDays_inscpection.vue         |   6 +-
 .../pageSubPack/instrument/checkouthouse.vue  |   6 +-
 .../instrument/replacement_record.vue         |  13 +-
 .../pageSubPack/ticket/hall.vue               | 164 +++++++++++-------
 .../pageSubPack/ticket/myticket.vue           |   3 +-
 .../pageSubPack/ticket/repairMain.vue         |  28 ++-
 .../pageSubPack/ticket/shareUser.vue          | 117 +++++++------
 wuye-manager-uniapp/pages/index/index.vue     |  48 ++---
 14 files changed, 333 insertions(+), 182 deletions(-)

diff --git a/wuye-manager-uniapp/api/ticket.js b/wuye-manager-uniapp/api/ticket.js
index a099204..413d8ba 100644
--- a/wuye-manager-uniapp/api/ticket.js
+++ b/wuye-manager-uniapp/api/ticket.js
@@ -3,7 +3,7 @@
  * @Author: Zy
  * @Date: 2026-05-19 16:29:20
  * @LastEditor: Zy
- * @LastEditTime: 2026-05-20 08:36:23
+ * @LastEditTime: 2026-05-20 10:45:01
  */
 import request, {
   get,
@@ -104,3 +104,30 @@ export function getTicketMainById(id) {
 export function ticketComputed(data) {
   return put('/manage/repair/order', filterParams(data))
 }
+
+
+
+
+/**
+ * @description: 获取工单大厅 工单列表
+ * @param {RequestParams<{
+ *           problemStatus:1|2
+ *          }>} data
+ * @return { Promise<RowsResult<myOrderListType>>}
+ */
+export function getTicketHallList(data) {
+  return get('/manage/repair/order/orderlist', filterParams(data))
+}
+
+
+
+
+
+/**
+ * @description: 分配 维修人员 - 维修工单
+ * @param {*} data
+ * @return
+ */
+export function shareRepairUser(data) {
+  return post('/manage/repair/order/allocate', filterParams(data))
+}
diff --git a/wuye-manager-uniapp/jsdoc.types.js b/wuye-manager-uniapp/jsdoc.types.js
index a8c2ed9..b2d681d 100644
--- a/wuye-manager-uniapp/jsdoc.types.js
+++ b/wuye-manager-uniapp/jsdoc.types.js
@@ -34,7 +34,6 @@
 /**
  * 【全局】角色标识枚举
  * @typedef {'manage'|'repair'|'inspection'|'EquipmentMaintenance'|'complainUser'} RoleKeyEnum
- *
  * @enum {RoleKeyEnum}
  * @property {'manage'} manage - 物业管理员
  * @property {'repair'} repair - 小区维修人员
diff --git a/wuye-manager-uniapp/pageSubPack/complaint/Details.vue b/wuye-manager-uniapp/pageSubPack/complaint/Details.vue
index cb77e56..03e7748 100644
--- a/wuye-manager-uniapp/pageSubPack/complaint/Details.vue
+++ b/wuye-manager-uniapp/pageSubPack/complaint/Details.vue
@@ -4,6 +4,7 @@
       <!-- 状态筛选标签 -->
       <TabsComponents
         :showBottomLine="false"
+        :activeValue="activeStatus"
         :tabslist="statusTabs"
         @update="switchStatus"
       ></TabsComponents>
@@ -125,9 +126,15 @@ function init() {
 }
 
 onShow(() => {
+  resetList()
+})
+function resetList() {
+  list.value = []
+  querySearch.value.pageNum = 1
+  querySearch.value.pageSize = 10
   hasMore.value = true
   init()
-})
+}
 
 // actions
 function handleComplaint(id: string) {
diff --git a/wuye-manager-uniapp/pageSubPack/complaint/handle.vue b/wuye-manager-uniapp/pageSubPack/complaint/handle.vue
index 678ba8f..27405eb 100644
--- a/wuye-manager-uniapp/pageSubPack/complaint/handle.vue
+++ b/wuye-manager-uniapp/pageSubPack/complaint/handle.vue
@@ -66,12 +66,19 @@ function handleBlur(e) {
 
 // 处理投诉 提交
 function handleSelecthouse() {
-  putComplainProcess({
-    id: form.value.complaintId,
-    handleContent: form.value.handleContent
-  }).then(() => {
-    uni.navigateBack()
-  })
+  if (checkoutinfo.value.userId) {
+    putComplainProcess({
+      id: form.value.complaintId,
+      handleContent: form.value.handleContent
+    }).then(() => {
+      uni.navigateBack()
+    })
+  } else {
+    uni.showToast({
+      icon: 'error',
+      title: '选择处理人员'
+    })
+  }
 }
 </script>
 
diff --git a/wuye-manager-uniapp/pageSubPack/complaint/handleUser.vue b/wuye-manager-uniapp/pageSubPack/complaint/handleUser.vue
index 8f91799..5d3b36c 100644
--- a/wuye-manager-uniapp/pageSubPack/complaint/handleUser.vue
+++ b/wuye-manager-uniapp/pageSubPack/complaint/handleUser.vue
@@ -6,17 +6,19 @@
         <view
           @click="handleClick"
           class="search_view flex-center"
-          v-if="!queryParmas.value.trim() && Searching"
+          v-if="!queryParmas.keyword.trim() && Searching"
         >
           <uni-icons type="search" size="34rpx" color="rgba(0,0,0,0.26)"></uni-icons>
           <text>请输入关键字进行搜索</text>
         </view>
         <uni-easyinput
           @blur="handleInput"
-          @change="handleSearch"
+          @confirm="handleSearch"
+          @clear="handleClear"
+          @input="handleClear"
           :focus="true"
           ref="inputRef"
-          v-model="queryParmas.value"
+          v-model="queryParmas.keyword"
           v-else
         />
       </view>
@@ -67,6 +69,7 @@
 import { ref, onMounted, getCurrentInstance } from 'vue'
 import { getSystemUsers_employee } from '@/api/common.js'
 import navBar from '@/components/navbar/navbar.vue'
+import { onShow } from '@dcloudio/uni-app'
 
 let eventChannel = null
 onMounted(() => {
@@ -81,11 +84,27 @@ function handleClick() {
 }
 /** 判断 失去焦点时 切换回 view */
 function handleInput() {
-  if (queryParmas.value.value.trim()) {
+  if (queryParmas.value.keyword.trim()) {
     Searching.value = true
+    resetList()
+  } else {
+    queryParmas.value.keyword = ''
+    Searching.value = false
+    resetList()
+  }
+}
+function handleSearch() {
+  if (queryParmas.value.keyword.trim()) {
+    resetList()
+  }
+}
+function handleClear() {
+  if (queryParmas.value.keyword.trim() === '') {
+    queryParmas.value.keyword = ''
+    Searching.value = true
+    resetList()
   }
 }
-function handleSearch() {}
 //  -----------------------------------------
 /* 选择列表 */
 const searchlist = ref([])
@@ -93,19 +112,10 @@ const searchlist = ref([])
 const queryParmas = ref({
   pageNum: 1,
   pageSize: 10,
-  value: ''
+  keyword: ''
 })
 const isLoading = ref(false) // 加载锁
-const hasMore = ref(true) // 是否还有更多数据
-const total = ref(21)
-function scrolltolower() {
-  // 必须加这两个判断！
-  if (isLoading.value || !hasMore.value) {
-    return
-  }
-  queryParmas.value.pageNum += 1
-  getlist()
-}
+
 function getlist() {
   // 2. 开启锁
   if (isLoading.value) {
@@ -116,7 +126,7 @@ function getlist() {
     title: '加载中',
     mask: true
   })
-  getSystemUsers_employee('complainUser', queryParmas.value.value)
+  getSystemUsers_employee('complainUser', queryParmas.value.keyword)
     .then(res => {
       searchlist.value = res.data
     })
@@ -125,8 +135,15 @@ function getlist() {
       uni.hideLoading()
     })
 }
-getlist()
+onShow(() => {
+  getlist()
+})
 
+function resetList() {
+  searchlist.value = []
+  queryParmas.value.pageNum = 1
+  getlist()
+}
 //=======================
 // 选中的人员id
 const checkoutUserid = ref(null)
diff --git a/wuye-manager-uniapp/pageSubPack/inspection/inspection_record.vue b/wuye-manager-uniapp/pageSubPack/inspection/inspection_record.vue
index 5907cbf..6aaebd8 100644
--- a/wuye-manager-uniapp/pageSubPack/inspection/inspection_record.vue
+++ b/wuye-manager-uniapp/pageSubPack/inspection/inspection_record.vue
@@ -3,7 +3,11 @@
   <view class="page_padding">
     <view class="inspection_record_box flex-1 flex flex-col">
       <navBar @clickLeft="navBack" title="巡检记录"></navBar>
-      <TabsComponents :tabslist="tabslist" @update="handleChangeTabs"></TabsComponents>
+      <TabsComponents
+        :activeValue="activeValue"
+        :tabslist="tabslist"
+        @update="handleChangeTabs"
+      ></TabsComponents>
       <view class="timebox">
         <view class="daybox flex items-center">
           <uni-datetime-picker
@@ -87,6 +91,7 @@ const tabslist = [
     value: 1
   }
 ]
+const activeValue = ref(2)
 
 // ---------------------------------------------------------------------
 
@@ -167,6 +172,7 @@ function scrolltolower() {
 }
 
 function handleChangeTabs(val: number) {
+  activeValue.value = val
   hasMore.value = true
   queryParmas.value.status = val
   queryParmas.value.pageNum = 1
@@ -182,8 +188,17 @@ function init() {
 
 onShow(() => {
   hasMore.value = true
-  init()
+  resetList()
 })
+function resetList() {
+  list.value = []
+  queryParmas.value.status = 2
+  queryParmas.value.pageSize = 10
+  queryParmas.value.pageSize = 10
+  hasMore.value = true
+  init()
+}
+
 // 返回上一页
 const navBack = () => {
   uni.navigateBack()
diff --git a/wuye-manager-uniapp/pageSubPack/inspection/toDays_inscpection.vue b/wuye-manager-uniapp/pageSubPack/inspection/toDays_inscpection.vue
index f7fa00c..f6db198 100644
--- a/wuye-manager-uniapp/pageSubPack/inspection/toDays_inscpection.vue
+++ b/wuye-manager-uniapp/pageSubPack/inspection/toDays_inscpection.vue
@@ -2,7 +2,11 @@
   <view class="page_padding">
     <view class="today_inspection_page flex flex-col">
       <!-- 状态筛选标签 -->
-      <TabsComponents :tabslist="tabslist" @update="handleTabs"></TabsComponents>
+      <TabsComponents
+        :activeValue="activeValue"
+        :tabslist="tabslist"
+        @update="handleTabs"
+      ></TabsComponents>
       <!-- body -->
       <view class="inspection_body flex-1" v-if="list.length > 0">
         <view
diff --git a/wuye-manager-uniapp/pageSubPack/instrument/checkouthouse.vue b/wuye-manager-uniapp/pageSubPack/instrument/checkouthouse.vue
index 8d9ef38..fdff5fa 100644
--- a/wuye-manager-uniapp/pageSubPack/instrument/checkouthouse.vue
+++ b/wuye-manager-uniapp/pageSubPack/instrument/checkouthouse.vue
@@ -56,6 +56,7 @@
 <script setup>
 import { ref, getCurrentInstance, onMounted } from 'vue'
 import { getVillageHouseList_keyword } from '@/api/common.js'
+import { onShow } from '@dcloudio/uni-app'
 
 const Searching = ref(true)
 const queryParmas = ref({
@@ -139,7 +140,10 @@ function getlist() {
       uni.hideLoading()
     })
 }
-getlist()
+
+onShow(() => {
+  resetList()
+})
 
 // 重置list
 function resetList() {
diff --git a/wuye-manager-uniapp/pageSubPack/instrument/replacement_record.vue b/wuye-manager-uniapp/pageSubPack/instrument/replacement_record.vue
index beb3292..9f23341 100644
--- a/wuye-manager-uniapp/pageSubPack/instrument/replacement_record.vue
+++ b/wuye-manager-uniapp/pageSubPack/instrument/replacement_record.vue
@@ -5,7 +5,11 @@
         <view class="line"></view>
         <text class="title">仪表换新记录</text>
       </view>
-      <TabsComponents :tabslist="tabslist" @update="handleChangeTabs"></TabsComponents>
+      <TabsComponents
+        :activeValue="activeValue"
+        :tabslist="tabslist"
+        @update="handleChangeTabs"
+      ></TabsComponents>
       <view class="instrument_body flex-1 flex">
         <scroll-view scroll-y lower-threshold="160" @scrolltolower="scrolltolower">
           <view
@@ -75,10 +79,11 @@ const tabslist = [
     value: 1
   }
 ]
-
+const activeValue = ref(0)
 // 切换tabs
 function handleChangeTabs(val: number) {
   queryParmas.value.deviceType = val
+  activeValue.value = val
   if (val === 0) {
     queryParmas.value.deviceType = undefined
   }
@@ -132,9 +137,7 @@ function getlist() {
     })
 }
 onShow(() => {
-  infolist.value = []
-  hasMore.value = true
-  getlist()
+  resetList()
 })
 
 // 重置
diff --git a/wuye-manager-uniapp/pageSubPack/ticket/hall.vue b/wuye-manager-uniapp/pageSubPack/ticket/hall.vue
index 6a3e134..ff1e082 100644
--- a/wuye-manager-uniapp/pageSubPack/ticket/hall.vue
+++ b/wuye-manager-uniapp/pageSubPack/ticket/hall.vue
@@ -7,6 +7,7 @@
       <!-- 状态筛选标签 -->
       <TabsComponents
         :tabslist="statusTabs"
+        :activeValue="activeStatus"
         :options="{ label: 'label', value: 'value' }"
         @update="switchStatus"
       ></TabsComponents>
@@ -40,49 +41,50 @@
         >
           <!-- 标题 + 状态标签 -->
           <view class="card-header">
-            <text class="card-title">{{ record.title }}</text>
+            <text class="card-title">{{ record.item }}</text>
             <view
               class="status-tag"
               :class="{
-                pending: record.repairStatus === 0,
-                processing: record.repairStatus === 1,
-                completed: record.repairStatus === 2
+                pending: record.problemStatus === statusMap.pending,
+                processing: record.problemStatus === statusMap.processing,
+                completed: record.problemStatus === statusMap.completed
               }"
             >
-              {{ getStatusText(record.repairStatus) }}
+              {{ getStatusText(record.problemStatus) }}
             </view>
           </view>
 
           <!-- 类型标签 -->
-          <view class="tag-group">
-            <view class="tag-item">{{ record.reportType }}</view>
-            <view class="tag-item">{{ record.category }}</view>
+          <view class="tag-group" v-if="record.maintenanceItemName || record.projectTypeStr">
+            <view class="tag-item" v-if="record.projectTypeStr">{{ record.projectTypeStr }}</view>
+            <view class="tag-item" v-if="record.maintenanceItemName">{{
+              record.maintenanceItemName
+            }}</view>
           </view>
 
           <!-- 内容 -->
           <view class="card-content">
-            {{ record.content }}
+            {{ record.problem }}
           </view>
           <!-- 工单图片 -->
-          <view class="card-image" v-if="record.images.length > 0">
+          <view class="card-image" v-if="record.repairImageUrlList.length > 0">
             <image
               lazy-load
-              v-for="(item, index) in record.images"
+              v-for="(item, index) in record.repairImageUrlList"
               :key="index"
               :src="item"
               class="images"
               mode="scaleToFill"
-              @tap="handlePrivew(record.images)"
             ></image>
           </view>
 
           <!-- 底部信息 -->
           <view class="card-footer">
             <text class="create-time">{{ record.createTime }}</text>
-            <text v-if="record.repairStatus === 1" class="repairman"
-              >维修师傅：{{ record.repairman }}</text
+            <text v-if="record.problemStatus === statusMap.processing" class="repairman"
+              >维修师傅：{{ record.repairName }}</text
             >
-            <view class="share" v-if="record.repairStatus === 0">
+            <view class="share" v-if="record.problemStatus === statusMap.pending">
               <text>分配</text>
             </view>
           </view>
@@ -94,41 +96,44 @@
 
 <script setup>
 import { ref, computed, nextTick } from 'vue'
-import { onReady } from '@dcloudio/uni-app'
+import { onReady, onShow } from '@dcloudio/uni-app'
 import TabsComponents from '@/components/tabs/tabs.vue'
 import NavBar from '@/components/navbar/navbar.vue'
-
+import { getTicketHallList } from '@/api/ticket.js'
 // 导航栏/标签高度（适配不同设备）
 
 // 筛选状态
-const activeStatus = ref('0') // 全部/待分配/待解决/已完成
-const activeType = ref('all') // 全部/公共报修/个人报修
+const activeStatus = ref(-1) // 全部/待分配/待解决/已完成
+const activeType = ref(-1) // 全部/公共报修/个人报修
 
+// 0 已提交 1已分配 2维修完成
 // 状态筛选选项
 const statusTabs = ref([
-  { label: '全部', value: 0 },
-  { label: '待分配', value: 1 },
-  { label: '待解决', value: 2 },
-  { label: '已完成', value: 3 }
+  { label: '全部', value: -1 },
+  { label: '待分配', value: 0 },
+  { label: '待解决', value: 1 },
+  { label: '已完成', value: 2 }
 ])
 
 // 类型筛选选项
 const typeTabs = ref([
-  { label: '全部', value: 'all' },
-  { label: '公共报修', value: 'public' },
-  { label: '个人报修', value: 'private' }
+  { label: '全部', value: -1 },
+  { label: '公共报修', value: 0 },
+  { label: '个人报修', value: 1 }
 ])
 
 // 模拟上报记录数据（实际项目替换为接口请求）
 const reportRecords = ref([])
-
 const queryParmas = ref({
   pageNum: 1,
-  pageSize: 5
+  pageSize: 5,
+  itemType: undefined, // -1 全部/ 0 公共报修/ 1 个人报修
+  problemStatus: undefined // 0 已提交 1已分配 2维修完成
 })
 const isLoading = ref(false) // 加载锁
 const hasMore = ref(true) // 是否还有更多数据
-const total = ref(21)
+const total = ref(0)
+
 function scrolltolower() {
   // 必须加这两个判断！
   if (isLoading.value || !hasMore.value) {
@@ -137,68 +142,85 @@ function scrolltolower() {
   queryParmas.value.pageNum += 1
   getlist()
 }
+
 function getlist() {
-  // 1. 如果正在加载或没有更多数据，直接返回
   if (isLoading.value || !hasMore.value) return
-  // 2. 开启锁
   isLoading.value = true
   uni.showLoading({
     title: '加载中',
     mask: true
   })
-  const { pageNum, pageSize } = queryParmas.value
-
-  const startId = (pageNum - 1) * pageSize + 1
-  const arr = Array.from({ length: pageSize }).map((_, index) => {
-    const realId = startId + index // ✅ 修复 ID 错误
-
-    // ✅ 随机生成 0、1、2
-    const randomStatus = Math.floor(Math.random() * 3)
-    return {
-      id: realId,
-      title: '标题巴拉巴拉巴拉' + startId + 1,
-      status: 'completed',
-      reportType: '公共报修',
-      category: '路灯',
-      content: '1栋楼下道路路灯不亮，并且有的亮度不够，请物业公司及时更换，防止发生意外事故。',
-      createTime: '2026-08-01 10:05:46',
-      images: ['https://picsum.photos/93', 'https://picsum.photos/93', 'https://picsum.photos/93'],
-      repairman: '张三',
-      repairStatus: randomStatus // 0 待分配，1待解决 2已完成
-    }
-  })
-
-  // 追加数据（正确方式）
-  reportRecords.value = [...reportRecords.value, ...arr]
-  // 判断是否还有更多
-  hasMore.value = reportRecords.value.length < total.value
-  isLoading.value = false
-  uni.hideLoading()
+  getTicketHallList(queryParmas.value)
+    .then(res => {
+      reportRecords.value = [...reportRecords.value, ...res.rows]
+      reportRecords.value.forEach(item => {
+        item.repairImageUrlList = item.repairImageUrl
+          ? item.repairImageUrl.split(',').filter(item => item)
+          : []
+      })
+      total.value = res.total
+      hasMore.value = reportRecords.value.length < total.value
+    })
+    .catch(err => {
+      uni.showToast({
+        icon: 'error',
+        title: '网络错误'
+      })
+    })
+    .finally(() => {
+      isLoading.value = false
+      uni.hideLoading()
+    })
 }
-getlist()
+
+onShow(() => {
+  resetList()
+})
+
 function resetList() {
   reportRecords.value = []
   queryParmas.value.pageNum = 1
+  queryParmas.value.pageSize = 5
   hasMore.value = true
   getlist()
 }
+
 // 切换状态（全部/待分配/待解决/已完成）筛选
 const switchStatus = value => {
   activeStatus.value = value
+  if (value === -1) {
+    queryParmas.value.problemStatus = undefined
+  } else {
+    queryParmas.value.problemStatus = value
+  }
   resetList()
 }
 
 // 切换类型（公共/个人）筛选
 const switchType = value => {
   activeType.value = value
+  if (value === -1) {
+    queryParmas.value.itemType = undefined
+  } else {
+    queryParmas.value.itemType = value
+  }
   resetList()
 }
 
-const statusMap = ['待分配', '待解决', '已完成']
+const statusMap = {
+  已提交: '待分配',
+  已分配: '待解决',
+  已完成: '已完成',
+
+  pending: '已提交',
+  processing: '已分配',
+  completed: '已完成'
+}
 // 获取状态文本
 const getStatusText = status => {
   return statusMap[status] || ''
 }
+
 // 返回上一页
 const navBack = () => {
   uni.navigateBack()
@@ -334,10 +356,11 @@ function handlePrivew(imgs) {
 
 .card-title {
   margin-right: 20rpx;
-  font-weight: 450;
-  font-size: 32rpx;
+
+  font-weight: 400;
   color: #222222;
   line-height: 40rpx;
+  font-size: 32rpx;
 }
 
 /* 状态标签 */
@@ -389,11 +412,11 @@ function handlePrivew(imgs) {
 /* 内容 */
 .card-content {
   margin-bottom: 20rpx;
-  font-weight: 450;
+  letter-spacing: 2rpx;
+  font-weight: 400;
   font-size: 28rpx;
   color: #666666;
   line-height: 40rpx;
-  letter-spacing: 2rpx;
 }
 /* 图片  */
 .card-image {
@@ -417,6 +440,12 @@ function handlePrivew(imgs) {
   font-size: 28rpx;
   color: #999;
 }
+.create-time {
+  font-weight: 400;
+  font-size: 28rpx;
+  color: #999999;
+  line-height: 40rpx;
+}
 .share {
   width: 127rpx;
   height: 44rpx;
@@ -431,6 +460,9 @@ function handlePrivew(imgs) {
 }
 
 .repairman {
-  color: #999;
+  font-weight: 400;
+  font-size: 28rpx;
+  color: #999999;
+  line-height: 40rpx;
 }
 </style>
diff --git a/wuye-manager-uniapp/pageSubPack/ticket/myticket.vue b/wuye-manager-uniapp/pageSubPack/ticket/myticket.vue
index e6444e2..3ec48f6 100644
--- a/wuye-manager-uniapp/pageSubPack/ticket/myticket.vue
+++ b/wuye-manager-uniapp/pageSubPack/ticket/myticket.vue
@@ -5,6 +5,7 @@
     <view class="hall_body flex-1 flex flex-col">
       <!-- 状态筛选标签 -->
       <TabsComponents
+        :activeValue="activeStatus"
         :tabslist="statusTabs"
         :options="{ label: 'label', value: 'value' }"
         @update="switchStatus"
@@ -156,7 +157,7 @@ function getlist() {
     })
 }
 onShow(() => {
-  getlist()
+  resetList()
 })
 function resetList() {
   reportRecords.value = []
diff --git a/wuye-manager-uniapp/pageSubPack/ticket/repairMain.vue b/wuye-manager-uniapp/pageSubPack/ticket/repairMain.vue
index 61de733..5eb0f81 100644
--- a/wuye-manager-uniapp/pageSubPack/ticket/repairMain.vue
+++ b/wuye-manager-uniapp/pageSubPack/ticket/repairMain.vue
@@ -142,7 +142,7 @@
 import { ref } from 'vue'
 import { onLoad, onShow } from '@dcloudio/uni-app'
 import Stops from '@/components/stops/stops.vue'
-import { getTicketMainById } from '@/api/ticket.js'
+import { getTicketMainById, shareRepairUser } from '@/api/ticket.js'
 // --------------------------------------
 /** 维修步骤：0提交 1分配 2维修完成 / 待解决 3记录完成 完成*/
 const currentStep = ref(2)
@@ -246,7 +246,31 @@ function handleStop(row) {
 /** 选择维修人员 */
 function handleSelecthouse() {
   uni.navigateTo({
-    url: '/pageSubPack/ticket/shareUser'
+    url: '/pageSubPack/ticket/shareUser',
+    events: {
+      backData: data => {
+        const repairid = data.checkoutUserid
+        if (repairid) {
+          shareRepairUser({
+            id: repairInfo.value.id,
+            repairId: repairid
+          })
+            .then(res => {
+              uni.showToast({
+                icon: 'success',
+                title: '分配成功'
+              })
+              getTicketById()
+            })
+            .catch(() => {
+              uni.showToast({
+                icon: 'error',
+                title: '网络异常'
+              })
+            })
+        }
+      }
+    }
   })
 }
 
diff --git a/wuye-manager-uniapp/pageSubPack/ticket/shareUser.vue b/wuye-manager-uniapp/pageSubPack/ticket/shareUser.vue
index 56853dc..c232d03 100644
--- a/wuye-manager-uniapp/pageSubPack/ticket/shareUser.vue
+++ b/wuye-manager-uniapp/pageSubPack/ticket/shareUser.vue
@@ -6,44 +6,41 @@
         <view
           @click="handleClick"
           class="search_view flex-center"
-          v-if="!queryParmas.value.trim() && Searching"
+          v-if="!queryParmas.keyword.trim() && Searching"
         >
           <uni-icons type="search" size="34rpx" color="rgba(0,0,0,0.26)"></uni-icons>
           <text>请输入关键字进行搜索</text>
         </view>
         <uni-easyinput
           @blur="handleInput"
-          @change="handleSearch"
+          @confirm="handleSearch"
+          @clear="handleClear"
+          @input="handleClear"
           :focus="true"
           ref="inputRef"
-          v-model="queryParmas.value"
+          v-model="queryParmas.keyword"
           v-else
         />
       </view>
       <!-- 已经选择人数 -->
       <view class="checkoutedUser_box">
         <text>已选({{ checkoutUserid ? 1 : 0 }}/1)</text>
-        <text class="checkoutUseName" v-if="checkoutInfo">{{ checkoutInfo.name }}</text>
+        <text class="checkoutUseName" v-if="checkoutInfo">{{ checkoutInfo.nickName }}</text>
       </view>
       <!-- srcoll -->
-      <scroll-view
-        scroll-y="true"
-        class="flex-1 overflow-auto"
-        lower-threshold="60"
-        @scrolltolower="scrolltolower"
-      >
+      <scroll-view scroll-y="true" class="flex-1 overflow-auto">
         <radio-group @change="radioChange">
           <label v-for="(item, index) in searchlist" :key="index">
             <view
               class="item flex items-center justify-between"
               :class="{
-                active: checkoutUserid === item.id
+                active: checkoutUserid === item.userId
               }"
             >
               <view class="">
                 <view class="info">
                   <text>姓名：</text>
-                  <text>{{ item.name }}</text>
+                  <text>{{ item.nickName }}</text>
                 </view>
                 <view class="info">
                   <text>角色：</text>
@@ -51,10 +48,10 @@
                 </view>
                 <view class="info">
                   <text>手机号码：</text>
-                  <text>{{ item.phone }}</text>
+                  <text>{{ item.phonenumber }}</text>
                 </view>
               </view>
-              <radio color="#4d5dfa" :value="item.id" />
+              <radio color="#4d5dfa" :value="item.userId" />
             </view>
           </label>
         </radio-group>
@@ -71,6 +68,9 @@
 <script setup>
 import { ref, onMounted, getCurrentInstance } from 'vue'
 import navBar from '@/components/navbar/navbar.vue'
+import { getSystemUsers_employee } from '@/api/common.js'
+import { onShow } from '@dcloudio/uni-app'
+
 const Searching = ref(true)
 /** 点击时切换到input,并聚焦 */
 function handleClick() {
@@ -78,73 +78,74 @@ function handleClick() {
 }
 /** 判断 失去焦点时 切换回 view */
 function handleInput() {
-  if (queryParmas.value.value.trim()) {
+  if (queryParmas.value.keyword.trim()) {
     Searching.value = true
+    resetList()
+  } else {
+    queryParmas.value.keyword = ''
+    Searching.value = false
+    resetList()
+  }
+}
+function handleSearch() {
+  if (queryParmas.value.keyword.trim()) {
+    resetList()
+  }
+}
+function handleClear() {
+  if (queryParmas.value.keyword.trim() === '') {
+    queryParmas.value.keyword = ''
+    Searching.value = true
+    resetList()
   }
 }
-function handleSearch() {}
 //  -----------------------------------------
 /* 选择列表 */
 const searchlist = ref([])
 
 const queryParmas = ref({
-  pageNum: 1,
-  pageSize: 10,
-  value: ''
+  keyword: '',
+  roleKey: 'repair'
 })
 const isLoading = ref(false) // 加载锁
 const hasMore = ref(true) // 是否还有更多数据
-const total = ref(21)
-function scrolltolower() {
-  // 必须加这两个判断！
-  if (isLoading.value || !hasMore.value) {
-    return
-  }
-  queryParmas.value.pageNum += 1
-  getlist()
-}
+
 function getlist() {
   // 1. 如果正在加载或没有更多数据，直接返回
-  if (isLoading.value || !hasMore.value) return
+  if (isLoading.value) return
   // 2. 开启锁
   isLoading.value = true
   uni.showLoading({
     title: '加载中',
     mask: true
   })
-  const { pageNum, pageSize } = queryParmas.value
 
-  const startId = (pageNum - 1) * pageSize + 1
-  const arr = Array.from({ length: pageSize }).map((_, index) => {
-    const realId = startId + index
-    const randomStatus = Math.floor(Math.random() * 3)
-    return {
-      name: '张三' + realId,
-      roleName: '维修人员',
-      phone: '19578012123',
-      id: realId
-    }
-  })
-  // 追加数据（正确方式）
-  searchlist.value = [...searchlist.value, ...arr]
-  // 判断是否还有更多
-  hasMore.value = searchlist.value.length < total.value
-  isLoading.value = false
-  uni.hideLoading()
+  const { keyword, roleKey } = queryParmas.value
+  getSystemUsers_employee(roleKey, keyword)
+    .then(res => {
+      searchlist.value = res.data
+    })
+    .finally(() => {
+      isLoading.value = false
+      uni.hideLoading()
+    })
 }
-getlist()
+
+onShow(() => {
+  resetList()
+})
+
 function resetList() {
-  reportRecords.value = []
+  searchlist.value = []
   queryParmas.value.pageNum = 1
-  hasMore.value = true
   getlist()
 }
 //searchlist----------------------
 const checkoutUserid = ref(null)
 const checkoutInfo = ref(null)
 function radioChange(val) {
-  checkoutUserid.value = Number(val.detail.value)
-  const find = searchlist.value.find(item => item.id === Number(val.detail.value))
+  checkoutUserid.value = val.detail.value
+  const find = searchlist.value.find(item => item.userId === val.detail.value)
   if (find) {
     checkoutInfo.value = find
   }
@@ -161,11 +162,13 @@ onMounted(() => {
 /* 确定派单 */
 function handleSelecthouse() {
   // api
-  eventChannel.emit('backData', {
-    checkoutUserid: checkoutUserid.value
-  })
-  // 3. 返回上一页
-  uni.navigateBack()
+  if (eventChannel) {
+    eventChannel.emit('backData', {
+      checkoutUserid: checkoutUserid.value
+    })
+    // 3. 返回上一页
+    uni.navigateBack()
+  }
 }
 //  ===========================================
 </script>
diff --git a/wuye-manager-uniapp/pages/index/index.vue b/wuye-manager-uniapp/pages/index/index.vue
index 943841d..f0ccd84 100644
--- a/wuye-manager-uniapp/pages/index/index.vue
+++ b/wuye-manager-uniapp/pages/index/index.vue
@@ -153,8 +153,12 @@
 <script setup>
 import { ref } from 'vue'
 import { onLoad, onUnload } from '@dcloudio/uni-app'
-import { getCurrentVillage,getTodayInspection,getNewNoticeData,getBannarList} from '../../api/api.js'
-
+import {
+  getCurrentVillage,
+  getTodayInspection,
+  getNewNoticeData,
+  getBannarList
+} from '../../api/api.js'
 
 // 列表数据状态
 const current = ref(0)
@@ -242,17 +246,19 @@ const currentVillageData = () => {
     .catch(() => {})
 }
 // 获取今日巡检数据
-const getInspectionData = () =>{
-  getTodayInspection().then(res =>{
-    if(res.code === 200){
-      if(res.data){
-        allCount.value = res.data.totalTasks
-        pendingCount.value = res.data.unfinishedTasks
-        InspectedCount.value = res.data.completedTasks
-      }else{
+const getInspectionData = () => {
+  getTodayInspection()
+    .then(res => {
+      if (res.code === 200) {
+        if (res.data) {
+          allCount.value = res.data.totalTasks
+          pendingCount.value = res.data.unfinishedTasks
+          InspectedCount.value = res.data.completedTasks
+        } else {
           allCount.value = 0
-         pendingCount.value = 0
-         InspectedCount.value = 0
+          pendingCount.value = 0
+          InspectedCount.value = 0
+        }
       }
     })
     .catch(err => {
@@ -272,14 +278,16 @@ const getNoticeData = () => {
     .catch(() => {})
 }
 // 获取bannar图
-function getbannarData(){
-  getBannarList().then(res => {
-    if (res.code === 200 && res.data) {
-      bannerList.value = res.data
-    }else{
-      bannerList.value = []
-    }
-  }).catch(() => {})
+function getbannarData() {
+  getBannarList()
+    .then(res => {
+      if (res.code === 200 && res.data) {
+        bannerList.value = res.data
+      } else {
+        bannerList.value = []
+      }
+    })
+    .catch(() => {})
 }
 
 // 接收选择小区返回的参数