From 109c1ada91baca5c1264fe329bd9c1192a019fdd Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Tue, 22 Oct 2019 15:30:33 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=9A=E7=9F=A5=E6=8F=90?=
 =?UTF-8?q?=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/layout/components/Navbar.vue | 42 ++++++++++++++------------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue
index 0147e237..af1da6c7 100644
--- a/src/views/layout/components/Navbar.vue
+++ b/src/views/layout/components/Navbar.vue
@@ -40,8 +40,12 @@ export default {
   data() {
     return {
       timer: '',
-      noticeContract: null,
       noticeContract1: null,
+      noticeContract2: null,
+      noticeContract3: null,
+      noticeContract4: null,
+      noticeContract5: null,
+      noticeContract6: null,
       noticeFund: null,
       noticeInvoice: null
     }
@@ -75,14 +79,14 @@ export default {
     comfirmMaterial_CG() {
       getMaterial_NOTES().then(res => {
         if (res.data.length) {
-          this.noticeContract = null
-          this.noticeContract = this.$notify.success({
+          this.noticeContract1 = null
+          this.noticeContract1 = this.$notify.success({
             title: '提示',
             message: '有新采购物料审批结果，点击查看',
             onClick: () => {
               setChakan().then(res => {
                 this.$router.push({ path: '/PurchasingCenter/MaterialMProcure' })
-                setTimeout(this.noticeContract.close(), 1000)
+                setTimeout(this.noticeContract1.close(), 1000)
               })
             },
             duration: 1000 * 60
@@ -92,14 +96,14 @@ 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({
+            this.noticeContract2 = null
+            this.noticeContract2 = this.$notify.success({
               title: '提示',
               message: '有合同请款申请审批结果，点击查看',
               onClick: () => {
                 setChakan().then(res => {
                   this.$router.push({ path: '/PurchasingCenter/PurchaseContractRequestFund' })
-                  setTimeout(this.noticeContract.close(), 1000)
+                  setTimeout(this.noticeContract2.close(), 1000)
                 })
               },
               duration: 1000 * 60
@@ -108,14 +112,14 @@ export default {
         })
         initApproval(1, 999, 1).then(res => {
           if (res.data.rows.length) {
-            this.noticeContract = null
-            this.noticeContract = this.$notify.success({
+            this.noticeContract3 = null
+            this.noticeContract3 = this.$notify.success({
               title: '提示',
               message: '有合同请款申请待审批，点击查看',
               onClick: () => {
                 setChakan().then(res => {
                   this.$router.push({ path: '/PurchasingCenter/FundApproval1' })
-                  setTimeout(this.noticeContract.close(), 1000)
+                  setTimeout(this.noticeContract3.close(), 1000)
                 })
               },
               duration: 1000 * 60
@@ -125,14 +129,14 @@ export default {
       } 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({
+            this.noticeContract4 = null
+            this.noticeContract4 = this.$notify.success({
               title: '提示',
               message: '有合同请款申请审批结果，点击查看',
               onClick: () => {
                 setChakan().then(res => {
                   this.$router.push({ path: '/PurchasingCenter/PurchaseContractRequestFund' })
-                  setTimeout(this.noticeContract.close(), 1000)
+                  setTimeout(this.noticeContract4.close(), 1000)
                 })
               },
               duration: 1000 * 60
@@ -144,13 +148,13 @@ export default {
     comfirmMaterial() {
       getMaterial().then(res => {
         if (res.data.length) {
-          this.noticeContract = null
-          this.noticeContract = this.$notify.success({
+          this.noticeContract5 = null
+          this.noticeContract5 = this.$notify.success({
             title: '提示',
             message: '您有采购物料申请待审批，请及时处理，点击查看',
             onClick: () => {
               this.$router.push({ path: '/PurchasingCenter/MaterialManagement' })
-              setTimeout(this.noticeContract.close(), 1000)
+              setTimeout(this.noticeContract5.close(), 1000)
             },
             duration: 1000 * 60
           })
@@ -160,13 +164,13 @@ export default {
     checkApproval() {
       searchTable1(1, 999, 0, null, null, 0, 0, 0, 0, 0, 0).then(res => {
         if (res.data.total) {
-          this.noticeContract = null
-          this.noticeContract = this.$notify.success({
+          this.noticeContract6 = null
+          this.noticeContract6 = this.$notify.success({
             title: '提示',
             message: '您有采购合同待审批，请及时处理，点击查看',
             onClick: () => {
               this.$router.push({ path: '/PurchasingCenter/PurchaseContractApproval' })
-              setTimeout(this.noticeContract.close(), 1000)
+              setTimeout(this.noticeContract6.close(), 1000)
             },
             duration: 1000 * 60
           })