|
@@ -186,7 +186,10 @@
|
|
|
|
|
|
<vxe-column title="操作" width="130px" fixed="right" align="center">
|
|
|
<template #default="scope">
|
|
|
- <el-button v-if="hasPermission('ccpm:info:edit') && scope.row.createId === $store.state.user.id && (scope.row.type === '1' || scope.row.type === '3' )" text type="primary" @click="edit(scope.row)">修改</el-button>
|
|
|
+<!-- 管理员修改-->
|
|
|
+ <el-button v-if=" (scope.row.type === '5' && isAdmin)" text type="primary" @click="editForm(scope.row)">修改</el-button>
|
|
|
+
|
|
|
+ <el-button v-if="hasPermission('ccpm:info:edit') && scope.row.createId === $store.state.user.id && (scope.row.type === '1' || scope.row.type === '3' )" text type="primary" @click="edit(scope.row)">修改</el-button>
|
|
|
<el-button v-if="hasPermission('ccpm:info:edit') && scope.row.createId === $store.state.user.id && (scope.row.type === '4')" text type="primary" @click="todo(scope.row)">驳回调整</el-button>
|
|
|
<el-button v-if="hasPermission('ccpm:info:edit') && scope.row.createId === $store.state.user.id && (scope.row.type === '2')" text type="primary" @click="reback(scope.row)">撤回</el-button>
|
|
|
<el-button v-if="hasPermission('ccpm:info:del') && scope.row.createId === $store.state.user.id && (scope.row.type === '1')" text type="primary" @click="del(scope.row.id)">删除</el-button>
|
|
@@ -224,7 +227,7 @@
|
|
|
import UserSelect from '@/components/userSelect'
|
|
|
import SelectTree from '@/components/treeSelect/treeSelect.vue'
|
|
|
import ProjectChooseForm from '../projectInfo/ProjectChooseForm'
|
|
|
- import InfoForm from './InfoForm'
|
|
|
+ import InfoForm from './InfoUpdateForm'
|
|
|
import taskService from '@/api/flowable/taskService'
|
|
|
import processService from '@/api/flowable/processService'
|
|
|
import pick from 'lodash.pick'
|
|
@@ -264,6 +267,8 @@
|
|
|
isZj:false,
|
|
|
isZjbry:false,
|
|
|
isSs:false,
|
|
|
+ isAdmin:false,
|
|
|
+ isDgsbxBmzr:false,
|
|
|
}
|
|
|
},
|
|
|
// reimbursementService: null,
|
|
@@ -332,7 +337,7 @@
|
|
|
let tabTitle = `发起流程【项目-报销审批】`
|
|
|
let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [项目-报销审批]`
|
|
|
console.log(this.processDefinitionId)
|
|
|
- if (this.isZj){
|
|
|
+ if (this.isZj || this.isDgsbxBmzr){
|
|
|
taskService.getTaskDef({ procDefId: this.processDefinitionIdSzbx,
|
|
|
status: 'startAndHold'}).then((data) => {
|
|
|
this.$router.push({
|
|
@@ -431,7 +436,7 @@
|
|
|
// 读取流程表单
|
|
|
let tabTitle = `发起流程【项目-报销审批】`
|
|
|
let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [项目-报销审批]`
|
|
|
- if (this.isZj){
|
|
|
+ if (this.isZj || this.isDgsbxBmzr){
|
|
|
taskService.getTaskDef({ procDefId: this.processDefinitionIdSzbx,
|
|
|
businessId: row.id,
|
|
|
businessTable: 'ccpm_reimbursement_info',
|
|
@@ -569,6 +574,10 @@
|
|
|
view (id) {
|
|
|
this.$refs.infoForm.init('view', id)
|
|
|
},
|
|
|
+ //管理员修改
|
|
|
+ editForm(row){
|
|
|
+ this.$refs.infoForm.init('edit', row.id)
|
|
|
+ },
|
|
|
// 查看报销项目
|
|
|
viewProject (id) {
|
|
|
// this.$refs.projectForm.init('view', id)
|
|
@@ -580,6 +589,12 @@
|
|
|
console.log('this.isZj',this.isZj)
|
|
|
})
|
|
|
},
|
|
|
+ checkIsDgsbxBmzr(){
|
|
|
+ userService.isDgsbxBmzr().then((data)=>{
|
|
|
+ this.isDgsbxBmzr = data
|
|
|
+ console.log('this.isZj',this.isZj)
|
|
|
+ })
|
|
|
+ },
|
|
|
//是否是总经办人员
|
|
|
checkIsZjbry(){
|
|
|
userService.isZjbry().then((data)=>{
|
|
@@ -592,6 +607,12 @@
|
|
|
this.isSs = data
|
|
|
})
|
|
|
},
|
|
|
+ // 查询当前用户是否是管理员用户
|
|
|
+ checkIsAdmin () {
|
|
|
+ userService.is().then((data) => {
|
|
|
+ this.isAdmin = data
|
|
|
+ })
|
|
|
+ },
|
|
|
// 获取数据列表
|
|
|
refreshList () {
|
|
|
this.loading = true
|
|
@@ -616,8 +637,10 @@
|
|
|
// this.loading = false
|
|
|
// })
|
|
|
this.checkIsZj()
|
|
|
+ this.checkIsDgsbxBmzr()
|
|
|
this.checkIsZjbry()
|
|
|
this.checkIsSs()
|
|
|
+ this.checkIsAdmin()
|
|
|
processService.getByName('项目-报销审批').then((data) => {
|
|
|
if (!this.commonJS.isEmpty(data.id)) {
|
|
|
this.processDefinitionId = data.id
|
|
@@ -687,7 +710,7 @@
|
|
|
// 流程详情
|
|
|
detail (row) {
|
|
|
if (!this.commonJS.isEmpty(row.type) && row.type !== '1') {
|
|
|
- if (this.isZj){
|
|
|
+ if (this.isZj || this.isDgsbxBmzr){
|
|
|
if (row.reimbursementType === '1') {
|
|
|
this.procDefId = this.processDefinitionIdSzbxInvoice
|
|
|
} else if (row.reimbursementType === '0') {
|