diff --git a/klp-ui/src/api/wms/approval.js b/klp-ui/src/api/wms/approval.js index 1321f852..5e59786d 100644 --- a/klp-ui/src/api/wms/approval.js +++ b/klp-ui/src/api/wms/approval.js @@ -55,3 +55,14 @@ export function withdrawApproval(approvalId) { } }) } + +/** + * 按业务ID查询审批信息(用于用印等业务) + */ +export function getApprovalByBizId(bizId) { + return request({ + url: '/wms/approval/getByBizId', + method: 'get', + params: { bizId } + }) +} diff --git a/klp-ui/src/router/index.js b/klp-ui/src/router/index.js index a7cc2ad5..bee1eefd 100644 --- a/klp-ui/src/router/index.js +++ b/klp-ui/src/router/index.js @@ -125,6 +125,19 @@ export const constantRoutes = [ meta: { title: '工厂总日历' } } ] + }, + { + path: '/wms/seal', + component: Layout, + hidden: true, + children: [ + { + path: 'sealDetail/:bizId', + component: () => import('@/views/wms/seal/sealDetail'), + name: 'WmsSealDetail', + meta: { title: '用印详情' } + } + ] } ] diff --git a/klp-ui/src/views/wms/hrm/todo/index.vue b/klp-ui/src/views/wms/hrm/todo/index.vue index fd351f5e..196fae42 100644 --- a/klp-ui/src/views/wms/hrm/todo/index.vue +++ b/klp-ui/src/views/wms/hrm/todo/index.vue @@ -126,24 +126,26 @@ > 详情 - - 同意 - - - 驳回 - + @@ -274,7 +276,8 @@ export default { applyType: item.approval.applyType, approverName: item.approval.approverName, taskId: item.task.taskId, - ...item.detail, // 合并请假/外出的详情字段 + bizId: item.approval.applyId, + ...item.detail, } }) this.total = res.total @@ -323,7 +326,13 @@ export default { // 查看详情 handleDetail(row) { - this.currentDetail = { ...row } // 深拷贝避免原数据被修改 + if (row.applyType === 'seal') { + this.$router.push({ + path: `/wms/seal/sealDetail/${row.bizId}` + }) + return + } + this.currentDetail = { ...row } this.detailDialogVisible = true }, @@ -427,6 +436,7 @@ export default { const textMap = { 'leave': '请假', 'out': '外出', + 'seal': '用印', } return textMap[type] || '未知类型' }, diff --git a/klp-ui/src/views/wms/seal/seal.vue b/klp-ui/src/views/wms/seal/seal.vue index a64856ff..53c2c0dc 100644 --- a/klp-ui/src/views/wms/seal/seal.vue +++ b/klp-ui/src/views/wms/seal/seal.vue @@ -5,7 +5,7 @@
用印申请 - +
@@ -223,7 +223,12 @@ export default { }) }, goDetail(row) { - this.$router.push({ path: '/job/sealDetail', query: { bizId: row.bizId } }) + // if (row.applyType === 'seal') { + this.$router.push({ + path: `/wms/seal/sealDetail/${row.bizId}` + }) + return + // } }, canPreviewReceipt(row) { return row.status === 'approved' && row.receiptFileIds diff --git a/klp-ui/src/views/wms/seal/sealDetail.vue b/klp-ui/src/views/wms/seal/sealDetail.vue index 3ea12caf..e1ce5aa3 100644 --- a/klp-ui/src/views/wms/seal/sealDetail.vue +++ b/klp-ui/src/views/wms/seal/sealDetail.vue @@ -150,6 +150,7 @@