From 7a96cf5063e3d3a58ac990c89873850b222f24cc Mon Sep 17 00:00:00 2001
From: liugongyu <290219706@qq.com>
Date: Sun, 21 Dec 2025 19:48:33 +0800
Subject: [PATCH] 重新提交

---
 common/utils/common.js                            |  34 ++++++++++++++++++++++++----------
 pages-sub/problem/work-order-manage/add-order.vue | 131 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------
 pages-sub/problem/work-order-manage/index.vue     | 277 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------
 3 files changed, 357 insertions(+), 85 deletions(-)

diff --git a/common/utils/common.js b/common/utils/common.js
index fcae8f5..f7e8658 100644
--- a/common/utils/common.js
+++ b/common/utils/common.js
@@ -1,28 +1,42 @@
 export const nextStepMap = {
   ylTeamLeader: {
     name: '养护组长分配',
-    btnText:'分配',
+    btnText: '分配',
     operateTypePass: 110,
-    backShow:true
+    operateTypeNoPass: 210,  //养护组长退回：210
+    backShow: true,
+    renewShow: false
   },
   ylWorker: {
     name: '养护员待实施',
-    btnText:'实施',
+    btnText: '实施',
     operateTypePass: 120,
-    backShow:true
+    backShow: true,
+    renewShow: false
   },
   ylTeamLeaderConfirm: {
     name: '养护组长验收',
-    btnText:'验收',
+    btnText: '验收',
     operateTypePass: 130, //养护组长验收通过: 130
     operateTypeNoPass: 230,  // 养护组长验收不通过：230
-    backShow:false
+    backShow: false,
+    renewShow: false
   },
-  ylInspector:{
+  ylInspector: {
     name: '巡查员验收',
-    btnText:'验收',
+    btnText: '验收',
     operateTypePass: 140, //巡查员验收通过: 140
     operateTypeNoPass: 240,  // 巡查员验收不通过：230
-    backShow:false
-  }
+    backShow: false,
+    renewShow: false
+  },
+  ylInspectorStart: {
+    name: '发起人确认',
+    btnText: '结束工单',
+    operateTypePass: 200, //巡查员结束工单：200
+    operateTypeNoPass: 240,  // 巡查员验收不通过：230
+    operateTypeRenew: 100,  //巡查员重新发起：100
+    backShow: false,
+    renewShow: true
+  },
 }
\ 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 fc8a61d..4822219 100644
--- a/pages-sub/problem/work-order-manage/add-order.vue
+++ b/pages-sub/problem/work-order-manage/add-order.vue
@@ -38,7 +38,6 @@
               disabled-color="#ffffff"
               placeholder="请先选择工单位置"
               border="none"
-
           ></up-input>
           <template #right>
             <up-icon name="arrow-right" size="16" ></up-icon>
@@ -167,12 +166,13 @@
 
 <script setup>
 import { ref, reactive, watch } from 'vue'
-import { onReady, onShow } from '@dcloudio/uni-app';
+import { onReady, onShow, onLoad } from '@dcloudio/uni-app';
 import { useUploadImgs } from '@/common/utils/useUploadImgs' // 引入改造后的上传逻辑
 import { getRoadListByLatLng } from '@/api/common'
-import { universalApproval } from '@/api/work-order-manage/work-order-manage'
+import { universalApproval, workorderCreate } 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)
 
