大区经理自己流程

刘淇
1 parent 2e2b95d3
Showing 2 changed files with 18 additions and 12 deletions
pages-sub/problem/regional-order-manage/add-order.vue
pages-sub/problem/regional-order-manage/index.vue
@@ -203,13 +203,12 @@ 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 { daquUniversalApproval, qyUniversalApproval,
+import { daquUniversalApproval, qyUniversalApproval,qyWorkorderCreate,
   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();
@@ -283,7 +283,7 @@ import {
   myBuzSimplePage,
   todoBuzSimplePage,
   doneBuzSimplePage,
-  universalApproval,
+  qyWorkorderCreate,
   qyUniversalApproval,
   daquUniversalApproval,
   dcyUniversalApproval
@@ -530,7 +530,7 @@ const handleProcess = async (item) =&gt; {
           if (res.confirm) {
             // 构建请求参数
             const requestData = {
-              "returnImgs": rejectImgs.getSuccessImgUrls(), // 改造后：获取上传成功的图片URL
+
               "workerDataId": item.id,
               "taskKey": 'ylInspectorStart',
               "taskId": item.taskId,
@@ -538,8 +538,18 @@ const handleProcess = async (item) =&gt; {
               "agree": 1,
               "reason": '结束工单'
             };
-            // 调用回退工单接口
-            const res = await qyUniversalApproval(requestData);
+            // 调用回退工单接口   daquUniversalApproval
+
+            if( userStore.userInfo.roles.includes('regional_manager')){  // 大区经理
+              await daquUniversalApproval(requestData)
+            }
+            if( userStore.userInfo.roles.includes('Inspector_global')){  // 督察员
+              await dcyUniversalApproval(requestData);
+            }
+            if( userStore.userInfo.roles.includes('patrol_global')){  // 全域巡查员
+              await qyUniversalApproval(requestData);
+            }
+
             uni.showToast({title: '结束成功', icon: 'success', duration: 1000});
             rejectModalShow.value = false;
             paging.value?.reload(); // 刷新列表
@@ -622,16 +632,12 @@ const confirmReject = async () =&gt; {
 };
 // 新增工单
 const handleAddOrder = () => {
-  // patrol_global  全域巡查员
-  // regional_manager  大区经理
-  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'
     });
@@ -674,7 +680,8 @@ const handleAcceptModalConfirm = async () =&gt; {
         "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()
+        "reason": acceptReason.value.trim(),
+        "agree":acceptRadioValue.value,
       }
       await daquUniversalApproval(postData);
     }