养护员提交养护工单

刘淇
1 parent fa775c6b
Showing 7 changed files with 331 additions and 266 deletions
api/work-order-manage/work-order-manage.js
common/utils/common.js
pages-sub/problem/work-order-manage/add-maintain-order.vue
pages-sub/problem/work-order-manage/add-order.vue
pages-sub/problem/work-order-manage/distribution-order.vue
pages-sub/problem/work-order-manage/index.vue
pages-sub/problem/work-order-manage/order-detail.vue
@@ -16,6 +16,17 @@ export const ylWorkerExcuteWOrder = (params) =&gt; {
 };
 /**
+ *   app端统一审批入口
+ * @returns {Promise}
+ */
+export const universalApproval = (params) => {
+  return post('/app-api/bpm/garden/workorder/universalApproval',params);
+};
+
+
+
+
+/**
  *   获得园林养护员列表、共同处理人也调用此接口
  * @returns {Promise}
  */
 export const nextStepMap = {
-  ylTeamLeader: '养护组长分配',  //
-  ylWorker:'养护员待实施'
-
+  ylTeamLeader: {
+    name: '养护组长分配',
+    btnText:'分配',
+    operateTypePass: 110,
+    backShow:true
+  },
+  ylWorker: {
+    name: '养护员待实施',
+    btnText:'实施',
+    operateTypePass: 120,
+    backShow:true
+  },
+  ylTeamLeaderConfirm: {
+    name: '养护组长验收',
+    btnText:'验收',
+    operateTypePass: 130, //养护组长验收通过: 130
+    operateTypeNoPass: 230,  // 养护组长验收不通过：230
+    backShow:false
+  },
 }
 \ No newline at end of file
@@ -5,7 +5,7 @@
           label-position="left"
           :model="workOrderForm"
           ref="workOrderFormRef"
-          labelWidth="190rpx"
+          labelWidth="170rpx"
       >
         <!-- 1. 工单编号（只读展示，从URL获取） -->
         <up-form-item
@@ -31,7 +31,7 @@
               v-model="workOrderForm.coProcessorName"
               disabled
               disabled-color="#ffffff"
-              placeholder="请选择共同处理人（支持多选）"
+              placeholder="请选择共同处理人"
               border="none"
           ></up-input>
           <template #right>
@@ -41,7 +41,7 @@
         <!-- 3. 处理建议（处理情况描述，必填） -->
         <up-form-item
-            label="处理情况描述"
+            label="处理情况"
             prop="reason"
             required
         >
@@ -50,97 +50,103 @@
               v-model.trim="workOrderForm.reason"
               count
               maxlength="200"
-              rows="4"
-              border="none"
+              rows="5"
               @blur="() => workOrderFormRef.validateField('reason')"
           ></up-textarea>
         </up-form-item>
-
-      <!-- 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"
-
-            @change = "imgTabChange"
-        ></up-tabs>
-        <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>
+        <!-- Tabs标签栏（图片切换：开始、进行中、结束、人员、材料）- 改造后 -->
+        <view class="tabs-wrap " style="margin-top: 30rpx;">
+          <up-tabs
+              v-model="activeTab"
+              :list="tabList"
+              line-width="40rpx"
+              active-color="#1989fa"
+              inactive-color="#666666"
+              @change = "imgTabChange"
+          >
+            <!-- 使用content插槽自定义每个tab的内容，添加红色*号 -->
+            <template #content="{ item, index }">
+              <view class="tab-item-content">
+                <!-- 给索引0（开始）和索引2（结束）添加红色*号 -->
+                <text v-if="index === 0 || index === 2" class="required-star">*</text>
+                <text class="tab-text">{{ item.name }}</text>
+              </view>
+            </template>
+          </up-tabs>
+          <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>
-      </view>
       </up-form>
     </view>
@@ -168,9 +174,9 @@
 import { ref, reactive, watch } from 'vue'
 import { onLoad, onReady, onShow } from '@dcloudio/uni-app';
 import { useUploadImgs } from '@/common/utils/useUploadImgs'
