全域巡查员

刘淇
1 parent 34d239d6
Showing 5 changed files with 88 additions and 52 deletions
api/work-order-manage/work-order-manage.js
pages-sub/problem/regional-order-manage/add-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
@@ -108,7 +108,7 @@ export const workorderCreate = (data) =&gt; {
  
  
 /**
- *  问题工单创建  大区经理      ai经理  督查员
+ *  问题工单创建  大区经理      ai经理
  * @returns {Promise}
  */
 export const regionmgrWorkorderCreate = (data) => {
@@ -124,7 +124,7 @@ export const qyWorkorderCreate = (data) =&gt; {
 };
  
 /**
- *   app端统一审批入口  -- 大区经理    ai经理  督查员
+ *   app端统一审批入口  -- 大区经理    ai经理
  * @returns {Promise}
  */
 export const regionmgrUniversalApproval = (params) => {
@@ -133,13 +133,33 @@ export const regionmgrUniversalApproval = (params) =&gt; {
  
  
 /**
- *   app端统一审批入口   和大区经理  回退   分配和   全域巡查员 。
+ *   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);
+};
+
+
+
+
  
  
  
@@ -203,7 +203,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 } from '@/api/work-order-manage/work-order-manage'
+import { regionmgrUniversalApproval,  regionmgrWorkorderCreate, inspectorWorkorderCreate } from '@/api/work-order-manage/work-order-manage'
 import { timeFormat } from '@/uni_modules/uview-plus'
 import { nextStepMap } from '@/common/utils/common'
 import { useUserStore } from '@/pinia/user';
@@ -562,6 +562,8 @@ const submitWorkOrder = async () =&gt; {
       return;
     }
  
+
+
     const commonSubmitData = {
       roadId: workOrderForm.roadId,
       roadName: workOrderForm.roadName,
@@ -594,7 +596,13 @@ const submitWorkOrder = async () =&gt; {
       }
       res = await regionmgrUniversalApproval(renewSubmitData)
     } else {
-      res = await regionmgrWorkorderCreate(commonSubmitData)
+
+      if( userStore.userInfo.roles.includes('team_leader_yl')){  // 督察员
+        res = await inspectorWorkorderCreate(commonSubmitData)
+      }else{
+        res = await regionmgrWorkorderCreate(commonSubmitData)
+      }
+
     }
  
     uni.hideLoading()
@@ -150,8 +150,7 @@
               </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>
@@ -431,7 +430,6 @@ const handleRenew = (item) =&gt; {
  
   // 1. 生成唯一临时标识
   const tempKey = generateTempKey();
-
   // 2. 将完整工单数据存入本地临时存储（同步存储，确保数据立即生效）
   try {
     uni.setStorageSync(tempKey, item);
@@ -452,7 +450,6 @@ const handleProcess = async (item) =&gt; {
   console.log(nextStepMap[item.taskKey].name)
   try {
     if (nextStepMap[item.taskKey]?.name == '大区经理分配') {
-      // ======== 核心修改：大区经理分配 改成和养护员待实施一样的逻辑 start ========
       // ① 生成唯一临时key（统一规则，避免冲突）
       const tempKey = `distribute_order_${Date.now()}_${Math.floor(Math.random() * 10000)}`;
       // ② 存储完整item到本地缓存（同步存储，确保立即生效）
@@ -467,10 +464,8 @@ const handleProcess = async (item) =&gt; {
       uni.navigateTo({
         url: `/pages-sub/problem/regional-order-manage/distribution-order?tempKey=${tempKey}`
       })
-      // ======== 核心修改 end ========
     }
     if (nextStepMap[item.taskKey]?.name == '养护员待实施') {
-
       // ① 生成唯一临时key（和重新提交工单逻辑一致，避免冲突）
       const tempKey = `maintain_order_${Date.now()}_${Math.floor(Math.random() * 10000)}`;
  
@@ -605,7 +600,7 @@ const confirmReject = async () =&gt; {
 const handleAddOrder = () => {
   // patrol_global  全域巡查员
   // regional_manager  大区经理
-  console.log(userStore.userInfo?.roles.includes('patrol_global'))
+  console.log(userStore.userInfo?.roles.includes('team_leader_yl'))
   if(userStore.userInfo?.roles.includes('patrol_global')){
     uni.navigateTo({
       url: '/pages-sub/problem/regional-order-manage/add-patrol-order'
@@ -616,6 +611,12 @@ const handleAddOrder = () =&gt; {
       url: '/pages-sub/problem/regional-order-manage/add-order'
     });
   }
+
+  if(userStore.userInfo?.roles.includes('team_leader_yl')){
+    uni.navigateTo({
+      url: '/pages-sub/problem/regional-order-manage/add-order'
+    });
+  }
 };
  
 // 验收弹窗 - 取消按钮（清空状态）
@@ -253,23 +253,23 @@
     </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>-->
+    <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="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>-->
+        <up-button type="primary" size="normal" @click="handleProcess(orderDetail)">{{
+            nextStepMap[orderDetail.taskKey].btnText
+          }}
+        </up-button>
  
-<!--      </view>-->
-<!--    </view>-->
+      </view>
+    </view>
  
     <!-- 回退原因弹窗（新增图片上传） -->
     <up-modal
@@ -361,7 +361,7 @@
 </template>
  
 <script setup lang="ts">
-import {ref, watch} from 'vue';
+import {ref} from 'vue';
 import {onLoad, onShow} from '@dcloudio/uni-app';
 import {timeFormat} from '@/uni_modules/uview-plus';
 import {
@@ -369,8 +369,8 @@ import {
   getDoneTaskDetail,
   getTodoTaskDetail,
   getApprovalDetail,
-  regionmgrUniversalApproval
-
+  regionmgrUniversalApproval,
+  qyUniversalApproval
 } from '@/api/work-order-manage/work-order-manage';
 import {nextStepMap, buzStatusMap, calculateFormatTimeDiff} from '@/common/utils/common'
 // 引入图片上传组合式函数
@@ -610,7 +610,6 @@ const handleRenew = (item: any) =&gt; {
  
   // 1. 生成唯一临时标识
   const tempKey = generateTempKey();
-
   // 2. 将完整工单数据存入本地临时存储（同步存储，确保数据立即生效）
   try {
     uni.setStorageSync(tempKey, item);
@@ -620,9 +619,9 @@ const handleRenew = (item: any) =&gt; {
     return;
   }
  
-  // 3. URL 仅传递「唯一标识」和「重新提交标记」
+  // 3. URL 仅传递「唯一标识」和「重新提交标记」（数据量极小，无长度问题）
   uni.navigateTo({
-    url: `/pages-sub/problem/work-order-manage/add-order?isRenew=1&tempKey=${tempKey}`
+    url: `/pages-sub/problem/regional-order-manage/add-patrol-order?isRenew=1&tempKey=${tempKey}`
   });
 };
  
@@ -675,14 +674,14 @@ const confirmReject = async () =&gt; {
       "reason": rejectReasonTrim
     };
     // 调用回退工单接口
-    const res = await regionmgrUniversalApproval(requestData);
+    const res = await qyUniversalApproval(requestData);
     uni.showToast({title: '回退成功', icon: 'success', duration: 1000});
  
     rejectModalShow.value = false;
     // 重新获取工单详情，刷新页面
     // await DetailQuery(taskId.value);
     uni.reLaunch({
-      url: `/pages-sub/problem/work-order-manage/index`
+      url: `/pages-sub/problem/regional-order-manage/index`
     });
   } catch (error) {
     console.error('回退工单失败：', error);
@@ -694,19 +693,30 @@ const confirmReject = async () =&gt; {
 };
  
 // ========== handleProcess 处理工单 ==========
-const handleProcess = async (item: any) => {
-  console.log(nextStepMap[item.taskKey]?.name)
+const handleProcess = async (item) => {
+  console.log(nextStepMap[item.taskKey].name)
   try {
-    if (nextStepMap[item.taskKey]?.name == '养护组长分配') {
+    if (nextStepMap[item.taskKey]?.name == '大区经理分配') {
+      // ① 生成唯一临时key（统一规则，避免冲突）
+      const tempKey = `distribute_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/distribution-order?taskId=${item.taskId}&orderNo=${item.orderNo}&id=${item.id}`
+        url: `/pages-sub/problem/regional-order-manage/distribution-order?tempKey=${tempKey}`
       })
     }
     if (nextStepMap[item.taskKey]?.name == '养护员待实施') {
-      // ① 生成唯一临时key
+      // ① 生成唯一临时key（和重新提交工单逻辑一致，避免冲突）
       const tempKey = `maintain_order_${Date.now()}_${Math.floor(Math.random() * 10000)}`;
  
-      // ② 存储完整item到本地缓存
+      // ② 存储完整item到本地缓存（同步存储，确保立即生效）
       try {
         uni.setStorageSync(tempKey, item);
       } catch (error) {
@@ -715,9 +725,9 @@ const handleProcess = async (item: any) =&gt; {
         return;
       }
  
-      // ③ URL仅传递临时key
+      // ③ URL仅传递临时key（可选：携带必要简单参数，方便目标页面快速使用）
       uni.navigateTo({
-        url: `/pages-sub/problem/work-order-manage/add-maintain-order?tempKey=${tempKey}`
+        url: `/pages-sub/problem/regional-order-manage/add-maintain-order?tempKey=${tempKey}`
       })
     }
     // 养护组长验收 - 打开弹窗
@@ -725,7 +735,6 @@ const handleProcess = async (item: any) =&gt; {
       currentAcceptItem.value = item; // 存储当前工单信息
       acceptReason.value = ''; // 清空上次的验收原因
       acceptRadioValue.value = '0'; // 重置默认选中“通过”
-      acceptImgs.clearImgs(); // 清空验收图片
       acceptModalShow.value = true; // 显示验收弹窗
     }
     // 巡查员验收 - 打开弹窗
@@ -733,7 +742,6 @@ const handleProcess = async (item: any) =&gt; {
       currentAcceptItem.value = item; // 存储当前工单信息
       acceptReason.value = ''; // 清空上次的验收原因
       acceptRadioValue.value = '0'; // 重置默认选中“通过”
-      acceptImgs.clearImgs(); // 清空验收图片
       acceptModalShow.value = true; // 显示验收弹窗
     }
  
@@ -745,21 +753,21 @@ const handleProcess = async (item: any) =&gt; {
         content: "请确定是否结束工单？",
         success: async function (res) {
           if (res.confirm) {
-            // 构建请求参数（携带returnImgs）
+            // 构建请求参数
             const requestData = {
-              "returnImgs": rejectImgs.getSuccessImgUrls(),
+              "returnImgs": rejectImgs.getSuccessImgUrls(), // 改造后：获取上传成功的图片URL
               "workerDataId": item.id,
-              "taskKey": 'ylInspectorStart',
+              "taskKey":'ylInspectorStart',
               "taskId": item.taskId,
               "operateType": 200,
               "agree": 1,
               "reason": '结束工单'
             };
             // 调用回退工单接口
-            const res = await regionmgrUniversalApproval(requestData);
+            const res = await qyUniversalApproval(requestData);
             uni.showToast({title: '结束成功', icon: 'success', duration: 1000});
-            // 重新获取工单详情，刷新页面
-            await DetailQuery(taskId.value);
+            rejectModalShow.value = false;
+            paging.value?.reload(); // 刷新列表
           } else if (res.cancel) {
             console.log("用户点击取消");
           }
@@ -150,8 +150,7 @@
               </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>