diff --git a/api/work-order-manage/work-order-manage.js b/api/work-order-manage/work-order-manage.js
new file mode 100644
index 0000000..e3fe81c
--- /dev/null
+++ b/api/work-order-manage/work-order-manage.js
@@ -0,0 +1,93 @@
+import { post, get, put } from '@/common/utils/request';
+
+// /app-api/bpm/garden/workorder/getApprovalDetail 获得审批详情
+
+
+// /app-api/bpm/garden/workorder/approve             验收通过调用此接口、巡查员结束工单也调用此接口
+// /app-api/bpm/garden/workorder/returnPreviousNode  不通过和退回都使用此接口
+
+
+/**
+ *   养护员工单实施页面提交接口
+ * @returns {Promise}
+ */
+export const ylWorkerExcuteWOrder = (params) => {
+  return put('/app-api/bpm/garden/workorder/ylWorkerExcuteWOrder',params);
+};
+
+/**
+ *   获得园林养护员列表、共同处理人也调用此接口
+ * @returns {Promise}
+ */
+export const getYlWorkersPage = (params) => {
+  return get('/app-api/bpm/garden/workorder/getYlWorkersPage',params);
+};
+
+/**
+ *  养护组长分配工单调用此接口
+ * @returns {Promise}
+ */
+export const ylTeamLeaderAssignWOrder = (params) => {
+  return put('/app-api/bpm/garden/workorder/ylTeamLeaderAssignWOrder',params);
+};
+
+
+/**
+ * 我发起的列表-工单详情
+ * @returns {Promise}
+ */
+export const getMyTaskDetail = (params) => {
+  return get('/app-api/bpm/garden/workorder/getMyTaskDetail',params);
+};
+
+
+/**
+ * 已办列表-工单详情
+ * @returns {Promise}
+ */
+export const getDoneTaskDetail = (params) => {
+  return get('/app-api/bpm/garden/workorder/getDoneTaskDetail',params);
+};
+
+/**
+ * 待办列表-工单详情
+ * @returns {Promise}
+ */
+export const getTodoTaskDetail = (params) => {
+  return get('/app-api/bpm/garden/workorder/getTodoTaskDetail',params);
+};
+
+
+/**
+ * 我发起的列表
+ * @returns {Promise}
+ */
+export const myBuzSimplePage = (params) => {
+  return get('/app-api/bpm/garden/workorder/myBuzSimplePage',params);
+};
+
+/**
+ * 已办汇总
+ * @returns {Promise}
+ */
+export const doneBuzSimplePage = (params) => {
+  return get('/app-api/bpm/garden/workorder/doneBuzSimplePage',params);
+};
+
+
+
+/**
+ *  待办汇总
+ * @returns {Promise}
+ */
+export const todoBuzSimplePage = (params) => {
+  return get('/app-api/bpm/garden/workorder/todoBuzSimplePage',params);
+};
+
+/**
+ *  问题工单创建
+ * @returns {Promise}
+ */
+export const workorderCreate = (data) => {
+  return post('/app-api/bpm/garden/workorder/create',data);
+};
diff --git a/pages-sub/daily/maintain-manage/add-record.vue b/pages-sub/daily/maintain-manage/add-record.vue
index 8abb417..21dd307 100644
--- a/pages-sub/daily/maintain-manage/add-record.vue
+++ b/pages-sub/daily/maintain-manage/add-record.vue
@@ -7,9 +7,9 @@
           ref="inspectFormRef"
           labelWidth="140rpx"
       >
-        <!-- 1. 巡查描述（文本域） -->
+        <!-- 1. 养护描述（文本域） -->
         <up-form-item
-            prop="content"
+            prop="remark"
             class="form-item"
         >
           <up-textarea
