禅道bug修复
This commit is contained in:
parent
0d656175d5
commit
999c3565d1
|
|
@ -1,7 +1,7 @@
|
||||||
<template>
|
<template>
|
||||||
<div class="app-container">
|
<div class="app-container">
|
||||||
<el-form v-show="showSearch" :model="queryParams" ref="queryForm" size="small" inline>
|
<el-form v-show="showSearch" :model="queryParams" ref="queryForm" size="small" inline>
|
||||||
<el-form-item label="关键字---" prop="keyWord">
|
<el-form-item label="关键字" prop="keyWord">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="queryParams.keyWord"
|
v-model="queryParams.keyWord"
|
||||||
placeholder="请输入关键字"
|
placeholder="请输入关键字"
|
||||||
|
|
@ -74,7 +74,7 @@
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-button type="text" size="mini" @click="handleRectify(scope.row, 5)">查看</el-button>
|
<el-button type="text" size="mini" @click="handleRectify(scope.row, 5)">查看</el-button>
|
||||||
<el-button
|
<el-button
|
||||||
v-if="scope.row.isDelayCheck == '1'"
|
v-if="scope.row.isDelayCheck == '1' && scope.row.userId == userId"
|
||||||
type="text"
|
type="text"
|
||||||
size="mini"
|
size="mini"
|
||||||
style="color: #f56c6c"
|
style="color: #f56c6c"
|
||||||
|
|
@ -159,6 +159,7 @@ export default {
|
||||||
{ label: '已驳回', value: '4' },
|
{ label: '已驳回', value: '4' },
|
||||||
{ label: '已撤回', value: '5' },
|
{ label: '已撤回', value: '5' },
|
||||||
],
|
],
|
||||||
|
userId: this.$store.state.user.id,
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
created() {
|
created() {
|
||||||
|
|
|
||||||
|
|
@ -82,7 +82,7 @@
|
||||||
type="text"
|
type="text"
|
||||||
size="mini"
|
size="mini"
|
||||||
style="color: #f56c6c"
|
style="color: #f56c6c"
|
||||||
@click="handleRectify(scope.row, 3)"
|
@click="handleRectify(scope.row, 1)"
|
||||||
v-if="scope.row.intoStatus == '1'"
|
v-if="scope.row.intoStatus == '1'"
|
||||||
>
|
>
|
||||||
审批
|
审批
|
||||||
|
|
|
||||||
|
|
@ -124,7 +124,7 @@
|
||||||
v-hasPermi="['system:subPersonApply:list']"
|
v-hasPermi="['system:subPersonApply:list']"
|
||||||
@click="handleApprove(scope.row)"
|
@click="handleApprove(scope.row)"
|
||||||
>
|
>
|
||||||
审批---
|
审批
|
||||||
</el-button>
|
</el-button>
|
||||||
<el-button size="mini" type="text" @click="handleView(scope.row)" v-else>查看</el-button>
|
<el-button size="mini" type="text" @click="handleView(scope.row)" v-else>查看</el-button>
|
||||||
<el-button size="mini" type="text" @click="handleAuditRecord(scope.row)">审核记录</el-button>
|
<el-button size="mini" type="text" @click="handleAuditRecord(scope.row)">审核记录</el-button>
|
||||||
|
|
|
||||||
|
|
@ -82,6 +82,16 @@
|
||||||
<el-table-column label="操作" align="center" width="150">
|
<el-table-column label="操作" align="center" width="150">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-button type="text" size="mini" @click="handleRectify(scope.row, 3)">查看</el-button>
|
<el-button type="text" size="mini" @click="handleRectify(scope.row, 3)">查看</el-button>
|
||||||
|
|
||||||
|
<template v-if="userType == '01'">
|
||||||
|
<template v-if="scope.row.intoStatus == '1' && scope.row.type != 1">
|
||||||
|
<el-button type="text" size="mini" style="color: #f56c6c" @click="handleRectify(scope.row, 1)">
|
||||||
|
审批
|
||||||
|
</el-button>
|
||||||
|
</template>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<template v-else>
|
||||||
<el-button
|
<el-button
|
||||||
type="text"
|
type="text"
|
||||||
size="mini"
|
size="mini"
|
||||||
|
|
@ -91,6 +101,8 @@
|
||||||
>
|
>
|
||||||
审批
|
审批
|
||||||
</el-button>
|
</el-button>
|
||||||
|
</template>
|
||||||
|
|
||||||
<el-button type="text" size="mini" style="color: #e6a23c" @click="handleRectify(scope.row, 2)">
|
<el-button type="text" size="mini" style="color: #e6a23c" @click="handleRectify(scope.row, 2)">
|
||||||
审批记录
|
审批记录
|
||||||
</el-button>
|
</el-button>
|
||||||
|
|
@ -162,10 +174,12 @@ export default {
|
||||||
],
|
],
|
||||||
// 表格数据
|
// 表格数据
|
||||||
tableList: [],
|
tableList: [],
|
||||||
|
userType: '',
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
created() {
|
created() {
|
||||||
this.getList()
|
this.getList()
|
||||||
|
this.userType = this.$store.state.user.userType
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
updateStatus(status) {
|
updateStatus(status) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue