From 9f836fb06bf28465acdc977c4477879921144207 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Sat, 12 Oct 2019 17:25:52 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../MaterialMProcure/index.vue | 2 +-
.../MaterialManagement/index.vue | 2 +-
src/views/layout/components/Navbar.vue | 22 +++++++++++++++++++
3 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/src/views/PurchasingCenter/MaterialMProcure/index.vue b/src/views/PurchasingCenter/MaterialMProcure/index.vue
index 0aa8996c..52823d57 100644
--- a/src/views/PurchasingCenter/MaterialMProcure/index.vue
+++ b/src/views/PurchasingCenter/MaterialMProcure/index.vue
@@ -120,7 +120,7 @@
size="small"
style="margin-left: 10px"
@click="pageCurrent=1;searchMaterial()">查询
- 申请
+ 新增采购物料申请
diff --git a/src/views/PurchasingCenter/MaterialManagement/index.vue b/src/views/PurchasingCenter/MaterialManagement/index.vue
index 975112c0..b853c245 100644
--- a/src/views/PurchasingCenter/MaterialManagement/index.vue
+++ b/src/views/PurchasingCenter/MaterialManagement/index.vue
@@ -132,7 +132,7 @@
新增供货商
- 待审核
+ 采购物料审核
diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue
index 216a16d0..f4f1312d 100644
--- a/src/views/layout/components/Navbar.vue
+++ b/src/views/layout/components/Navbar.vue
@@ -28,6 +28,7 @@ import { mapGetters } from 'vuex'
import Breadcrumb from '@/components/Breadcrumb'
import Hamburger from '@/components/Hamburger'
import { searchTable1 } from '@/api/PurchasingCenter/PurchaseContractApproval'
+import { getMaterial } from '@/api/PurchasingCenter/MaterialManagement'
import { initApproval, initApprovalOffline } from '@/api/PurchasingCenter/FundApproval'
import { searchTable1 as searchTableInvoice } from '@/api/PurchasingCenter/InvoiceSettlementApprove'
export default {
@@ -57,11 +58,32 @@ export default {
this.checkApproval()
this.timer = setInterval(this.checkApproval, 1000 * 60 * 5)
}
+ if (this.id.toString() === '11') {
+ this.comfirmMaterial()
+ this.timer = setInterval(this.comfirmMaterial, 1000 * 60 * 5)
+ }
},
beforeDestroy() {
clearInterval(this.timer)
},
methods: {
+ comfirmMaterial() {
+ getMaterial().then(res => {
+ console.log(res)
+ if (res.data.total) {
+ this.noticeContract = null
+ this.noticeContract = this.$notify.success({
+ title: '提示',
+ message: '您有采购物料申请待审批,请及时处理,点击查看',
+ onClick: () => {
+ this.$router.push({ path: '/PurchasingCenter/MaterialManagement' })
+ setTimeout(this.noticeContract.close(), 1000)
+ },
+ duration: 1000 * 60
+ })
+ }
+ })
+ },
checkApproval() {
searchTable1(1, 999, 0, null, null, 0, 0, 0, 0, 0, 0).then(res => {
if (res.data.total) {