From 13eaf68ac528061b98268e43047b193d463444d6 Mon Sep 17 00:00:00 2001 From: Vergil <974548713@qq.com> Date: Wed, 13 May 2020 14:45:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A7=9C=E7=A6=8F=E5=A3=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/layout/components/Navbar.vue | 49 ++++++++++++++++++++------ 1 file changed, 38 insertions(+), 11 deletions(-) diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue index d4bc3f1a..d0a1e99a 100644 --- a/src/views/layout/components/Navbar.vue +++ b/src/views/layout/components/Navbar.vue @@ -37,6 +37,7 @@ import { RequestFund, setChakan2 } from '@/api/PurchasingCenter/PurchaseContract import { getPickingList, setPickingList } from '@/api/Inventory/MaterialOut' import { searchTable } from '@/api/PurchasingCenter/PurchaseMaterielModify' import { search } from '@/api/Assembly/DeliveryConfirmation' +import { searchtable as searchtableSupplement } from '@/api/WorkshopProcurement/ScrappedSupplementaryInvestment1' // 查询报废补投零件 import Cookies from 'js-cookie' export default { components: { @@ -72,24 +73,28 @@ export default { }, mounted() { console.log(Cookies.get('id'), 999) - if (this.id === 3 || Cookies.get('id') === 3) { + if (this.id === 3 || Cookies.get('id') === 3) { // id=3 沈大为 总经理 this.checkApproval() this.timer = setInterval(this.checkApproval, 1000 * 60 * 5) - } else if (this.token.toString() === '11' || this.token.toString() === '12') { - this.comfirmMaterial() + } else if (this.token.toString() === '11' || this.token.toString() === '12') { // 11 技术部长 12 技术员 + // 存储过程 库存管理_物料主文件_基本_采购部_查询未审核数量 + this.comfirmMaterial() // 您有采购物料申请待审批，请及时处理，点击查看 this.timer = setInterval(this.comfirmMaterial, 1000 * 60 * 5) - this.comfirmMaterial_Update() + // 存储过程 采购管理_采购物料修改确认_查询数据 + this.comfirmMaterial_Update() // 您有采购物料更改申请待审批，请及时处理，点击查看 this.timer = setInterval(this.comfirmMaterial_Update, 1000 * 60 * 5) - } else if (this.token.toString() === '2' || this.token.toString() === '3') { + } else if (this.token.toString() === '2' || this.token.toString() === '3') { // 2 采购部长 3 采购员 18 财务(会计) this.comfirmMaterial_CG() this.timer = setInterval(this.comfirmMaterial_CG, 1000 * 60 * 5) - } else if (this.token.toString() === '15') { + } else if (this.token.toString() === '15') { // 15 库管员 this.comfirmMaterial_KG() this.timer = setInterval(this.comfirmMaterial_KG, 1000 * 60 * 5) - } else if (this.token.toString() === '5') { + } else if (this.token.toString() === '5') { // 5 计划员 this.comfirmUrgentItem() this.timer = setInterval(this.comfirmUrgentItem, 1000 * 60 * 5) - } else if (this.token.toString() === '21') { + this.searchtableSupplement() // 报废补投(制造) + this.timer = setInterval(this.searchtableSupplement, 1000 * 60 * 5) + } else if (this.token.toString() === '21') { // 21 装配部长 this.comfirmDeliver() this.timer = setInterval(this.comfirmDeliver, 1000 * 60 * 5) } @@ -185,9 +190,28 @@ export default { }) } }, + // 修改完成 + searchtableSupplement() { + searchtableSupplement(0, 0, 0, 0, 0, 1, 1, 1, 99).then(res => { + if (res.data.result) { + this.noticeContract5 = null + this.noticeContract5 = this.$notify.success({ + title: '提示', + message: '您有报废补投信息待处理，请及时处理，点击查看', + onClick: () => { + this.$router.push({ path: '/WorkshopProcurement/ScrappedSupplementaryInvestment1' }) + setTimeout(this.noticeContract5.close(), 1000) + }, + duration: 1000 * 60 + }) + } + }) + }, + // 修改完成 comfirmMaterial() { getMaterial().then(res => { - if (res.data.length) { + // if (res.data.length) { + if (res.data[0].数量) { this.noticeContract5 = null this.noticeContract5 = this.$notify.success({ title: '提示', @@ -201,9 +225,11 @@ export default { } }) }, + // 修改完成 comfirmMaterial_Update() { - searchTable().then(res => { - if (res.data.length) { + searchTable(1, 1).then(res => { + // console.log(res, '您有采购物料更改申请待审批，请及时处理，点击查看') + if (res.data.rows.length) { this.noticeContract7 = null this.noticeContract7 = this.$notify.success({ title: '提示', @@ -243,6 +269,7 @@ export default { }) }) Promise.race([p1, p2]).then(res => { + console.log(res, 'res678') if (res.data.total) { this.noticeFund = this.$notify.success({ title: '提示', From a2aedea48090037cdaedf4b0a3e3c82b22d627fd Mon Sep 17 00:00:00 2001 From: Vergil <974548713@qq.com> Date: Wed, 13 May 2020 16:27:09 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=BF=BD=E6=BA=AF=E5=8A=A0=E5=B7=A5?= =?UTF-8?q?=E8=BF=87=E7=A8=8B=E5=A7=9C=E7=A6=8F=E5=A3=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProcessingStatusNew/index.vue | 20 +++++++++++++++++++ static/config.js | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue index 604bcd88..ab6d050e 100644 --- a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue +++ b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue @@ -49,6 +49,16 @@ {{ scope.row.完成数量 }} + + + + + + + + + + + +