From 48179370c0a55cb8ebd748684141d1b92c519c90 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Tue, 30 Apr 2024 19:25:16 +0800 Subject: [PATCH] =?UTF-8?q?2024-04-30=20=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/changeManagement/changeManagement.js | 7 ++ .../modules/changeManagement/changeRecord.vue | 23 ++++- .../changeManagement/changeRequest.vue | 35 ++++---- src/views/modules/part/bomManagement.vue | 5 +- src/views/modules/part/partInformation.vue | 13 ++- src/views/modules/part/routingManagement.vue | 2 +- .../projectInfo/com_project_info_part.vue | 90 +++++++------------ 7 files changed, 90 insertions(+), 85 deletions(-) diff --git a/src/api/changeManagement/changeManagement.js b/src/api/changeManagement/changeManagement.js index badff8b..e7d815a 100644 --- a/src/api/changeManagement/changeManagement.js +++ b/src/api/changeManagement/changeManagement.js @@ -193,6 +193,13 @@ export const issueChange = data => createAPI(`/plm/changeManagement/issueChange` */ export const submitChange = data => createAPI(`/plm/changeManagement/submitChange`,'post',data) +/** + * 获取节点权限 + * @param data + * @returns {*} + */ +export const getNodeAuthority = data => createAPI(`/plm/changeManagement/getNodeAuthority`,'post',data) + diff --git a/src/views/modules/changeManagement/changeRecord.vue b/src/views/modules/changeManagement/changeRecord.vue index c06d021..4639a47 100644 --- a/src/views/modules/changeManagement/changeRecord.vue +++ b/src/views/modules/changeManagement/changeRecord.vue @@ -262,7 +262,7 @@ 保存 关闭 - 提交 + 提交 @@ -351,6 +351,7 @@ 保存 关闭 + 提交 @@ -501,6 +502,7 @@ 保存 关闭 + 提交 @@ -553,6 +555,7 @@ 保存 关闭 + 提交 @@ -848,6 +851,7 @@ countersignatureUpdate, // 编辑会签信息 issueChange, // 下达 submitChange, // 提交 + getNodeAuthority, // 获取节点权限 } from '@/api/changeManagement/changeManagement.js' import ChooseList from '@/views/modules/common/Chooselist' import changeUploadFile from "../base/upload_file.vue"; @@ -932,6 +936,7 @@ tempPartRow: {}, tempExecutorRow: {}, changeTitle: '', + nodeAuthorityArr: '', // ======== 数据对象 ======== modalData: { site: this.$store.state.user.site, @@ -1718,9 +1723,18 @@ }, methods: { - // 获取流程的配置权限 - getNodeAuthority () { + // 获取流程的配置权限 + getNodeAuthority (changeNo) { + let tempData = { + site: this.$store.state.user.site, + changeNo: changeNo + } + getNodeAuthority(tempData).then(({data}) => { + if (data && data.code === 0) { + this.nodeAuthorityArr = data.rows + } + }) }, // ======= 正则校验 ======= @@ -2079,6 +2093,9 @@ // 修改变更单模态框 updateModal (row) { + if (row.changeStatus !== '草稿') { + this.getNodeAuthority(row.changeNo) + } this.modalData = { site: row.site, changeNo: row.changeNo, diff --git a/src/views/modules/changeManagement/changeRequest.vue b/src/views/modules/changeManagement/changeRequest.vue index 9694fdd..a430cff 100644 --- a/src/views/modules/changeManagement/changeRequest.vue +++ b/src/views/modules/changeManagement/changeRequest.vue @@ -55,7 +55,6 @@ type="selection" header-align="center" align="center" - :selectable="selectFlag" width="50"> - + @@ -372,7 +371,7 @@
- 选择评估模板 + 选择评估信息
- - - + + + + + + + + + + + + ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- 选择执行模板 + 选择执行信息
Copy Build Retire - 转正式BOM + @@ -2587,7 +2587,8 @@ export default { updateBy: this.$store.state.user.name, printUnit: row.printUnit, printUnitName: row.printUnitName, - officialFlag: row.officialFlag + officialFlag: row.officialFlag, + offFlag: row.offFlag } this.subDetailTable = 'bom_sub_detail' // 查bom明细 diff --git a/src/views/modules/part/partInformation.vue b/src/views/modules/part/partInformation.vue index b207b50..5d96be7 100644 --- a/src/views/modules/part/partInformation.vue +++ b/src/views/modules/part/partInformation.vue @@ -3260,9 +3260,16 @@ if (data && data.code === 0) { this.getPartItem() this.attributeDialog = true - this.$message.success(data.msg) + this.$message({ + message: '操作成功', + type: 'success', + duration: 1500, + onClose: () => {} + }) } else { - this.$message.warning(data.msg) + this.$alert(data.msg, '错误', { + confirmButtonText: '确定' + }) } this.loading = false }).catch((error) => { @@ -3837,7 +3844,7 @@ toBecomeOfficialPartModal (row) { this.modalData = { flag: '3', - title: '物料投产', + title: '物料转正', site: row.site, partNo: row.partNo, partDesc: row.partDesc, diff --git a/src/views/modules/part/routingManagement.vue b/src/views/modules/part/routingManagement.vue index 6384082..70479f6 100644 --- a/src/views/modules/part/routingManagement.vue +++ b/src/views/modules/part/routingManagement.vue @@ -158,7 +158,7 @@ Copy Build Retire - 转正式Routing + diff --git a/src/views/modules/project/projectInfo/com_project_info_part.vue b/src/views/modules/project/projectInfo/com_project_info_part.vue index d60882f..5823f1d 100644 --- a/src/views/modules/project/projectInfo/com_project_info_part.vue +++ b/src/views/modules/project/projectInfo/com_project_info_part.vue @@ -764,6 +764,22 @@ dataListLoading: false, currentRow:'', columnList:[ + { + userId: this.$store.state.user.name, + functionId: 101002001, + serialNumber: '101002001Table4finalPartNo', + tableId: "101002001Table4", + tableName: "项目物料", + columnProp: "finalPartNo", + headerAlign: "center", + align: "center", + columnLabel: "IFS物料编码", + columnHidden: false, + columnImage: false, + status: true, + fixed: '', + columnWidth: 100 + }, { userId: this.$store.state.user.name, functionId: 101002001, @@ -776,8 +792,6 @@ columnLabel: "物料编码", columnHidden: false, columnImage: false, - columnSortable: false, - sortLv: 0, status: true, fixed: '', columnWidth: 100 @@ -794,8 +808,6 @@ columnLabel: "物料描述", columnHidden: false, columnImage: false, - columnSortable: false, - sortLv: 0, status: true, fixed: '', columnWidth: 120 @@ -812,30 +824,10 @@ columnLabel: "物料状态", columnHidden: false, columnImage: false, - columnSortable: false, - sortLv: 0, status: true, fixed: '', columnWidth: 100 }, - // { - // userId: this.$store.state.user.name, - // functionId: 101002001, - // serialNumber: '101002001Table4PartType', - // tableId: "101002001Table4", - // tableName: "项目物料", - // columnProp: "partType", - // headerAlign: "center", - // align: "center", - // columnLabel: "物料分类", - // columnHidden: false, - // columnImage: false, - // columnSortable: false, - // sortLv: 0, - // status: true, - // fixed: '', - // columnWidth: 60 - // }, { userId: this.$store.state.user.name, functionId: 101002001, @@ -848,8 +840,6 @@ columnLabel: "物料分类", columnHidden: false, columnImage: false, - columnSortable: false, - sortLv: 0, status: true, fixed: '', columnWidth: 80 @@ -866,8 +856,6 @@ columnLabel: "属性模板", columnHidden: false, columnImage: false, - columnSortable: false, - sortLv: 0, status: true, fixed: '', columnWidth: 80 @@ -884,8 +872,6 @@ columnLabel: "属性模板名称", columnHidden: false, columnImage: false, - columnSortable: false, - sortLv: 0, status: true, fixed: '', columnWidth: 100 @@ -902,30 +888,26 @@ columnLabel: "备注", columnHidden: false, columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 120 - }, - { - userId: this.$store.state.user.name, - functionId: 101002001, - serialNumber: '101002001Table4PlmPartNo', - tableId: "101002001Table4", - tableName: "项目物料", - columnProp: "plmPartNo", - headerAlign: "center", - align: "center", - columnLabel: "PLM料号", - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, status: true, fixed: '', columnWidth: 120 }, + // { + // userId: this.$store.state.user.name, + // functionId: 101002001, + // serialNumber: '101002001Table4PlmPartNo', + // tableId: "101002001Table4", + // tableName: "项目物料", + // columnProp: "plmPartNo", + // headerAlign: "center", + // align: "center", + // columnLabel: "PLM料号", + // columnHidden: false, + // columnImage: false, + // status: true, + // fixed: '', + // columnWidth: 120 + // }, { userId: this.$store.state.user.name, functionId: 101002001, @@ -938,8 +920,6 @@ columnLabel: "创建时间", columnHidden: false, columnImage: false, - columnSortable: false, - sortLv: 0, status: true, fixed: '', columnWidth: 120 @@ -956,8 +936,6 @@ columnLabel: "创建人", columnHidden: false, columnImage: false, - columnSortable: false, - sortLv: 0, status: true, fixed: '', columnWidth: 80 @@ -974,8 +952,6 @@ columnLabel: "上次修改日期", columnHidden: false, columnImage: false, - columnSortable: false, - sortLv: 0, status: true, fixed: '', columnWidth: 120 @@ -992,8 +968,6 @@ columnLabel: "修改人", columnHidden: false, columnImage: false, - columnSortable: false, - sortLv: 0, status: true, fixed: '', columnWidth: 80