From 49aea87984b241786e9a6b0f7d00441e1a279815 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?= Date: Tue, 14 Jul 2026 09:09:38 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E5=A4=A7=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/part/partInfo.js | 3 +- src/api/workFlow/workFlow.js | 3 + .../modules/srmPart/com_part_Approval.vue | 5 +- .../modules/srmPart/partApprovalList.vue | 2 +- src/views/modules/srmPart/partInfoList.vue | 76 +++++++++++++++---- 5 files changed, 71 insertions(+), 18 deletions(-) diff --git a/src/api/part/partInfo.js b/src/api/part/partInfo.js index 788dc8f..1edfbd9 100644 --- a/src/api/part/partInfo.js +++ b/src/api/part/partInfo.js @@ -5,8 +5,9 @@ export const searchPartList = data => createAPI('/part/searchPartList', 'POST', export const createPart = data => createAPI('/part/save', 'POST', data) export const updatePart = data => createAPI('/part/save', 'POST', data) export const copyPartByBase = data => createAPI('/part/copyByBasePartNo', 'POST', data) +export const startPartFormalApprove = data => createAPI('/part/startFormalApprove', 'POST', data) export const searchPartInfo = data => createAPI('part/getPart','POST', data) -export const deletePart = id => createAPI('/part/delete', 'POST', { id: id }) +export const deletePart = data => createAPI('/part/delete', 'POST', data) //产品审批 export const partApprove = data => createAPI('/part/partApprove', 'POST', data) //待审批物料流程 diff --git a/src/api/workFlow/workFlow.js b/src/api/workFlow/workFlow.js index 5ca7777..3e9e08c 100644 --- a/src/api/workFlow/workFlow.js +++ b/src/api/workFlow/workFlow.js @@ -51,3 +51,6 @@ export const restartFlowInstance = data => createAPI(`/workFlow/instance/restart // 通过业务单号查询流程节点实例列表 export const getNodeInstanceList = data => createAPI(`/workFlow/instance/getNodeInstanceList`, 'post', data) + +// 通过业务单号查询全部流程节点历史（时间倒序） - rqrq +export const getNodeInstanceHistoryList = data => createAPI(`/workFlow/instance/getNodeInstanceHistoryList`, 'post', data) diff --git a/src/views/modules/srmPart/com_part_Approval.vue b/src/views/modules/srmPart/com_part_Approval.vue index 8df6e97..f8ae2a9 100644 --- a/src/views/modules/srmPart/com_part_Approval.vue +++ b/src/views/modules/srmPart/com_part_Approval.vue @@ -63,7 +63,7 @@ import Chooselist from '@/views/modules/common/Chooselist_eam' import { - getNodeInstanceList + getNodeInstanceHistoryList } from '../../../api/workFlow/workFlow.js' import { @@ -259,7 +259,8 @@ export default { }, searchTable(){ - getNodeInstanceList(this.searchData).then(({data}) => { + // 审批与放行页签展示该物料全部审批历史（按时间倒序） - rqrq + getNodeInstanceHistoryList(this.searchData).then(({data}) => { //区分请求成功和失败的状况 if (data && data.code == 0) { this.dataList = data.rows diff --git a/src/views/modules/srmPart/partApprovalList.vue b/src/views/modules/srmPart/partApprovalList.vue index 390ecf0..1f52a4d 100644 --- a/src/views/modules/srmPart/partApprovalList.vue +++ b/src/views/modules/srmPart/partApprovalList.vue @@ -757,7 +757,7 @@ export default { comment: this.approveData.comment }).then(({ data }) => { if (data && data.code === 0) { - this.$message.success(action === 'APPROVED' ? '审批通过成功' : '驳回成功') + this.$message.success(action === 'APPROVED' ? '审批通过成功' : '驳回成功，审批已终止') this.approveDialogVisible = false //刷新列表 this.getMainData() diff --git a/src/views/modules/srmPart/partInfoList.vue b/src/views/modules/srmPart/partInfoList.vue index 819a945..76d00a0 100644 --- a/src/views/modules/srmPart/partInfoList.vue +++ b/src/views/modules/srmPart/partInfoList.vue @@ -87,11 +87,12 @@ fixed="right" header-align="center" align="center" - width="160" + width="220" label="Action"> @@ -129,7 +130,8 @@ - + +
- - - - - - - - + + + + + + + + + + + + + +
确认 @@ -328,7 +336,8 @@ import { createPart, updatePart, copyPartByBase, - deletePart + deletePart, + startPartFormalApprove } from '@/api/part/partInfo.js' import excel from '@/utils/excel-util.js' import Chooselist from '@/views/modules/common/Chooselist_eam' @@ -899,7 +908,13 @@ export default { methods: { formatPartStageDesc (partStage) { - return partStage === 'Approved' ? '正式物料' : '新增物料' + if (partStage === 'Approved') { + return '正式物料' + } + if (partStage === 'Approving') { + return '转正审批中' + } + return '新增物料' }, formatTableCell (columnProp, row) { if (columnProp === 'partStage') { @@ -944,8 +959,10 @@ export default { return index > 0 && index < value.length - 1 ? value.substring(index + 1) : '' }, openCopyDialog () { + const selectedBasePartNo = (this.currentRow && this.currentRow.basePartNo) ? this.currentRow.basePartNo : '' this.copyForm = { - basePartNo: '', + // 复制弹窗默认带出当前选中行基准料号 - rqrq + basePartNo: (selectedBasePartNo || '').trim().toUpperCase(), partSuffix: '' } this.copyDialogVisible = true @@ -981,6 +998,33 @@ export default { }) }) }, + startFormalApprove (row) { + if (!row || !row.partNo) { + this.$message.warning('未找到有效物料编码') + return + } + // 新增物料阶段手动发起转正审批 - rqrq + this.$confirm('确认发起该物料的转正流程吗？', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + let inData = { + site: this.$store.state.user.site, + partNo: row.partNo + } + startPartFormalApprove(inData).then(({ data }) => { + if (data && data.code === 0) { + this.$message.success(data.msg || '操作成功') + this.getMainData() + return + } + this.$message.error((data && data.msg) || '发起转正失败') + }).catch(error => { + this.$message.error('发起转正失败: ' + error.message) + }) + }).catch(() => {}) + }, fetchPartFamilyOptions (familyType, parentPartFamily) { return listPartFamilyByType({ site: this.$store.state.user.site, @@ -1397,7 +1441,11 @@ export default { cancelButtonText: '取消', type: 'warning' }).then(() => { - deletePart(row.id).then(({data}) => { + deletePart({ + id: row.id, + site: row.site, + partNo: row.partNo + }).then(({data}) => { if (data && data.code === 0) { this.$message.success('产品删除成功') this.getMainData()