diff --git a/src/views/modules/srmPart/partApprovalList.vue b/src/views/modules/srmPart/partApprovalList.vue index 924bf28..e8d3faf 100644 --- a/src/views/modules/srmPart/partApprovalList.vue +++ b/src/views/modules/srmPart/partApprovalList.vue @@ -8,15 +8,47 @@ 产品编码 + + + + + + + + + + + 查询 - @@ -55,8 +87,8 @@ width="160" label="Action"> @@ -180,15 +212,11 @@ export default { partNo: '', npc: '', partDesc: '', - partSpec: '', orderType: '产品资料', - buyerName: '', - sourcingName: '', - category: '', - unit: '', - status: '', - codeNo: '', - createBy: '', + startDate: '', + endDate: '', + partStage: '', + specialRelease: '', site: this.$store.state.user.site, page: 1, limit: 10 @@ -199,7 +227,7 @@ export default { tagNo: '', mainDataList: [], dataListLoading: false, - activeName: 'basicInfo', + activeName: 'approval', // 审批对话框 approveDialogVisible: false, approveLoading: false, @@ -449,25 +477,25 @@ export default { 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: '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') @@ -648,12 +676,12 @@ export default { // 打开审批对话框 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, + applyNo: row.applyNo, + site: row.site, + orderType: row.orderType, + flowCode: row.flowCode, + flowVersion: row.flowVersion, + nodeCode: row.nodeCode, comment: '' }