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: '提示',