meswork/JY1.0
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

审批half

Browse Source
This commit is contained in:
chenjianan
2019-05-28 16:20:34 +08:00
parent d8357d9647
commit ce6d9a3e4a
4 changed files with 38 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/PurchasingCenter/InvoiceSettlementApprove.js
View File

@@ -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]
}
})

8
src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue
View File

@@ -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>

28
src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue
View File

@@ -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', '')

21
src/views/layout/components/Navbar.vue
View File

@@ -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')