From d7b148963a93d3bf18cbf7e36833439905347210 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Sat, 12 Oct 2019 18:22:27 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/PurchasingCenter/MaterialManagement/index.vue | 1 +
 src/views/layout/components/Navbar.vue                  | 7 +++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/PurchasingCenter/MaterialManagement/index.vue b/src/views/PurchasingCenter/MaterialManagement/index.vue
index b853c245..5450644a 100644
--- a/src/views/PurchasingCenter/MaterialManagement/index.vue
+++ b/src/views/PurchasingCenter/MaterialManagement/index.vue
@@ -676,6 +676,7 @@ export default {
     this.fetchData()
     this.searchMaterialCategory()
     this.getGonghuoshang()
+    this.searchMaterial()
   },
   methods: {
     // 通过
diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue
index f4f1312d..ceb6d264 100644
--- a/src/views/layout/components/Navbar.vue
+++ b/src/views/layout/components/Navbar.vue
@@ -50,6 +50,7 @@ export default {
       'avatar',
       'name',
       'id',
+      'token',
       'token'
     ])
   },
@@ -57,8 +58,7 @@ export default {
     if (this.id.toString() === '3') {
       this.checkApproval()
       this.timer = setInterval(this.checkApproval, 1000 * 60 * 5)
-    }
-    if (this.id.toString() === '11') {
+    } else if (this.token.toString() === '11' || this.token.toString() === '12') {
       this.comfirmMaterial()
       this.timer = setInterval(this.comfirmMaterial, 1000 * 60 * 5)
     }
@@ -69,8 +69,7 @@ export default {
   methods: {
     comfirmMaterial() {
       getMaterial().then(res => {
-        console.log(res)
-        if (res.data.total) {
+        if (res.data.length) {
           this.noticeContract = null
           this.noticeContract = this.$notify.success({
             title: '提示',