修改接口路径和命名

刘淇
1 parent eaaa8665
Showing 10 changed files with 294 additions and 124 deletions
api/regional-order-manage/regional-order-manage.js
api/work-order-manage/work-order-manage.js
common/utils/common.js
pages-sub/problem/regional-order-manage/add-order.vue
pages-sub/problem/regional-order-manage/add-patrol-order.vue
pages-sub/problem/regional-order-manage/distribution-order.vue
pages-sub/problem/regional-order-manage/index.vue
pages-sub/problem/regional-order-manage/order-detail.vue
pages-sub/problem/work-order-manage/index.vue
pages/workbench/index.vue
+import { post, get, put } from '@/common/utils/request';
+
+
+/**
+ *   获得审批详情  流程节点
+ * @returns {Promise}
+ */
+export const getApprovalDetail = (params) => {
+  return get('/app-api/bpm/garden/workorder/getApprovalDetail',params);
+};
+
+
+
+/**
+ *   获得园林养护员列表、共同处理人也调用此接口
+ * @returns {Promise}
+ */
+export const getYlWorkersPage = (params) => {
+  return get('/app-api/bpm/garden/workorder/getYlWorkersPage',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 daquWorkorderCreate = (data) => {
+  return post('/app-api/bpm/regionmgr/workorder/create',data);
+
+};
+
+/**
+ *   app端统一审批入口  -- 大区经理
+ * @returns {Promise}
+ */
+export const daquUniversalApproval = (params) => {
+  return post('/app-api/bpm/regionmgr/workorder/universalApproval',params);
+};
+
+
+/**
+ *  问题工单创建    全域巡查员
+ * @returns {Promise}
+ */
+export const qyWorkorderCreate = (data) => {
+  return post('/app-api/bpm/universal/workorder/create',data);
+};
+
+
+
+/**
+ *   app端统一审批入口   大区经理 对全域巡查员 单子 回退   分配和   全域巡查员 。
+ * @returns {Promise}
+ */
+export const qyUniversalApproval = (params) => {
+  return post('/app-api/bpm/universal/workorder/universalApproval',params);
+};
+
+/**
+ *  问题工单创建   全域督察员创建工单
+ * @returns {Promise}
+ */
+export const dcyWorkorderCreate = (data) => {
+  return post('/app-api/bpm/inspector/workorder/create',data);
+};
+
+
+/**
+ *  问题工单创建   全域督察员发起审批入口  ，大区经理对督察员的单子  回退   分配
+ * @returns {Promise}
+ */
+export const dcyUniversalApproval = (data) => {
+  return post('/app-api/bpm/inspector/workorder/universalApproval',data);
+};
+
+
+
+
+
+
+
+
@@ -107,58 +107,6 @@ export const workorderCreate = (data) =&gt; {
 };
-/**
- *  问题工单创建  大区经理      ai经理
- * @returns {Promise}
- */
-export const regionmgrWorkorderCreate = (data) => {
-  return post('/app-api/bpm/regionmgr/workorder/create',data);
-};
-
-/**
- *  问题工单创建    全域巡查员
- * @returns {Promise}
- */
-export const qyWorkorderCreate = (data) => {
-  return post('/app-api/bpm/universal/workorder/create',data);
-};
-
-/**
- *   app端统一审批入口  -- 大区经理    ai经理
- * @returns {Promise}
- */
-export const regionmgrUniversalApproval = (params) => {
-  return post('/app-api/bpm/regionmgr/workorder/universalApproval',params);
-};
-
-
-/**
- *   app端统一审批入口   大区经理  回退   分配和   全域巡查员 。
- * @returns {Promise}
- */
-export const qyUniversalApproval = (params) => {
-  return post('/app-api/bpm/universal/workorder/universalApproval',params);
-};
-
-/**
- *  问题工单创建   全域督察员创建工单
- * @returns {Promise}
- */
-export const inspectorWorkorderCreate = (data) => {
-  return post('/app-api/bpm/inspector/workorder/create',data);
-};
-
-
-/**
- *  问题工单创建   全域督察员发起审批入口
- * @returns {Promise}
- */
-export const inspectorUniversalApproval = (data) => {
-  return post('/app-api/bpm/inspector/workorder/universalApproval',data);
-};
-
-
-
@@ -50,6 +50,17 @@ export const nextStepMap = {
     backShow: true,
     renewShow: false
   },
+
+
+  shRegionManager: {
+    name: '督察员单子大区经理分配',
+    btnText: '分配',
+    operateTypePass: 60, // 大区经理分配：60
+    operateTypeNoPass: 70,  //  大区经理退回：70
+    // operateTypeRenew: 100,  //巡查员重新发起：100
+    backShow: true,
+    renewShow: false
+  },
 }
@@ -67,6 +78,8 @@ export const buzStatusMap = {
   "240" : '验收不通过',
   '90' : '退回',
   '80' : '分配',
+  '70': '退回',
+  '60': '分配',
 }
@@ -203,10 +203,13 @@ import { ref, reactive } from &#39;vue&#39;
 import { onReady, onShow, onLoad } from '@dcloudio/uni-app';
 import { useUploadImgs } from '@/common/utils/useUploadImgs'
 import { getRoadListByLatLng } from '@/api/common'
-import { regionmgrUniversalApproval,  regionmgrWorkorderCreate, inspectorWorkorderCreate } from '@/api/work-order-manage/work-order-manage'
+import { daquUniversalApproval, qyUniversalApproval,
+  dcyUniversalApproval,  daquWorkorderCreate,
+  dcyWorkorderCreate } from '@/api/regional-order-manage/regional-order-manage'
 import { timeFormat } from '@/uni_modules/uview-plus'
 import { nextStepMap } from '@/common/utils/common'
 import { useUserStore } from '@/pinia/user';
+import { qyWorkorderCreate } from "../../../api/regional-order-manage/regional-order-manage";
 // ========== 状态管理 ==========
 const userStore = useUserStore();
@@ -330,6 +333,7 @@ onLoad((options) =&gt; {
     try {
       const orderData = uni.getStorageSync(tempKey);
+      console.log(orderData)
       if (orderData && typeof orderData === 'object') {
         renewOrderData.value = orderData;
         echoOrderData(renewOrderData.value);
@@ -562,11 +566,19 @@ const submitWorkOrder = async () =&gt; {
       return;
     }
-
-
     const commonSubmitData = {
       roadId: workOrderForm.roadId,
       roadName: workOrderForm.roadName,
+
+      // roadId: 550,
+      // roadName:'东明胡同(三海)',
+
+      // roadId: 551,
+      // roadName:'地安门西大街51号',
+      //
+      // roadId: 553,
+      // roadName:'什刹海前海南沿',
+
       problemsImgs: problemImgs.getSuccessImgUrls(),
       remark: workOrderForm.problemDesc.trim(),
       latLonType: 2,
@@ -594,15 +606,34 @@ const submitWorkOrder = async () =&gt; {
         reason: '重新提交工单',
         ...commonSubmitData
       }
-      res = await regionmgrUniversalApproval(renewSubmitData)
+
+      if( userStore.userInfo.roles.includes('regional_manager')){  // 大区经理
+        res = await daquUniversalApproval(renewSubmitData)
+      }
+
+      if( userStore.userInfo.roles.includes('Inspector_global')){  // 督察员
+        res = await dcyUniversalApproval(renewSubmitData)
+      }
+
+      if( userStore.userInfo.roles.includes('patrol_global')){  // 全域巡查员
+        res = await qyUniversalApproval(renewSubmitData)
+      }
+
     } else {
-      if( userStore.userInfo.roles.includes('team_leader_yl')){  // 督察员
-        res = await inspectorWorkorderCreate(commonSubmitData)
-      }else{
-        res = await regionmgrWorkorderCreate(commonSubmitData)
+      if( userStore.userInfo.roles.includes('regional_manager')){  // 大区经理
+        res = await daquWorkorderCreate(commonSubmitData)
+      }
+
+      if( userStore.userInfo.roles.includes('Inspector_global')){  // 督察员
+        res = await dcyWorkorderCreate(commonSubmitData)
+      }
+
+      if( userStore.userInfo.roles.includes('patrol_global')){  // 全域巡查员
+        res = await qyWorkorderCreate(commonSubmitData)
       }
+
     }
     uni.hideLoading()
@@ -103,7 +103,7 @@
 import { ref, reactive } from 'vue'
 import { onReady, onShow, onLoad } from '@dcloudio/uni-app';
 import { useUploadImgs } from '@/common/utils/useUploadImgs'
-import { qyUniversalApproval,  qyWorkorderCreate } from '@/api/work-order-manage/work-order-manage'
+import { qyUniversalApproval,  qyWorkorderCreate } from '@/api/regional-order-manage/regional-order-manage'
 import { timeFormat } from '@/uni_modules/uview-plus'
 import { nextStepMap } from '@/common/utils/common'
 import { useUserStore } from '@/pinia/user';
@@ -197,7 +197,7 @@ import { ref, reactive } from &#39;vue&#39;
 import { onReady, onShow, onLoad } from '@dcloudio/uni-app';
 import { useUploadImgs } from '@/common/utils/useUploadImgs'
 import { getRoadListByLatLng } from '@/api/common'
-import { regionmgrUniversalApproval,  regionmgrWorkorderCreate, qyUniversalApproval } from '@/api/work-order-manage/work-order-manage'
+import { daquUniversalApproval,  daquWorkorderCreate, qyUniversalApproval } from '@/api/regional-order-manage/regional-order-manage'
 import { timeFormat } from '@/uni_modules/uview-plus'
 import { nextStepMap } from '@/common/utils/common'
 import { useUserStore } from '@/pinia/user';
@@ -338,7 +338,7 @@ onLoad((options) =&gt; {
       setTimeout(() => uni.navigateBack(), 1000);
       return;
     } finally {
-      // uni.removeStorageSync(tempKey);   // 调试完  打开
+      uni.removeStorageSync(tempKey);   // 调试完  打开
     }
   }
 });
@@ -94,7 +94,7 @@
               </view>
               <view class="u-body-item u-flex">
                 <view class="u-body-item-title">工单状态：</view>
-                <view class="u-line-1 u-body-value">{{buzStatusMap[item.buzStatus] }}</view>
+                <view class="u-line-1 u-body-value">{{ buzStatusMap[item.buzStatus] }}</view>
               </view>
               <view class="u-body-item u-flex">
                 <view class="u-body-item-title">提交时间：</view>
@@ -150,7 +150,8 @@
               </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 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>
@@ -158,7 +159,7 @@
               </view>
               <view class="u-body-item u-flex">
                 <view class="u-body-item-title">工单状态：</view>
-                <view class="u-line-1 u-body-value">{{buzStatusMap[item.buzStatus] }}</view>
+                <view class="u-line-1 u-body-value">{{ buzStatusMap[item.buzStatus] }}</view>
               </view>
               <view class="u-body-item u-flex">
                 <view class="u-body-item-title">提交时间：</view>
@@ -171,11 +172,11 @@
     </z-paging>
     <!-- 底部新增工单按钮（仅巡查员显示） -->
-<!--    <view v-if="isInspector" class="fixed-bottom-btn-wrap">-->
-<!--      <up-button type="primary" size="large" @click="handleAddOrder">-->
-<!--        新增工单-->
-<!--      </up-button>-->
-<!--    </view>-->
+    <!--    <view v-if="isInspector" class="fixed-bottom-btn-wrap">-->
+    <!--      <up-button type="primary" size="large" @click="handleAddOrder">-->
+    <!--        新增工单-->
+    <!--      </up-button>-->
+    <!--    </view>-->
     <view class="fixed-bottom-btn-wrap" v-if="isInspector">
       <up-button type="primary" size="large" @click="handleAddOrder">
@@ -283,14 +284,15 @@ import {
   todoBuzSimplePage,
   doneBuzSimplePage,
   universalApproval,
-  qyUniversalApproval
-} from '@/api/work-order-manage/work-order-manage'
+  qyUniversalApproval,
+  daquUniversalApproval,
+  dcyUniversalApproval
+} from '@/api/regional-order-manage/regional-order-manage'
 // 从用户store获取角色信息
 import { useUserStore } from '@/pinia/user';
 import { nextStepMap, buzStatusMap } from '@/common/utils/common'
 // 引入图片上传组合式函数（与参考页面一致）
 import { useUploadImgs } from '@/common/utils/useUploadImgs'
-
 // ========== 状态管理 ==========
 const userStore = useUserStore();
 // 标签页切换
@@ -325,7 +327,6 @@ const isInspector = computed(() =&gt; {
 const rejectModalShow = ref(false); // 回退modal显示开关
 const rejectReason = ref(''); // 回退原因
 const currentRejectItem = ref(null); // 当前回退工单
-
 // 回退图片上传配置（与参考页面风格一致）
 const rejectImgs = useUploadImgs({
   maxCount: 3, // 最多上传3张
@@ -334,14 +335,11 @@ const rejectImgs = useUploadImgs({
   formRef: null, // 该弹窗无表单校验
   fieldName: 'rejectImgs' // 自定义字段名
 })
-
-
 // ========== 验收弹窗相关状态（含图片上传） ==========
 const acceptModalShow = ref(false); // 验收弹窗显示开关
 const acceptRadioValue = ref('0'); // 单选框值，默认0（通过）
 const acceptReason = ref(''); // 验收原因
 const currentAcceptItem = ref(null); // 当前验收的工单项
-
 // 验收图片上传配置（独立实例，参考回退弹窗）
 const acceptImgs = useUploadImgs({
   maxCount: 3, // 最多上传3张，与回退弹窗一致
@@ -350,7 +348,6 @@ const acceptImgs = useUploadImgs({
   formRef: null, // 验收弹窗无表单校验
   fieldName: 'acceptImgs' // 自定义字段名，区分回退图片
 })
-
 // 分页查询列表
 const queryList = async (pageNo, pageSize) => {
   try {
@@ -379,7 +376,6 @@ const queryList = async (pageNo, pageSize) =&gt; {
     uni.showToast({title: '加载失败，请重试', icon: 'none'});
   }
 };
-
 // ========== 事件处理 ==========
 // 标签页切换
 const handleTabChange = (item) => {
@@ -414,24 +410,19 @@ const handleDetail = (item) =&gt; {
     }
   });
 };
-
 // 生成临时key
 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 {
+    console.log(item)
+    console.log('123')
     uni.setStorageSync(tempKey, item);
   } catch (error) {
     console.error('存储工单数据失败：', error);
@@ -439,12 +430,26 @@ const handleRenew = (item) =&gt; {
     return;
   }
-  // 3. URL 仅传递「唯一标识」和「重新提交标记」（数据量极小，无长度问题）
-  uni.navigateTo({
-    url: `/pages-sub/problem/regional-order-manage/add-patrol-order?isRenew=1&tempKey=${tempKey}`
-  });
+  if (userStore.userInfo?.roles.includes('patrol_global')) { // 全域巡查员
+    uni.navigateTo({
+      url: `/pages-sub/problem/regional-order-manage/add-patrol-order?isRenew=1&tempKey=${tempKey}`
+    });
+  }
+  if (userStore.userInfo?.roles.includes('regional_manager')) {  // 大区经理
+    uni.navigateTo({
+      url: `/pages-sub/problem/regional-order-manage/add-order?isRenew=1&tempKey=${tempKey}`
+    });
+  }
+  if (userStore.userInfo?.roles.includes('Inspector_global')) {  // 督察员
+    uni.navigateTo({
+      url: `/pages-sub/problem/regional-order-manage/add-order?isRenew=1&tempKey=${tempKey}`
+    });
+  }
+  // // 3. URL 仅传递「唯一标识」和「重新提交标记」（数据量极小，无长度问题）
+  // uni.navigateTo({
+  //   url: `/pages-sub/problem/regional-order-manage/add-patrol-order?isRenew=1&tempKey=${tempKey}`
+  // });
 };
-
 // 待办-处理工单
 const handleProcess = async (item) => {
   console.log(nextStepMap[item.taskKey].name)
@@ -465,10 +470,29 @@ const handleProcess = async (item) =&gt; {
         url: `/pages-sub/problem/regional-order-manage/distribution-order?tempKey=${tempKey}`
       })
     }
+    if (nextStepMap[item.taskKey]?.name == '督察员单子大区经理分配') {
+       let postData = {
+         "taskKey":item.taskKey,
+         "taskId": item.taskId,
+         "operateType":60,
+         "workerDataId":item.id,
+         "agree":0,
+         "reason":item.remark,
+         "roadId":item.roadId,
+         "roadName":item.roadName,
+         "pressingType":item.pressingType,
+         "orderName":item.orderName,
+         "expectedFinishDate": item.expectedFinishDate,
+         "busiLine":item.busiLine,
+       }
+      const res = await dcyUniversalApproval(postData);
+      uni.showToast({title: '分配成功', icon: 'success', duration: 1000});
+      paging.value?.reload(); // 刷新列表
+    }
+
     if (nextStepMap[item.taskKey]?.name == '养护员待实施') {
       // ① 生成唯一临时key（和重新提交工单逻辑一致，避免冲突）
       const tempKey = `maintain_order_${Date.now()}_${Math.floor(Math.random() * 10000)}`;
-
       // ② 存储完整item到本地缓存（同步存储，确保立即生效）
       try {
         uni.setStorageSync(tempKey, item);
@@ -477,7 +501,6 @@ const handleProcess = async (item) =&gt; {
         uni.showToast({title: '数据存储异常，无法跳转', icon: 'none'});
         return;
       }
-
       // ③ URL仅传递临时key（可选：携带必要简单参数，方便目标页面快速使用）
       uni.navigateTo({
         url: `/pages-sub/problem/regional-order-manage/add-maintain-order?tempKey=${tempKey}`
@@ -497,7 +520,6 @@ const handleProcess = async (item) =&gt; {
       acceptRadioValue.value = '0'; // 重置默认选中“通过”
       acceptModalShow.value = true; // 显示验收弹窗
     }
-
     // 发起人确认
     if (nextStepMap[item.taskKey]?.name == '发起人确认') {
       console.log(item)
@@ -510,7 +532,7 @@ const handleProcess = async (item) =&gt; {
             const requestData = {
               "returnImgs": rejectImgs.getSuccessImgUrls(), // 改造后：获取上传成功的图片URL
               "workerDataId": item.id,
-              "taskKey":'ylInspectorStart',
+              "taskKey": 'ylInspectorStart',
               "taskId": item.taskId,
               "operateType": 200,
               "agree": 1,
@@ -532,7 +554,6 @@ const handleProcess = async (item) =&gt; {
     uni.showToast({title: '处理失败，请重试', icon: 'none'});
   }
 };
-
 // 待办-回退工单（打开回退modal）
 const handleReject = (item) => {
   console.log('123213')
@@ -546,14 +567,12 @@ const handleReject = (item) =&gt; {
   rejectImgs.clearImgs(); // 改造后：使用组合式函数的清空方法
   rejectModalShow.value = true; // 显示回退modal
 };
-
 // 回退modal - 取消按钮
 const handleRejectModalCancel = () => {
   rejectModalShow.value = false;
   rejectReason.value = '';
   rejectImgs.clearImgs(); // 改造后：使用组合式函数的清空方法
 };
-
 // 确认回退工单
 const confirmReject = async () => {
   // 严格校验回退原因（去除首尾空格）
@@ -564,26 +583,32 @@ const confirmReject = async () =&gt; {
   }
   // 校验当前工单有效性
   if (!currentRejectItem.value || !currentRejectItem.value.id) {
-    uni.showToast({title: '工单信息异常，无法提交', icon: 'none', duration:1000});
+    uni.showToast({title: '工单信息异常，无法提交', icon: 'none', duration: 1000});
     rejectModalShow.value = false;
     return;
   }
   try {
     // 显示加载中，防止重复提交
     uni.showLoading({title: '提交中...', mask: true});
-
     // 构建请求参数
     const requestData = {
       "returnImgs": rejectImgs.getSuccessImgUrls(), // 改造后：获取上传成功的图片URL数组
       "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 qyUniversalApproval(requestData);
+    if(currentRejectItem.value.taskKey=='shRegionManager'){  //  对督察员单子  回退
+      const res = await dcyUniversalApproval(requestData);
+    }
+    if(currentRejectItem.value.taskKey=='regionManager'){  //  对全域巡查员单子  回退
+      const res = await qyUniversalApproval(requestData);
+    }
+    //  对大区经理单子  回退
     uni.showToast({title: '回退成功', icon: 'success', duration: 1000});
     rejectModalShow.value = false;
     paging.value?.reload(); // 刷新列表
@@ -595,30 +620,28 @@ const confirmReject = async () =&gt; {
     uni.hideLoading();
   }
 };
-
 // 新增工单
 const handleAddOrder = () => {
   // patrol_global  全域巡查员
   // regional_manager  大区经理
-  console.log(userStore.userInfo?.roles.includes('team_leader_yl'))
-  if(userStore.userInfo?.roles.includes('patrol_global')){
+  console.log(userStore.userInfo?.roles.includes('Inspector_global'))
+  console.log(userStore.userInfo?.roles)
+  if (userStore.userInfo?.roles.includes('patrol_global')) { // 全域巡查员
     uni.navigateTo({
       url: '/pages-sub/problem/regional-order-manage/add-patrol-order'
     });
   }
-  if(userStore.userInfo?.roles.includes('regional_manager')){
+  if (userStore.userInfo?.roles.includes('regional_manager')) {
     uni.navigateTo({
       url: '/pages-sub/problem/regional-order-manage/add-order'
     });
   }
-
-  if(userStore.userInfo?.roles.includes('team_leader_yl')){
+  if (userStore.userInfo?.roles.includes('Inspector_global')) {  // 督察员
     uni.navigateTo({
       url: '/pages-sub/problem/regional-order-manage/add-order'
     });
   }
 };
-
 // 验收弹窗 - 取消按钮（清空状态）
 const handleAcceptModalCancel = () => {
   acceptModalShow.value = false;
@@ -626,7 +649,6 @@ const handleAcceptModalCancel = () =&gt; {
   acceptRadioValue.value = '0'; // 重置单选框为“通过”
   acceptImgs.clearImgs(); // 清空验收图片
 };
-
 // 验收弹窗 - 确定按钮（含returnImgs传参）
 const handleAcceptModalConfirm = async () => {
   // 1. 校验验收原因是否为空
@@ -642,9 +664,11 @@ const handleAcceptModalConfirm = async () =&gt; {
   try {
     // 3. 构建请求参数（含returnImgs）
     console.log(currentAcceptItem.value)
-    let postData = {}
-    if (currentAcceptItem.value?.taskKey == 'ylTeamLeaderConfirm') {   // 养护组长验收
-      postData = {
+    console.log( userStore.userInfo.roles)
+    console.log( userStore.userInfo.roles.includes('Inspector_global'))
+    //
+    if( userStore.userInfo.roles.includes('regional_manager')){  // 大区经理验收
+      let postData = {
         "returnImgs": acceptImgs.getSuccessImgUrls(), // 验收图片URL数组
         "taskKey": currentAcceptItem.value.taskKey,
         "workerDataId": currentAcceptItem.value.id,
@@ -652,9 +676,11 @@ const handleAcceptModalConfirm = async () =&gt; {
         "operateType": acceptRadioValue.value == 0 ? nextStepMap[currentAcceptItem.value.taskKey].operateTypePass : nextStepMap[currentAcceptItem.value.taskKey].operateTypeNoPass,
         "reason": acceptReason.value.trim()
       }
+      await daquUniversalApproval(postData);
     }
-    if (currentAcceptItem.value?.taskKey == 'ylInspector') {   // 全域巡查员验收
-      postData = {
+    //
+    if( userStore.userInfo.roles.includes('patrol_global')){  // 全域巡查员验收
+      let  postData = {
         "returnImgs": acceptImgs.getSuccessImgUrls(), // 验收图片URL数组
         "taskKey": currentAcceptItem.value.taskKey,
         "taskId": currentAcceptItem.value.taskId,
@@ -663,8 +689,22 @@ const handleAcceptModalConfirm = async () =&gt; {
         "reason": acceptReason.value.trim(),
         "agree": acceptRadioValue.value
       }
+      await qyUniversalApproval(postData);
     }
-    const acceptRes = await universalApproval(postData);
+    //
+    if( userStore.userInfo.roles.includes('Inspector_global')){  // 督察员验收
+      let  postData = {
+        "returnImgs": acceptImgs.getSuccessImgUrls(), // 验收图片URL数组
+        "taskKey": currentAcceptItem.value.taskKey,
+        "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
+      }
+      await dcyUniversalApproval(postData);
+    }
+
     // 4. 操作成功处理
     uni.showToast({title: '提交成功', icon: 'success', duration: 1000});
     handleAcceptModalCancel(); // 清空状态
@@ -675,7 +715,6 @@ const handleAcceptModalConfirm = async () =&gt; {
     uni.showToast({title: '验收提交失败，请重试', icon: 'none', duration: 1000});
   }
 };
-
 // 页面初始化
 onLoad(() => {
   // 初始化加载列表
@@ -369,9 +369,10 @@ import {
   getDoneTaskDetail,
   getTodoTaskDetail,
   getApprovalDetail,
-  regionmgrUniversalApproval,
-  qyUniversalApproval
-} from '@/api/work-order-manage/work-order-manage';
+  daquUniversalApproval,
+  qyUniversalApproval,
+  dcyUniversalApproval
+} from '@/api/regional-order-manage/regional-order-manage';
 import {nextStepMap, buzStatusMap, calculateFormatTimeDiff} from '@/common/utils/common'
 // 引入图片上传组合式函数
 import {useUploadImgs} from '@/common/utils/useUploadImgs'
@@ -825,7 +826,7 @@ const handleAcceptModalConfirm = async () =&gt; {
         "agree": acceptRadioValue.value
       }
     }
-    const acceptRes = await regionmgrUniversalApproval(postData);
+    const acceptRes = await daquUniversalApproval(postData);
     // 4. 操作成功处理
     handleAcceptModalCancel(); // 清空状态
@@ -554,7 +554,7 @@ const confirmReject = async () =&gt; {
   try {
     // 显示加载中，防止重复提交
     uni.showLoading({title: '提交中...', mask: true});
-
+    console.log( currentRejectItem.value.roadId)
     // 构建请求参数
     const requestData = {
       "returnImgs": rejectImgs.getSuccessImgUrls(), // 改造后：获取上传成功的图片URL数组
@@ -563,7 +563,8 @@ const confirmReject = async () =&gt; {
       "taskId": currentRejectItem.value.taskId,
       "operateType": nextStepMap[currentRejectItem.value.taskKey].operateTypeNoPass,
       "agree": 1,
-      "reason": rejectReasonTrim
+      "reason": rejectReasonTrim,
+      "roadId": currentRejectItem.value.roadId,   //  给督察员回退的 要加上
     };
     // 调用回退工单接口
     const res = await universalApproval(requestData);
@@ -118,7 +118,7 @@ onShow(async () =&gt; {
       setTimeout(() => {
         // 使用reLaunch跳转，清空页面栈，避免返回当前菜单页
         uni.reLaunch({
-          url: '/pages/login/login', // 替换为你的实际登录页路径
+          url: '/pages/login/index', // 替换为你的实际登录页路径
           fail: (err) => {
             console.error('跳转登录页失败：', err);
             uni.showToast({ title: '跳转登录页异常', icon: 'none' });