diff --git a/src/views/PurchasingCenter/FundApproval1/index.vue b/src/views/PurchasingCenter/FundApproval1/index.vue index 2a4a471b..9a3528c7 100644 --- a/src/views/PurchasingCenter/FundApproval1/index.vue +++ b/src/views/PurchasingCenter/FundApproval1/index.vue @@ -245,7 +245,6 @@ export default { }, searchTable1() { initApproval(this.pageCurrent1, this.pageSize1, 0).then(response => { - console.log(response.data) this.tableData1 = response.data.rows this.total1 = response.data.total }) @@ -261,7 +260,6 @@ export default { }, searchTable2() { initApprovalOffline(this.pageCurrent2, this.pageSize2, 0).then(response => { - console.log(response.data.rows) this.tableData2 = response.data.rows this.total2 = response.data.total }) diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue index c47317c7..0147e237 100644 --- a/src/views/layout/components/Navbar.vue +++ b/src/views/layout/components/Navbar.vue @@ -31,6 +31,7 @@ import { searchTable1 } from '@/api/PurchasingCenter/PurchaseContractApproval' import { getMaterial, getMaterial_NOTES, setChakan } from '@/api/PurchasingCenter/MaterialManagement' import { initApproval, initApprovalOffline } from '@/api/PurchasingCenter/FundApproval' import { searchTable1 as searchTableInvoice } from '@/api/PurchasingCenter/InvoiceSettlementApprove' +import { searchRequestFund } from '@/api/PurchasingCenter/PurchaseContractRequestFund' export default { components: { Breadcrumb, @@ -40,6 +41,7 @@ export default { return { timer: '', noticeContract: null, + noticeContract1: null, noticeFund: null, noticeInvoice: null } @@ -87,6 +89,57 @@ export default { }) } }) + if (this.token.toString() === '2') { + searchRequestFund(1, 9999, 0, 0, 0, 0, 0).then(res => { + if (res.data.length) { + this.noticeContract = null + this.noticeContract = this.$notify.success({ + title: '提示', + message: '有合同请款申请审批结果,点击查看', + onClick: () => { + setChakan().then(res => { + this.$router.push({ path: '/PurchasingCenter/PurchaseContractRequestFund' }) + setTimeout(this.noticeContract.close(), 1000) + }) + }, + duration: 1000 * 60 + }) + } + }) + initApproval(1, 999, 1).then(res => { + if (res.data.rows.length) { + this.noticeContract = null + this.noticeContract = this.$notify.success({ + title: '提示', + message: '有合同请款申请待审批,点击查看', + onClick: () => { + setChakan().then(res => { + this.$router.push({ path: '/PurchasingCenter/FundApproval1' }) + setTimeout(this.noticeContract.close(), 1000) + }) + }, + duration: 1000 * 60 + }) + } + }) + } else if (this.token.toString() === '3') { + searchRequestFund(1, 99999, 0, 0, 0, 0, 0).then(res => { + if (res.data.length) { + this.noticeContract = null + this.noticeContract = this.$notify.success({ + title: '提示', + message: '有合同请款申请审批结果,点击查看', + onClick: () => { + setChakan().then(res => { + this.$router.push({ path: '/PurchasingCenter/PurchaseContractRequestFund' }) + setTimeout(this.noticeContract.close(), 1000) + }) + }, + duration: 1000 * 60 + }) + } + }) + } }, comfirmMaterial() { getMaterial().then(res => {