From 2764b83e602b3746156e41ee9b4d4c5e222f0fc8 Mon Sep 17 00:00:00 2001
From: liugongyu <290219706@qq.com>
Date: Sat, 20 Dec 2025 14:12:16 +0800
Subject: [PATCH] 分配养护员

---
 common/utils/common.js                                     |   5 +++++
 pages-sub/problem/work-order-manage/add-maintain-order.vue | 645 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pages-sub/problem/work-order-manage/add-order.vue          | 449 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 pages-sub/problem/work-order-manage/index.vue              |  45 +++++++++++++++++++++------------------------
 pages-sub/problem/work-order-manage/order-detail.vue       |  10 ++++++++--
 pages.json                                                 |   7 ++++++-
 6 files changed, 808 insertions(+), 353 deletions(-)
 create mode 100644 pages-sub/problem/work-order-manage/add-maintain-order.vue

diff --git a/common/utils/common.js b/common/utils/common.js
index e69de29..e7a0559 100644
--- a/common/utils/common.js
+++ b/common/utils/common.js
@@ -0,0 +1,5 @@
+export const nextStepMap = {
+  ylTeamLeader: '养护组长分配',  //
+  ylWorker:'养护员待实施'
+
+}
\ No newline at end of file
diff --git a/pages-sub/problem/work-order-manage/add-maintain-order.vue b/pages-sub/problem/work-order-manage/add-maintain-order.vue
new file mode 100644
index 0000000..b985656
--- /dev/null
+++ b/pages-sub/problem/work-order-manage/add-maintain-order.vue
@@ -0,0 +1,645 @@
+<template>
+  <view class="page-container">
+    <view class="work-order-form-content commonPageLRpadding">
+      <up-form
+          label-position="left"
+          :model="workOrderForm"
+          ref="workOrderFormRef"
+          labelWidth="190rpx"
+      >
+        <!-- 1. 工单编号（新增：从URL获取，只读展示） -->
+        <up-form-item
+            label="工单编号"
+            border-bottom
+        >
+          <up-input
+              v-model="workOrderForm.orderNo"
+              border="none"
+              readonly
+              placeholder="暂无工单编号"
+          ></up-input>
+        </up-form-item>
+
+        <!-- 2. 共同处理人（新增：非必选，下拉框） -->
+        <up-form-item
+            label="共同处理人"
+            prop="coProcessorName"
+            border-bottom
+            @click="handleActionSheetOpen('coProcessor'); hideKeyboard()"
+        >
+          <up-input
+              v-model="workOrderForm.coProcessorName"
+              disabled
+              disabled-color="#ffffff"
+              placeholder="请选择共同处理人（可选）"
+              border="none"
+          ></up-input>
+          <template #right>
+            <up-icon name="arrow-right" size="16"></up-icon>
+          </template>
+        </up-form-item>
+
+        <!-- 3. 处理建议（新增：必传，文本域） -->
+        <up-form-item
+            label="处理建议"
+            prop="reason"
+            required
+        >
+          <up-textarea
+              placeholder="请输入处理建议（必填，最多200字）"
+              v-model.trim="workOrderForm.reason"
+              count
+              maxlength="200"
+              rows="4"
+              border="none"
+              @blur="() => workOrderFormRef.validateField('reason')"
+          ></up-textarea>
+        </up-form-item>
+
+        <!-- 原有：工单位置（地图选择） -->
+        <up-form-item
+            label="工单位置"
+            prop="workLocation"
+            border-bottom
+            required
+            @click="chooseWorkLocation(); hideKeyboard()"
+        >
+          <up-input
+              v-model="workOrderForm.workLocation"
+              border="none"
+              readonly
+              suffix-icon="map-fill"
+              placeholder="点击选择工单位置"
+          ></up-input>
+        </up-form-item>
+
+        <!-- 原有：道路名称（下拉框） -->
+        <up-form-item
+            label="道路名称"
+            prop="roadName"
+            border-bottom
+            required
+            @click="handleActionSheetOpen('roadName'); hideKeyboard()"
+        >
+          <up-input
+              v-model="workOrderForm.roadName"
+              readonly
+              disabled-color="#ffffff"
+              placeholder="请先选择工单位置"
+              border="none"
+          ></up-input>
+          <template #right>
+            <up-icon name="arrow-right" size="16"></up-icon>
+          </template>
+        </up-form-item>
+
+        <!-- 原有：工单名称（下拉框） -->
+        <up-form-item
+            label="工单名称"
+            prop="orderName"
+            border-bottom
+            required
+            @click="handleActionSheetOpen('orderName'); hideKeyboard()"
+        >
+          <up-input
+              v-model="workOrderForm.orderName"
+              disabled
+              disabled-color="#ffffff"
+              placeholder="请选择工单名称"
+              border="none"
+          ></up-input>
+          <template #right>
+            <up-icon name="arrow-right" size="16"></up-icon>
+          </template>
+        </up-form-item>
+
+        <!-- 原有：紧急程度选择 -->
+        <up-form-item
+            label="紧急程度"
+            prop="pressingTypeName"
+            border-bottom
+            required
+            @click="handleActionSheetOpen('pressingType'); hideKeyboard()"
+        >
+          <up-input
+              v-model="workOrderForm.pressingTypeName"
+              disabled
+              disabled-color="#ffffff"
+              placeholder="请选择紧急程度"
+              border="none"
+          ></up-input>
+          <template #right>
+            <up-icon name="arrow-right" size="16"></up-icon>
+          </template>
+        </up-form-item>
+
+        <!-- 原有：情况描述（文本域） -->
+        <up-form-item
+            label="情况描述"
+            prop="problemDesc"
+            required
+        >
+          <up-textarea
+              placeholder="请输入情况描述（最多200字）"
+              v-model.trim="workOrderForm.problemDesc"
+              count
+              maxlength="200"
+              rows="4"
+              @blur="() => workOrderFormRef.validateField('problemDesc')"
+          ></up-textarea>
+        </up-form-item>
+
+        <!-- 原有：问题照片 -->
+        <up-form-item label="问题照片" prop="problemImgs" required>
+          <up-upload
+              :file-list="problemImgs.imgList"
+              @after-read="problemImgs.uploadImgs"
+              @delete="problemImgs.deleteImg"
+              multiple
+              :max-count="problemImgs.uploadConfig.maxCount"
+              :upload-text="problemImgs.uploadConfig.uploadText"
+              :size-type="problemImgs.uploadConfig.sizeType"
+          ></up-upload>
+        </up-form-item>
+
+        <!-- 原有：完成时间 -->
+        <up-form-item
+            label="希望完成时间"
+            prop="finishDate"
+            @click="show=true;hideKeyboard()"
+        >
+          <up-input
+              v-model="workOrderForm.finishDate"
+              border="none"
+              readonly
+              placeholder="点击选择时间"
+          ></up-input>
+          <template #right>
+            <up-icon name="arrow-right" size="16"></up-icon>
+          </template>
+        </up-form-item>
+      </up-form>
+
+      <!-- 4. Tabs标签栏（新增：开始、进行中、结束、人员、材料） -->
+      <view class="tabs-wrap commonPageLRpadding" style="margin-top: 30rpx;">
+        <up-tabs
+            v-model="activeTab"
+            :list="tabList"
+            line-width="40rpx"
+            active-color="#1989fa"
+            inactive-color="#666666"
+        ></up-tabs>
+        <!-- Tab对应内容容器（可根据需求填充具体内容） -->
+        <view class="tab-content" style="padding-top: 20rpx;">
+          <view v-if="activeTab === 0">开始阶段相关内容</view>
+          <view v-if="activeTab === 1">进行中阶段相关内容</view>
+          <view v-if="activeTab === 2">结束阶段相关内容</view>
+          <view v-if="activeTab === 3">人员配置相关内容</view>
+          <view v-if="activeTab === 4">材料使用相关内容</view>
+        </view>
+      </view>
+    </view>
+
+    <!-- 底部提交按钮 -->
+    <view class="fixed-bottom-btn-wrap">
+      <up-button
+          type="primary"
+          text="提交工单"
+          @click="submitWorkOrder"
+      ></up-button>
+    </view>
+
+    <!-- 合并后的通用下拉弹窗（新增共同处理人配置） -->
+    <up-action-sheet
+        :show="showActionSheet"
+        :actions="currentActionSheetData.list"
+        :title="currentActionSheetData.title"
+        @close="handleActionSheetClose"
+        @select="handleActionSheetSelect"
+    ></up-action-sheet>
+
+    <!-- 完成时间选择器 -->
+    <up-datetime-picker
+        :show="show"
+        v-model="finishDate"
+        mode="datetime"
+        :min-date="new Date()"
+        @cancel="show = false"
+        @confirm="finishDateConfirm"
+    ></up-datetime-picker>
+  </view>
+</template>
+
+<script setup>
+import { ref, reactive, watch, onLoad } from 'vue'
+import { onReady, onShow } from '@dcloudio/uni-app';
+import { useUploadImgs } from '@/common/utils/useUploadImgs'
+import { getRoadListByLatLng } from '@/api/common'
+import { workorderCreate, getYlWorkersPage, ylTeamLeaderAssignWOrder, ylWorkerExcuteWOrder } from '@/api/work-order-manage/work-order-manage'
+import { timeFormat } from '@/uni_modules/uview-plus'
+
+// ========== 表单Ref ==========
+const workOrderFormRef = ref(null)
+
+// ========== 公共上传逻辑复用 ==========
+const problemImgs = useUploadImgs({
+  maxCount: 3,
+  uploadText: '选择问题照片',
+  sizeType: ['compressed'],
+  formRef: workOrderFormRef,
+  fieldName: 'problemImgs'
+})
+
+// 核心修复：监听响应式数组变化，同步更新纯数组
+watch(() => problemImgs.rawImgList.value, (newVal) => {
+  problemImgs.imgList = newVal
+}, { deep: true })
+
+// ========== 页面状态 ==========
+const showActionSheet = ref(false)
+const currentActionSheetData = reactive({
+  type: '',
+  list: [],
+  title: ''
+})
+const show = ref(false)
+const finishDate = ref(Date.now())
+
+// 新增：Tabs配置
+const activeTab = ref(0) // 默认选中第一个标签
+const tabList = ref([
+  { name: '开始' },
+  { name: '进行中' },
+  { name: '结束' },
+  { name: '人员' },
+  { name: '材料' }
+])
+
+// ========== 下拉列表数据 ==========
+const roadNameList = ref([])
+const orderNameList = ref([])
+const pressingTypeList = ref([])
+const coProcessorList = ref([]) // 新增：共同处理人列表（来自getYlWorkersPage）
+
+// ========== 工单表单数据（新增字段） ==========
+const workOrderForm = reactive({
+  orderNo: '',                  // 新增：工单编号（URL获取）
+  coProcessorId: '',            // 新增：共同处理人ID（非必选，提交接口用）
+  coProcessorName: '',          // 新增：共同处理人名称（显示用）
+  reason: '',                   // 新增：处理建议（必填）
+  roadId: 0,
+  roadName: '',
+  workLocation: '',
+  orderName: '',
+  pressingType: '',
+  pressingTypeName: '',
+  problemDesc: '',
+  lat: 0,
+  lon: 0,
+  finishDate: '',
+})
+
+// ========== 表单校验规则（更新：新增处理建议必填、共同处理人非必填） ==========
+const workOrderFormRules = reactive({
+  orderNo: [                    // 工单编号仅展示，无校验
+    { type: 'string', trigger: ['change'] }
+  ],
+  coProcessorName: [            // 共同处理人非必填，仅长度兜底
+    { type: 'string', max: 50, message: '共同处理人名称过长', trigger: ['change'] }
+  ],
+  reason: [                     // 处理建议必填+长度限制
+    { type: 'string', required: true, message: '请输入处理建议', trigger: ['change', 'blur'] },
+    { type: 'string', max: 200, message: '处理建议最多200字', trigger: ['change', 'blur'] }
+  ],
+  workLocation: [
+    { type: 'string', required: true, message: '请选择工单位置', trigger: ['change', 'blur'] }
+  ],
+  roadName: [
+    { type: 'string', required: true, message: '请选择道路名称', trigger: ['change', 'blur'] }
+  ],
+  orderName: [
+    { type: 'string', required: true, message: '请选择工单名称', trigger: ['change', 'blur'] }
+  ],
+  pressingTypeName: [
+    { type: 'string', required: true, message: '请选择紧急程度', trigger: ['change'] }
+  ],
+  problemDesc: [
+    { type: 'string', required: true, message: '请输入情况描述', trigger: ['change', 'blur'] },
+    { type: 'string', min: 3, max: 200, message: '情况描述需3-200字', trigger: ['change', 'blur'] }
+  ],
+  problemImgs: [problemImgs.imgValidateRule]
+})
+
+// ========== 生命周期 ==========
+// 新增：onLoad - 从URL获取工单编号
+onLoad((options) => {
+  if (options && options.orderNo) {
+    workOrderForm.orderNo = options.orderNo
+  }
+  console.log('从URL获取工单编号：', workOrderForm.orderNo)
+})
+
+onReady(() => {
+  if (workOrderFormRef.value) {
+    workOrderFormRef.value.setRules(workOrderFormRules)
+  }
+  console.log('工单表单规则初始化完成')
+})
+
+onShow(async () => {
+  console.log(uni.$dict.getDictLabel('ai_image_status', 20))
+  console.log(uni.$dict.getDictSimpleList('work_name'))
+
+  // 初始化工单名称列表
+  orderNameList.value = uni.$dict.transformLabelValueToNameValue(uni.$dict.getDictSimpleList('work_name'))
+  console.log('工单名称列表：', orderNameList.value)
+
+  // 初始化紧急程度列表
+  pressingTypeList.value = uni.$dict.transformLabelValueToNameValue(uni.$dict.getDictSimpleList('workorder_pressing_type'))
+  console.log('紧急程度列表：', pressingTypeList.value)
+
+  // 新增：加载共同处理人列表（来自getYlWorkersPage）
+  await loadCoProcessorList()
+})
+
+// ========== 新增：加载共同处理人列表 ==========
+const loadCoProcessorList = async () => {
+  try {
+    uni.showLoading({ title: '获取处理人列表中...' })
+    // 构造查询参数（可根据接口需求调整）
+    const queryData = {
+      roleCode: 'team_leader_yl',
+      busiLine: 'yl',
+      pageNo: 1,
+      pageSize: 100
+    }
+    const res = await getYlWorkersPage(queryData)
+    uni.hideLoading()
+
+    // 适配接口返回格式（兼容res.data.list或res.records）
+    let listData = []
+    if (res && res.code === 0 && res.data && res.data.list) {
+      listData = res.data.list
+    } else if (res && res.records) {
+      listData = res.records
+    }
+
+    if (Array.isArray(listData) && listData.length > 0) {
+      // 格式化共同处理人列表（映射name和value）
+      coProcessorList.value = listData.map(item => ({
+        name: item.nickname || item.realName || item.userName || '未知处理人',
+        value: item.id || item.workerId || '',
+        id: item.id || item.workerId || ''
+      }))
+    } else {
+      coProcessorList.value = []
+      uni.showToast({ title: '未查询到处理人数据', icon: 'none' })
+    }
+  } catch (err) {
+    uni.hideLoading()
+    console.error('获取共同处理人列表失败：', err)
+    uni.showToast({ title: '获取处理人失败，请重试', icon: 'none' })
+    coProcessorList.value = []
+  }
+}
+
+// ========== 方法定义 ==========
+/**
+ * 打开通用下拉弹窗（新增共同处理人配置）
+ */
+const handleActionSheetOpen = (type) => {
+  // 道路名称需先校验工单位置是否选择
+  if (type === 'roadName' && !workOrderForm.workLocation) {
+    uni.showToast({ title: '请先选择工单位置', icon: 'none' })
+    return
+  }
+
+  // 共同处理人列表为空提示
+  if (type === 'coProcessor' && coProcessorList.value.length === 0) {
+    uni.showToast({ title: '暂无处理人数据可选', icon: 'none' })
+    return
+  }
+
+  // 配置当前弹窗参数（新增coProcessor）
+  const configMap = {
+    coProcessor: {
+      title: '请选择共同处理人',
+      list: coProcessorList.value
+    },
+    roadName: {
+      title: '请选择道路名称',
+      list: roadNameList.value
+    },
+    orderName: {
+      title: '请选择工单名称',
+      list: orderNameList.value
+    },
+    pressingType: {
+      title: '请选择紧急程度',
+      list: pressingTypeList.value
+    }
+  }
+
+  currentActionSheetData.type = type
+  currentActionSheetData.title = configMap[type].title
+  currentActionSheetData.list = configMap[type].list
+  showActionSheet.value = true
+}
+
+/**
+ * 关闭通用下拉弹窗
+ */
+const handleActionSheetClose = () => {
+  showActionSheet.value = false
+  currentActionSheetData.type = ''
+  currentActionSheetData.list = []
+  currentActionSheetData.title = ''
+}
+
+/**
+ * 通用下拉弹窗选择事件（新增共同处理人逻辑）
+ */
+const handleActionSheetSelect = (e) => {
+  const { type } = currentActionSheetData
+  switch (type) {
+    case 'coProcessor': // 新增：共同处理人选择
+      workOrderForm.coProcessorName = e.name
+      workOrderForm.coProcessorId = e.value
+      workOrderFormRef.value?.validateField('coProcessorName')
+      break
+    case 'roadName':
+      workOrderForm.roadName = e.name
+      workOrderForm.roadId = e.code
+      workOrderFormRef.value?.validateField('roadName')
+      break
+    case 'orderName':
+      workOrderForm.orderName = e.name
+      workOrderFormRef.value?.validateField('orderName')
+      break
+    case 'pressingType':
+      workOrderForm.pressingType = e.value
+      workOrderForm.pressingTypeName = e.name
+      workOrderFormRef.value?.validateField('pressingType')
+      break
+  }
+  showActionSheet.value = false
+}
+
+/**
+ * 返回上一页
+ */
+const navigateBack = () => {
+  uni.navigateBack()
+}
+
+/**
+ * 选择工单位置
+ */
+const chooseWorkLocation = () => {
+  uni.chooseLocation({
+    success: async (res) => {
+      workOrderForm.roadName = ''
+      workOrderForm.roadId = 0
+      roadNameList.value = []
+
+      workOrderForm.workLocation = res.name
+      workOrderForm.lat = res.latitude
+      workOrderForm.lon = res.longitude
+
+      workOrderFormRef.value?.validateField('workLocation')
+      workOrderFormRef.value?.validateField('roadName')
+
+      try {
+        uni.showLoading({ title: '获取道路名称中...' })
+        const roadRes = await getRoadListByLatLng({
+          companyCode: 'sls',
+          latitude: res.latitude,
+          longitude: res.longitude
+        })
+        uni.hideLoading()
+
+        if (Array.isArray(roadRes)) {
+          roadNameList.value = roadRes.map((item) => ({
+            name: item.roadName || '',
+            code: item.roadCode || '',
+            id: item.roadId || 0
+          }))
+        } else {
+          roadNameList.value = [{ name: '未查询到道路名称', code: '', id: 0 }]
+          uni.showToast({ title: '未查询到该位置的道路信息', icon: 'none' })
+        }
+      } catch (err) {
+        uni.hideLoading()
+        console.error('获取道路名称失败：', err)
+        uni.showToast({ title: '获取道路名称失败，请重试', icon: 'none' })
+        roadNameList.value = [{ name: '获取失败，请重新选择位置', code: '', id: 0 }]
+      }
+    },
+    fail: (err) => {
+      console.error('选择位置失败：', err)
+      uni.showToast({ title: '选择位置失败：' + err.errMsg, icon: 'none' })
+    }
+  })
+}
+
+/**
+ * 完成时间确认
+ */
+const finishDateConfirm = (e) => {
+  console.log('选择的完成时间：', e)
+  workOrderForm.finishDate = timeFormat(e.value, 'yyyy-mm-dd hh:MM:ss')
+  show.value = false
+}
+
+/**
+ * 隐藏键盘
+ */
+const hideKeyboard = () => {
+  uni.hideKeyboard()
+}
+
+/**
+ * 提交工单（改造：使用ylWorkerExcuteWOrder接口，传递新增参数）
+ */
+const submitWorkOrder = async () => {
+  try {
+    // 表单校验
+    await workOrderFormRef.value.validate()
+
+    // 构造提交参数（包含原有参数+新增字段）
+    const submitData = {
+      id: workOrderForm.orderNo,        // 工单编号（对应接口id）
+      reason: workOrderForm.reason.trim(), // 处理建议（必填）
+      coProcessorId: workOrderForm.coProcessorId, // 共同处理人ID（非必选）
+      roadId: workOrderForm.roadId,
+      roadName: workOrderForm.roadName,
+      imgs: problemImgs.getSuccessImgUrls(),
+      remark: workOrderForm.problemDesc.trim(),
+      latLonType: 2,
+      lat: workOrderForm.lat,
+      lon: workOrderForm.lon,
+      lonLatAddress: workOrderForm.workLocation,
+      pressingType: workOrderForm.pressingType,
+      orderName: workOrderForm.orderName,
+      finishDate: workOrderForm.finishDate,
+      sourceId: 1,
+      sourceName: '园林',
+      busiLine: 'yl'
+    }
+
+    // 显示加载中
+    uni.showLoading({ title: '提交中...' })
+
+    // 替换为指定接口：ylWorkerExcuteWOrder
+    const res = await ylWorkerExcuteWOrder(submitData)
+
+    uni.hideLoading()
+    uni.showToast({
+      title: '工单提交成功',
+      icon: 'success',
+      duration: 1000
+    })
+
+    // 延迟跳转
+    setTimeout(() => {
+      uni.redirectTo({
+        url: '/pages-sub/problem/work-order-manage/index'
+      })
+    }, 1000)
+  } catch (error) {
+    uni.hideLoading()
+
+    // 区分表单校验失败和接口调用失败
+    if (!Array.isArray(error)) {
+      console.error('工单提交失败：', error)
+      uni.showToast({
+        title: '提交失败，请重试',
+        icon: 'none',
+        duration: 2000
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+// 全局页面样式
+.page-container {
+  min-height: 100vh;
+  padding-bottom: 100rpx; // 给底部按钮留空间
+  background-color: #f5f5f5;
+}
+
+// 工单表单内容容器
+.work-order-form-content {
+  background: #fff;
+  padding-bottom: 30rpx;
+}
+
+// Tabs容器样式
+.tabs-wrap {
+  background: #fff;
+}
+
+
+</style>
\ No newline at end of file
diff --git a/pages-sub/problem/work-order-manage/add-order.vue b/pages-sub/problem/work-order-manage/add-order.vue
index 9e97683..257378a 100644
--- a/pages-sub/problem/work-order-manage/add-order.vue
+++ b/pages-sub/problem/work-order-manage/add-order.vue
@@ -7,77 +7,32 @@
           ref="workOrderFormRef"
           labelWidth="190rpx"
       >
-        <!-- 1. 工单位置（地图选择） -->
+        <!-- 1. 工单编号（从URL获取展示） -->
         <up-form-item
-            label="工单位置"
-            prop="workLocation"
+            label="工单编号"
             border-bottom
-            required
-            @click="chooseWorkLocation(); hideKeyboard()"
         >
           <up-input
-              v-model="workOrderForm.workLocation"
+              v-model="workOrderForm.orderNo"
               border="none"
               readonly
-              suffix-icon="map-fill"
-              placeholder="点击选择工单位置"
-          ></up-input>
-        </up-form-item>
-
-        <!-- 2. 道路名称（下拉框） -->
-        <up-form-item
-            label="道路名称"
-            prop="roadName"
-            border-bottom
-            required
-            @click="handleActionSheetOpen('roadName'); hideKeyboard()"
-        >
-          <up-input
-              v-model="workOrderForm.roadName"
-              readonly
-              disabled-color="#ffffff"
-              placeholder="请先选择工单位置"
-              border="none"
-
-          ></up-input>
-          <template #right>
-            <up-icon name="arrow-right" size="16" ></up-icon>
-          </template>
-        </up-form-item>
-
-        <!-- 3. 工单名称（下拉框） -->
-        <up-form-item
-            label="工单名称"
-            prop="orderName"
-            border-bottom
-            required
-            @click="handleActionSheetOpen('orderName'); hideKeyboard()"
-        >
-          <up-input
-              v-model="workOrderForm.orderName"
-              disabled
-              disabled-color="#ffffff"
-              placeholder="请选择工单名称"
-              border="none"
+              placeholder="暂无工单编号"
           ></up-input>
-          <template #right>
-            <up-icon name="arrow-right" size="16"></up-icon>
-          </template>
         </up-form-item>
 
-        <!-- 新增：紧急程度选择 -->
+        <!-- 2. 养护员选择（必选，下拉框） -->
         <up-form-item
-            label="紧急程度"
-            prop="pressingTypeName"
+            label="养护员"
+            prop="assigneeName"
             border-bottom
             required
-            @click="handleActionSheetOpen('pressingType'); hideKeyboard()"
+            @click="handleActionSheetOpen('assignee'); hideKeyboard()"
         >
           <up-input
-              v-model="workOrderForm.pressingTypeName"
+              v-model="workOrderForm.assigneeName"
               disabled
               disabled-color="#ffffff"
-              placeholder="请选择紧急程度"
+              placeholder="请选择养护员"
               border="none"
           ></up-input>
           <template #right>
@@ -85,51 +40,19 @@
           </template>
         </up-form-item>
 
-        <!-- 4. 情况描述（文本域） -->
+        <!-- 3. 处理意见（非必填，文本域） -->
         <up-form-item
-            label="情况描述"
-            prop="problemDesc"
-            required
+            label="处理意见"
+            prop="reason"
         >
           <up-textarea
-              placeholder="请输入情况描述（最多200字）"
-              v-model.trim="workOrderForm.problemDesc"
+              placeholder="请输入处理意见（可选，最多200字）"
+              v-model.trim="workOrderForm.reason"
               count
               maxlength="200"
               rows="4"
-              @blur="() => workOrderFormRef.validateField('problemDesc')"
           ></up-textarea>
         </up-form-item>
-
-        <!-- 问题照片（核心修复：绑定纯数组） -->
-        <up-form-item label="问题照片" prop="problemImgs" required>
-          <up-upload
-              :file-list="problemImgs.imgList"
-              @after-read="problemImgs.uploadImgs"
-              @delete="problemImgs.deleteImg"
-              multiple
-              :max-count="problemImgs.uploadConfig.maxCount"
-              :upload-text="problemImgs.uploadConfig.uploadText"
-              :size-type="problemImgs.uploadConfig.sizeType"
-          ></up-upload>
-        </up-form-item>
-
-        <!-- 完成时间 -->
-        <up-form-item
-            label="希望完成时间"
-            prop="finishDate"
-            @click="show=true;hideKeyboard()"
-        >
-          <up-input
-              v-model="workOrderForm.finishDate"
-              border="none"
-              readonly
-              placeholder="点击选择时间"
-          ></up-input>
-          <template #right>
-            <up-icon name="arrow-right" size="16"></up-icon>
-          </template>
-        </up-form-item>
       </up-form>
     </view>
 
@@ -137,12 +60,12 @@
     <view class="fixed-bottom-btn-wrap">
       <up-button
           type="primary"
-          text="提交工单"
+          text="提交"
           @click="submitWorkOrder"
       ></up-button>
     </view>
 
-    <!-- 合并后的通用下拉弹窗 -->
+    <!-- 养护员下拉弹窗 -->
     <up-action-sheet
         :show="showActionSheet"
         :actions="currentActionSheetData.list"
@@ -150,315 +73,188 @@
         @close="handleActionSheetClose"
         @select="handleActionSheetSelect"
     ></up-action-sheet>
-
-    <!-- 完成时间选择器 -->
-    <up-datetime-picker
-        :show="show"
-        v-model="finishDate"
-        mode="datetime"
-        :min-date="new Date()"
-        @cancel="show = false"
-        @confirm="finishDateConfirm"
-    ></up-datetime-picker>
   </view>
 </template>
 
 <script setup>
-import { ref, reactive, watch } from 'vue'
-import { onReady, onShow } from '@dcloudio/uni-app';
-import { useUploadImgs } from '@/common/utils/useUploadImgs' // 引入改造后的上传逻辑
-import { getRoadListByLatLng } from '@/api/common'
-import { workorderCreate } from '@/api/work-order-manage/work-order-manage'
-import { timeFormat } from '@/uni_modules/uview-plus'
-
+import { ref, reactive } from 'vue'
+import { onLoad, onReady, onShow } from '@dcloudio/uni-app';
+import { getYlWorkersPage, ylTeamLeaderAssignWOrder } from '@/api/work-order-manage/work-order-manage'
+import { useUserStore } from '@/pinia/user';
+const userStore = useUserStore();
 // ========== 表单Ref ==========
 const workOrderFormRef = ref(null)
-
-// ========== 公共上传逻辑复用 ==========
-const problemImgs = useUploadImgs({
-  maxCount: 3,
-  uploadText: '选择问题照片',
-  sizeType: ['compressed'],
-  formRef: workOrderFormRef,
-  fieldName: 'problemImgs'
-})
-
-// 核心修复：监听响应式数组变化，同步更新纯数组（解决u-upload不刷新问题）
-watch(() => problemImgs.rawImgList.value, (newVal) => {
-  problemImgs.imgList = newVal
-}, { deep: true })
-
 // ========== 页面状态 ==========
-// 通用弹窗控制
 const showActionSheet = ref(false)
-// 当前弹窗配置
 const currentActionSheetData = reactive({
   type: '',
   list: [],
   title: ''
 })
-// 完成时间选择器控制
-const show = ref(false)
-const finishDate = ref(Date.now())
-
 // ========== 下拉列表数据 ==========
-const roadNameList = ref([])
-const orderNameList = ref([])
-const pressingTypeList = ref([])
-
-// ========== 工单表单数据 ==========
+const assigneeList = ref([]) // 养护员列表
+// ========== 工单表单数据（仅保留所需字段） ==========
 const workOrderForm = reactive({
-  roadId: 0,                     // 道路ID
-  roadName: '',                  // 道路名称
-  workLocation: '',              // 工单位置
-  orderName: '',                 // 工单名称
-  pressingType: '',               // 紧急程度值（提交接口用）
-  pressingTypeName: '',          // 紧急程度名称（显示用）
-  problemDesc: '',               // 情况描述
-  lat: 0,                        // 纬度
-  lon: 0,                        // 经度
-  finishDate: '',                // 完成时间
+  taskId:'',
+  orderNo: '',        // 工单编号（对应接口参数id）
+  assigneeId: '',     // 养护员ID（对应接口参数nextAssignee）
+  assigneeName: '',   // 养护员名称（显示用）
+  reason: ''          // 处理意见（对应接口参数reason）
 })
-
-// ========== 表单校验规则 ==========
+// ========== 表单校验规则（仅保留养护员必选校验） ==========
 const workOrderFormRules = reactive({
-  workLocation: [
-    { type: 'string', required: true, message: '请选择工单位置', trigger: ['change', 'blur'] }
+  assigneeName: [
+    {type: 'string', required: true, message: '请选择养护员', trigger: ['change']}
   ],
-  roadName: [
-    { type: 'string', required: true, message: '请选择道路名称', trigger: ['change', 'blur'] }
-  ],
-  orderName: [
-    { type: 'string', required: true, message: '请选择工单名称', trigger: ['change', 'blur'] }
-  ],
-  pressingTypeName: [
-    { type: 'string', required: true, message: '请选择紧急程度', trigger: ['change'] }
-  ],
-  problemDesc: [
-    { type: 'string', required: true, message: '请输入情况描述', trigger: ['change', 'blur'] },
-    { type: 'string', min: 3, max: 200, message: '情况描述需3-200字', trigger: ['change', 'blur'] }
-  ],
-  problemImgs: [problemImgs.imgValidateRule] // 复用上传校验规则
+  reason: [
+    {type: 'string', max: 200, message: '处理意见最多200字', trigger: ['change', 'blur']}
+  ]
 })
-
 // ========== 生命周期 ==========
+// onLoad - 获取URL中的工单编号
+onLoad((options) => {
+  // 从URL参数中获取工单编号（参数名orderNo可根据实际修改）
+  if (options && options.orderNo) {
+    workOrderForm.orderNo = options.orderNo
+    workOrderForm.taskId = options.taskId
+
+  }
+  console.log('从URL获取工单编号：', workOrderForm.orderNo)
+})
 onReady(() => {
   // 设置表单校验规则
   if (workOrderFormRef.value) {
     workOrderFormRef.value.setRules(workOrderFormRules)
   }
-  console.log('工单表单规则初始化完成')
 })
-
 onShow(() => {
-  console.log(uni.$dict.getDictLabel('ai_image_status', 20))
-  console.log(uni.$dict.getDictSimpleList('work_name'))
-
-  // 初始化工单名称列表
-  orderNameList.value = uni.$dict.transformLabelValueToNameValue(uni.$dict.getDictSimpleList('work_name'))
-  console.log('工单名称列表：', orderNameList.value)
-
-  // 初始化紧急程度列表
-  pressingTypeList.value = uni.$dict.transformLabelValueToNameValue(uni.$dict.getDictSimpleList('workorder_pressing_type'))
-  console.log('紧急程度列表：', pressingTypeList.value)
+  // 加载养护员列表
+  loadAssigneeList()
 })
-
+// ========== 加载养护员列表 ==========
+const loadAssigneeList = async () => {
+  try {
+    uni.showLoading({title: '获取养护员中...'})
+    // 调用getYlWorkersPage接口（可根据接口要求传递参数，此处默认空对象）
+    console.log(userStore.userInfo.user.busiLine)
+    let queryData = {
+      // roleCode:userStore.userInfo.roles,
+      roleCode: 'yl_worker',
+      busiLine: userStore.userInfo.user.busiLine,
+      pageNo: 1,
+      pageSize: 100
+    }
+    const res = await getYlWorkersPage(queryData)
+    uni.hideLoading()
+    if (res.list.length > 0) {
+      assigneeList.value = res.list.map(item => ({
+        name: item.nickname,
+        value: item.id,
+        id: item.id
+      }))
+      console.log(currentActionSheetData.list)
+    } else {
+      uni.showToast({title: '所在班组暂无养护员,请先配置养护员', icon: 'none'})
+    }
+    console.log(currentActionSheetData.list)
+  } catch (err) {
+    uni.hideLoading()
+    console.error('获取养护员列表失败：', err)
+    uni.showToast({title: '获取养护员失败，请重试', icon: 'none'})
+    assigneeList.value = []
+  }
+}
 // ========== 方法定义 ==========
 /**
- * 打开通用下拉弹窗
+ * 打开养护员下拉弹窗
  */
 const handleActionSheetOpen = (type) => {
-  // 道路名称需先校验工单位置是否选择
-  if (type === 'roadName' && !workOrderForm.workLocation) {
-    uni.showToast({ title: '请先选择工单位置', icon: 'none' })
+  // 判断养护员列表是否为空
+  if (type === 'assignee' && assigneeList.value.length === 0) {
+    uni.showToast({title: '暂无养护员数据可选', icon: 'none'})
     return
   }
-
-  // 配置当前弹窗参数
+  // 配置弹窗参数
   const configMap = {
-    roadName: {
-      title: '请选择道路名称',
-      list: roadNameList.value
-    },
-    orderName: {
-      title: '请选择工单名称',
-      list: orderNameList.value
-    },
-    pressingType: {
-      title: '请选择紧急程度',
-      list: pressingTypeList.value
+    assignee: {
+      title: '请选择养护员',
+      list: assigneeList.value
     }
   }
-
   currentActionSheetData.type = type
   currentActionSheetData.title = configMap[type].title
   currentActionSheetData.list = configMap[type].list
   showActionSheet.value = true
 }
-
 /**
- * 关闭通用下拉弹窗
+ * 关闭下拉弹窗
  */
 const handleActionSheetClose = () => {
   showActionSheet.value = false
-  // 重置当前弹窗配置
   currentActionSheetData.type = ''
   currentActionSheetData.list = []
   currentActionSheetData.title = ''
 }
-
 /**
- * 通用下拉弹窗选择事件
+ * 养护员选择事件
  */
 const handleActionSheetSelect = (e) => {
-  const { type } = currentActionSheetData
-  // 根据类型处理不同的选择逻辑
-  switch (type) {
-    case 'roadName':
-      workOrderForm.roadName = e.name
-      workOrderForm.roadId = e.code
-      workOrderFormRef.value?.validateField('roadName')
-      break
-    case 'orderName':
-      workOrderForm.orderName = e.name
-      workOrderFormRef.value?.validateField('orderName')
-      break
-    case 'pressingType':
-      console.log(e)
-      workOrderForm.pressingType =e.value
-      workOrderForm.pressingTypeName = e.name
-      workOrderFormRef.value?.validateField('pressingType')
-      break
+  const {type} = currentActionSheetData
+  if (type === 'assignee') {
+    workOrderForm.assigneeName = e.name
+    workOrderForm.assigneeId = e.value // 绑定养护员ID
+    workOrderFormRef.value?.validateField('assigneeName')
   }
-  // 关闭弹窗
   showActionSheet.value = false
 }
-
-/**
- * 返回上一页
- */
-const navigateBack = () => {
-  uni.navigateBack()
-}
-
-/**
- * 选择工单位置
- */
-const chooseWorkLocation = () => {
-  uni.chooseLocation({
-    success: async (res) => {
-      workOrderForm.roadName = ''
-      workOrderForm.roadId = 0
-      roadNameList.value = []
-
-      workOrderForm.workLocation = res.name
-      workOrderForm.lat = res.latitude
-      workOrderForm.lon = res.longitude
-
-      workOrderFormRef.value?.validateField('workLocation')
-      workOrderFormRef.value?.validateField('roadName')
-
-      try {
-        uni.showLoading({ title: '获取道路名称中...' })
-        const roadRes = await getRoadListByLatLng({
-          companyCode: 'sls',
-          latitude: res.latitude,
-          longitude: res.longitude
-        })
-        uni.hideLoading()
-
-        if (Array.isArray(roadRes)) {
-          roadNameList.value = roadRes.map((item) => ({
-            name: item.roadName || '',
-            code: item.roadCode || '',
-            id: item.roadId || 0
-          }))
-        } else {
-          roadNameList.value = [{ name: '未查询到道路名称', code: '', id: 0 }]
-          uni.showToast({ title: '未查询到该位置的道路信息', icon: 'none' })
-        }
-      } catch (err) {
-        uni.hideLoading()
-        console.error('获取道路名称失败：', err)
-        uni.showToast({ title: '获取道路名称失败，请重试', icon: 'none' })
-        roadNameList.value = [{ name: '获取失败，请重新选择位置', code: '', id: 0 }]
-      }
-    },
-    fail: (err) => {
-      console.error('选择位置失败：', err)
-      uni.showToast({ title: '选择位置失败：' + err.errMsg, icon: 'none' })
-    }
-  })
-}
-
-/**
- * 完成时间确认
- */
-const finishDateConfirm = (e) => {
-  console.log('选择的完成时间：', e)
-  workOrderForm.finishDate = timeFormat(e.value, 'yyyy-mm-dd hh:MM:ss')
-  show.value = false
-}
-
 /**
  * 隐藏键盘
  */
 const hideKeyboard = () => {
   uni.hideKeyboard()
 }
-
 /**
- * 提交工单
+ * 提交数据（使用ylTeamLeaderAssignWOrder接口，传递指定参数）
  */
 const submitWorkOrder = async () => {
   try {
-    // 先执行表单校验
+    // 1. 表单校验（先校验养护员必选项）
     await workOrderFormRef.value.validate()
-
+    // 2. 校验工单编号是否存在（避免无工单编号提交）
+    if (!workOrderForm.orderNo) {
+      uni.showToast({title: '工单编号不能为空', icon: 'none'})
+      return
+    }
+    // 3. 构造接口所需参数
     const submitData = {
-      roadId: workOrderForm.roadId,
-      roadName: workOrderForm.roadName,
-      imgs: problemImgs.getSuccessImgUrls(), // 复用上传逻辑的URL获取方法
-      remark: workOrderForm.problemDesc.trim(),
-      latLonType: 2,
-      lat: workOrderForm.lat,
-      lon: workOrderForm.lon,
-      lonLatAddress: workOrderForm.workLocation,
-      pressingType: workOrderForm.pressingType,
-      orderName: workOrderForm.orderName,
-      finishDate: workOrderForm.finishDate,
-      sourceId: 1,
-      sourceName: '园林',
-      busiLine: 'yl'
+      id: workOrderForm.taskId,        // 工单编码（对应接口参数id）
+      reason: workOrderForm.reason.trim(), // 处理建议（对应接口参数reason）
+      nextAssignee: workOrderForm.assigneeId // 养护员ID（对应接口参数nextAssignee）
     }
-
-    // 显示加载中
-    uni.showLoading({ title: '提交中...' })
-
-    // 调用提交接口
-    const res = await workorderCreate(submitData)
-
+    console.log('提交参数：', submitData)
+    // 4. 显示加载提示
+    uni.showLoading({title: '提交中...'})
+    // 5. 调用指定接口 ylTeamLeaderAssignWOrder
+    const res = await ylTeamLeaderAssignWOrder(submitData)
+    // 6. 隐藏加载提示并给出成功反馈
     uni.hideLoading()
     uni.showToast({
-      title: '工单提交成功',
+      title: '提交成功',
       icon: 'success',
       duration: 1000
     })
-
-    // 延迟跳转
+    // 7. 提交成功后返回上一页
     setTimeout(() => {
-      uni.redirectTo({
-        url: '/pages-sub/problem/work-order-manage/index'
+      uni.navigateTo({
+        url: `/pages-sub/problem/work-order-manage/index`
       })
     }, 1000)
   } catch (error) {
-    // 隐藏加载框
+    // 隐藏加载提示
     uni.hideLoading()
-
-    // 区分是表单校验失败还是接口调用失败
+    // 区分表单校验失败和接口调用失败
     if (!Array.isArray(error)) {
-      // 接口调用失败
-      console.error('工单提交失败：', error)
+      console.error('提交失败：', error)
       uni.showToast({
         title: '提交失败，请重试',
         icon: 'none',
@@ -472,13 +268,14 @@ const submitWorkOrder = async () => {
 <style lang="scss" scoped>
 // 全局页面样式
 .page-container {
-  min-height: 100vh;
-  padding-bottom: 100rpx; // 给底部按钮留空间
+
 }
 
-// 工单表单内容容器
+// 表单内容容器
 .work-order-form-content {
   background: #fff;
+  margin-top: 10rpx;
 }
 
+
 </style>
\ No newline at end of file
diff --git a/pages-sub/problem/work-order-manage/index.vue b/pages-sub/problem/work-order-manage/index.vue
index 4271ee0..77f5cda 100644
--- a/pages-sub/problem/work-order-manage/index.vue
+++ b/pages-sub/problem/work-order-manage/index.vue
@@ -61,7 +61,7 @@
     <view class="common-card-list" style="padding-top: 200rpx;padding-bottom: 30rpx">
       <!-- 待办工单卡片 -->
       <up-card
-          v-if="activeTab == 1"
+          v-if="activeTab == 0"
           :border="false"
           :foot-border-top="false"
           v-for="(item, index) in orderList"
@@ -109,7 +109,7 @@
 
       <!-- 已办工单卡片和我发起的 -->
       <up-card
-          v-if="activeTab == 2||activeTab == 0"
+          v-if="activeTab == 2||activeTab == 1"
           :border="false"
           :foot-border-top="false"
           v-for="(item, index) in orderList"
@@ -199,16 +199,15 @@ import { timeFormat } from '@/uni_modules/uview-plus';
 import { myBuzSimplePage, todoBuzSimplePage, doneBuzSimplePage } from '@/api/work-order-manage/work-order-manage'
 // 假设从用户store获取角色信息
 import { useUserStore } from '@/pinia/user';
-import { getDictLabel } from "../../../common/utils/dict";
-import EmptyView from "../../../components/empty-view/empty-view.vue";
+  import { nextStepMap } from '@/common/utils/common'
 
 // ========== 状态管理 ==========
 const userStore = useUserStore();
 // 标签页切换
-const activeTab = ref(0); // 0-我发起的 1-待办 2-已办
+const activeTab = ref(0); // 0-待办 1-我发起的 2-已办
 const tabList = ref([
-  { name: '我发起的任务' },
   { name: '待办' },
+  { name: '我发起的任务' },
   { name: '已办' }
 ]);
 // 排序下拉框
@@ -252,11 +251,12 @@ const queryList = async (pageNo, pageSize) => {
 
     let res;
     if (activeTab.value == 0) {
-      // 我发起的任务
-      res = await myBuzSimplePage(apiParams);
-    } else if(activeTab.value == 1) {
       // 待办工单
       res = await todoBuzSimplePage(apiParams);
+    } else if(activeTab.value == 1) {
+      // 我发起的任务
+      res = await myBuzSimplePage(apiParams);
+
     }else {
       // 已办工单
       res = await doneBuzSimplePage(apiParams);
@@ -294,7 +294,7 @@ const handleSearch = (val) => {
 
 // 工单详情
 const handleDetail = (item) => {
-  // 0-我发起的 1-待办 2-已办
+  // 0-待办 1我发起的- 2-已办
   uni.navigateTo({
     url: `/pages-sub/problem/work-order-manage/order-detail?taskId=${item.taskId}&activeTab=${activeTab.value}`
   });
@@ -302,22 +302,19 @@ const handleDetail = (item) => {
 
 // 待办-处理工单
 const handleProcess = async (item) => {
+  console.log(nextStepMap)
   try {
-    // 调用处理工单接口，获取跳转标识
-    const res = await uni.request({
-      url: '/api/order/process',
-      method: 'POST',
-      data: { orderId: item.id }
-    });
 
-    const { jumpType, jumpUrl } = res.data;
-    // 根据返回标识跳转不同页面
-    if (jumpType === 1) {
-      uni.navigateTo({ url: jumpUrl });
-    } else if (jumpType === 2) {
-      uni.redirectTo({ url: jumpUrl });
-    } else if (jumpType === 3) {
-      uni.switchTab({ url: jumpUrl });
+    if(nextStepMap[item.taskKey] == '养护组长分配'){
+      uni.navigateTo({
+        url: `/pages-sub/problem/work-order-manage/add-order?taskId=${item.taskId}&orderNo=${item.orderNo}`
+      })
+    }
+
+    if(nextStepMap[item.taskKey] == '养护员待实施'){
+      uni.navigateTo({
+        url: `/pages-sub/problem/work-order-manage/add-maintain-order?taskId=${item.taskId}&orderNo=${item.orderNo}`
+      })
     }
   } catch (error) {
     console.error('处理工单失败：', error);
diff --git a/pages-sub/problem/work-order-manage/order-detail.vue b/pages-sub/problem/work-order-manage/order-detail.vue
index 0469f5c..291f89e 100644
--- a/pages-sub/problem/work-order-manage/order-detail.vue
+++ b/pages-sub/problem/work-order-manage/order-detail.vue
@@ -184,12 +184,18 @@ const getMyTaskDetailQuery = async (taskId) => {
 onLoad((options) => {
   console.log(options)
   const { taskId, activeTab } = options;
-  // 0-我发起的 1-待办 2-已办
+  // 0-待办 1我发起的- 2-已办
   console.log(taskId)
   if(activeTab==0){
-    getMyTaskDetailQuery(taskId);
+    getTodoTaskDetail(taskId);
   }
+  if(activeTab==1){
+    getMyTaskDetailQuery(taskId);
 
+  }
+  if(activeTab==2){
+    getDoneTaskDetail(taskId);
+  }
 });
 </script>
 
diff --git a/pages.json b/pages.json
index e08c3cc..18e3deb 100644
--- a/pages.json
+++ b/pages.json
@@ -126,13 +126,18 @@
 				},
 				{
 					"path": "work-order-manage/add-order",
-					"style": { "navigationBarTitleText": "新增工单" }
+					"style": { "navigationBarTitleText": "工单提交" }
 				},
 
 				{
 					"path": "work-order-manage/order-detail",
 					"style": { "navigationBarTitleText": "工单详情" }
 				},
+				{
+					"path": "work-order-manage/add-maintain-order",
+					"style": { "navigationBarTitleText": "养护任务" }
+				},
+
 
 
 				{
--
libgit2 0.21.4