diff --git a/dist.zip b/dist.zip deleted file mode 100644 index a46bd1f0..00000000 Binary files a/dist.zip and /dev/null differ diff --git a/src/views/WorkshopProcurement/FundApproval2/index.vue b/src/views/WorkshopProcurement/FundApproval2/index.vue index cb41e9d8..7cd4fdd2 100644 --- a/src/views/WorkshopProcurement/FundApproval2/index.vue +++ b/src/views/WorkshopProcurement/FundApproval2/index.vue @@ -246,6 +246,7 @@ export default { this.searchTable() }, searchTable() { + this.tableData = [] initApproval1(this.pageCurrent, this.pageSize, 1).then(response => { if (response.data.rows.length !== 0) { for (let i = 0; i < response.data.rows.length; i++) { @@ -358,7 +359,7 @@ export default { execMaterials(row.采购计划请款流水号, 1, '通过', this.id, 1).then(response => { if (response.data[0].result === '1') { this.$message.success('执行成功') - this.searchTable3() + this.searchTable() } else { this.$message.error('执行失败') } }) } @@ -385,7 +386,7 @@ export default { execMaterials(row.采购计划请款流水号, 2, value, this.id, 1).then(response => { if (response.data[0].result === '1') { this.$message.success('执行成功') - this.searchTable3() + this.searchTable() } else { this.$message.error('执行失败') } }) } diff --git a/src/views/WorkshopProcurement/FundApproval3/index.vue b/src/views/WorkshopProcurement/FundApproval3/index.vue index b5157441..29043193 100644 --- a/src/views/WorkshopProcurement/FundApproval3/index.vue +++ b/src/views/WorkshopProcurement/FundApproval3/index.vue @@ -258,6 +258,7 @@ export default { this.searchTable3() }, searchTable() { + this.tableData = [] initApproval1(this.pageCurrent, this.pageSize, 2).then(response => { if (response.data.rows.length !== 0) { for (let i = 0; i < response.data.rows.length; i++) { @@ -390,14 +391,14 @@ export default { execApprovalOffline(row.离线合同请款流水号, 1, '通过', this.id, 2).then(response => { if (response.data[0].result === '1') { this.$message.success('执行成功') - this.searchTable2() + this.searchTable() } else { this.$message.error('执行失败') } }) } else if (row.类别 === '备料') { execMaterials(row.采购计划请款流水号, 1, '通过', this.id, 2).then(response => { if (response.data[0].result === '1') { this.$message.success('执行成功') - this.searchTable3() + this.searchTable() } else { this.$message.error('执行失败') } }) } @@ -424,14 +425,14 @@ export default { execApprovalOffline(row.离线合同请款流水号, 2, value, this.id, 2).then(response => { if (response.data[0].result === '1') { this.$message.success('执行成功') - this.searchTable2() + this.searchTable() } else { this.$message.error('执行失败') } }) } else if (row.类别 === '备料') { execMaterials(row.采购计划请款流水号, 2, value, this.id, 2).then(response => { if (response.data[0].result === '1') { this.$message.success('执行成功') - this.searchTable3() + this.searchTable() } else { this.$message.error('执行失败') } }) } @@ -451,7 +452,7 @@ export default { execApprovalOffline(row.离线合同请款流水号, 1, '通过', this.id, 2).then(response => { if (response.data[0].result === '1') { this.$message.success('执行成功') - this.searchTable2() + this.searchTable() } else { this.$message.error('执行失败') } }) }).catch(() => { @@ -469,7 +470,7 @@ export default { execApprovalOffline(row.离线合同请款流水号, 2, value, this.id, 2).then(response => { if (response.data[0].result === '1') { this.$message.success('执行成功') - this.searchTable2() + this.searchTable() } else { this.$message.error('执行失败') } }) }).catch(() => { @@ -488,7 +489,7 @@ export default { execMaterials(row.采购计划请款流水号, 1, '通过', this.id, 2).then(response => { if (response.data[0].result === '1') { this.$message.success('执行成功') - this.searchTable3() + this.searchTable() } else { this.$message.error('执行失败') } }) }).catch(() => { @@ -506,7 +507,7 @@ export default { execMaterials(row.采购计划请款流水号, 2, value, this.id, 2).then(response => { if (response.data[0].result === '1') { this.$message.success('执行成功') - this.searchTable3() + this.searchTable() } else { this.$message.error('执行失败') } }) }).catch(() => { diff --git a/src/views/layout/components/TagsView.vue b/src/views/layout/components/TagsView.vue index 48cf1003..a17d2de1 100644 --- a/src/views/layout/components/TagsView.vue +++ b/src/views/layout/components/TagsView.vue @@ -70,6 +70,15 @@ export default { case 'ProjectPlanningManagementQuery': // 项目计划管理 document.getElementById('app-main').style.width = '1710px' break + case 'CreatingPurchasingMaterials': // 外购备料 + document.getElementById('app-main').style.width = '1950' + break + case 'RequestOutsourcingMaterials': // 外购备料请款 + document.getElementById('app-main').style.width = '1710px' + break + case 'OfflineProcurement': // 外购备料(离线) + document.getElementById('app-main').style.width = '1950px' + break default: document.getElementById('app-main').style.width = '1380px' }