图片参数处理

刘淇
1 parent 4fa8cf12
Showing 7 changed files with 426 additions and 139 deletions
common/utils/common.js
pages-sub/daily/maintain-manage/add-record.vue
pages-sub/daily/quick-order/add-order.vue
pages-sub/daily/quick-order/index.vue
pages-sub/problem/work-order-manage/add-order.vue
pages-sub/problem/work-order-manage/index.vue
pages-sub/problem/work-order-manage/order-detail.vue
@@ -42,16 +42,6 @@ export const nextStepMap = {
   },
 }
  
-// ylTeamLeader       养护组长退回：210
-// ylTeamLeader       养护组长分配：110
-// ylInspectorStart    巡查员结束工单：200
-// ylInspectorStart    巡查员重新发起：100
-// ylWorker           养护员退回    ：220
-// ylWorker           养护员实施    ：120
-// ylTeamLeaderConfirm 养护组长验收通过: 130
-// ylTeamLeaderConfirm 养护组长验收不通过：230
-// ylInspector         巡查员验收通过：140
-// ylInspector         巡查员验收不通过：240
  
 export const buzStatusMap = {
   '000' :'巡查员发起',
@@ -116,38 +116,14 @@ export default {
             }
           }
         ],
-        // progress: [
-        //   {
-        //
-        //     required: true,
-        //     message: '请设置完成进度',
-        //     trigger: ['change'],
-        //     validator: (rule, value, callback) => {
-        //       // 第一步：校验是否为空/0
-        //       if (!value && value !== 0) {
-        //         callback(new Error('请设置完成进度'))
-        //       }
-        //       // 第二步：校验是否大于初始进度
-        //       else if (value <= this.initProgress) {
-        //         callback(new Error(`完成进度必须大于${this.initProgress}%`))
-        //       }
-        //       // 校验通过
-        //       else {
-        //         callback()
-        //       }
-        //     }
-        //   }
-        // ]
+
       }
     }
   },
   onLoad(option) {
     console.log('页面参数：', option)
     this.paramsOptins = option
-    // // 初始化初始进度
-    // this.initProgress = option.finishPercent ? Number(option.finishPercent)+1 : 0
-    // // 关键修复：初始进度值设为 初始进度+1，避免刚进入就触发校验失败
-    // this.inspectForm.progress = this.initProgress
+
  
   },
   onReady() {
@@ -158,30 +134,7 @@ export default {
     /**
      * 进度滑块变化处理 - 核心优化：实时触发校验 + 状态更新
      */
-    handleProgressChange(value) {
-      // // 1. 强制修正非法值（兜底）
-      // console.log(value)
-      // if (value <= this.initProgress) {
-      //   console.log('123')
-      //   this.inspectForm.progress = this.initProgress + 1
-      //   uni.showToast({
-      //     title: `进度不能低于${this.initProgress}%`,
-      //     icon: 'none',
-      //     duration: 1500
-      //   })
-      // }
-      //
-      // // 2. 关键：手动触发progress字段的校验，实时更新提示状态
-      // this.$nextTick(async () => {
-      //   try {
-      //     // 触发单个字段校验
-      //     await this.$refs.inspectFormRef.validateField('progress')
-      //   } catch (err) {
-      //     // 校验失败时uView会自动显示提示，此处无需额外处理
-      //     console.log('进度校验失败：', err)
-      //   }
-      // })
-    },
+
  
     /**
      * 删除图片
@@ -445,8 +445,8 @@ export default {
         const submitData = {
           roadId: this.workOrderForm.roadId,
           roadName: this.workOrderForm.roadName,
-          imgs: this.getImgUrlList(this.problemImgsList),
-          longRangeImgList: this.getImgUrlList(this.completeImgsList),
+          problemsImgs: this.getImgUrlList(this.problemImgsList),
+          endImgs : this.getImgUrlList(this.completeImgsList),
           remark: this.workOrderForm.problemDesc.trim(),
           handleResult: this.workOrderForm.handleResult.trim(),
           latLonType: 2,
@@ -4,7 +4,7 @@
     <up-sticky>
       <view class="search-header">
         <!-- 左侧下拉框：替换为uView Plus的Select组件 -->
-        <view class="select-wrap">
+        <view class="select-wrap common-text-color">
           <up-select
               v-model:current="selectedSortValue"
               :options="sortOptions"
@@ -173,8 +173,7 @@ const handleAddOrder = () =&gt; {
  
   // 下拉选择框容器
   .select-wrap {
-    width: 80px;
-    color: #333;
+    width: 60px;
     margin-right: 20rpx;
     // 适配up-select样式
     :deep(.u-select) {
@@ -118,11 +118,11 @@
         <!-- 完成时间 -->
         <up-form-item
             label="希望完成时间"
-            prop="finishDate"
+            prop="expectedFinishDate"
             @click="show=true;hideKeyboard()"
         >
           <up-input
-              v-model="workOrderForm.finishDate"
+              v-model="workOrderForm.expectedFinishDate"
               border="none"
               readonly
               placeholder="点击选择时间"
@@ -155,11 +155,11 @@
     <!-- 完成时间选择器 -->
     <up-datetime-picker
         :show="show"
-        v-model="finishDate"
+        v-model="expectedFinishDate"
         mode="datetime"
         :min-date="new Date()"
         @cancel="show = false"
-        @confirm="finishDateConfirm"
+        @confirm="expectedFinishDateConfirm"
     ></up-datetime-picker>
   </view>
 </template>
@@ -201,7 +201,7 @@ const currentActionSheetData = reactive({
 })
 // 完成时间选择器控制
 const show = ref(false)
-const finishDate = ref(Date.now())
+const expectedFinishDate = ref(Date.now())
  
 // ========== 重新提交相关状态（核心：本地存储读取） ==========
 const isRenew = ref(false); // 是否为重新提交状态
@@ -223,7 +223,7 @@ const workOrderForm = reactive({
   problemDesc: '',               // 情况描述
   lat: 0,                        // 纬度
   lon: 0,                        // 经度
-  finishDate: '',                // 完成时间
+  expectedFinishDate: '',                // 希望完成时间
 })
  
 // ========== 表单校验规则 ==========
@@ -318,7 +318,7 @@ const echoOrderData = (orderItem) =&gt; {
   workOrderForm.problemDesc = orderItem.remark || '';
   workOrderForm.lat = orderItem.lat || 0;
   workOrderForm.lon = orderItem.lon || 0;
-  workOrderForm.finishDate = orderItem.finishDate || timeFormat(new Date(), 'yyyy-mm-dd hh:MM:ss');
+  workOrderForm.expectedFinishDate = orderItem.expectedFinishDate || timeFormat(new Date(), 'yyyy-mm-dd hh:MM:ss');
  
   // 2. 上传图片回显（兼容useUploadImgs格式）
   if (orderItem.problemsImgs && Array.isArray(orderItem.problemsImgs) && orderItem.problemsImgs.length > 0) {
@@ -480,9 +480,9 @@ const chooseWorkLocation = () =&gt; {
 /**
  * 完成时间确认
  */
-const finishDateConfirm = (e) => {
+const expectedFinishDateConfirm = (e) => {
   console.log('选择的完成时间：', e)
-  workOrderForm.finishDate = timeFormat(e.value, 'yyyy-mm-dd hh:MM:ss')
+  workOrderForm.expectedFinishDate = timeFormat(e.value, 'yyyy-mm-dd hh:MM:ss')
   show.value = false
 }
  
@@ -505,7 +505,7 @@ const submitWorkOrder = async () =&gt; {
     const commonSubmitData = {
       roadId: workOrderForm.roadId,
       roadName: workOrderForm.roadName,
-      imgs: problemImgs.getSuccessImgUrls(), // 复用上传逻辑的URL获取方法
+      problemsImgs: problemImgs.getSuccessImgUrls(), // 复用上传逻辑的URL获取方法
       remark: workOrderForm.problemDesc.trim(),
       latLonType: 2,
       lat: workOrderForm.lat,
@@ -513,7 +513,7 @@ const submitWorkOrder = async () =&gt; {
       lonLatAddress: workOrderForm.workLocation,
       pressingType: workOrderForm.pressingType,
       orderName: workOrderForm.orderName,
-      finishDate: workOrderForm.finishDate,
+      expectedFinishDate: workOrderForm.expectedFinishDate,
       sourceId: 1,
       sourceName: '园林',
       busiLine: 'yl'
@@ -510,12 +510,12 @@ const confirmReject = async () =&gt; {
   // 严格校验回退原因（去除首尾空格）
   const rejectReasonTrim = rejectReason.value.trim();
   if (!rejectReasonTrim) {
-    uni.showToast({title: '请填写回退原因', icon: 'none', duration: 2000});
+    uni.showToast({title: '请填写回退原因', icon: 'none', duration: 1000});
     return;
   }
   // 校验当前工单有效性
   if (!currentRejectItem.value || !currentRejectItem.value.id) {
-    uni.showToast({title: '工单信息异常，无法提交', icon: 'none', duration: 2000});
+    uni.showToast({title: '工单信息异常，无法提交', icon: 'none', duration:1000});
     rejectModalShow.value = false;
     return;
   }
@@ -559,12 +559,12 @@ const handleAddOrder = () =&gt; {
 const handleAcceptModalConfirm = async () => {
   // 1. 校验验收原因是否为空
   if (!acceptReason.value.trim()) {
-    uni.showToast({title: '请填写验收原因', icon: 'none', duration: 2000});
+    uni.showToast({title: '请填写验收原因', icon: 'none', duration: 1000});
     return;
   }
   // 2. 校验验收原因长度
   if (acceptReason.value.length > 200) {
-    uni.showToast({title: '验收原因最多200字', icon: 'none', duration: 2000});
+    uni.showToast({title: '验收原因最多200字', icon: 'none', duration: 1000});
     return;
   }
   try {
@@ -592,14 +592,14 @@ const handleAcceptModalConfirm = async () =&gt; {
     }
     const acceptRes = await universalApproval(postData);
     // 4. 操作成功处理
-    uni.showToast({title: '提交成功', icon: 'success', duration: 1500});
+    uni.showToast({title: '提交成功', icon: 'success', duration: 1000});
     acceptModalShow.value = false;
     acceptReason.value = ''; // 清空验收原因
     paging.value?.reload(); // 刷新工单列表
   } catch (error) {
     // 5. 操作失败处理
     console.error('养护组长验收失败：', error);
-    uni.showToast({title: '验收提交失败，请重试', icon: 'none', duration: 2000});
+    uni.showToast({title: '验收提交失败，请重试', icon: 'none', duration: 1000});
   }
 };
  
@@ -679,12 +679,6 @@ onShow(() =&gt; {
   }
 }
  
-.reject-textarea {
-  font-size: 28rpx;
-  padding: 16rpx;
-  border: 1rpx solid #e4e7ed;
-  border-radius: 8rpx;
-}
  
 .upload-wrap {
   margin-top: 20rpx;
@@ -110,7 +110,7 @@
             <!-- 希望完成时间 -->
             <up-cell
                 title="希望完成时间"
-                :value="orderDetail.finishDate === 0 ? '未设置' : timeFormat(orderDetail.finishDate, 'yyyy-mm-dd hh:MM:ss')"
+                :value="orderDetail.expectedFinishDate === 0 ? '未设置' : timeFormat(orderDetail.expectedFinishDate, 'yyyy-mm-dd hh:MM:ss')"
                 align="middle"
                 :border="false"
             ></up-cell>
@@ -131,7 +131,9 @@
                   <view style="min-width: 200rpx">共同处理人</view>
                 </template>
                 <template #value>
-                  <view class="common-text-color up-line-1">{{ orderDetail.coHandlersName.join(',') || '--' }}</view>
+                  <view class="common-text-color up-line-1">
+                    {{ Array.isArray(orderDetail.coHandlersName) && orderDetail.coHandlersName.length > 0 ? orderDetail.coHandlersName.join(',') : '--' }}
+                  </view>
                 </template>
               </up-cell>
             </up-cell-group>
@@ -167,10 +169,10 @@
               v-if="processData.activityNodes && processData.activityNodes.length"
               :list="processData.activityNodes"
               :current="getCurrentStepIndex()"
-          direction="column"
-          active-color="#3c9cff"
-          inactive-color="#999"
-          class="vertical-steps"
+              direction="column"
+              active-color="#3c9cff"
+              inactive-color="#999"
+              class="vertical-steps"
           >
             <template >
               <up-steps-item
@@ -193,7 +195,7 @@
                       <!-- 时间行 -->
                       <view class="time-line">
                         处理时间：{{ timeFormat(item.startTime, 'yyyy-mm-dd hh:MM:ss') }}
-                        <text v-if="item.endTime"> - {{ timeFormat(item.endTime, 'yyyy-mm-dd hh:MM:ss') }}</text>
+                        <text v-if="item.endTime"> 至 {{ timeFormat(item.endTime, 'yyyy-mm-dd hh:MM:ss') }}</text>
                         <text v-else class="processing-tag">（处理中）</text>
                       </view>
                       <!-- 原因行 -->
@@ -230,19 +232,98 @@
         </view>
       </view>
     </view>
+
+    <!-- activeTab==0的时候才出现， 也就是待办 -->
+    <view v-if="activeTab==0&&nextStepMap[orderDetail.taskKey]" class="fixed-bottom-btn-wrap">
+      <view class="u-body-item u-flex common-justify-between common-item-center ">
+        <up-button type="warning" size="normal" @click="handleReject(orderDetail)"
+                   v-show="nextStepMap[orderDetail.taskKey].backShow">回退
+        </up-button>
+
+        <up-button type="success" size="normal" @click="handleRenew(orderDetail)"
+                   v-show="nextStepMap[orderDetail.taskKey].renewShow">重新提交
+        </up-button>
+
+        <up-button type="primary" size="normal" @click="handleProcess(orderDetail)">{{
+            nextStepMap[orderDetail.taskKey].btnText
+          }}
+        </up-button>
+
+      </view>
+    </view>
+
+    <!-- 回退原因弹窗 -->
+    <up-modal
+        :show="rejectModalShow"
+        title="回退原因"
+        :closeOnClickOverlay="false"
+        :showConfirmButton="true"
+        :showCancelButton="true"
+        @cancel="handleRejectModalCancel"
+        @confirm="confirmReject"
+    >
+      <view class="reject-modal-content">
+        <up-textarea
+            v-model.trim="rejectReason"
+            placeholder="请输入回退原因（必填）"
+            rows="6"
+            :count="200"
+            maxlength="200"
+            class="reject-textarea"
+        />
+      </view>
+    </up-modal>
+
+    <!-- 验收弹窗 -->
+    <up-modal
+        :show="acceptModalShow"
+        title="验收"
+        :closeOnClickOverlay="false"
+        :showConfirmButton="true"
+        :showCancelButton="true"
+        @cancel="acceptModalShow=false"
+        @confirm="handleAcceptModalConfirm"
+    >
+      <view class="accept-modal-content">
+        <!-- 第一行：单选框（通过/不通过，默认通过） -->
+        <view class="radio-group-wrap">
+          <up-radio-group v-model="acceptRadioValue">
+            <up-radio name="0" label="通过"></up-radio>
+            <up-radio name="1" label="不通过"></up-radio>
+          </up-radio-group>
+        </view>
+
+        <!-- 第二行：必填textarea，最多200字 -->
+        <view class="textarea-wrap mt-30">
+          <up-textarea
+              v-model.trim="acceptReason"
+              placeholder="请输入验收原因（必填，最多200字）"
+              :required="true"
+              maxlength="200"
+              rows="5"
+              count
+          />
+        </view>
+      </view>
+    </up-modal>
+
   </view>
 </template>
  
 <script setup lang="ts">
-import {ref, computed} from 'vue';
+import {ref, watch} from 'vue';
 import {onLoad, onShow} from '@dcloudio/uni-app';
 import {timeFormat} from '@/uni_modules/uview-plus';
 import {
   getMyTaskDetail,
   getDoneTaskDetail,
   getTodoTaskDetail,
-  getApprovalDetail
+  getApprovalDetail,
+  universalApproval
 } from '@/api/work-order-manage/work-order-manage';
+import { nextStepMap, buzStatusMap } from '@/common/utils/common'
+// 引入图片上传组合式函数
+import { useUploadImgs } from '@/common/utils/useUploadImgs'
  
 // 状态管理
 const loading = ref(true);
@@ -263,36 +344,6 @@ const processData = ref&lt;any&gt;({
   todoTask: null
 });
  
-const activeTopTabClick = async (item: any) => {
-  console.log(item)
-  activeTopTab.value = item.index
-  if (activeTopTab.value == 1) {
-    let getData = {
-      processInstanceId: processInstanceId.value,
-    }
-    const res = await getApprovalDetail(getData)
-    console.log(res)
-    // 关键：格式化数据，补充up-steps要求的title字段
-    if (res && res.activityNodes && res.activityNodes.length) {
-      // 1. 先过滤：剔除 name 为 "结束" 的节点
-      const filteredActivityNodes = res.activityNodes.filter(node => {
-        // 返回 true 保留节点，返回 false 剔除节点
-        return node.name !== '结束';
-      });
-      const formatActivityNodes = filteredActivityNodes.map(node => ({
-        ...node,
-        title: node.name // 补充强制字段，满足3.3.48版本组件要求
-      }));
-      processData.value = {
-        ...res,
-        activityNodes: formatActivityNodes
-      };
-    } else {
-      processData.value = res;
-    }
-  }
-}
-
 // 图片分类Tab列表（带角标配置）
 const imgTabList = ref([
   {name: '开始', badge: {isDot: true}},
@@ -318,6 +369,7 @@ const orderDetail = ref&lt;any&gt;({
   curingLevelName: '',
   commitDate: 0,
   finishDate: 0,
+  expectedFinishDate:0,
   pressingType: 0,
   userId: 0,
   userName: '',
@@ -360,7 +412,7 @@ const orderDetail = ref&lt;any&gt;({
 const currentImgList = ref([])
  
 const tabKeyMap = ['startImgs', 'processingImgs', 'endImgs', 'personImgs', 'materialImgs'];
-const imgTabChange = (({index}) => {
+const imgTabChange = (({index}: {index: number}) => {
   console.log(index)
   const currentKey = tabKeyMap[index]
   console.log(currentKey)
@@ -389,16 +441,6 @@ const getCurrentStepIndex = () =&gt; {
   const { activityNodes } = processData.value;
   if (!activityNodes || !activityNodes.length) return 0;
  
-  // item.tasks && item.tasks[0]?.assigneeUser?.nickname
-  // 1. 查找第一个状态为1（处理中）的节点，即为当前步骤
-  // const processingNodeIndex = activityNodes.findIndex(node => node.name === '结束');
-  // console.log(processingNodeIndex)
-  // if (processingNodeIndex !== -1) {
-  //   return activityNodes.length - 2
-  // }else{
-  //   return activityNodes.length - 1
-  // }
-
   // 2. 若没有处理中的节点（全部已完成），则激活最后一个节点
   return activityNodes.length - 1;
 }
@@ -442,6 +484,281 @@ const DetailQuery = async (taskIdStr: string) =&gt; {
 const taskId = ref('')
 const activeTab = ref('')
 const processInstanceId = ref('')
+
+const activeTopTabClick = async (item: any) => {
+  console.log(item)
+  activeTopTab.value = item.index
+  if (activeTopTab.value == 1) {
+    let getData = {
+      processInstanceId: processInstanceId.value,
+    }
+    const res = await getApprovalDetail(getData)
+    console.log(res)
+    // 关键：格式化数据，补充up-steps要求的title字段
+    if (res && res.activityNodes && res.activityNodes.length) {
+      // 1. 先过滤：剔除 name 为 "结束" 的节点
+      const filteredActivityNodes = res.activityNodes.filter(node => {
+        // 返回 true 保留节点，返回 false 剔除节点
+        return node.name !== '结束';
+      });
+      const formatActivityNodes = filteredActivityNodes.map(node => ({
+        ...node,
+        title: node.name // 补充强制字段，满足3.3.48版本组件要求
+      }));
+      processData.value = {
+        ...res,
+        activityNodes: formatActivityNodes
+      };
+    } else {
+      processData.value = res;
+    }
+  }
+}
+
+
+// ========== 新增：回退弹窗相关状态 ==========
+const rejectModalShow = ref(false); // 回退modal显示开关
+const rejectReason = ref(''); // 回退原因
+const currentRejectItem = ref<any>(null); // 当前回退工单
+// 回退图片上传配置
+const rejectImgs = useUploadImgs({
+  maxCount: 3,
+  uploadText: '选择回退图片',
+  sizeType: ['compressed'],
+  formRef: null,
+  fieldName: 'rejectImgs'
+})
+// 监听上传实例响应式变化
+watch(() => rejectImgs.rawImgList.value, (newVal) => {
+  rejectImgs.imgList = newVal
+}, { deep: true })
+
+// ========== 新增：验收弹窗相关状态 ==========
+const acceptModalShow = ref(false); // 验收弹窗显示开关
+const acceptRadioValue = ref('0'); // 单选框值，默认0（通过）
+const acceptReason = ref(''); // 验收原因
+const currentAcceptItem = ref<any>(null); // 当前验收的工单项
+
+// ========== 新增：生成临时key ==========
+const generateTempKey = () => {
+  return 'renew_order_' + Date.now() + '_' + Math.floor(Math.random() * 10000);
+};
+
+// ========== 新增：handleRenew 重新提交工单 ==========
+const handleRenew = (item: any) => {
+  // 校验工单有效性
+  if (!item || !item.id) {
+    uni.showToast({title: '工单信息异常，无法重新提交', icon: 'none'});
+    return;
+  }
+
+  // 1. 生成唯一临时标识
+  const tempKey = generateTempKey();
+
+  // 2. 将完整工单数据存入本地临时存储（同步存储，确保数据立即生效）
+  try {
+    uni.setStorageSync(tempKey, item);
+  } catch (error) {
+    console.error('存储工单数据失败：', error);
+    uni.showToast({title: '数据存储异常，无法重新提交', icon: 'none'});
+    return;
+  }
+
+  // 3. URL 仅传递「唯一标识」和「重新提交标记」
+  uni.navigateTo({
+    url: `/pages-sub/problem/work-order-manage/add-order?isRenew=1&tempKey=${tempKey}`
+  });
+};
+
+// ========== 新增：handleReject 打开回退弹窗 ==========
+const handleReject = (item: any) => {
+  // 校验工单有效性
+  if (!item || !item.id) {
+    uni.showToast({title: '工单信息异常，无法回退', icon: 'none'});
+    return;
+  }
+  currentRejectItem.value = item;
+  rejectReason.value = ''; // 清空上次输入
+  rejectImgs.clearImgs(); // 清空上传图片
+  rejectModalShow.value = true; // 显示回退modal
+};
+
+// ========== 新增：回退弹窗取消按钮 ==========
+const handleRejectModalCancel = () => {
+  rejectModalShow.value = false;
+  rejectReason.value = '';
+  rejectImgs.clearImgs(); // 清空上传图片
+};
+
+// ========== 新增：确认回退工单 ==========
+const confirmReject = async () => {
+  // 严格校验回退原因（去除首尾空格）
+  const rejectReasonTrim = rejectReason.value.trim();
+  if (!rejectReasonTrim) {
+    uni.showToast({title: '请填写回退原因', icon: 'none', duration: 1000});
+    return;
+  }
+  // 校验当前工单有效性
+  if (!currentRejectItem.value || !currentRejectItem.value.id) {
+    uni.showToast({title: '工单信息异常，无法提交', icon: 'none', duration: 1000});
+    rejectModalShow.value = false;
+    return;
+  }
+  try {
+    // 显示加载中，防止重复提交
+    uni.showLoading({title: '提交中...', mask: true});
+
+    // 构建请求参数
+    const requestData = {
+      "returnImgs": rejectImgs.getSuccessImgUrls(),
+      "workerDataId": currentRejectItem.value.id,
+      "taskKey": currentRejectItem.value.taskKey,
+      "taskId": currentRejectItem.value.taskId,
+      "operateType": nextStepMap[currentRejectItem.value.taskKey].operateTypeNoPass,
+      "agree": 1,
+      "reason": rejectReasonTrim
+    };
+    // 调用回退工单接口
+    const res = await universalApproval(requestData);
+    uni.showToast({title: '回退成功', icon: 'success', duration: 1000});
+    rejectModalShow.value = false;
+    // 重新获取工单详情，刷新页面
+    await DetailQuery(taskId.value);
+  } catch (error) {
+    console.error('回退工单失败：', error);
+    uni.showToast({title: '网络异常，回退失败', icon: 'none', duration: 1000});
+  } finally {
+    // 隐藏加载中
+    uni.hideLoading();
+  }
+};
+
+// ========== 新增：handleProcess 处理工单 ==========
+const handleProcess = async (item: any) => {
+  console.log(nextStepMap[item.taskKey]?.name)
+  try {
+    if (nextStepMap[item.taskKey]?.name == '养护组长分配') {
+      uni.navigateTo({
+        url: `/pages-sub/problem/work-order-manage/distribution-order?taskId=${item.taskId}&orderNo=${item.orderNo}&id=${item.id}`
+      })
+    }
+    if (nextStepMap[item.taskKey]?.name == '养护员待实施') {
+      // ① 生成唯一临时key
+      const tempKey = `maintain_order_${Date.now()}_${Math.floor(Math.random() * 10000)}`;
+
+      // ② 存储完整item到本地缓存
+      try {
+        uni.setStorageSync(tempKey, item);
+      } catch (error) {
+        console.error('存储养护工单数据失败：', error);
+        uni.showToast({title: '数据存储异常，无法跳转', icon: 'none'});
+        return;
+      }
+
+      // ③ URL仅传递临时key
+      uni.navigateTo({
+        url: `/pages-sub/problem/work-order-manage/add-maintain-order?tempKey=${tempKey}`
+      })
+    }
+    // 养护组长验收 - 打开弹窗
+    if (nextStepMap[item.taskKey]?.name == '养护组长验收') {
+      currentAcceptItem.value = item; // 存储当前工单信息
+      acceptReason.value = ''; // 清空上次的验收原因
+      acceptRadioValue.value = '0'; // 重置默认选中“通过”
+      acceptModalShow.value = true; // 显示验收弹窗
+    }
+    // 巡查员验收 - 打开弹窗
+    if (nextStepMap[item.taskKey]?.name == '巡查员验收') {
+      currentAcceptItem.value = item; // 存储当前工单信息
+      acceptReason.value = ''; // 清空上次的验收原因
+      acceptRadioValue.value = '0'; // 重置默认选中“通过”
+      acceptModalShow.value = true; // 显示验收弹窗
+    }
+
+    // 发起人确认
+    if (nextStepMap[item.taskKey]?.name == '发起人确认') {
+      console.log(item)
+      uni.showModal({
+        title: "结束工单",
+        content: "请确定是否结束工单？",
+        success: async function (res) {
+          if (res.confirm) {
+            // 构建请求参数
+            const requestData = {
+              "returnImgs": rejectImgs.getSuccessImgUrls(),
+              "workerDataId": item.id,
+              "taskKey":'ylInspectorStart',
+              "taskId": item.taskId,
+              "operateType": 200,
+              "agree": 1,
+              "reason": '结束工单'
+            };
+            // 调用回退工单接口
+            const res = await universalApproval(requestData);
+            uni.showToast({title: '结束成功', icon: 'success', duration: 1000});
+            // 重新获取工单详情，刷新页面
+            await DetailQuery(taskId.value);
+          } else if (res.cancel) {
+            console.log("用户点击取消");
+          }
+        },
+      });
+    }
+  } catch (error) {
+    console.error('处理工单失败：', error);
+    uni.showToast({title: '处理失败，请重试', icon: 'none'});
+  }
+};
+
+// ========== 新增：验收弹窗确认按钮 ==========
+const handleAcceptModalConfirm = async () => {
+  // 1. 校验验收原因是否为空
+  if (!acceptReason.value.trim()) {
+    uni.showToast({title: '请填写验收原因', icon: 'none', duration: 1000});
+    return;
+  }
+  // 2. 校验验收原因长度
+  if (acceptReason.value.length > 200) {
+    uni.showToast({title: '验收原因最多200字', icon: 'none', duration: 1000});
+    return;
+  }
+  try {
+    // 3. 调用验收接口
+    console.log(currentAcceptItem.value)
+    let postData: any = {}
+    if (currentAcceptItem.value?.taskKey == 'ylTeamLeaderConfirm') {   // 养护组长验收
+      postData = {
+        "taskKey": currentAcceptItem.value.taskKey, // ylTeamLeaderConfirm
+        "workerDataId": currentAcceptItem.value.id,
+        "taskId": currentAcceptItem.value.taskId,
+        "operateType": acceptRadioValue.value == 0 ? nextStepMap[currentAcceptItem.value.taskKey].operateTypePass : nextStepMap[currentAcceptItem.value.taskKey].operateTypeNoPass,
+        "reason": acceptReason.value.trim()
+      }
+    }
+    if (currentAcceptItem.value?.taskKey == 'ylInspector') {   // 巡查员验收
+      postData = {
+        "taskKey": currentAcceptItem.value.taskKey,  //ylInspector
+        "taskId": currentAcceptItem.value.taskId,
+        "workerDataId": currentAcceptItem.value.id,
+        "operateType": acceptRadioValue.value == 0 ? nextStepMap[currentAcceptItem.value.taskKey].operateTypePass : nextStepMap[currentAcceptItem.value.taskKey].operateTypeNoPass,
+        "reason": acceptReason.value.trim(),
+        "agree": acceptRadioValue.value
+      }
+    }
+    const acceptRes = await universalApproval(postData);
+    // 4. 操作成功处理
+    uni.showToast({title: '提交成功', icon: 'success', duration: 1000});
+    acceptModalShow.value = false;
+    acceptReason.value = ''; // 清空验收原因
+    // 重新获取工单详情，刷新页面
+    await DetailQuery(taskId.value);
+  } catch (error) {
+    // 5. 操作失败处理
+    console.error('验收失败：', error);
+    uni.showToast({title: '验收提交失败，请重试', icon: 'none', duration: 1000});
+  }
+};
+
 onLoad((options: any) => {
   console.log('页面入参：', options)
   const {taskId: taskIdOpt, activeTab: activeTabOpt, processInstanceId: processInstanceIdOpt} = options;
@@ -465,7 +782,7 @@ onShow(() =&gt; {
  
 // 主内容容器
 .main-content {
-  padding-bottom: 20rpx;
+  padding-bottom: 80rpx;
 }
  
 // 顶部Tabs
@@ -601,4 +918,38 @@ onShow(() =&gt; {
     }
   }
 }
+
+
+
+// 回退弹窗样式
+.reject-modal-content {
+  width: 100%;
+  box-sizing: border-box;
+  padding: 10rpx 0;
+}
+
+
+// 验收弹窗样式
+.accept-modal-content {
+  width: 100%;
+  box-sizing: border-box;
+}
+
+.radio-group-wrap {
+  display: flex;
+  align-items: center;
+  gap: 40rpx;
+  font-size: 28rpx;
+  margin-bottom: 20rpx;
+}
+
+.textarea-wrap {
+  width: 100%;
+  margin-top: 30rpx;
+}
+
+
+.mt-30 {
+  margin-top: 30rpx;
+}
 </style>
 \ No newline at end of file