@@ -148,7 +148,7 @@ export default {
     // this.initProgress = option.finishPercent ? Number(option.finishPercent)+1 : 0
     // // 关键修复：初始进度值设为 初始进度+1，避免刚进入就触发校验失败
     // this.inspectForm.progress = this.initProgress
-    console.log('初始进度值：', this.initProgress)
+
   },
   onReady() {
     this.$refs.inspectFormRef.setRules(this.inspectFormRules)
@@ -284,7 +284,6 @@ export default {
         console.log('图片列表：', this.imagesList)
 
         const submitData = {
-          totalFinishPercent: 100,
           "planNo": this.paramsOptins.planNo,
           "imgHost": "1",
           "beginImg": this.getImgUrlList(this.imagesList),
diff --git a/pages-sub/daily/maintain-manage/index.vue b/pages-sub/daily/maintain-manage/index.vue
index 787eac0..f46456e 100644
--- a/pages-sub/daily/maintain-manage/index.vue
+++ b/pages-sub/daily/maintain-manage/index.vue
@@ -151,8 +151,8 @@
               </view>
 
               <view class="u-body-item u-flex">
-                <view class="u-body-item-title">已完成比例：</view>
-                <view class="u-line-1 u-body-value">{{ item.finishPercent || 0 }}%</view>
+                <view class="u-body-item-title">已完成次数：</view>
+                <view class="u-line-1 u-body-value">{{ item.planFinishNum || 0 }}</view>
               </view>
 
               <view class="u-body-item u-flex">
@@ -181,7 +181,8 @@ const typeTabs = ref([])
 const statusTabs = ref([
   { name: '待完成', id: '1' },
   { name: '已失效', id: '3' },
-  { name: '已完成', id: '2' }
+  { name: '已完成', id: '2' },
+  { name: '已终止', id: '4' }
 ])
 
 // 核心响应式数据
@@ -303,13 +304,13 @@ const goToDetail = (item) => {
 // 提交记录
 const submitRecord = (item) => {
   console.log('提交记录：', item)
-  if (item.finishPercent == 0) { // 去新增
+  if (item.planFinishNum == 0) { // 去新增
     uni.navigateTo({
-      url: `/pages-sub/daily/maintain-manage/add-record?finishState=${item.finishState}&planNo=${item.planNo}&finishPercent=${item.finishPercent}`
+      url: `/pages-sub/daily/maintain-manage/add-record?finishState=${item.finishState}&planNo=${item.planNo}`
     })
   } else {
     uni.navigateTo({
-      url: `/pages-sub/daily/maintain-manage/pending-plan-detail?finishState=${item.finishState}&planNo=${item.planNo}&finishPercent=${item.finishPercent}&planTypeId=${item.planTypeId}`
+      url: `/pages-sub/daily/maintain-manage/pending-plan-detail?finishState=${item.finishState}&planNo=${item.planNo}&planTypeId=${item.planTypeId}`
     })
   }
 
diff --git a/pages-sub/daily/maintain-manage/pending-plan-detail.vue b/pages-sub/daily/maintain-manage/pending-plan-detail.vue
index 8dd0b0f..c367b74 100644
--- a/pages-sub/daily/maintain-manage/pending-plan-detail.vue
+++ b/pages-sub/daily/maintain-manage/pending-plan-detail.vue
@@ -93,14 +93,12 @@ const batchNo = ref('')
 const planNo = ref('')
 const finishState = ref('')
 const planTypeId = ref('')
-const finishPercent = ref('')
 
 // 页面加载接收参数（逻辑完全保留）
 onLoad((options) => {
   planNo.value = options.planNo;
   finishState.value = options.finishState
   planTypeId.value = options.planTypeId
-  finishPercent.value = options.finishPercent
 });
 
 // 页面显示时请求数据（逻辑完全保留）
@@ -138,7 +136,7 @@ const gotoFinishPlanDetail = (i) => {
 // 新增记录（逻辑完全保留）
 const addNewRecord = () => {
   uni.navigateTo({
-    url: `/pages-sub/daily/maintain-manage/add-record?planNo=${planNo.value}&finishPercent=${finishPercent.value}`,
+    url: `/pages-sub/daily/maintain-manage/add-record?planNo=${planNo.value}`,
   });
 };
 </script>
diff --git a/pages-sub/daily/maintain-manage/road-detail-list.vue b/pages-sub/daily/maintain-manage/road-detail-list.vue
index 6f5fd29..7eab512 100644
--- a/pages-sub/daily/maintain-manage/road-detail-list.vue
+++ b/pages-sub/daily/maintain-manage/road-detail-list.vue
@@ -114,10 +114,10 @@
                 </view>
               </view>
 
-<!--              <view class="u-body-item u-flex">-->
-<!--                <view class="u-body-item-title">已完成比例：</view>-->
-<!--                <view class="u-line-1 u-body-value">{{ item.finishPercent || 0 }}%</view>-->
-<!--              </view>-->
+              <view class="u-body-item u-flex">
+                <view class="u-body-item-title">完成次数：</view>
+                <view class="u-line-1 u-body-value">{{ item.planFinishNum || 0 }}</view>
+              </view>
 
               <view class="u-body-item u-flex">
                 <view class="u-body-item-title">计划有效期：</view>
@@ -142,7 +142,8 @@ import { getRoadDetails } from "@/api/maintain-manage/maintain-manage";
 const statusTabs = ref([
   {name: '待完成', id: '1'},
   {name: '已失效', id: '3'},
-  {name: '已完成', id: '2'}
+  {name: '已完成', id: '2'},
+  { name: '已终止', id: '4' }
 ])
 const activeStatus = ref('1')
 const searchValue = ref('')
@@ -179,14 +180,14 @@ const submitRecord = (item) => {
   if (item.finishState === '3') {
     return
   }
-  console.log('提交记录：', item.finishPercent)
-  if (item.finishPercent == 0) {
+  console.log('提交记录：', item.planFinishNum)
+  if (item.planFinishNum == 0) {
     uni.navigateTo({
-      url: `/pages-sub/daily/maintain-manage/add-record?finishState=${item.finishState}&planNo=${item.planNo}&finishPercent=${item.finishPercent}`
+      url: `/pages-sub/daily/maintain-manage/add-record?finishState=${item.finishState}&planNo=${item.planNo}`
     })
   } else {
     uni.navigateTo({
-      url: `/pages-sub/daily/maintain-manage/pending-plan-detail?finishState=${item.finishState}&planNo=${item.planNo}&finishPercent=${item.finishPercent}&planTypeId=${item.planTypeId}`
+      url: `/pages-sub/daily/maintain-manage/pending-plan-detail?finishState=${item.finishState}&planNo=${item.planNo}&planTypeId=${item.planTypeId}`
     })
   }
 }
diff --git a/pages-sub/daily/patrol-manage/add-patrol-record.vue b/pages-sub/daily/patrol-manage/add-patrol-record.vue
index 5789ab5..79e1aa2 100644
--- a/pages-sub/daily/patrol-manage/add-patrol-record.vue
+++ b/pages-sub/daily/patrol-manage/add-patrol-record.vue
@@ -12,9 +12,10 @@
         <up-form-item
             prop="content"
             class="form-item"
+            required
         >
           <up-textarea
-              v-model="inspectForm.content"
+              v-model.trim="inspectForm.content"
               placeholder="请输入巡查描述"
               maxlength="200"
               count
@@ -102,13 +103,13 @@ export default {
       imagesList: [],
       // 单选列表
       radioList: [
-        { label: '是', value: '2' },
-        { label: '否', value: '1' }
+        { label: '否', value: '1' },
+        { label: '是', value: '2' }
       ],
       // 巡查表单数据
       inspectForm: {
         content: '',        // 巡查描述
-        isWorkOrder: '2'    // 是否转为工单 1:否（默认） 2:是
+        isWorkOrder: '1'    // 是否转为工单 1:否（默认） 2:是
       },
       paramsOptins:{},//接受参数
       // 表单校验规则
@@ -133,6 +134,10 @@ export default {
             }
           }
         ],
+
+        content: [
+          { type: 'string', required: true, message: '请输入工单描述', trigger: ['change'] }
+        ],
         isWorkOrder: [
           { type: 'string', required: true, message: '请选择是否转为工单', trigger: ['change'] }
         ]
@@ -268,7 +273,7 @@ export default {
           "inspectionState": this.inspectForm.isWorkOrder,
           "transState": this.inspectForm.isWorkOrder==1?'1':'2',
           "transWorkNo": "default'",
-          "remark": this.inspectForm.content
+          "remark": this.inspectForm.content.trim()
         }
 
         // 显示加载中
diff --git a/pages-sub/daily/patrol-manage/finish-plan-detail.vue b/pages-sub/daily/patrol-manage/finish-plan-detail.vue
index 3b62805..c199661 100644
--- a/pages-sub/daily/patrol-manage/finish-plan-detail.vue
+++ b/pages-sub/daily/patrol-manage/finish-plan-detail.vue
@@ -9,91 +9,98 @@
     ></up-loading-page>
 
     <!-- 内容容器 -->
-    <view v-else class="content-wrap" v-for="(i, index) in orderDetail" :key="index">
-      <template >
-        <!-- 工单详情内容 -->
-        <up-cell-group :border="false" inset >
-          <!-- 1. 工单名称 -->
-          <up-cell
-              align="middle"
-          >
-            <template #title>
-              <view  class="up-line-1">{{i.planName || '--'}}</view>
-            </template>
-<!--            <template #value>-->
-<!--              <view  class="up-line-1">{{orderDetail.planName || '&#45;&#45;'}}</view>-->
-<!--            </template>-->
-          </up-cell>
-
-          <!-- 2. 工单位置 -->
-          <up-cell
-              title="计划编码"
-              :value="i.planNo || '--'"
-              align="middle"
-          ></up-cell>
-
-          <!-- 3. 工单名称 -->
-          <up-cell
-              title="养护周期"
-              :value="`${i.rate}${uni.$dict.getDictLabel('cycle_id_type', i.cycleId)}`"
-              align="middle"
-          ></up-cell>
-
-          <!-- 4. 情况描述 -->
-          <up-cell
-              title="计划有效期"
-              :value="`${timeFormat(i.beginTime,'yyyy-mm-dd')} 至 ${timeFormat(i. endTime,'yyyy-mm-dd')}`"
-              align="middle"
-          ></up-cell>
-
-          <!-- 5. 问题照片（核心修复：判断条件+空值处理） -->
-          <up-cell title="照片">
-            <template #value>
-              <view class="cell-content-wrap">
-
-                <!-- 修复1：正确判断problemImgsList，补充空数组默认值 -->
-                <up-album
-                    v-if="!!i.imgList?.length"
-                    :urls="i.imgList || []"
-                    singleSize="70"
-                    :preview-full-image="true"
-
-                ></up-album>
-                <text v-else class="empty-text">暂无问题照片</text>
-              </view>
-            </template>
-          </up-cell>
-
-          <!-- 7. 处理结果 -->
-          <up-cell
-              align="middle"
-          >
-            <template #title>
-              <view  style="min-width: 200rpx">巡查描述</view>
-            </template>
-            <template #value>
-              <view  class="up-line-1 common-text-color">{{i.remark || '--'}}</view>
-            </template>
-          </up-cell>
-
-          <up-cell
-              title="提交时间"
-              :value="timeFormat(i.finishTime,'yyyy-mm-dd hh:MM:ss') || '--'"
-              align="middle"
-
-          ></up-cell>
-
-          <up-cell
-              title="提交人"
-              :value="i.userName || '--'"
-              align="middle"
-              :border="false"
-          ></up-cell>
-        </up-cell-group>
-      </template>
-
-
-    </view>
+    <template  v-else>
+      <view v-if="orderDetail.length>0">
+        <view class="content-wrap" v-for="(i, index) in orderDetail" :key="index">
+          <!-- 工单详情内容 -->
+          <up-cell-group :border="false" inset >
+            <!-- 1. 工单名称 -->
+            <up-cell
+                align="middle"
+            >
+              <template #title>
+                <view  class="up-line-1">{{i.planName || '--'}}</view>
+              </template>
+              <!--            <template #value>-->
+              <!--              <view  class="up-line-1">{{orderDetail.planName || '&#45;&#45;'}}</view>-->
+              <!--            </template>-->
+            </up-cell>
+
+            <!-- 2. 工单位置 -->
+            <up-cell
+                title="计划编码"
+                :value="i.planNo || '--'"
+                align="middle"
+            ></up-cell>
+
+            <!-- 3. 工单名称 -->
+            <up-cell
+                title="养护周期"
+                :value="`${i.rate}${uni.$dict.getDictLabel('cycle_id_type', i.cycleId)}`"
+                align="middle"
+            ></up-cell>
+
+            <!-- 4. 情况描述 -->
+            <up-cell
+                title="计划有效期"
+                :value="`${timeFormat(i.beginTime,'yyyy-mm-dd')} 至 ${timeFormat(i. endTime,'yyyy-mm-dd')}`"
+                align="middle"
+            ></up-cell>
+
+            <!-- 5. 问题照片（核心修复：判断条件+空值处理） -->
+            <up-cell title="照片">
+              <template #value>
+                <view class="cell-content-wrap">
+
+                  <!-- 修复1：正确判断problemImgsList，补充空数组默认值 -->
+                  <up-album
+                      v-if="!!i.imgList?.length"
+                      :urls="i.imgList || []"
+                      singleSize="70"
+                      :preview-full-image="true"
+
+                  ></up-album>
+                  <text v-else class="empty-text">暂无问题照片</text>
+                </view>
+              </template>
+            </up-cell>
+
+            <!-- 7. 处理结果 -->
+            <up-cell
+                align="middle"
+            >
+              <template #title>
+                <view  style="min-width: 200rpx">巡查描述</view>
+              </template>
+              <template #value>
+                <view  class="up-line-1 common-text-color">{{i.remark || '--'}}</view>
+              </template>
+            </up-cell>
+
+            <up-cell
+                title="提交时间"
+                :value="timeFormat(i.finishTime,'yyyy-mm-dd hh:MM:ss') || '--'"
+                align="middle"
+
+            ></up-cell>
+
+            <up-cell
+                title="提交人"
+                :value="i.userName || '--'"
+                align="middle"
+                :border="false"
+            ></up-cell>
+          </up-cell-group>
+
+        </view>
+      </view>
+       <view v-else>
+         <up-empty
+             mode="history">
+         </up-empty>
+       </view>
+
+    </template>
   </view>
 </template>
 
diff --git a/pages-sub/daily/patrol-manage/index.vue b/pages-sub/daily/patrol-manage/index.vue
index a0ba6b7..ffdfd7b 100644
--- a/pages-sub/daily/patrol-manage/index.vue
+++ b/pages-sub/daily/patrol-manage/index.vue
@@ -112,7 +112,8 @@ import { inspectionPlanPage } from "@/api/patrol-manage/patrol-plan";
 const tabList = ref([
   {name: '待完成', id: '1'},
   {name: '已失效', id: '3'},
-  {name: '已完成', id: '2'}
+  {name: '已完成', id: '2'},
+  { name: '已终止', id: '4' }
 ]);
 const pagingRef = ref(null)
 const activeTab = ref('1');
diff --git a/pages-sub/problem/work-order-manage/add-maintain-order.vue b/pages-sub/problem/work-order-manage/add-maintain-order.vue
index b985656..dc1ab7e 100644
--- a/pages-sub/problem/work-order-manage/add-maintain-order.vue
+++ b/pages-sub/problem/work-order-manage/add-maintain-order.vue
@@ -7,7 +7,7 @@
           ref="workOrderFormRef"
           labelWidth="190rpx"
       >
-        <!-- 1. 工单编号（新增：从URL获取，只读展示） -->
+        <!-- 1. 工单编号（只读展示，从URL获取） -->
         <up-form-item
             label="工单编号"
             border-bottom
@@ -20,7 +20,7 @@
           ></up-input>
         </up-form-item>
 
-        <!-- 2. 共同处理人（新增：非必选，下拉框） -->
+        <!-- 2. 共同处理人（支持多选） -->
         <up-form-item
             label="共同处理人"
             prop="coProcessorName"
@@ -31,7 +31,7 @@
               v-model="workOrderForm.coProcessorName"
               disabled
               disabled-color="#ffffff"
-              placeholder="请选择共同处理人（可选）"
+              placeholder="请选择共同处理人（支持多选）"
               border="none"
           ></up-input>
           <template #right>
@@ -39,14 +39,14 @@
           </template>
         </up-form-item>
 
-        <!-- 3. 处理建议（新增：必传，文本域） -->
+        <!-- 3. 处理建议（处理情况描述，必填） -->
         <up-form-item
-            label="处理建议"
+            label="处理情况描述"
             prop="reason"
             required
         >
           <up-textarea
-              placeholder="请输入处理建议（必填，最多200字）"
+              placeholder="请输入处理情况描述（必填，最多200字）"
               v-model.trim="workOrderForm.reason"
               count
               maxlength="200"
@@ -56,131 +56,8 @@
           ></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标签栏（新增：开始、进行中、结束、人员、材料） -->
+      <!-- Tabs标签栏（图片切换：开始、进行中、结束、人员、材料） -->
       <view class="tabs-wrap commonPageLRpadding" style="margin-top: 30rpx;">
         <up-tabs
             v-model="activeTab"
@@ -188,19 +65,86 @@
             line-width="40rpx"
             active-color="#1989fa"
             inactive-color="#666666"
+
+            @change = "imgTabChange"
         ></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 class="tab-content" style="padding-top: 20rpx; background: #fff; padding-bottom: 20rpx;">
+          <!-- 开始阶段图片上传 -->
+          <view v-if="activeTab == 0">
+            <up-form-item  prop="startImgs">
+              <up-upload
+                  :file-list="startImgs.imgList"
+                  @after-read="startImgs.uploadImgs"
+                  @delete="startImgs.deleteImg"
+                  multiple
+                  :max-count="startImgs.uploadConfig.maxCount"
+                  :upload-text="startImgs.uploadConfig.uploadText"
+                  :size-type="startImgs.uploadConfig.sizeType"
+              ></up-upload>
+            </up-form-item>
+          </view>
+          <!-- 进行中阶段图片上传 -->
+          <view v-if="activeTab == 1">
+            <up-form-item  prop="processingImgs">
+              <up-upload
+                  :file-list="processingImgs.imgList"
+                  @after-read="processingImgs.uploadImgs"
+                  @delete="processingImgs.deleteImg"
+                  multiple
+                  :max-count="processingImgs.uploadConfig.maxCount"
+                  :upload-text="processingImgs.uploadConfig.uploadText"
+                  :size-type="processingImgs.uploadConfig.sizeType"
+              ></up-upload>
+            </up-form-item>
+          </view>
+          <!-- 结束阶段图片上传 -->
+          <view v-if="activeTab == 2">
+            <up-form-item  prop="endImgs">
+              <up-upload
+                  :file-list="endImgs.imgList"
+                  @after-read="endImgs.uploadImgs"
+                  @delete="endImgs.deleteImg"
+                  multiple
+                  :max-count="endImgs.uploadConfig.maxCount"
+                  :upload-text="endImgs.uploadConfig.uploadText"
+                  :size-type="endImgs.uploadConfig.sizeType"
+              ></up-upload>
+            </up-form-item>
+          </view>
+          <!-- 人员配置图片上传 -->
+          <view v-if="activeTab == 3">
+            <up-form-item  prop="personImgs">
+              <up-upload
+                  :file-list="personImgs.imgList"
+                  @after-read="personImgs.uploadImgs"
+                  @delete="personImgs.deleteImg"
+                  multiple
+                  :max-count="personImgs.uploadConfig.maxCount"
+                  :upload-text="personImgs.uploadConfig.uploadText"
+                  :size-type="personImgs.uploadConfig.sizeType"
+              ></up-upload>
+            </up-form-item>
+          </view>
+          <!-- 材料使用图片上传 -->
+          <view v-if="activeTab == 4">
+            <up-form-item  prop="materialImgs">
+              <up-upload
+                  :file-list="materialImgs.imgList"
+                  @after-read="materialImgs.uploadImgs"
+                  @delete="materialImgs.deleteImg"
+                  multiple
+                  :max-count="materialImgs.uploadConfig.maxCount"
+                  :upload-text="materialImgs.uploadConfig.uploadText"
+                  :size-type="materialImgs.uploadConfig.sizeType"
+              ></up-upload>
+            </up-form-item>
+          </view>
         </view>
       </view>
+      </up-form>
     </view>
 
-    <!-- 底部提交按钮 -->
+    <!-- 底部提交按钮（保留，按需可移除） -->
     <view class="fixed-bottom-btn-wrap">
       <up-button
           type="primary"
@@ -209,7 +153,7 @@
       ></up-button>
     </view>
 
-    <!-- 合并后的通用下拉弹窗（新增共同处理人配置） -->
+    <!-- 通用下拉弹窗（仅用于共同处理人多选） -->
     <up-action-sheet
         :show="showActionSheet"
         :actions="currentActionSheetData.list"
@@ -217,56 +161,31 @@
         @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 { ref, reactive, watch } from 'vue'
+import { onLoad, 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)
+import { getYlWorkersPage, ylWorkerExcuteWOrder } from '@/api/work-order-manage/work-order-manage'
+import { useUserStore } from '@/pinia/user';
 
-// ========== 公共上传逻辑复用 ==========
-const problemImgs = useUploadImgs({
-  maxCount: 3,
-  uploadText: '选择问题照片',
-  sizeType: ['compressed'],
-  formRef: workOrderFormRef,
-  fieldName: 'problemImgs'
-})
+const userStore = useUserStore();
 
-// 核心修复：监听响应式数组变化，同步更新纯数组
-watch(() => problemImgs.rawImgList.value, (newVal) => {
-  problemImgs.imgList = newVal
-}, { deep: true })
+// 表单Ref
+const workOrderFormRef = ref(null)
 
-// ========== 页面状态 ==========
+// 页面状态
 const showActionSheet = ref(false)
 const currentActionSheetData = reactive({
   type: '',
   list: [],
-  title: ''
+  title: '',
 })
-const show = ref(false)
-const finishDate = ref(Date.now())
 
-// 新增：Tabs配置
-const activeTab = ref(0) // 默认选中第一个标签
+// Tabs配置（图片切换用）
+const activeTab = ref(0)
 const tabList = ref([
   { name: '开始' },
   { name: '进行中' },
@@ -275,63 +194,99 @@ const tabList = ref([
   { name: '材料' }
 ])
 
-// ========== 下拉列表数据 ==========
-const roadNameList = ref([])
-const orderNameList = ref([])
-const pressingTypeList = ref([])
-const coProcessorList = ref([]) // 新增：共同处理人列表（来自getYlWorkersPage）
+// 共同处理人列表
+const coProcessorList = ref([])
 
-// ========== 工单表单数据（新增字段） ==========
+// 工单表单数据（仅保留需要的字段）
 const workOrderForm = reactive({
-  orderNo: '',                  // 新增：工单编号（URL获取）
-  coProcessorId: '',            // 新增：共同处理人ID（非必选，提交接口用）
-  coProcessorName: '',          // 新增：共同处理人名称（显示用）
-  reason: '',                   // 新增：处理建议（必填）
-  roadId: 0,
-  roadName: '',
-  workLocation: '',
-  orderName: '',
-  pressingType: '',
-  pressingTypeName: '',
-  problemDesc: '',
-  lat: 0,
-  lon: 0,
-  finishDate: '',
+  orderNo: '',                  // 工单编号
+  coProcessorId: '',            // 共同处理人ID数组（多选）
+  coProcessorName: '',          // 共同处理人名称数组（多选）
+  reason: '',                   // 处理情况描述
+})
+
+// ========== 图片上传配置（5个Tab分别配置，均限制3张，与参考示例一致） ==========
+// 开始阶段图片
+const startImgs = useUploadImgs({
+  maxCount: 3,
+  uploadText: '选择开始阶段照片',
+  sizeType: ['compressed'],
+  formRef: workOrderFormRef,
+  fieldName: 'startImgs'
+})
+// 进行中阶段图片
+const processingImgs = useUploadImgs({
+  maxCount: 3,
+  uploadText: '选择进行中阶段照片',
+  sizeType: ['compressed'],
+  formRef: workOrderFormRef,
+  fieldName: 'processingImgs'
+})
+// 结束阶段图片
+const endImgs = useUploadImgs({
+  maxCount: 3,
+  uploadText: '选择结束阶段照片',
+  sizeType: ['compressed'],
+  formRef: workOrderFormRef,
+  fieldName: 'endImgs'
 })
+// 人员配置图片
+const personImgs = useUploadImgs({
+  maxCount: 3,
+  uploadText: '选择人员配置照片',
+  sizeType: ['compressed'],
+  formRef: workOrderFormRef,
+  fieldName: 'personImgs'
+})
+// 材料使用图片
+const materialImgs = useUploadImgs({
+  maxCount: 3,
+  uploadText: '选择材料使用照片',
+  sizeType: ['compressed'],
+  formRef: workOrderFormRef,
+  fieldName: 'materialImgs'
+})
+
+// ========== 核心修复：监听每个上传实例的响应式数组变化，解决u-upload不刷新问题 ==========
+watch(() => startImgs.rawImgList.value, (newVal) => {
+  startImgs.imgList = newVal
+}, { deep: true })
+
+watch(() => processingImgs.rawImgList.value, (newVal) => {
+  processingImgs.imgList = newVal
+}, { deep: true })
+
+watch(() => endImgs.rawImgList.value, (newVal) => {
+  endImgs.imgList = newVal
+}, { deep: true })
+
+watch(() => personImgs.rawImgList.value, (newVal) => {
+  personImgs.imgList = newVal
+}, { deep: true })
+
+watch(() => materialImgs.rawImgList.value, (newVal) => {
+  materialImgs.imgList = newVal
+}, { deep: true })
 
-// ========== 表单校验规则（更新：新增处理建议必填、共同处理人非必填） ==========
+// 表单校验规则（新增5个图片字段校验，复用上传校验规则）
 const workOrderFormRules = reactive({
-  orderNo: [                    // 工单编号仅展示，无校验
+  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'] }
+
+  reason: [
+    { type: 'string', required: true, message: '请输入处理情况描述', trigger: ['change', 'blur'] },
+    { type: 'string', max: 200, message: '处理情况描述最多200字', trigger: ['change', 'blur'] }
   ],
-  problemImgs: [problemImgs.imgValidateRule]
+  // 新增5个图片字段校验
+  startImgs: [startImgs.imgValidateRule],
+  processingImgs: [processingImgs.imgValidateRule],
+  endImgs: [endImgs.imgValidateRule],
+  personImgs: [personImgs.imgValidateRule],
+  materialImgs: [materialImgs.imgValidateRule]
 })
 
-// ========== 生命周期 ==========
-// 新增：onLoad - 从URL获取工单编号
+// 生命周期 - 从URL获取工单编号
 onLoad((options) => {
   if (options && options.orderNo) {
     workOrderForm.orderNo = options.orderNo
@@ -339,6 +294,7 @@ onLoad((options) => {
   console.log('从URL获取工单编号：', workOrderForm.orderNo)
 })
 
+// 生命周期 - 初始化表单规则
 onReady(() => {
   if (workOrderFormRef.value) {
     workOrderFormRef.value.setRules(workOrderFormRules)
@@ -346,29 +302,17 @@ onReady(() => {
   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',
+      roleCode: 'yl_worker',
       busiLine: 'yl',
       pageNo: 1,
       pageSize: 100
@@ -376,21 +320,13 @@ const loadCoProcessorList = async () => {
     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 || ''
+    if (res.list && res.list.length > 0) {
+      coProcessorList.value = res.list.map(item => ({
+        name: item.nickname,
+        value: item.id,
+        id: item.id
       }))
+      console.log('共同处理人列表：', coProcessorList.value)
     } else {
       coProcessorList.value = []
       uni.showToast({ title: '未查询到处理人数据', icon: 'none' })
@@ -403,40 +339,19 @@ const loadCoProcessorList = async () => {
   }
 }
 
-// ========== 方法定义 ==========
-/**
- * 打开通用下拉弹窗（新增共同处理人配置）
- */
+// 打开通用下拉弹窗（仅共同处理人）
 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
+      list: coProcessorList.value,
     }
   }
 
@@ -446,9 +361,7 @@ const handleActionSheetOpen = (type) => {
   showActionSheet.value = true
 }
 
-/**
- * 关闭通用下拉弹窗
- */
+// 关闭通用下拉弹窗
 const handleActionSheetClose = () => {
   showActionSheet.value = false
   currentActionSheetData.type = ''
@@ -456,144 +369,71 @@ const handleActionSheetClose = () => {
   currentActionSheetData.title = ''
 }
 
-/**
- * 通用下拉弹窗选择事件（新增共同处理人逻辑）
- */
+// 下拉弹窗选择事件（仅处理共同处理人多选）
 const handleActionSheetSelect = (e) => {
+  console.log(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
+  // 多选场景（仅共同处理人）
+  if (type === 'coProcessor') {
+    workOrderForm.coProcessorName = e.name
+    workOrderForm.coProcessorId = e.id
+    workOrderFormRef.value?.validateField('coProcessorName')
   }
   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 imgTabChange = (item)=> {
+  console.log(item)
+  activeTab.value = item.index
 }
 
-/**
- * 隐藏键盘
- */
+// 隐藏键盘
 const hideKeyboard = () => {
   uni.hideKeyboard()
 }
 
-/**
- * 提交工单（改造：使用ylWorkerExcuteWOrder接口，传递新增参数）
- */
+// 提交工单（整合所有图片URL，与参考示例一致）
 const submitWorkOrder = async () => {
   try {
     // 表单校验
     await workOrderFormRef.value.validate()
 
-    // 构造提交参数（包含原有参数+新增字段）
+    // 构造所有图片URL（按Tab分类，或合并为一个数组，可按需调整）
+    const allImgs = {
+      startImgs: startImgs.getSuccessImgUrls(),
+      processingImgs: processingImgs.getSuccessImgUrls(),
+      endImgs: endImgs.getSuccessImgUrls(),
+      personImgs: personImgs.getSuccessImgUrls(),
+      materialImgs: materialImgs.getSuccessImgUrls()
+    }
+
+    // 构造提交参数（可按需调整图片字段格式，此处既保留分类也提供合并数组）
     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'
+      id: workOrderForm.orderNo,
+      reason: workOrderForm.reason.trim(),
+      coProcessorId: workOrderForm.coProcessorId, // 数组格式提交，如需字符串可.join(',')
+      busiLine: 'yl',
+      // 分类图片URL
+      startImgs: allImgs.startImgs,
+      processingImgs: allImgs.processingImgs,
+      endImgs: allImgs.endImgs,
+      personImgs: allImgs.personImgs,
+      materialImgs: allImgs.materialImgs,
+      // 合并所有图片为一个数组（若接口需要）
+      imgs: [
+        ...allImgs.startImgs,
+        ...allImgs.processingImgs,
+        ...allImgs.endImgs,
+        ...allImgs.personImgs,
+        ...allImgs.materialImgs
+      ]
     }
 
-    // 显示加载中
     uni.showLoading({ title: '提交中...' })
-
-    // 替换为指定接口：ylWorkerExcuteWOrder
     const res = await ylWorkerExcuteWOrder(submitData)
-
     uni.hideLoading()
+
     uni.showToast({
       title: '工单提交成功',
       icon: 'success',
@@ -609,7 +449,7 @@ const submitWorkOrder = async () => {
   } catch (error) {
     uni.hideLoading()
 
-    // 区分表单校验失败和接口调用失败
+    // 区分校验失败和接口失败
     if (!Array.isArray(error)) {
       console.error('工单提交失败：', error)
       uni.showToast({
@@ -623,14 +463,13 @@ const submitWorkOrder = async () => {
 </script>
 
 <style lang="scss" scoped>
-// 全局页面样式
+// 页面容器样式
 .page-container {
   min-height: 100vh;
-  padding-bottom: 100rpx; // 给底部按钮留空间
-  background-color: #f5f5f5;
+  padding-bottom: 100rpx; // 给底部按钮留空间，与参考示例一致
 }
 
-// 工单表单内容容器
+// 表单内容容器
 .work-order-form-content {
   background: #fff;
   padding-bottom: 30rpx;
@@ -641,5 +480,4 @@ const submitWorkOrder = async () => {
   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 257378a..9e97683 100644
--- a/pages-sub/problem/work-order-manage/add-order.vue
+++ b/pages-sub/problem/work-order-manage/add-order.vue
@@ -7,32 +7,77 @@
           ref="workOrderFormRef"
           labelWidth="190rpx"
       >
-        <!-- 1. 工单编号（从URL获取展示） -->
+        <!-- 1. 工单位置（地图选择） -->
         <up-form-item
-            label="工单编号"
+            label="工单位置"
+            prop="workLocation"
             border-bottom
+            required
+            @click="chooseWorkLocation(); hideKeyboard()"
         >
           <up-input
-              v-model="workOrderForm.orderNo"
+              v-model="workOrderForm.workLocation"
               border="none"
               readonly
-              placeholder="暂无工单编号"
+              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"
           ></up-input>
+          <template #right>
+            <up-icon name="arrow-right" size="16"></up-icon>
+          </template>
         </up-form-item>
 
-        <!-- 2. 养护员选择（必选，下拉框） -->
+        <!-- 新增：紧急程度选择 -->
         <up-form-item
-            label="养护员"
-            prop="assigneeName"
+            label="紧急程度"
+            prop="pressingTypeName"
             border-bottom
             required
-            @click="handleActionSheetOpen('assignee'); hideKeyboard()"
+            @click="handleActionSheetOpen('pressingType'); hideKeyboard()"
         >
           <up-input
-              v-model="workOrderForm.assigneeName"
+              v-model="workOrderForm.pressingTypeName"
               disabled
               disabled-color="#ffffff"
-              placeholder="请选择养护员"
+              placeholder="请选择紧急程度"
               border="none"
           ></up-input>
           <template #right>
@@ -40,19 +85,51 @@
           </template>
         </up-form-item>
 
-        <!-- 3. 处理意见（非必填，文本域） -->
+        <!-- 4. 情况描述（文本域） -->
         <up-form-item
-            label="处理意见"
-            prop="reason"
+            label="情况描述"
+            prop="problemDesc"
+            required
         >
           <up-textarea
-              placeholder="请输入处理意见（可选，最多200字）"
-              v-model.trim="workOrderForm.reason"
+              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>
     </view>
 
@@ -60,12 +137,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"
@@ -73,188 +150,315 @@
         @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 } 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();
+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'
+
 // ========== 表单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 assigneeList = ref([]) // 养护员列表
-// ========== 工单表单数据（仅保留所需字段） ==========
+const roadNameList = ref([])
+const orderNameList = ref([])
+const pressingTypeList = ref([])
+
+// ========== 工单表单数据 ==========
 const workOrderForm = reactive({
-  taskId:'',
-  orderNo: '',        // 工单编号（对应接口参数id）
-  assigneeId: '',     // 养护员ID（对应接口参数nextAssignee）
-  assigneeName: '',   // 养护员名称（显示用）
-  reason: ''          // 处理意见（对应接口参数reason）
+  roadId: 0,                     // 道路ID
+  roadName: '',                  // 道路名称
+  workLocation: '',              // 工单位置
+  orderName: '',                 // 工单名称
+  pressingType: '',               // 紧急程度值（提交接口用）
+  pressingTypeName: '',          // 紧急程度名称（显示用）
+  problemDesc: '',               // 情况描述
+  lat: 0,                        // 纬度
+  lon: 0,                        // 经度
+  finishDate: '',                // 完成时间
 })
-// ========== 表单校验规则（仅保留养护员必选校验） ==========
+
+// ========== 表单校验规则 ==========
 const workOrderFormRules = reactive({
-  assigneeName: [
-    {type: 'string', required: true, message: '请选择养护员', trigger: ['change']}
+  workLocation: [
+    { type: 'string', required: true, message: '请选择工单位置', trigger: ['change', 'blur'] }
   ],
-  reason: [
-    {type: 'string', max: 200, message: '处理意见最多200字', 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) => {
-  // 从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(() => {
-  // 加载养护员列表
-  loadAssigneeList()
+  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)
 })
-// ========== 加载养护员列表 ==========
-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 === 'assignee' && assigneeList.value.length === 0) {
-    uni.showToast({title: '暂无养护员数据可选', icon: 'none'})
+  // 道路名称需先校验工单位置是否选择
+  if (type === 'roadName' && !workOrderForm.workLocation) {
+    uni.showToast({ title: '请先选择工单位置', icon: 'none' })
     return
   }
-  // 配置弹窗参数
+
+  // 配置当前弹窗参数
   const configMap = {
-    assignee: {
-      title: '请选择养护员',
-      list: assigneeList.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
-  if (type === 'assignee') {
-    workOrderForm.assigneeName = e.name
-    workOrderForm.assigneeId = e.value // 绑定养护员ID
-    workOrderFormRef.value?.validateField('assigneeName')
+  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
   }
+  // 关闭弹窗
   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 = {
-      id: workOrderForm.taskId,        // 工单编码（对应接口参数id）
-      reason: workOrderForm.reason.trim(), // 处理建议（对应接口参数reason）
-      nextAssignee: workOrderForm.assigneeId // 养护员ID（对应接口参数nextAssignee）
+      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'
     }
-    console.log('提交参数：', submitData)
-    // 4. 显示加载提示
-    uni.showLoading({title: '提交中...'})
-    // 5. 调用指定接口 ylTeamLeaderAssignWOrder
-    const res = await ylTeamLeaderAssignWOrder(submitData)
-    // 6. 隐藏加载提示并给出成功反馈
+
+    // 显示加载中
+    uni.showLoading({ title: '提交中...' })
+
+    // 调用提交接口
+    const res = await workorderCreate(submitData)
+
     uni.hideLoading()
     uni.showToast({
-      title: '提交成功',
+      title: '工单提交成功',
       icon: 'success',
       duration: 1000
     })
-    // 7. 提交成功后返回上一页
+
+    // 延迟跳转
     setTimeout(() => {
-      uni.navigateTo({
-        url: `/pages-sub/problem/work-order-manage/index`
+      uni.redirectTo({
+        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',
@@ -268,14 +472,13 @@ 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/distribution-order.vue b/pages-sub/problem/work-order-manage/distribution-order.vue
new file mode 100644
index 0000000..1c4f521
--- /dev/null
+++ b/pages-sub/problem/work-order-manage/distribution-order.vue
@@ -0,0 +1,282 @@
+<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="assigneeName"
+            border-bottom
+            required
+            @click="handleActionSheetOpen('assignee'); hideKeyboard()"
+        >
+          <up-input
+              v-model="workOrderForm.assigneeName"
+              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"
+        >
+          <up-textarea
+              placeholder="请输入处理意见（可选，最多200字）"
+              v-model.trim="workOrderForm.reason"
+              count
+              maxlength="200"
+              rows="4"
+          ></up-textarea>
+        </up-form-item>
+      </up-form>
+    </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>
+  </view>
+</template>
+
+<script setup>
+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 showActionSheet = ref(false)
+const currentActionSheetData = reactive({
+  type: '',
+  list: [],
+  title: ''
+})
+// ========== 下拉列表数据 ==========
+const assigneeList = ref([]) // 养护员列表
+// ========== 工单表单数据（仅保留所需字段） ==========
+const workOrderForm = reactive({
+  taskId:'',
+  orderNo: '',        // 工单编号（对应接口参数id）
+  assigneeId: '',     // 养护员ID（对应接口参数nextAssignee）
+  assigneeName: '',   // 养护员名称（显示用）
+  reason: ''          // 处理意见（对应接口参数reason）
+})
+// ========== 表单校验规则（仅保留养护员必选校验） ==========
+const workOrderFormRules = reactive({
+  assigneeName: [
+    {type: 'string', required: true, message: '请选择养护员', trigger: ['change']}
+  ],
+  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)
+  }
+})
+onShow(() => {
+  // 加载养护员列表
+  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: 'yl',
+      // 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 === 'assignee' && assigneeList.value.length === 0) {
+    uni.showToast({title: '暂无养护员数据可选', icon: 'none'})
+    return
+  }
+  // 配置弹窗参数
+  const configMap = {
+    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
+  if (type === 'assignee') {
+    workOrderForm.assigneeName = e.name
+    workOrderForm.assigneeId = e.value // 绑定养护员ID
+    workOrderFormRef.value?.validateField('assigneeName')
+  }
+  showActionSheet.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 = {
+      id: workOrderForm.taskId,        // 工单编码（对应接口参数id）
+      reason: workOrderForm.reason.trim(), // 处理建议（对应接口参数reason）
+      nextAssignee: workOrderForm.assigneeId // 养护员ID（对应接口参数nextAssignee）
+    }
+    console.log('提交参数：', submitData)
+    // 4. 显示加载提示
+    uni.showLoading({title: '提交中...'})
+    // 5. 调用指定接口 ylTeamLeaderAssignWOrder
+    const res = await ylTeamLeaderAssignWOrder(submitData)
+    // 6. 隐藏加载提示并给出成功反馈
+    uni.hideLoading()
+    uni.showToast({
+      title: '提交成功',
+      icon: 'success',
+      duration: 1000
+    })
+    // 7. 提交成功后返回上一页
+    setTimeout(() => {
+      uni.navigateTo({
+        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 {
+
+}
+
+// 表单内容容器
+.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 77f5cda..fba2bf4 100644
--- a/pages-sub/problem/work-order-manage/index.vue
+++ b/pages-sub/problem/work-order-manage/index.vue
@@ -307,7 +307,7 @@ const handleProcess = async (item) => {
 
     if(nextStepMap[item.taskKey] == '养护组长分配'){
       uni.navigateTo({
-        url: `/pages-sub/problem/work-order-manage/add-order?taskId=${item.taskId}&orderNo=${item.orderNo}`
+        url: `/pages-sub/problem/work-order-manage/distribution-order?taskId=${item.taskId}&orderNo=${item.orderNo}`
       })
     }
 
diff --git a/pages-sub/problem/work-order-manage/order-detail.vue b/pages-sub/problem/work-order-manage/order-detail.vue
index 291f89e..d03c2e3 100644
--- a/pages-sub/problem/work-order-manage/order-detail.vue
+++ b/pages-sub/problem/work-order-manage/order-detail.vue
@@ -121,8 +121,8 @@
 </template>
 
 <script setup lang="ts">
-import { ref, reactive, computed } from 'vue';
-import { onLoad } from '@dcloudio/uni-app';
+import { ref, computed } from 'vue';
+import { onLoad, onShow } from '@dcloudio/uni-app';
 import { timeFormat } from '@/uni_modules/uview-plus';
 import { getMyTaskDetail, getDoneTaskDetail, getTodoTaskDetail } from '@/api/work-order-manage/work-order-manage';
 
@@ -165,12 +165,27 @@ const getCurrentImgList = computed(() => {
 /**
  * 获取工单详情
  */
-const getMyTaskDetailQuery = async (taskId) => {
+const DetailQuery = async (taskIdStr) => {
+  console.log(taskIdStr)
   try {
     loading.value = true;
-    const res = await getMyTaskDetail({ taskId });
-    console.log('工单详情接口返回：', res);
-    orderDetail.value = res
+    if(activeTab.value==0){
+
+      const res = await getTodoTaskDetail({ taskId:taskIdStr });
+      orderDetail.value = res
+    }
+    if(activeTab.value==1){
+
+      const res = await getMyTaskDetail({ taskId:  taskIdStr });
+      orderDetail.value = res
+
+    }
+    if(activeTab.value==2){
+
+      const res = await getDoneTaskDetail({ taskId:  taskIdStr });
+      orderDetail.value = res
+    }
+
 
   } catch (error) {
     console.error('获取工单详情失败：', error);
@@ -181,22 +196,20 @@ const getMyTaskDetailQuery = async (taskId) => {
 };
 
 // 页面加载
+const taskId = ref('')
+const activeTab = ref('')
 onLoad((options) => {
   console.log(options)
-  const { taskId, activeTab } = options;
+  const { taskId: taskIdOpt, activeTab: activeTabOpt  } = options;
   // 0-待办 1我发起的- 2-已办
-  console.log(taskId)
-  if(activeTab==0){
-    getTodoTaskDetail(taskId);
-  }
-  if(activeTab==1){
-    getMyTaskDetailQuery(taskId);
+  console.log(taskIdOpt)
+  taskId.value = taskIdOpt
+  activeTab.value = activeTabOpt
 
-  }
-  if(activeTab==2){
-    getDoneTaskDetail(taskId);
-  }
 });
+onShow(()=>{
+  DetailQuery(taskId.value)
+})
 </script>
 
 <style scoped lang="scss">
diff --git a/pages.json b/pages.json
index 18e3deb..33bf4e7 100644
--- a/pages.json
+++ b/pages.json
@@ -126,10 +126,17 @@
 				},
 				{
 					"path": "work-order-manage/add-order",
-					"style": { "navigationBarTitleText": "工单提交" }
+					"style": { "navigationBarTitleText": "工单任务" }
 				},
 
 				{
+					"path": "work-order-manage/distribution-order",
+					"style": { "navigationBarTitleText": "分配工单" }
+				},
+
+
+
+				{
 					"path": "work-order-manage/order-detail",
 					"style": { "navigationBarTitleText": "工单详情" }
 				},