|
@@ -299,7 +299,8 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column :label="$t('operation')" min-width="180" fixed="right" v-if="!isAuditList && !isSyncData">
|
|
|
<template slot-scope="scope">
|
|
|
- <div v-if="(scope.row.status != 0 && scope.row.ownerId == user.id) || permissions.leaveAll">
|
|
|
+ <!-- <div v-if="(scope.row.status != 0 && scope.row.ownerId == user.id) || permissions.leaveAll"> -->
|
|
|
+ <div v-if="(scope.row.status != 0 || permissions.leaveAll) && scope.row.ownerId == user.id">
|
|
|
<el-button size="mini" v-if="scope.row.status == 3 ||scope.row.status == 2" @click.stop.native="deletes(scope.row)" >删除</el-button>
|
|
|
<el-button size="mini" v-if="scope.row.status == 1" @click.stop.native="cancel(scope.row)">撤回</el-button>
|
|
|
<el-button size="mini" v-if="scope.row.status == 3 ||scope.row.status == 2 " type="primary" @click.stop.native="editor(scope.row)">重新提交</el-button>
|
|
@@ -1924,6 +1925,7 @@ export default {
|
|
|
res => {
|
|
|
if (res.code == "ok") {
|
|
|
this.addForm.timeDays = res.data
|
|
|
+ this.timeChoose = res.data
|
|
|
} else {
|
|
|
this.$message({
|
|
|
message: res.msg,
|