-import { getYlWorkersPage, ylWorkerExcuteWOrder } from '@/api/work-order-manage/work-order-manage'
+import { getYlWorkersPage, universalApproval } from '@/api/work-order-manage/work-order-manage'
+import { nextStepMap } from '@/common/utils/common'
 import { useUserStore } from '@/pinia/user';
-
 const userStore = useUserStore();
 // 表单Ref
@@ -199,6 +205,8 @@ const coProcessorList = ref([])
 // 工单表单数据（仅保留需要的字段）
 const workOrderForm = reactive({
+  workerDataId:'',
+  taskId:'', // 任务id
   orderNo: '',                  // 工单编号
   coProcessorId: '',            // 共同处理人ID数组（多选）
   coProcessorName: '',          // 共同处理人名称数组（多选）
@@ -209,7 +217,7 @@ const workOrderForm = reactive({
 // 开始阶段图片
 const startImgs = useUploadImgs({
   maxCount: 3,
-  uploadText: '选择开始阶段照片',
+  uploadText: '选择开始照片',
   sizeType: ['compressed'],
   formRef: workOrderFormRef,
   fieldName: 'startImgs'
@@ -217,7 +225,7 @@ const startImgs = useUploadImgs({
 // 进行中阶段图片
 const processingImgs = useUploadImgs({
   maxCount: 3,
-  uploadText: '选择进行中阶段照片',
+  uploadText: '选择进行中照片',
   sizeType: ['compressed'],
   formRef: workOrderFormRef,
   fieldName: 'processingImgs'
@@ -225,7 +233,7 @@ const processingImgs = useUploadImgs({
 // 结束阶段图片
 const endImgs = useUploadImgs({
   maxCount: 3,
-  uploadText: '选择结束阶段照片',
+  uploadText: '选择结束照片',
   sizeType: ['compressed'],
   formRef: workOrderFormRef,
   fieldName: 'endImgs'
@@ -233,7 +241,7 @@ const endImgs = useUploadImgs({
 // 人员配置图片
 const personImgs = useUploadImgs({
   maxCount: 3,
-  uploadText: '选择人员配置照片',
+  uploadText: '选择人员照片',
   sizeType: ['compressed'],
   formRef: workOrderFormRef,
   fieldName: 'personImgs'
@@ -241,7 +249,7 @@ const personImgs = useUploadImgs({
 // 材料使用图片
 const materialImgs = useUploadImgs({
   maxCount: 3,
-  uploadText: '选择材料使用照片',
+  uploadText: '选择材料照片',
   sizeType: ['compressed'],
   formRef: workOrderFormRef,
   fieldName: 'materialImgs'
@@ -279,19 +287,22 @@ const workOrderFormRules = reactive({
     { type: 'string', max: 200, message: '处理情况描述最多200字', trigger: ['change', 'blur'] }
   ],
   // 新增5个图片字段校验
-  startImgs: [startImgs.imgValidateRule],
-  processingImgs: [processingImgs.imgValidateRule],
-  endImgs: [endImgs.imgValidateRule],
-  personImgs: [personImgs.imgValidateRule],
-  materialImgs: [materialImgs.imgValidateRule]
+  // startImgs: [startImgs.imgValidateRule],
+  // processingImgs: [processingImgs.imgValidateRule],
+  // endImgs: [endImgs.imgValidateRule],
+  // personImgs: [personImgs.imgValidateRule],
+  // materialImgs: [materialImgs.imgValidateRule]
 })
 // 生命周期 - 从URL获取工单编号
 onLoad((options) => {
-  if (options && options.orderNo) {
-    workOrderForm.orderNo = options.orderNo
-  }
-  console.log('从URL获取工单编号：', workOrderForm.orderNo)
+
+
+      workOrderForm.workerDataId = options.id
+      workOrderForm.taskId = options.taskId
+      workOrderForm.orderNo = options.orderNo
+
+  console.log('从URL获取工单编号：', workOrderForm.taskId)
 })
 // 生命周期 - 初始化表单规则
@@ -393,45 +404,69 @@ const hideKeyboard = () =&gt; {
   uni.hideKeyboard()
 }
-// 提交工单（整合所有图片URL，与参考示例一致）
+// 提交工单（整合所有图片URL，增加开始/结束图片必填校验）
 const submitWorkOrder = async () => {
   try {
-    // 表单校验
+    // ========== 新增：校验开始和结束阶段图片至少各1张 ==========
+    const startImgUrls = startImgs.getSuccessImgUrls(); // 开始阶段图片URL数组
+    const endImgUrls = endImgs.getSuccessImgUrls();     // 结束阶段图片URL数组
+
+    // 判断开始图片是否为空
+    if (startImgUrls.length === 0) {
+      uni.showToast({
+        title: '请至少上传1张开始阶段图片',
+        icon: 'none',
+        duration: 2000
+      });
+      return; // 终止提交流程
+    }
+
+    // 判断结束图片是否为空
+    if (endImgUrls.length === 0) {
+      uni.showToast({
+        title: '请至少上传1张结束阶段图片',
+        icon: 'none',
+        duration: 2000
+      });
+      return; // 终止提交流程
+    }
+    // ========== 图片校验结束 ==========
+
+    // 原有表单校验
     await workOrderFormRef.value.validate()
-    // 构造所有图片URL（按Tab分类，或合并为一个数组，可按需调整）
+    // 构造所有图片URL（原有代码不变）
     const allImgs = {
-      startImgs: startImgs.getSuccessImgUrls(),
+      startImgs: startImgUrls, // 直接使用已获取的开始图片URL
       processingImgs: processingImgs.getSuccessImgUrls(),
-      endImgs: endImgs.getSuccessImgUrls(),
+      endImgs: endImgUrls,     // 直接使用已获取的结束图片URL
       personImgs: personImgs.getSuccessImgUrls(),
       materialImgs: materialImgs.getSuccessImgUrls()
     }
     // 构造提交参数（可按需调整图片字段格式，此处既保留分类也提供合并数组）
     const submitData = {
-      id: workOrderForm.orderNo,
-      reason: workOrderForm.reason.trim(),
-      coProcessorId: workOrderForm.coProcessorId, // 数组格式提交，如需字符串可.join(',')
-      busiLine: 'yl',
-      // 分类图片URL
+      taskId: workOrderForm.taskId,
+      taskKey:'ylWorker',
+      operateType:nextStepMap['ylWorker'].operateType,
+      workerDataId:Number(workOrderForm.workerDataId),
+      // nextStepMap
+      handleResult: workOrderForm.reason.trim(),
+      coHandlers: [String(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
-      ]
+
+      problemsImgs:[]
     }
+    console.log(submitData)
     uni.showLoading({ title: '提交中...' })
-    const res = await ylWorkerExcuteWOrder(submitData)
+    const res = await universalApproval(submitData)
     uni.hideLoading()
     uni.showToast({
@@ -480,4 +515,21 @@ const submitWorkOrder = async () =&gt; {
   background: #fff;
 }
+// 新增：Tab自定义内容样式（红色*号）
+.tab-item-content {
+  display: flex;
+  align-items: center;
+}
+
+.required-star {
+  color: #f53f3f; // 红色必填标识
+  margin-right: 4rpx; // 与文字保持小间距
+  font-weight: bold;
+}
+
+.tab-text {
+  font-size: 28rpx; // 与原有Tab文字大小一致
+}
+
+
 </style>
 \ No newline at end of file
@@ -108,6 +108,8 @@
               @after-read="problemImgs.uploadImgs"
               @delete="problemImgs.deleteImg"
               multiple
+              :width="70"
+              :height="70"
               :max-count="problemImgs.uploadConfig.maxCount"
               :upload-text="problemImgs.uploadConfig.uploadText"
               :size-type="problemImgs.uploadConfig.sizeType"
@@ -168,9 +170,9 @@ import { ref, reactive, watch } from &#39;vue&#39;
 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 { universalApproval } from '@/api/work-order-manage/work-order-manage'
 import { timeFormat } from '@/uni_modules/uview-plus'
-
+import { nextStepMap } from '@/common/utils/common'
 // ========== 表单Ref ==========
 const workOrderFormRef = ref(null)
@@ -436,7 +438,7 @@ const submitWorkOrder = async () =&gt; {
     uni.showLoading({ title: '提交中...' })
     // 调用提交接口
-    const res = await workorderCreate(submitData)
+    const res = await universalApproval(submitData)
     uni.hideLoading()
     uni.showToast({
@@ -79,7 +79,8 @@
 <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 { getYlWorkersPage, universalApproval } from '@/api/work-order-manage/work-order-manage'
+import { nextStepMap } from '@/common/utils/common'
 import { useUserStore } from '@/pinia/user';
 const userStore = useUserStore();
 // ========== 表单Ref ==========
@@ -228,7 +229,10 @@ const submitWorkOrder = async () =&gt; {
     }
     // 3. 构造接口所需参数
     const submitData = {
-      id: workOrderForm.taskId,        // 工单编码（对应接口参数id）
+      operateType: nextStepMap['ylTeamLeader'].operateTypePass,
+      taskKey:'ylTeamLeader',
+      agree:0,
+      taskId: workOrderForm.taskId,        // 工单编码（对应接口参数id）
       reason: workOrderForm.reason.trim(), // 处理建议（对应接口参数reason）
       nextAssignee: workOrderForm.assigneeId // 养护员ID（对应接口参数nextAssignee）
     }
@@ -236,7 +240,7 @@ const submitWorkOrder = async () =&gt; {
     // 4. 显示加载提示
     uni.showLoading({title: '提交中...'})
     // 5. 调用指定接口 ylTeamLeaderAssignWOrder
-    const res = await ylTeamLeaderAssignWOrder(submitData)
+    const res = await universalApproval(submitData)
     // 6. 隐藏加载提示并给出成功反馈
     uni.hideLoading()
     uni.showToast({
@@ -54,103 +54,108 @@
         :auto-show-system-loading="true"
     >
-    <template #empty>
-      <empty-view />
-    </template>
-
-    <view class="common-card-list" style="padding-top: 200rpx;padding-bottom: 30rpx">
-      <!-- 待办工单卡片 -->
-      <up-card
-          v-if="activeTab == 0"
-          :border="false"
-          :foot-border-top="false"
-          v-for="(item, index) in orderList"
-          :key="`todo_${item.orderNo}_${index}`"
-          :show-head="false"
-          class="order-card"
-      >
-        <template #body>
-          <view class="card-body">
-            <view class="u-body-item u-flex">
-              <view class="u-body-item-title">工单编号：</view>
-              <view class="u-line-1 u-body-value">{{ item.orderNo || '-' }}</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.roadName || '-' }}</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.orderName || '未填写' }}</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.remark || '无' }}</view>
-            </view>
-            <view class="u-body-item u-flex  common-item-center common-justify-between">
-              <view class="u-body-item-title">紧急程度：</view>
-              <view class="u-line-1 u-body-value">
-                {{uni.$dict.getDictLabel('workorder_pressing_type',item.pressingType)}}
+      <template #empty>
+        <empty-view/>
+      </template>
+
+      <view class="common-card-list" style="padding-top: 200rpx;padding-bottom: 30rpx">
+        <!-- 待办工单卡片 -->
+        <up-card
+            v-if="activeTab == 0"
+            :border="false"
+            :foot-border-top="false"
+            v-for="(item, index) in orderList"
+            :key="`todo_${item.orderNo}_${index}`"
+            :show-head="false"
+            class="order-card"
+        >
+          <template #body>
+            <view class="card-body">
+              <view class="u-body-item u-flex">
+                <view class="u-body-item-title">工单编号：</view>
+                <view class="u-line-1 u-body-value">{{ item.orderNo || '-' }}</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.roadName || '-' }}</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.orderName || '未填写' }}</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.remark || '无' }}</view>
+              </view>
+              <view class="u-body-item u-flex  common-item-center common-justify-between">
+                <view class="u-body-item-title">紧急程度：</view>
+                <view class="u-line-1 u-body-value">
+                  {{ uni.$dict.getDictLabel('workorder_pressing_type', item.pressingType) }}
+                </view>
+              </view>
+              <view class="u-body-item u-flex">
+                <view class="u-body-item-title">提交时间：</view>
+                <view class="u-line-1 u-body-value">{{ timeFormat(item.createTime, 'yyyy-mm-dd hh:MM:ss') }}</view>
+              </view>
+              <!-- 操作按钮行 -->
+              <view class="u-body-item u-flex common-justify-between common-item-center mt-20">
+                <up-button type="warning" size="mini" @click="handleReject(item)"
+                           v-show="nextStepMap[item.taskKey].backShow">回退
+                </up-button>
+                <up-button type="primary" size="mini" @click="handleProcess(item)">{{ nextStepMap[item.taskKey].btnText }}
+                </up-button>
+                <up-button type="info" size="mini" @click="handleDetail(item)">详情</up-button>
               </view>
             </view>
-            <view class="u-body-item u-flex">
-              <view class="u-body-item-title">提交时间：</view>
-              <view class="u-line-1 u-body-value">{{ timeFormat(item.createTime, 'yyyy-mm-dd hh:MM:ss') }}</view>
-            </view>
-            <!-- 操作按钮行 -->
-            <view class="u-body-item u-flex common-justify-between common-item-center mt-20">
-              <up-button type="warning" size="mini" @click="handleReject(item)">回退</up-button>
-              <up-button type="primary" size="mini" @click="handleProcess(item)">处理</up-button>
-              <up-button type="info" size="mini" @click="handleDetail(item)">详情</up-button>
-            </view>
-          </view>
-        </template>
-      </up-card>
-
-      <!-- 已办工单卡片和我发起的 -->
-      <up-card
-          v-if="activeTab == 2||activeTab == 1"
-          :border="false"
-          :foot-border-top="false"
-          v-for="(item, index) in orderList"
-          :key="`done_${item.orderNo}_${index}`"
-          :show-head="false"
-          class="order-card"
-      >
-        <template #body>
-          <view class="card-body">
-            <view class="u-body-item u-flex">
-              <view class="u-body-item-title">工单编号：</view>
-              <view class="u-line-1 u-body-value">{{ item.orderNo || '-' }}</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.roadName || '-' }}</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.orderName || '未填写' }}</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.remark || '无' }}</view>
-            </view>
+          </template>
+        </up-card>
+
+        <!-- 已办工单卡片和我发起的 -->
+        <up-card
+            v-if="activeTab == 2||activeTab == 1"
+            :border="false"
+            :foot-border-top="false"
+            v-for="(item, index) in orderList"
+            :key="`done_${item.orderNo}_${index}`"
+            :show-head="false"
+            class="order-card"
+        >
+          <template #body>
+            <view class="card-body">
+              <view class="u-body-item u-flex">
+                <view class="u-body-item-title">工单编号：</view>
+                <view class="u-line-1 u-body-value">{{ item.orderNo || '-' }}</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.roadName || '-' }}</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.orderName || '未填写' }}</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.remark || '无' }}</view>
+              </view>
-            <view class="u-body-item u-flex common-justify-between common-item-center">
-                <view class="u-body-item-title">紧急程度： {{uni.$dict.getDictLabel('workorder_pressing_type',item.pressingType)}}</view>
+              <view class="u-body-item u-flex common-justify-between common-item-center">
+                <view class="u-body-item-title">紧急程度：
+                  {{ uni.$dict.getDictLabel('workorder_pressing_type', item.pressingType) }}
+                </view>
                 <view class=" ">
                   <up-button type="primary" size="mini" @click="handleDetail(item)">工单详情</up-button>
                 </view>
+              </view>
+              <view class="u-body-item u-flex">
+                <view class="u-body-item-title">提交时间：</view>
+                <view class="u-line-1 u-body-value">{{ timeFormat(item.createTime, 'yyyy-mm-dd hh:MM:ss') }}</view>
+              </view>
             </view>
-            <view class="u-body-item u-flex">
-              <view class="u-body-item-title">提交时间：</view>
-              <view class="u-line-1 u-body-value">{{ timeFormat(item.createTime, 'yyyy-mm-dd hh:MM:ss') }}</view>
-            </view>
-          </view>
-        </template>
-      </up-card>
-    </view>
+          </template>
+        </up-card>
+      </view>
     </z-paging>
     <!-- 底部新增工单按钮（仅巡查员显示） -->
@@ -199,24 +204,23 @@ import { timeFormat } from &#39;@/uni_modules/uview-plus&#39;;
 import { myBuzSimplePage, todoBuzSimplePage, doneBuzSimplePage } from '@/api/work-order-manage/work-order-manage'
 // 假设从用户store获取角色信息
 import { useUserStore } from '@/pinia/user';
-  import { nextStepMap } from '@/common/utils/common'
-
+import { nextStepMap } from '@/common/utils/common'
 // ========== 状态管理 ==========
 const userStore = useUserStore();
 // 标签页切换
 const activeTab = ref(0); // 0-待办 1-我发起的 2-已办
 const tabList = ref([
-  { name: '待办' },
-  { name: '我发起的任务' },
-  { name: '已办' }
+  {name: '待办'},
+  {name: '我发起的任务'},
+  {name: '已办'}
 ]);
 // 排序下拉框
 const selectedSortValue = ref(1);
 const sortOptions = ref([
-  { name: '位置', id: 1 },
-  { name: '名称', id: 2 },
-  { name: '描述', id: 3 },
-  { name: '编号', id: 4 },
+  {name: '位置', id: 1},
+  {name: '名称', id: 2},
+  {name: '描述', id: 3},
+  {name: '编号', id: 4},
 ]);
 // 搜索
 const searchValue = ref('');
@@ -235,10 +239,6 @@ const rejectFileList = ref([]);
 const currentRejectItem = ref(null);
 // 上传地址（根据实际接口配置）
 const uploadUrl = ref('https://xxx.com/upload');
-
-
-
-
 // 分页查询列表
 const queryList = async (pageNo, pageSize) => {
   try {
@@ -248,29 +248,25 @@ const queryList = async (pageNo, pageSize) =&gt; {
       pageSize,
       type: selectedSortValue.value // 1-位置 2-工单名称 3-情况描述 4-工单编号
     };
-
     let res;
     if (activeTab.value == 0) {
       // 待办工单
       res = await todoBuzSimplePage(apiParams);
-    } else if(activeTab.value == 1) {
+    } else if (activeTab.value == 1) {
       // 我发起的任务
       res = await myBuzSimplePage(apiParams);
-
-    }else {
+    } else {
       // 已办工单
       res = await doneBuzSimplePage(apiParams);
     }
-
     // 适配z-paging分页
     paging.value.complete(res.list, res.total);
   } catch (error) {
     console.error('加载工单失败：', error);
     paging.value?.complete(false);
-    uni.showToast({ title: '加载失败，请重试', icon: 'none' });
+    uni.showToast({title: '加载失败，请重试', icon: 'none'});
   }
 };
-
 // ========== 事件处理 ==========
 // 标签页切换
 const handleTabChange = (item) => {
@@ -278,20 +274,17 @@ const handleTabChange = (item) =&gt; {
   activeTab.value = item.index;
   paging.value?.reload(); // 切换标签页刷新列表
 };
-
 // 排序变更
 const handleSortChange = (val) => {
   selectedSortValue.value = val.id;
   searchValue.value = '';
   paging.value?.reload(); // 排序变更刷新列表
 };
-
 // 搜索
 const handleSearch = (val) => {
   searchValue.value = val;
   paging.value?.reload(); // 搜索刷新列表
 };
-
 // 工单详情
 const handleDetail = (item) => {
   // 0-待办 1我发起的- 2-已办
@@ -299,29 +292,25 @@ const handleDetail = (item) =&gt; {
     url: `/pages-sub/problem/work-order-manage/order-detail?taskId=${item.taskId}&activeTab=${activeTab.value}`
   });
 };
-
 // 待办-处理工单
 const handleProcess = async (item) => {
   console.log(nextStepMap)
   try {
-
-    if(nextStepMap[item.taskKey] == '养护组长分配'){
+    if (nextStepMap[item.taskKey].name == '养护组长分配') {
       uni.navigateTo({
         url: `/pages-sub/problem/work-order-manage/distribution-order?taskId=${item.taskId}&orderNo=${item.orderNo}`
       })
     }
-
-    if(nextStepMap[item.taskKey] == '养护员待实施'){
+    if (nextStepMap[item.taskKey].name == '养护员待实施') {
       uni.navigateTo({
-        url: `/pages-sub/problem/work-order-manage/add-maintain-order?taskId=${item.taskId}&orderNo=${item.orderNo}`
+        url: `/pages-sub/problem/work-order-manage/add-maintain-order?taskId=${item.taskId}&id=${item.id}&orderNo=${item.orderNo}`
       })
     }
   } catch (error) {
     console.error('处理工单失败：', error);
-    uni.showToast({ title: '处理失败，请重试', icon: 'none' });
+    uni.showToast({title: '处理失败，请重试', icon: 'none'});
   }
 };
-
 // 待办-回退工单
 const handleReject = (item) => {
   currentRejectItem.value = item;
@@ -329,14 +318,12 @@ const handleReject = (item) =&gt; {
   rejectFileList.value = [];
   rejectPopupShow.value = true;
 };
-
 // 确认回退工单
 const confirmReject = async () => {
   if (!rejectReason.value.trim()) {
-    uni.showToast({ title: '请填写回退原因', icon: 'none' });
+    uni.showToast({title: '请填写回退原因', icon: 'none'});
     return;
   }
-
   try {
     // 调用回退工单接口
     await uni.request({
@@ -348,35 +335,28 @@ const confirmReject = async () =&gt; {
         fileUrls: rejectFileList.value.map(file => file.url)
       }
     });
-
-    uni.showToast({ title: '回退成功', icon: 'success' });
+    uni.showToast({title: '回退成功', icon: 'success'});
     rejectPopupShow.value = false;
     paging.value?.reload(); // 刷新列表
   } catch (error) {
     console.error('回退工单失败：', error);
-    uni.showToast({ title: '回退失败，请重试', icon: 'none' });
+    uni.showToast({title: '回退失败，请重试', icon: 'none'});
   }
 };
-
 // 新增工单
 const handleAddOrder = () => {
   uni.navigateTo({
     url: '/pages-sub/problem/work-order-manage/add-order'
   });
 };
-
-
-
 // 上传图片-读取后
 const handleAfterRead = (file) => {
   rejectFileList.value.push(file);
 };
-
 // 上传图片-删除
 const handleDeleteFile = (index) => {
   rejectFileList.value.splice(index, 1);
 };
-
 // 页面初始化
 onShow(() => {
   // 初始化加载列表
@@ -63,8 +63,8 @@
               <template #value>
                 <view class="cell-content-wrap">
                   <up-album
-                      v-if="!!orderDetail.problemImgsList?.length"
-                      :urls="orderDetail.problemImgsList.slice(0, 3)"
+                      v-if="!!orderDetail.problemsImgs?.length"
+                      :urls="orderDetail.problemsImgs.slice(0, 3)"
                       singleSize="70"
                       :preview-full-image="true"
                   ></up-album>