【修改】修改流程传参 修改名称样式
This commit is contained in:
@@ -9,15 +9,15 @@
|
||||
height: '48px'}"
|
||||
border
|
||||
@sort-change="sortChange">
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
prop="orgName"
|
||||
align="center"
|
||||
label="审批人所在部门">
|
||||
<template slot-scope="scope">
|
||||
<span >{{ scope.row.orgName }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- <el-table-column-->
|
||||
<!-- show-overflow-tooltip-->
|
||||
<!-- prop="orgName"-->
|
||||
<!-- align="center"-->
|
||||
<!-- label="审批人所在部门">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <span >{{ scope.row.orgName }}</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<el-table-column
|
||||
prop="assignee"
|
||||
align="center"
|
||||
@@ -53,9 +53,9 @@
|
||||
align="center"
|
||||
label="开始时间"
|
||||
prop="startTime"
|
||||
sortable="custom">
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.startTime ? formatIssueDate(scope.row.startTime) : '' }}</span>
|
||||
<span> {{formatDate(scope.row.startTime,"yyyy-mm-dd hh:mm:ss")}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
@@ -64,11 +64,12 @@
|
||||
align="center"
|
||||
label="完成时间"
|
||||
prop="endTime"
|
||||
sortable="custom">
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.endTime ? formatIssueDate(scope.row.endTime) : '' }}</span>
|
||||
</template>
|
||||
<span>{{formatDate(scope.row.endTime?scope.row.endTime:'',"yyyy-mm-dd hh:mm:ss")}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
width="150px"
|
||||
@@ -106,12 +107,17 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
|
||||
import { formatDate } from '@/utils/date'
|
||||
export default {
|
||||
name: 'approvalHistory',
|
||||
props: ['query'],
|
||||
props: {
|
||||
prcNum:{
|
||||
type:String
|
||||
}
|
||||
},
|
||||
data () {
|
||||
return {
|
||||
formatDate,
|
||||
loading: false,
|
||||
standTableList: [],
|
||||
importModalshowflagtemp: false,
|
||||
@@ -147,10 +153,10 @@ export default {
|
||||
},
|
||||
getListByInstance (form) {
|
||||
this.$api.process.getHistory({
|
||||
prcNum: this.query.prcNum,
|
||||
prcNum: this.prcNum,
|
||||
...form
|
||||
}).then(res => {
|
||||
this.standTableList = res
|
||||
this.standTableList = res.data
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
@@ -131,8 +131,8 @@
|
||||
></pagination>
|
||||
|
||||
<!-- 已选择的用户 -->
|
||||
<el-divider content-position="left">已选择</el-divider>
|
||||
<div class="checked-user-list">
|
||||
<el-divider v-if="maxSelected !== 1" content-position="left">已选择</el-divider>
|
||||
<div v-if="maxSelected !== 1" class="checked-user-list">
|
||||
<el-tag
|
||||
size="medium"
|
||||
closable
|
||||
@@ -703,6 +703,9 @@ export default {
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.org-table {
|
||||
::v-deep .el-form-item--mini .el-form-item__content{
|
||||
line-height: 40px;
|
||||
}
|
||||
::v-deep .el-dialog__header {
|
||||
padding: 0 20px;
|
||||
height: 50px;
|
||||
|
||||
@@ -317,7 +317,7 @@ export default {
|
||||
|
||||
}).then(() => {
|
||||
changeAssigneeNew({
|
||||
taskId: this.$store.getters.getHandleInfo.taskIds, // 任务id
|
||||
taskId: this.$store.getters.getHandleInfo.taskId, // 任务id
|
||||
assignee, // 被委托人
|
||||
userId: this.$store.getters.userInfo.userId, // 委托人
|
||||
pId: this.$store.getters.getHandleInfo.prcId // 流程实例
|
||||
|
||||
@@ -92,13 +92,18 @@
|
||||
completeProcess(obj) {
|
||||
this.$api.process.completeTask(obj).then(res=>{
|
||||
this.$message['success']('提交成功')
|
||||
this.$router.back(-1)
|
||||
this.$router.push({
|
||||
path:"/userCenter/processCenter",
|
||||
query:{
|
||||
id:'AEHJB8YNJ3'
|
||||
}
|
||||
})
|
||||
})
|
||||
},
|
||||
// 获取流程详细信息
|
||||
getProcessDetail(){
|
||||
getProcessDetail(params){
|
||||
return new Promise((resolve,reject)=>{
|
||||
this.$api.process.getProcessDetail({taskId:this.taskIds}).then(res=>{
|
||||
this.$api.process.getProcessDetail(params).then(res=>{
|
||||
let data=res.data
|
||||
this.processOld=data.data
|
||||
resolve()
|
||||
|
||||
Reference in New Issue
Block a user