From ce6d9a3e4a9a8ca784922b15262d9b5e36daa7ca Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Tue, 28 May 2019 16:20:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=89=B9half?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../InvoiceSettlementApprove.js               |  2 +-
 .../InvoiceSettlementApplication/index.vue    |  8 +++---
 .../InvoiceSettlementApprove/index.vue        | 28 +++++++++----------
 src/views/layout/components/Navbar.vue        | 21 ++++++++++++--
 4 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/src/api/PurchasingCenter/InvoiceSettlementApprove.js b/src/api/PurchasingCenter/InvoiceSettlementApprove.js
index 15f3e5ac..650d34d5 100644
--- a/src/api/PurchasingCenter/InvoiceSettlementApprove.js
+++ b/src/api/PurchasingCenter/InvoiceSettlementApprove.js
@@ -8,7 +8,7 @@ export function searchTable1(...group) {
     data: {
       type: '1',
       name: '采购管理_发票结算申请单_查询数据',
-      param: `时间段_check=${group[0]}&开始日期=${group[1]}&结束日期=${group[2]}&是否提交=1`,
+      param: `时间段_check=${group[0]}&开始日期=${group[1]}&结束日期=${group[2]}&是否提交=1&角色编号=${group[5]}`,
       Pagination: group[3] + '&' + group[4]
     }
   })
diff --git a/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue b/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue
index 0a46f95d..a357d4f7 100644
--- a/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue
+++ b/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue
@@ -76,17 +76,17 @@
             {{ scope.row.审批1时间 ? scope.row.审批1时间 : '—' }}
           </template>
         </el-table-column>
-        <el-table-column label="财务审批" align="center" min-width="60">
+        <el-table-column label="总经理审批" align="center" min-width="70">
           <template slot-scope="scope">
-            {{ scope.row.审批人2姓名 ? scope.row.审批人2姓名 : '未审批' }}
+            {{ scope.row.审批人4姓名 ? scope.row.审批人4姓名 : '未审批' }}
           </template>
         </el-table-column>
         <el-table-column label="审批时间" align="center" min-width="115">
           <template slot-scope="scope">
-            {{ scope.row.审批2时间 ? scope.row.审批2时间 : '—' }}
+            {{ scope.row.审批4时间 ? scope.row.审批4时间 : '—' }}
           </template>
         </el-table-column>
-        <el-table-column label="总经理审批" align="center" min-width="70">
+        <el-table-column label="财务审批" align="center" min-width="60">
           <template slot-scope="scope">
             {{ scope.row.审批人3姓名 ? scope.row.审批人3姓名 : '未审批' }}
           </template>
diff --git a/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue b/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue
index 887a1179..bb24fb59 100644
--- a/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue
+++ b/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue
@@ -66,7 +66,7 @@
             {{ scope.row.申请时间 ? scope.row.申请时间 : '—' }}
           </template>
         </el-table-column>
-        <el-table-column label="采购审批" align="center" min-width="60">
+        <el-table-column label="采购审批" align="center" min-width="70">
           <template slot-scope="scope">
             {{ scope.row.审批人1姓名 ? scope.row.审批人1姓名 : '未审批' }}
           </template>
@@ -76,17 +76,7 @@
             {{ scope.row.审批1时间 ? scope.row.审批1时间 : '—' }}
           </template>
         </el-table-column>
-        <el-table-column label="财务审批" align="center" min-width="60">
-          <template slot-scope="scope">
-            {{ scope.row.审批人3姓名 ? scope.row.审批人3姓名 : '未审批' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="审批时间" align="center" min-width="115">
-          <template slot-scope="scope">
-            {{ scope.row.审批3时间 ? scope.row.审批3时间 : '—' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="总经理审批" align="center" min-width="70">
+        <el-table-column label="总经理审批" align="center" min-width="90">
           <template slot-scope="scope">
             {{ scope.row.审批人4姓名 ? scope.row.审批人4姓名 : '未审批' }}
           </template>
@@ -96,6 +86,16 @@
             {{ scope.row.审批4时间 ? scope.row.审批4时间 : '—' }}
           </template>
         </el-table-column>
+        <el-table-column label="财务审批" align="center" min-width="70">
+          <template slot-scope="scope">
+            {{ scope.row.审批人3姓名 ? scope.row.审批人3姓名 : '未审批' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="审批时间" align="center" min-width="115">
+          <template slot-scope="scope">
+            {{ scope.row.审批3时间 ? scope.row.审批3时间 : '—' }}
+          </template>
+        </el-table-column>
         <el-table-column label="操作" align="center" width="100">
           <template slot-scope="scope">
             <el-button :disabled="false" type="primary" size="mini" @click="excuteApprove(scope.row)">审批</el-button>
@@ -194,11 +194,11 @@ export default {
   },
   methods: {
     fetchData() {
-      console.log(this.token)
+      // console.log(this.token)
     },
     searchTable1() {
       this.date1 && this.date2 ? this.check1 = 1 : (this.check1 = 0, this.date1 = '', this.date2 = '')
-      searchTable1(this.check1, this.date1, this.date2, this.pageCurrent1, this.pageSize1).then(response => {
+      searchTable1(this.check1, this.date1, this.date2, this.pageCurrent1, this.pageSize1, this.token).then(response => {
         this.tableData1 = response.data.rows
         this.tableData1.map(v => {
           this.$set(v, 'scanSrc', '')
diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue
index 36fd2587..5cbaa94d 100644
--- a/src/views/layout/components/Navbar.vue
+++ b/src/views/layout/components/Navbar.vue
@@ -27,6 +27,7 @@ import Breadcrumb from '@/components/Breadcrumb'
 import Hamburger from '@/components/Hamburger'
 import { searchTable1 } from '@/api/PurchasingCenter/PurchaseContractApproval'
 import { initApproval, initApprovalOffline } from '@/api/PurchasingCenter/FundApproval'
+import { searchTable1 as searchTableInvoice } from '@/api/PurchasingCenter/InvoiceSettlementApprove'
 export default {
   components: {
     Breadcrumb,
@@ -36,7 +37,8 @@ export default {
     return {
       timer: '',
       noticeContract: null,
-      noticeFund: null
+      noticeFund: null,
+      noticeInvoice: null
     }
   },
   computed: {
@@ -44,7 +46,8 @@ export default {
       'sidebar',
       'avatar',
       'name',
-      'id'
+      'id',
+      'token'
     ])
   },
   mounted() {
@@ -95,6 +98,20 @@ export default {
           })
         }
       })
+      searchTableInvoice(0, null, null, 1, 999, this.token).then(res => {
+        if (res.data.total) {
+          this.noticeInvoice = null
+          this.noticeInvoice = this.$notify.info({
+            title: '提示',
+            message: '您有发票结算申请待审批，请及时处理，点击查看',
+            onClick: () => {
+              this.$router.push({ path: '/InvoiceSettlementApprove/index' })
+              setTimeout(this.noticeInvoice.close(), 1000)
+            },
+            duration: 1000 * 60
+          })
+        }
+      })
     },
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')