@@ -203,6 +203,10 @@ const currentActionSheetData = reactive({
 const show = ref(false)
 const finishDate = ref(Date.now())
 
+// ========== 重新提交相关状态（核心：本地存储读取） ==========
+const isRenew = ref(false); // 是否为重新提交状态
+const renewOrderData = ref(null); // 重新提交的原有工单数据
+
 // ========== 下拉列表数据 ==========
 const roadNameList = ref([])
 const orderNameList = ref([])
@@ -244,6 +248,43 @@ const workOrderFormRules = reactive({
 })
 
 // ========== 生命周期 ==========
+// 页面加载：读取本地存储的工单数据（核心改造）
+onLoad((options) => {
+  // 判断是否为重新提交状态
+  console.log('434')
+  console.log(options)
+  if (options.isRenew ==1 && options.tempKey) {
+    isRenew.value = true;
+    const tempKey = options.tempKey;
+
+    // 1. 从本地同步存储中读取完整工单数据
+    try {
+      const orderData = uni.getStorageSync(tempKey);
+      if (orderData && typeof orderData === 'object') {
+        renewOrderData.value = orderData;
+
+        console.log('123213')
+        console.log(orderData)
+        // 2. 回显工单数据到表单
+        echoOrderData(renewOrderData.value);
+      } else {
+        uni.showToast({ title: '工单数据不存在，无法重新提交', icon: 'none' });
+        // 跳转回列表页
+        setTimeout(() => uni.navigateBack(), 1000);
+        return;
+      }
+    } catch (error) {
+      console.error('读取工单数据失败：', error);
+      uni.showToast({ title: '数据读取异常，无法重新提交', icon: 'none' });
+      setTimeout(() => uni.navigateBack(), 1000);
+      return;
+    } finally {
+      // 3. 关键：用完即删，避免本地冗余存储和数据泄露
+      uni.removeStorageSync(tempKey);
+    }
+  }
+});
+
 onReady(() => {
   // 设置表单校验规则
   if (workOrderFormRef.value) {
@@ -265,6 +306,49 @@ onShow(() => {
   console.log('紧急程度列表：', pressingTypeList.value)
 })
 
+// ========== 核心方法：工单数据回显 ==========
+const echoOrderData = (orderItem) => {
+  // 1. 基础表单字段回显（适配工单字段与表单字段映射）
+  workOrderForm.roadId = orderItem.roadId || 0;
+  workOrderForm.roadName = orderItem.roadName || '';
+  workOrderForm.workLocation = orderItem.lonLatAddress || orderItem.roadName || '';
+  workOrderForm.orderName = orderItem.orderName || '';
+  workOrderForm.pressingType = orderItem.pressingType || '';
+  workOrderForm.pressingTypeName = uni.$dict.getDictLabel('workorder_pressing_type', orderItem.pressingType) || '';
+  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');
+
+  // 2. 上传图片回显（兼容useUploadImgs格式）
+  if (orderItem.problemsImgs && Array.isArray(orderItem.problemsImgs) && orderItem.problemsImgs.length > 0) {
+    const imgList = orderItem.problemsImgs.map((imgUrl, index) => ({
+      url: imgUrl,
+      name: `renew_img_${index}`,
+      status: 'success' // 标记为已上传状态
+    }));
+    problemImgs.imgList = imgList;
+    problemImgs.rawImgList.value = imgList;
+  }
+
+  // 3. 自动获取道路列表（保证下拉框正常使用）
+  if (orderItem.lat && orderItem.lon) {
+    getRoadListByLatLng({
+      companyCode: 'sls',
+      latitude: orderItem.lat,
+      longitude: orderItem.lon
+    }).then((roadRes) => {
+      if (Array.isArray(roadRes)) {
+        roadNameList.value = roadRes.map((item) => ({
+          name: item.roadName || '',
+          code: item.roadCode || '',
+          id: item.roadId || 0
+        }));
+      }
+    }).catch(err => console.error('回显道路列表失败：', err));
+  }
+};
+
 // ========== 方法定义 ==========
 /**
  * 打开通用下拉弹窗
@@ -327,9 +411,9 @@ const handleActionSheetSelect = (e) => {
       break
     case 'pressingType':
       console.log(e)
-      workOrderForm.pressingType =e.value
+      workOrderForm.pressingType = e.value
       workOrderForm.pressingTypeName = e.name
-      workOrderFormRef.value?.validateField('pressingType')
+      workOrderFormRef.value?.validateField('pressingTypeName')
       break
   }
   // 关闭弹窗
@@ -410,14 +494,15 @@ const hideKeyboard = () => {
 }
 
 /**
- * 提交工单
+ * 提交工单（区分新增/重新提交，接口隔离）
  */
 const submitWorkOrder = async () => {
   try {
     // 先执行表单校验
     await workOrderFormRef.value.validate()
 
-    const submitData = {
+    // 构建公共提交数据
+    const commonSubmitData = {
       roadId: workOrderForm.roadId,
       roadName: workOrderForm.roadName,
       imgs: problemImgs.getSuccessImgUrls(), // 复用上传逻辑的URL获取方法
@@ -436,18 +521,36 @@ const submitWorkOrder = async () => {
 
     // 显示加载中
     uni.showLoading({ title: '提交中...' })
-
-    // 调用提交接口
-    const res = await universalApproval(submitData)
+    let res
+
+    // 核心：根据状态区分接口调用
+    if (isRenew.value) {
+      // 重新提交：调用 universalApproval 接口
+      const renewSubmitData = {
+        // 原有工单必要参数
+        workerDataId: renewOrderData.value.id,
+        taskKey: renewOrderData.value.taskKey,
+        taskId: renewOrderData.value.taskId,
+        operateType: nextStepMap[renewOrderData.value.taskKey]?.operateTypeRenew || '',
+        agree: 0,
+        reason: '重新提交工单',
+        // 新编辑的工单数据
+        ...commonSubmitData
+      }
+      res = await universalApproval(renewSubmitData)
+    } else {
+      // 新增工单：调用原有 workorderCreate 接口（不影响原有功能）
+      res = await workorderCreate(commonSubmitData)
+    }
 
     uni.hideLoading()
     uni.showToast({
-      title: '工单提交成功',
+      title: isRenew.value ? '重新提交成功' : '工单提交成功',
       icon: 'success',
       duration: 1000
     })
 
-    // 延迟跳转
+    // 延迟跳转回列表页
     setTimeout(() => {
       uni.redirectTo({
         url: '/pages-sub/problem/work-order-manage/index'
@@ -460,9 +563,9 @@ const submitWorkOrder = async () => {
     // 区分是表单校验失败还是接口调用失败
     if (!Array.isArray(error)) {
       // 接口调用失败
-      console.error('工单提交失败：', error)
+      console.error(isRenew.value ? '工单重新提交失败：' : '工单提交失败：', error)
       uni.showToast({
-        title: '提交失败，请重试',
+        title: isRenew.value ? '重新提交失败，请重试' : '提交失败，请重试',
         icon: 'none',
         duration: 2000
       })
diff --git a/pages-sub/problem/work-order-manage/index.vue b/pages-sub/problem/work-order-manage/index.vue
index ea93205..94cf804 100644
--- a/pages-sub/problem/work-order-manage/index.vue
+++ b/pages-sub/problem/work-order-manage/index.vue
@@ -100,6 +100,11 @@
                 <up-button type="warning" size="mini" @click="handleReject(item)"
                            v-show="nextStepMap[item.taskKey].backShow">回退
                 </up-button>
+
+                <up-button type="success" size="mini" @click="handleRenew(item)"
+                           v-show="nextStepMap[item.taskKey].renewShow">重新提交
+                </up-button>
+
                 <up-button type="primary" size="mini" @click="handleProcess(item)">{{
                     nextStepMap[item.taskKey].btnText
                   }}
@@ -139,7 +144,6 @@
                 <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) }}
@@ -165,18 +169,31 @@
       </up-button>
     </view>
 
-    <!-- 回退原因弹窗 -->
-    <up-popup v-model="rejectPopupShow" mode="center" :close-on-click-overlay="false">
-      <view class="reject-popup">
-        <view class="popup-title">回退原因</view>
+    <!-- 回退原因弹窗：替换为up-modal（核心修改） -->
+    <up-modal
+        :show="rejectModalShow"
+        title="回退原因"
+        :closeOnClickOverlay="false"
+        :showConfirmButton="true"
+        :showCancelButton="true"
+        @cancel="handleRejectModalCancel"
+        @confirm="confirmReject"
+    >
+      <view class="reject-modal-content">
+        <!-- 回退原因 必填textarea -->
+        <!--        <view class="textarea-label">-->
+        <!--          回退原因 <text class="required-mark">*</text>-->
+        <!--        </view>-->
         <up-textarea
-            v-model="rejectReason"
+            v-model.trim="rejectReason"
             placeholder="请输入回退原因（必填）"
-            :required="true"
-            maxlength="-1"
+
             rows="6"
-            class="mt-20"
+            :count="200"
+            maxlength="200"
+            class="reject-textarea"
         />
+        <!-- 上传图片（选填） -->
         <view class="upload-wrap mt-20">
           <view class="upload-title">上传图片（选填）</view>
           <up-upload
@@ -188,14 +205,10 @@
               max-count="3"
           />
         </view>
-        <view class="popup-btn-wrap mt-40">
-          <up-button type="default" size="medium" @click="rejectPopupShow = false" class="mr-20">取消</up-button>
-          <up-button type="primary" size="medium" @click="confirmReject">确认提交</up-button>
-        </view>
       </view>
-    </up-popup>
+    </up-modal>
 
-    <!-- 新增：养护组长验收弹窗 up-modal -->
+    <!-- 养护组长验收弹窗 up-modal -->
     <up-modal
         :show="acceptModalShow"
         title="验收"
@@ -225,8 +238,6 @@
               count
           />
         </view>
-
-
       </view>
     </up-modal>
   </view>
@@ -245,6 +256,7 @@ import {
 // 假设从用户store获取角色信息
 import { useUserStore } from '@/pinia/user';
 import { nextStepMap } from '@/common/utils/common'
+import { workorderCreate } from "../../../api/work-order-manage/work-order-manage";
 // ========== 状态管理 ==========
 const userStore = useUserStore();
 // 标签页切换
@@ -269,14 +281,14 @@ const paging = ref(null);
 const orderList = ref([]);
 // 角色控制（巡查员显示新增按钮）
 const isInspector = computed(() => {
-  // 假设用户角色字段为role，巡查员标识为inspector
-  return userStore.userInfo.roles.includes('yl_inspector')
+  // 增加可选链，避免用户信息不存在报错
+  return userStore.userInfo?.roles?.includes('yl_inspector') || false;
 });
-// 回退弹窗相关
-const rejectPopupShow = ref(false);
-const rejectReason = ref('');
-const rejectFileList = ref([]);
-const currentRejectItem = ref(null);
+// 回退弹窗相关（核心修改：将rejectPopupShow改为rejectModalShow）
+const rejectModalShow = ref(false); // 回退modal显示开关
+const rejectReason = ref(''); // 回退原因
+const rejectFileList = ref([]); // 回退上传图片列表
+const currentRejectItem = ref(null); // 当前回退工单
 // 上传地址（根据实际接口配置）
 const uploadUrl = ref('https://xxx.com/upload');
 // ========== 新增：养护组长验收弹窗相关状态 ==========
@@ -337,73 +349,163 @@ const handleDetail = (item) => {
     url: `/pages-sub/problem/work-order-manage/order-detail?taskId=${item.taskId}&activeTab=${activeTab.value}&processInstanceId=${item.processInstanceId}`
   });
 };
+
+// 待办-重新提交工单（跳转到新增页面并携带工单数据）
+
+const generateTempKey = () => {
+  return 'renew_order_' + Date.now() + '_' + Math.floor(Math.random() * 10000);
+};
+
+// 待办-重新提交工单（改造后：大数据存本地，仅传唯一标识）
+const handleRenew = (item) => {
+  // 校验工单有效性
+  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}`
+  });
+};
+
 // 待办-处理工单
 const handleProcess = async (item) => {
   console.log(nextStepMap[item.taskKey].name)
   try {
-    if (nextStepMap[item.taskKey].name == '养护组长分配') {
+    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].name == '养护员待实施') {
+    if (nextStepMap[item.taskKey]?.name == '养护员待实施') {
       uni.navigateTo({
         url: `/pages-sub/problem/work-order-manage/add-maintain-order?taskId=${item.taskId}&id=${item.id}&orderNo=${item.orderNo}`
       })
     }
     // 养护组长验收 - 打开弹窗
-    if (nextStepMap[item.taskKey].name == '养护组长验收') {
-      console.log('123')
+    if (nextStepMap[item.taskKey]?.name == '养护组长验收') {
       currentAcceptItem.value = item; // 存储当前工单信息
       acceptReason.value = ''; // 清空上次的验收原因
       acceptRadioValue.value = '0'; // 重置默认选中“通过”
       acceptModalShow.value = true; // 显示验收弹窗
     }
-
     // 巡查员验收 - 打开弹窗
-    if (nextStepMap[item.taskKey].name == '巡查员验收') {
-      console.log('456')
+    if (nextStepMap[item.taskKey]?.name == '巡查员验收') {
       currentAcceptItem.value = item; // 存储当前工单信息
       acceptReason.value = ''; // 清空上次的验收原因
       acceptRadioValue.value = '0'; // 重置默认选中“通过”
       acceptModalShow.value = true; // 显示验收弹窗
     }
 
+    // 发起人确认
+    if (nextStepMap[item.taskKey]?.name == '发起人确认') {
+      console.log(item)
+      // currentAcceptItem.value = item; // 存储当前工单信息
+      uni.showModal({
+        title: "结束工单",
+        content: "请确定是否结束工单？",
+        success: async function (res) {
+          if (res.confirm) {
+            // 构建请求参数
+            const requestData = {
+              // fileUrls: rejectFileList.value.map(file => file.url || ''),
+              "workerDataId": item.id,
+              "taskKey": item.taskKey,
+              "taskId": item.taskId,
+              "operateType": nextStepMap[item.taskKey].operateTypeNoPass,
+              "agree": 1,
+              "reason": '结束工单'
+            };
+            // 调用回退工单接口
+            const res = await universalApproval(requestData);
+            uni.showToast({title: '结束成功', icon: 'success', duration: 1000});
+            rejectModalShow.value = false;
+            paging.value?.reload(); // 刷新列表
+          } else if (res.cancel) {
+            console.log("用户点击取消");
+          }
+        },
+      });
+    }
+
+
+
   } catch (error) {
     console.error('处理工单失败：', error);
     uni.showToast({title: '处理失败，请重试', icon: 'none'});
   }
 };
-// 待办-回退工单
+// 待办-回退工单（打开回退modal）
 const handleReject = (item) => {
+  console.log('123213')
+  // 校验工单有效性
+  if (!item || !item.id) {
+    uni.showToast({title: '工单信息异常，无法回退', icon: 'none'});
+    return;
+  }
   currentRejectItem.value = item;
+  rejectReason.value = ''; // 清空上次输入
+  rejectFileList.value = []; // 清空上次上传图片
+  rejectModalShow.value = true; // 显示回退modal
+};
+// 回退modal - 取消按钮
+const handleRejectModalCancel = () => {
+  rejectModalShow.value = false;
   rejectReason.value = '';
   rejectFileList.value = [];
-  rejectPopupShow.value = true;
 };
 // 确认回退工单
 const confirmReject = async () => {
-  if (!rejectReason.value.trim()) {
-    uni.showToast({title: '请填写回退原因', icon: 'none'});
+  // 严格校验回退原因（去除首尾空格）
+  const rejectReasonTrim = rejectReason.value.trim();
+  if (!rejectReasonTrim) {
+    uni.showToast({title: '请填写回退原因', icon: 'none', duration: 2000});
+    return;
+  }
+  // 校验当前工单有效性
+  if (!currentRejectItem.value || !currentRejectItem.value.id) {
+    uni.showToast({title: '工单信息异常，无法提交', icon: 'none', duration: 2000});
+    rejectModalShow.value = false;
     return;
   }
   try {
+    // 显示加载中，防止重复提交
+    uni.showLoading({title: '提交中...', mask: true});
+    // 构建请求参数
+    const requestData = {
+      // fileUrls: rejectFileList.value.map(file => file.url || ''),
+      "workerDataId": currentRejectItem.value.id,
+      "taskKey": currentRejectItem.value.taskKey,
+      "taskId": currentRejectItem.value.taskId,
+      "operateType": nextStepMap[currentRejectItem.value.taskKey].operateTypeNoPass,
+      "agree": 1,
+      "reason": rejectReasonTrim
+    };
     // 调用回退工单接口
-    await uni.request({
-      url: '/api/order/reject',
-      method: 'POST',
-      data: {
-        orderId: currentRejectItem.value.id,
-        reason: rejectReason.value,
-        fileUrls: rejectFileList.value.map(file => file.url)
-      }
-    });
-    uni.showToast({title: '回退成功', icon: 'success'});
-    rejectPopupShow.value = false;
+    const res = await universalApproval(requestData);
+    uni.showToast({title: '回退成功', icon: 'success', duration: 1000});
+    rejectModalShow.value = false;
     paging.value?.reload(); // 刷新列表
   } catch (error) {
     console.error('回退工单失败：', error);
-    uni.showToast({title: '回退失败，请重试', icon: 'none'});
+    uni.showToast({title: '网络异常，回退失败', icon: 'none', duration: 1000});
+  } finally {
+    // 隐藏加载中
+    uni.hideLoading();
   }
 };
 // 新增工单
@@ -412,20 +514,20 @@ const handleAddOrder = () => {
     url: '/pages-sub/problem/work-order-manage/add-order'
   });
 };
-// 上传图片-读取后
+// 上传图片-读取后（避免重复添加）
 const handleAfterRead = (file) => {
-  rejectFileList.value.push(file);
+  if (!file) return;
+  const isExist = rejectFileList.value.some(item => item.url === file.url);
+  if (!isExist && rejectFileList.value.length < 3) {
+    rejectFileList.value.push(file);
+  }
 };
-// 上传图片-删除
+// 上传图片-删除（安全删除，避免索引越界）
 const handleDeleteFile = (index) => {
+  if (index < 0 || index >= rejectFileList.value.length) return;
   rejectFileList.value.splice(index, 1);
 };
 // ========== 新增：养护组长验收弹窗事件 ==========
-// 验收弹窗 - 取消按钮
-const handleAcceptModalCancel = () => {
-  acceptModalShow.value = false;
-  acceptReason.value = ''; // 清空验收原因
-};
 // 验收弹窗 - 确定按钮（含表单校验）
 const handleAcceptModalConfirm = async () => {
   // 1. 校验验收原因是否为空
@@ -433,7 +535,7 @@ const handleAcceptModalConfirm = async () => {
     uni.showToast({title: '请填写验收原因', icon: 'none', duration: 2000});
     return;
   }
-  // 2. 校验验收原因长度（虽textarea已限制maxlength，此处做兜底校验）
+  // 2. 校验验收原因长度
   if (acceptReason.value.length > 200) {
     uni.showToast({title: '验收原因最多200字', icon: 'none', duration: 2000});
     return;
@@ -442,7 +544,7 @@ const handleAcceptModalConfirm = async () => {
     // 3. 调用验收接口
     console.log(currentAcceptItem.value)
     let postData = {}
-    if(currentAcceptItem.value.taskKey == 'ylTeamLeaderConfirm'){   //   养护组长验收
+    if (currentAcceptItem.value?.taskKey == 'ylTeamLeaderConfirm') {   // 养护组长验收
       postData = {
         "taskKey": "ylTeamLeaderConfirm",
         "taskId": currentAcceptItem.value.taskId,
@@ -450,16 +552,15 @@ const handleAcceptModalConfirm = async () => {
         "reason": acceptReason.value.trim()
       }
     }
-    if(currentAcceptItem.value.taskKey == 'ylInspector'){   //   巡查员验收
+    if (currentAcceptItem.value?.taskKey == 'ylInspector') {   // 巡查员验收
       postData = {
         "taskKey": "ylTeamLeaderConfirm",
         "taskId": currentAcceptItem.value.taskId,
         "operateType": acceptRadioValue.value == 0 ? nextStepMap['ylTeamLeaderConfirm'].operateTypePass : nextStepMap['ylTeamLeaderConfirm'].operateTypeNoPass,
         "reason": acceptReason.value.trim(),
-        "agree":acceptRadioValue.value
+        "agree": acceptRadioValue.value
       }
     }
-
     const acceptRes = await universalApproval(postData);
     // 4. 操作成功处理
     uni.showToast({title: '提交成功', icon: 'success', duration: 1500});
@@ -482,6 +583,7 @@ onShow(() => {
 <style scoped lang="scss">
 .page-container {
   min-height: 100vh;
+  background-color: #fafafa;
 }
 
 // 顶部固定区域
@@ -516,7 +618,59 @@ onShow(() => {
   }
 }
 
-// 新增：养护组长验收弹窗样式
+// 工单卡片样式
+.order-card {
+  margin: 0 20rpx 20rpx;
+  background: #fff;
+  border-radius: 12rpx;
+  box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.04);
+}
+
+.card-body {
+
+}
+
+
+// 回退modal样式
+.reject-modal-content {
+  width: 100%;
+  box-sizing: border-box;
+  padding: 10rpx 0;
+}
+
+.textarea-label {
+  font-size: 28rpx;
+  color: #333;
+  margin-bottom: 10rpx;
+
+  .required-mark {
+    color: #f56c6c;
+    margin-left: 4rpx;
+  }
+}
+
+.reject-textarea {
+  font-size: 28rpx;
+  padding: 16rpx;
+  border: 1rpx solid #e4e7ed;
+  border-radius: 8rpx;
+}
+
+.upload-wrap {
+  margin-top: 20rpx;
+
+  .upload-title {
+    font-size: 28rpx;
+    color: #333;
+    margin-bottom: 10rpx;
+  }
+}
+
+.mt-20 {
+  margin-top: 20rpx;
+}
+
+// 养护组长验收弹窗样式
 .accept-modal-content {
   width: 100%;
   box-sizing: border-box;
@@ -532,6 +686,7 @@ onShow(() => {
 
 .textarea-wrap {
   width: 100%;
+  margin-top: 30rpx;
 }
 
 .modal-btn-wrap {
--
libgit2 0.21.4