From d64d1c291eef857ff3cfd18c3ec3ad8bcc27c1bf Mon Sep 17 00:00:00 2001 From: yanyan <513352169@qq.com> Date: Thu, 19 Mar 2026 17:01:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81=E8=B5=84=E6=96=99=E4=B8=8E?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=94=BE=E8=A1=8C=E7=95=8C=E9=9D=A2=E5=88=86?= =?UTF-8?q?=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/part/partInfo.js | 5 + .../modules/srmPart/com_part_Suppliers.vue | 6 +- .../modules/srmPart/partApprovalList.vue | 835 ++++++++++++++++++ src/views/modules/srmPart/partInfoList.vue | 264 +++--- 4 files changed, 961 insertions(+), 149 deletions(-) create mode 100644 src/views/modules/srmPart/partApprovalList.vue diff --git a/src/api/part/partInfo.js b/src/api/part/partInfo.js index e30eafc..aeadf70 100644 --- a/src/api/part/partInfo.js +++ b/src/api/part/partInfo.js @@ -6,3 +6,8 @@ export const createPart = data => createAPI('/part/save', 'POST', data) export const updatePart = data => createAPI('/part/save', 'POST', data) export const searchPartInfo = data => createAPI('part/getPart','POST', data) export const deletePart = id => createAPI('/part/delete', 'POST', { id: id }) +//产品审批 +export const partApprove = data => createAPI('/part/partApprove', 'POST', data) +//待审批物料流程 +export const searchPartApproveList = data => createAPI('/part/searchPartApproveList', 'POST', data) + diff --git a/src/views/modules/srmPart/com_part_Suppliers.vue b/src/views/modules/srmPart/com_part_Suppliers.vue index 5574e34..34246c4 100644 --- a/src/views/modules/srmPart/com_part_Suppliers.vue +++ b/src/views/modules/srmPart/com_part_Suppliers.vue @@ -70,8 +70,8 @@ - - + + @@ -145,7 +145,7 @@ export default { secondarySupplierName:'', remark:'', createdBy:'', - isMainSupplier:'N', + isMainSupplier:'Y', }, contractModelFlag:false, visible:false, diff --git a/src/views/modules/srmPart/partApprovalList.vue b/src/views/modules/srmPart/partApprovalList.vue new file mode 100644 index 0000000..924bf28 --- /dev/null +++ b/src/views/modules/srmPart/partApprovalList.vue @@ -0,0 +1,835 @@ + + + + + + \ No newline at end of file diff --git a/src/views/modules/srmPart/partInfoList.vue b/src/views/modules/srmPart/partInfoList.vue index 544e72b..6b399f0 100644 --- a/src/views/modules/srmPart/partInfoList.vue +++ b/src/views/modules/srmPart/partInfoList.vue @@ -55,8 +55,8 @@ width="160" label="Action"> @@ -190,37 +190,13 @@ - - @@ -236,15 +212,11 @@ - 同意 驳回 - 取消 - - - + --> @@ -538,61 +510,61 @@ export default { sortLv: 0, status: true, fixed: false - }, - { - userId: this.$store.state.user.name, - functionId: this.functionId, - serialNumber: 'partTableDepartmentName', - tableId: 'partTable', - tableName: '产品信息', - columnProp: 'departmentName', - headerAlign: 'center', - align: 'center', - columnLabel: '审批部门', - columnWidth: '100', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: false - }, - { - userId: this.$store.state.user.name, - functionId: this.functionId, - serialNumber: 'partTableApproverName', - tableId: 'partTable', - tableName: '产品信息', - columnProp: 'assigneeName', - headerAlign: 'center', - align: 'center', - columnLabel: '要求审批人', - columnWidth: '100', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: false - }, - { - userId: this.$store.state.user.name, - functionId: this.functionId, - serialNumber: 'partTableFlowStatus', - tableId: 'partTable', - tableName: '产品信息', - columnProp: 'flowStatus', - headerAlign: 'center', - align: 'center', - columnLabel: '审批状态', - columnWidth: '100', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: false } + // { + // userId: this.$store.state.user.name, + // functionId: this.functionId, + // serialNumber: 'partTableDepartmentName', + // tableId: 'partTable', + // tableName: '产品信息', + // columnProp: 'departmentName', + // headerAlign: 'center', + // align: 'center', + // columnLabel: '审批部门', + // columnWidth: '100', + // columnHidden: false, + // columnImage: false, + // columnSortable: false, + // sortLv: 0, + // status: true, + // fixed: false + // }, + // { + // userId: this.$store.state.user.name, + // functionId: this.functionId, + // serialNumber: 'partTableApproverName', + // tableId: 'partTable', + // tableName: '产品信息', + // columnProp: 'assigneeName', + // headerAlign: 'center', + // align: 'center', + // columnLabel: '要求审批人', + // columnWidth: '100', + // columnHidden: false, + // columnImage: false, + // columnSortable: false, + // sortLv: 0, + // status: true, + // fixed: false + // }, + // { + // userId: this.$store.state.user.name, + // functionId: this.functionId, + // serialNumber: 'partTableFlowStatus', + // tableId: 'partTable', + // tableName: '产品信息', + // columnProp: 'flowStatus', + // headerAlign: 'center', + // align: 'center', + // columnLabel: '审批状态', + // columnWidth: '100', + // columnHidden: false, + // columnImage: false, + // columnSortable: false, + // sortLv: 0, + // status: true, + // fixed: false + // } ], exportName: '产品信息' + this.dayjs().format('YYYYMMDDHHmmss'), // 产品对话框相关 @@ -925,71 +897,71 @@ export default { this.$message.error('删除失败: ' + error.message) }) }) - }, + } // 打开审批对话框 - openApproveDialog(row) { - this.approveData = { - applyNo: row.flowNodeInstanceData.applyNo, - site: row.flowNodeInstanceData.site, - orderType: row.flowNodeInstanceData.orderType, - flowCode: row.flowNodeInstanceData.flowCode, - flowVersion: row.flowNodeInstanceData.flowVersion, - nodeCode: row.flowNodeInstanceData.nodeCode, - comment: '' + // openApproveDialog(row) { + // this.approveData = { + // applyNo: row.flowNodeInstanceData.applyNo, + // site: row.flowNodeInstanceData.site, + // orderType: row.flowNodeInstanceData.orderType, + // flowCode: row.flowNodeInstanceData.flowCode, + // flowVersion: row.flowNodeInstanceData.flowVersion, + // nodeCode: row.flowNodeInstanceData.nodeCode, + // comment: '' - } - this.approveDialogVisible = true - }, + // } + // this.approveDialogVisible = true + // }, // 提交审批 - submitApprove(action) { - if (action === 'REJECTED' && !this.approveData.comment) { - this.$message.warning('驳回时必须填写审批意见') - return - } - this.approveLoading = true - approveNodeInstance({ - applyNo: this.approveData.applyNo, - nodeCode: this.approveData.nodeCode, - site: this.approveData.site, - orderType: this.approveData.orderType, - specialRelease: this.approveData.specialRelease, - action: action, - comment: this.approveData.comment - }).then(({ data }) => { - if (data && data.code === 0) { - this.$message.success(action === 'APPROVED' ? '审批通过成功' : '驳回成功') - this.approveDialogVisible = false - //刷新列表 - this.getMainData() - } else { - this.$message.error(data.msg || '操作失败') - } - }).finally(() => { - this.approveLoading = false - }) - }, + // submitApprove(action) { + // if (action === 'REJECTED' && !this.approveData.comment) { + // this.$message.warning('驳回时必须填写审批意见') + // return + // } + // this.approveLoading = true + // approveNodeInstance({ + // applyNo: this.approveData.applyNo, + // nodeCode: this.approveData.nodeCode, + // site: this.approveData.site, + // orderType: this.approveData.orderType, + // specialRelease: this.approveData.specialRelease, + // action: action, + // comment: this.approveData.comment + // }).then(({ data }) => { + // if (data && data.code === 0) { + // this.$message.success(action === 'APPROVED' ? '审批通过成功' : '驳回成功') + // this.approveDialogVisible = false + // //刷新列表 + // this.getMainData() + // } else { + // this.$message.error(data.msg || '操作失败') + // } + // }).finally(() => { + // this.approveLoading = false + // }) + // }, // 重新审批 - rqrq - handleRestart(row) { - this.$confirm('确定要重新发起审批流程吗？', '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning' - }).then(() => { - restartFlowInstance({ - applyNo: row.applyNo, - site: row.site, - orderType: row.orderType - }).then(({ data }) => { - if (data && data.code === 0) { - this.$message.success('重新审批成功') - this.getMainData() - } else { - this.$message.error(data.msg || '操作失败') - } - }) - }).catch(() => {}) - } + // handleRestart(row) { + // this.$confirm('确定要重新发起审批流程吗？', '提示', { + // confirmButtonText: '确定', + // cancelButtonText: '取消', + // type: 'warning' + // }).then(() => { + // restartFlowInstance({ + // applyNo: row.applyNo, + // site: row.site, + // orderType: row.orderType + // }).then(({ data }) => { + // if (data && data.code === 0) { + // this.$message.success('重新审批成功') + // this.getMainData() + // } else { + // this.$message.error(data.msg || '操作失败') + // } + // }) + // }).catch(() => {}) + // } }