diff --git a/pages-sub/problem/regional-order-manage/add-patrol-order.vue b/pages-sub/problem/regional-order-manage/add-patrol-order.vue index dced183..599654c 100644 --- a/pages-sub/problem/regional-order-manage/add-patrol-order.vue +++ b/pages-sub/problem/regional-order-manage/add-patrol-order.vue @@ -352,9 +352,11 @@ const submitWorkOrder = async () => { reason: '重新提交工单', ...commonSubmitData } - res = await qyUniversalApproval(renewSubmitData) + if (userStore.userInfo?.roles.includes('patrol_global')) { // 全域巡查员 + await qyUniversalApproval(renewSubmitData) + } } else { - res = await qyWorkorderCreate(commonSubmitData) + await qyWorkorderCreate(commonSubmitData) } uni.hideLoading() diff --git a/pages-sub/problem/regional-order-manage/index.vue b/pages-sub/problem/regional-order-manage/index.vue index 272d8f0..96241f6 100644 --- a/pages-sub/problem/regional-order-manage/index.vue +++ b/pages-sub/problem/regional-order-manage/index.vue @@ -101,6 +101,7 @@ {{ timeFormat(item.createTime, 'yyyy-mm-dd hh:MM:ss') }} + 回退 @@ -379,6 +380,7 @@ const queryList = async (pageNo, pageSize) => { // ========== 事件处理 ========== // 标签页切换 const handleTabChange = (item) => { + orderList.value = []; console.log(item) activeTab.value = item.index; paging.value?.reload(); // 切换标签页刷新列表 @@ -490,36 +492,15 @@ const handleProcess = async (item) => { 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); - } catch (error) { - console.error('存储养护工单数据失败:', error); - uni.showToast({title: '数据存储异常,无法跳转', icon: 'none'}); - return; - } - // ③ URL仅传递临时key(可选:携带必要简单参数,方便目标页面快速使用) - uni.navigateTo({ - url: `/pages-sub/problem/regional-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 == '巡查员验收') { + + // 验收 - 打开弹窗 + if (nextStepMap[item.taskKey]?.name == '巡查员验收' || nextStepMap[item.taskKey]?.name == '养护组长验收') { currentAcceptItem.value = item; // 存储当前工单信息 acceptReason.value = ''; // 清空上次的验收原因 acceptRadioValue.value = '0'; // 重置默认选中“通过” acceptModalShow.value = true; // 显示验收弹窗 } + // 发起人确认 if (nextStepMap[item.taskKey]?.name == '发起人确认') { console.log(item) diff --git a/pages-sub/problem/work-order-manage/index.vue b/pages-sub/problem/work-order-manage/index.vue index 5bdbf72..abd105d 100644 --- a/pages-sub/problem/work-order-manage/index.vue +++ b/pages-sub/problem/work-order-manage/index.vue @@ -375,6 +375,7 @@ const queryList = async (pageNo, pageSize) => { // ========== 事件处理 ========== // 标签页切换 const handleTabChange = (item) => { + orderList.value = []; console.log(item) activeTab.value = item.index; paging.value?.reload(); // 切换标签页刷新列表