修改监控流程详情
This commit is contained in:
@@ -38,7 +38,7 @@ export default {
|
||||
return request({
|
||||
url: '/api/createModel',
|
||||
method: 'get',
|
||||
data: data
|
||||
params: data
|
||||
})
|
||||
},
|
||||
//删除模板
|
||||
@@ -49,5 +49,14 @@ export default {
|
||||
params: data
|
||||
})
|
||||
},
|
||||
//转办
|
||||
changeAssignee (data){
|
||||
return request({
|
||||
url: '/api/changeAssignee',
|
||||
method: 'get',
|
||||
params: data
|
||||
})
|
||||
},
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -46,6 +46,13 @@ export default {
|
||||
params: data,
|
||||
responseType: 'blob',
|
||||
})
|
||||
},
|
||||
//强制撤回
|
||||
getBack(data){
|
||||
return request({
|
||||
url: '/api/forceRecall',
|
||||
method: 'GET',
|
||||
params: data
|
||||
})
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -48,6 +48,11 @@ instance.interceptors.response.use(function (response) {
|
||||
store.commit('saveUserInfo', null)
|
||||
router.push('/login')
|
||||
Message.error('登录超时过期')
|
||||
//清除vuex
|
||||
this.$store.commit('saveUserInfo', null)
|
||||
this.$store.commit('savePathUrl', null)
|
||||
this.$store.commit('saveMenuName', null)
|
||||
this.$store.commit('saveMenuData', null)
|
||||
// var url = 'http://192.168.144.22:9966/login?loginType=1'
|
||||
// // var url = 'http://10.64.23.30:7766/home'
|
||||
//
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<!-- 流程详情 -->
|
||||
<template>
|
||||
<div id="processDetails" v-loading="loading">
|
||||
<div id="processDetails" class="content-height" v-loading="loading">
|
||||
<div class="flow-chart">
|
||||
<div class="flow-header">
|
||||
<div class="back" title="返回" @click="back">
|
||||
@@ -31,87 +31,21 @@
|
||||
<!-- >导出</el-button>-->
|
||||
</div>
|
||||
<div class="flow-list">
|
||||
<el-table
|
||||
height="100%"
|
||||
ref="selection"
|
||||
:data="detailData"
|
||||
tooltip-effect="dark"
|
||||
style="width: 100%"
|
||||
border
|
||||
row-key="id"
|
||||
:no-data-text="listNoDataText"
|
||||
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
|
||||
@selection-change="tableChange"
|
||||
>
|
||||
<el-table-column
|
||||
type="selection"
|
||||
width="55"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="name"
|
||||
label="任务步骤"
|
||||
align="center"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="assignee"
|
||||
label="任务受理人"
|
||||
align="center"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="createTime"
|
||||
label="创建时间"
|
||||
sortable
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.createTime ? formatIssueDate(scope.row.createTime) : '' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="endTime"
|
||||
label="完成时间"
|
||||
align="center"
|
||||
sortable>
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.endTime ? formatIssueDate(scope.row.endTime) : '' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="approvalOpinion"
|
||||
label="审批意见"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-tooltip class="item" effect="dark" :content="scope.row.approvalOpinion" placement="top">
|
||||
<span>{{scope.row.approvalOpinion}}</span>
|
||||
</el-tooltip>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- <el-table-column-->
|
||||
<!-- prop="completeFlag"-->
|
||||
<!-- label="状态"-->
|
||||
<!-- align="center">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column label="操作" align="center" width="50">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <div @click.stop style="display: inline-block">-->
|
||||
<!-- <el-dropdown trigger="click" @command="handleCommand">-->
|
||||
<!-- <i class="iconfont"></i>-->
|
||||
<!-- <el-dropdown-menu slot="dropdown">-->
|
||||
<!-- <el-dropdown-item :command="[scope.row, '查看']">查看</el-dropdown-item>-->
|
||||
<!-- <el-dropdown-item :command="[scope.row, '删除']">删除</el-dropdown-item>-->
|
||||
<!-- </el-dropdown-menu>-->
|
||||
<!-- </el-dropdown>-->
|
||||
<!-- </div>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
</el-table>
|
||||
<!-- <loading :loading="loading">流程列表加载中</loading>-->
|
||||
|
||||
<vxe-table ref="xTable" :data="detailData" :empty-render="{name: 'NotData'}" align="center" border stripe
|
||||
v-table-min-height="'calc(100% - 50px)'" max-height="95%">
|
||||
<vxe-column type="checkbox" width="60"></vxe-column>
|
||||
<vxe-column show-overflow show-header-overflow field="taskId"
|
||||
title="任务步骤"></vxe-column>
|
||||
<vxe-column show-overflow show-header-overflow field="assignee" title="任务受理人"></vxe-column>
|
||||
<vxe-column show-overflow show-header-overflow field="createTime"
|
||||
title="创建时间"></vxe-column>
|
||||
<vxe-column show-overflow show-header-overflow field="endTime" title="完成时间"></vxe-column>
|
||||
<vxe-column show-overflow show-header-overflow field="approvalOpinion"
|
||||
title="审批意见"></vxe-column>
|
||||
<vxe-column show-overflow show-header-overflow field="status"
|
||||
title="状态"></vxe-column>
|
||||
</vxe-table>
|
||||
<el-drawer
|
||||
title="调整处理人"
|
||||
:visible.sync="drawerModal"
|
||||
@@ -368,7 +302,7 @@ export default {
|
||||
sortWord: this.shunxu ? this.paixu : '',
|
||||
shunxu: this.shunxu
|
||||
}).then(res=>{
|
||||
this.detailData = res
|
||||
this.detailData = [{name:1},{name:1},{name:1},]
|
||||
res[res.length - 1].endTime ? this.urgeRowFlag = false : this.urgeRowFlag = true
|
||||
})
|
||||
},
|
||||
|
||||
@@ -38,14 +38,11 @@ export default {
|
||||
};
|
||||
},
|
||||
methods: {
|
||||
handleClose(done) {
|
||||
this.$confirm('确认关闭?')
|
||||
.then(_ => {
|
||||
done();
|
||||
})
|
||||
.catch(_ => { });
|
||||
handleClose() {
|
||||
this.dialogVisible = true
|
||||
},
|
||||
open() {
|
||||
this.form.name
|
||||
this.dialogVisible = true
|
||||
},
|
||||
submit() {
|
||||
@@ -95,4 +92,4 @@ export default {
|
||||
height: 40px;
|
||||
border-radius: 30px;
|
||||
margin-right: 30px;
|
||||
}</style>
|
||||
}</style>
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
<el-button type="text" size="small">
|
||||
查看
|
||||
</el-button>
|
||||
<el-button type="text" size="small">
|
||||
<el-button type="text" size="small" @click="withdraw">
|
||||
<span>强制撤回</span>
|
||||
</el-button>
|
||||
</template>
|
||||
@@ -67,11 +67,31 @@ export default {
|
||||
this.loadData()
|
||||
},
|
||||
methods: {
|
||||
//撤回
|
||||
withdraw(row){
|
||||
this.$confirm('确认强制撤回该条数据?', '强制撤回', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
confirmButtonClass: 'common-button-primary',
|
||||
type: 'warning'
|
||||
}).then(() => {
|
||||
this.$api.processCenter.getBack({prcId: row.prcId}).then(res => {
|
||||
this.$message.success(res.data.message)
|
||||
this.loadData()
|
||||
}).catch(err => {
|
||||
console.log(err)
|
||||
this.tableData = [{name: 1}]
|
||||
})
|
||||
})
|
||||
},
|
||||
loadData() {
|
||||
let userId=this.$store.getters.userInfo.usid
|
||||
this.$api.processCenter.sentProcessPage({...this.q,...this.searchForm,userId:userId}).then(res=>{
|
||||
this.tableData = res.data.list
|
||||
this.tableData = res.data.list.length>0 ?res.data.list:[{name:1}]
|
||||
this.total = res.data.count
|
||||
}).catch(err=>{
|
||||
console.log(err)
|
||||
this.tableData = [{name:1}]
|
||||
})
|
||||
},
|
||||
// 单页数据量
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
return {
|
||||
modelId : '',
|
||||
name: '',
|
||||
actUrl: 'http://10.0.10.87:7060/bat-wkflow/modeler.html?modelId='
|
||||
actUrl: 'http://10.0.10.173:7060/modeler.html?modelId='
|
||||
}
|
||||
},
|
||||
created() {
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
<template #default="{ row }">
|
||||
<el-button type="text" @click="editRow(row)">编辑</el-button>
|
||||
<el-button type="text" @click="deploy(row)">部署</el-button>
|
||||
<el-button type="text" @click="deleteRow(row)">删除</el-button>
|
||||
<el-button type="text" class="deleRed" @click="deleteRow(row)">删除</el-button>
|
||||
</template>
|
||||
</vxe-column>
|
||||
</vxe-table>
|
||||
@@ -162,7 +162,7 @@ export default {
|
||||
|
||||
type: 'warning'
|
||||
}).then(() => {
|
||||
this.$api.process.deploy({id: row.id}).then(res=>{
|
||||
this.$api.process.deploy({modelId: row.id}).then(res=>{
|
||||
this.$message.warning(res.message)
|
||||
this.queryTablePage()
|
||||
})
|
||||
@@ -286,5 +286,8 @@ export default {
|
||||
padding: 20px 20px;
|
||||
}
|
||||
}
|
||||
.deleRed{
|
||||
color: red !important;
|
||||
}
|
||||
|
||||
</style>
|
||||
|
||||
Reference in New Issue
Block a user