diff --git a/api/work-order-manage/work-order-manage.js b/api/work-order-manage/work-order-manage.js index 36f737d..f5814c8 100644 --- a/api/work-order-manage/work-order-manage.js +++ b/api/work-order-manage/work-order-manage.js @@ -108,7 +108,7 @@ export const workorderCreate = (data) => { /** - * 问题工单创建 大区经理 ai经理 督查员 + * 问题工单创建 大区经理 ai经理 * @returns {Promise} */ export const regionmgrWorkorderCreate = (data) => { @@ -124,7 +124,7 @@ export const qyWorkorderCreate = (data) => { }; /** - * app端统一审批入口 -- 大区经理 ai经理 督查员 + * app端统一审批入口 -- 大区经理 ai经理 * @returns {Promise} */ export const regionmgrUniversalApproval = (params) => { @@ -133,13 +133,33 @@ export const regionmgrUniversalApproval = (params) => { /** - * 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); +}; + + + + diff --git a/pages-sub/problem/regional-order-manage/add-order.vue b/pages-sub/problem/regional-order-manage/add-order.vue index 6a53faa..fe046ce 100644 --- a/pages-sub/problem/regional-order-manage/add-order.vue +++ b/pages-sub/problem/regional-order-manage/add-order.vue @@ -203,7 +203,7 @@ import { ref, reactive } from 'vue' 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 () => { return; } + + const commonSubmitData = { roadId: workOrderForm.roadId, roadName: workOrderForm.roadName, @@ -594,7 +596,13 @@ const submitWorkOrder = async () => { } 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() diff --git a/pages-sub/problem/regional-order-manage/index.vue b/pages-sub/problem/regional-order-manage/index.vue index d530463..7fecbc4 100644 --- a/pages-sub/problem/regional-order-manage/index.vue +++ b/pages-sub/problem/regional-order-manage/index.vue @@ -150,8 +150,7 @@ - 紧急程度: - {{ uni.$dict.getDictLabel('workorder_pressing_type', item.pressingType) }} + 紧急程度:{{ uni.$dict.getDictLabel('workorder_pressing_type', item.pressingType) }} 工单详情 @@ -431,7 +430,6 @@ const handleRenew = (item) => { // 1. 生成唯一临时标识 const tempKey = generateTempKey(); - // 2. 将完整工单数据存入本地临时存储(同步存储,确保数据立即生效) try { uni.setStorageSync(tempKey, item); @@ -452,7 +450,6 @@ const handleProcess = async (item) => { 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) => { 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 () => { 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 = () => { 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' + }); + } }; // 验收弹窗 - 取消按钮(清空状态) diff --git a/pages-sub/problem/regional-order-manage/order-detail.vue b/pages-sub/problem/regional-order-manage/order-detail.vue index da58ff5..3538da1 100644 --- a/pages-sub/problem/regional-order-manage/order-detail.vue +++ b/pages-sub/problem/regional-order-manage/order-detail.vue @@ -253,23 +253,23 @@ - - - - - + + + 回退 + - - - + 重新提交 + - - - - + {{ + nextStepMap[orderDetail.taskKey].btnText + }} + - - + +