From 80b42668ae0c40f195ae982b29ba0a31a5788757 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Fri, 18 Oct 2019 15:19:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=90=8C=E8=AF=B7=E6=AC=BE=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PurchasingCenter/FundApproval1/index.vue  |  2 -
 src/views/layout/components/Navbar.vue        | 53 +++++++++++++++++++
 2 files changed, 53 insertions(+), 2 deletions(-)

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 => {