修改标准征求意见流程审批历史
This commit is contained in:
范强强
@@ -27,6 +27,7 @@ import SQTree from './SQTree'
|
||||
import OrgTable from './OrgTable'
|
||||
import MySelect from './mySelect'
|
||||
import PhoneHistortTable from './phoneHistortTable'
|
||||
import processNodeInformation from './processNodeInformation'
|
||||
|
||||
import phoneRole from './phoneRole'
|
||||
|
||||
@@ -57,6 +58,7 @@ const install = function (Vue) {
|
||||
Vue.component('MySelect', MySelect)
|
||||
Vue.component('phoneRole', phoneRole)
|
||||
Vue.component('PhoneHistortTable', PhoneHistortTable)
|
||||
Vue.component('processNodeInformation', processNodeInformation)
|
||||
}
|
||||
|
||||
export default {
|
||||
|
||||
@@ -0,0 +1,551 @@
|
||||
<template>
|
||||
<div class="flow-chart-box">
|
||||
<div class="flow-chart">
|
||||
<div class="flow-group-process" v-if="$route.query.oldAndNew == 'new'">
|
||||
<div class="flow-group-process-stard">
|
||||
开始
|
||||
</div>
|
||||
<div v-for="(item,index) in nameList"
|
||||
:class="{'flow-group-process-box-one':arrangeFromTheLeft(index + 1)}"
|
||||
class="flow-group-process-box">
|
||||
<div v-if="leftArrow(index + 1)"
|
||||
:class="{'flow-group-process-arrow-left':arrangeFromTheLeft(index + 1)}"
|
||||
class="flow-group-process-arrow">
|
||||
</div>
|
||||
<div class="flow-group-process-content"
|
||||
:style="backdrop(item.taskStatus)"
|
||||
:class="{'flow-group-process-content-dis':!leftArrow(index + 1)}">
|
||||
<div class="flow-group-process-content-top">
|
||||
{{item.taskKeyName}}
|
||||
</div>
|
||||
<el-tooltip placement="top">
|
||||
<div slot="content">
|
||||
<div style="margin-bottom: 4px"
|
||||
v-for="val1 in item.userNames">
|
||||
{{val1}}
|
||||
</div>
|
||||
</div>
|
||||
<div class="flow-group-process-content-bottom"
|
||||
v-if="item.userNames && item.userNames.length > 0">
|
||||
<div v-if="item.userNames && item.userNames.length > 0"
|
||||
v-for="val in item.userNames">
|
||||
<div>{{val}}</div>
|
||||
</div>
|
||||
</div>
|
||||
</el-tooltip>
|
||||
<div class="flow-group-process-content-bottom" v-if="!item.userNames">
|
||||
<div>暂未选择处理人</div>
|
||||
</div>
|
||||
</div>
|
||||
<div v-if="isVerticalLine(index + 1)"
|
||||
:class="{'flow-group-process-arrow-one':(index + 1) % num == 0 ? true : false}"
|
||||
class="flow-group-process-arrow"></div>
|
||||
<div v-if="!arrangeFromTheLeft(index + 1) && (index + 1) == nameList.length
|
||||
&& (index + 1) % num != 0"
|
||||
:class="{'flow-group-process-arrow-left':arrangeFromTheLeft(index + 1)}"
|
||||
class="flow-group-process-arrow">
|
||||
</div>
|
||||
</div>
|
||||
<div class="flow-group-process-end"
|
||||
:style="backdrop(nameList[nameList.length - 1].taskStatus == 'done' ? 'done' : '')"
|
||||
:class="{'flow-group-process-end-left':isProcessEnd(nameList.length),
|
||||
'flow-group-process-end-one':isProcessEndOne(nameList.length),}">
|
||||
结束
|
||||
</div>
|
||||
</div>
|
||||
<img v-else :src="processStep" class="process-img">
|
||||
</div>
|
||||
<div class="flow-list">
|
||||
|
||||
<el-table
|
||||
v-if="$route.query.oldAndNew == 'new'"
|
||||
height="100%"
|
||||
ref="selection"
|
||||
:data="histortData"
|
||||
tooltip-effect="dark"
|
||||
style="width: 100%"
|
||||
border
|
||||
row-key="id"
|
||||
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
|
||||
<el-table-column
|
||||
type="index"
|
||||
width="55"
|
||||
label="序号"
|
||||
align="center"/>
|
||||
<el-table-column
|
||||
prop="taskKeyShow"
|
||||
label="任务步骤"
|
||||
align="center"
|
||||
/>
|
||||
<el-table-column
|
||||
prop="userName"
|
||||
label="任务受理人"
|
||||
align="center"
|
||||
/>
|
||||
<el-table-column
|
||||
prop="createTime"
|
||||
label="创建时间"
|
||||
align="center"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="endTime"
|
||||
label="完成时间"
|
||||
align="center"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="commitText"
|
||||
label="意见内容"
|
||||
align="center"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.commitText }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="completeFlag"
|
||||
label="状态"
|
||||
align="center"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.taskStatusShow }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<el-table
|
||||
v-else
|
||||
height="100%"
|
||||
ref="selection"
|
||||
:data="histortData"
|
||||
tooltip-effect="dark"
|
||||
style="width: 100%"
|
||||
border
|
||||
row-key="id"
|
||||
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
|
||||
<el-table-column
|
||||
label="序号"
|
||||
align="center"
|
||||
type="index"
|
||||
width="50">
|
||||
</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="创建时间"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="endTime"
|
||||
label="完成时间"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="comment"
|
||||
label="流程信息"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.commentText }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="completeFlag"
|
||||
label="状态"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.endTime ? '已完成' : scope.row.receiveStatus ? '已接收' : '未完成' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
<loading :loading="loading">流程列表加载中</loading>
|
||||
</div>
|
||||
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import axios from "axios";
|
||||
|
||||
export default {
|
||||
name: "index",
|
||||
props: {
|
||||
prcId: {
|
||||
type: String,
|
||||
default: ''
|
||||
},
|
||||
prcType: {
|
||||
type: String,
|
||||
default: ''
|
||||
},
|
||||
prcNum: {
|
||||
type: String,
|
||||
default: ''
|
||||
},
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
histortData: [],
|
||||
processStep: '',
|
||||
nameList: [],
|
||||
loading: false,
|
||||
num: 0
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
if (this.$route.query.oldAndNew == 'new') {
|
||||
this.getProcessList()
|
||||
} else {
|
||||
this.processNum()
|
||||
}
|
||||
this.processTable()
|
||||
},
|
||||
methods: {
|
||||
// 请求列表
|
||||
processTable() {
|
||||
let url = ''
|
||||
let query = {}
|
||||
if (this.$route.query.oldAndNew == 'new') {
|
||||
url = '/lawss/activiti/queryFlowHistoryList'
|
||||
query = {
|
||||
actiProcInstId: this.prcId,
|
||||
flowType: this.prcType,
|
||||
}
|
||||
} else {
|
||||
url = 'lawss/activiti/get_list_by_instance'
|
||||
query = {
|
||||
prcNum: this.prcNum,
|
||||
}
|
||||
}
|
||||
this.loading = true
|
||||
this.$http.get(url, query, {
|
||||
_this: this
|
||||
}, res => {
|
||||
this.histortData = res
|
||||
this.loading = false
|
||||
}, e => {
|
||||
})
|
||||
},
|
||||
getProcessList() {
|
||||
let query = {
|
||||
actiProcInstId: this.prcId,
|
||||
flowType: this.prcType,
|
||||
}
|
||||
this.$http.get('/lawss/activiti/getImgDataList', query, {
|
||||
_this: this
|
||||
}, res => {
|
||||
this.nameList = res
|
||||
this.nameList.forEach(val => {
|
||||
if (val.userNames) {
|
||||
val.userNames = val.userNames.split(',')
|
||||
}
|
||||
})
|
||||
this.$nextTick(() => {
|
||||
let flowGroupProcess = document.getElementsByClassName('flow-group-process')
|
||||
let num = (flowGroupProcess[0].offsetWidth - 100) / 248
|
||||
this.num = Math.floor(num)
|
||||
let width = 248 * this.num
|
||||
let offsetWidth = flowGroupProcess[0].offsetWidth
|
||||
flowGroupProcess[0].style.width = (offsetWidth - (offsetWidth - 100 - width) + 40) + 'px'
|
||||
})
|
||||
}, e => {
|
||||
})
|
||||
},
|
||||
arrangeFromTheLeft(index) {
|
||||
let num = Math.ceil(index / this.num)
|
||||
if (num % 2 == 0) {
|
||||
return true
|
||||
}
|
||||
return false
|
||||
},
|
||||
leftArrow(index) {
|
||||
let num = Math.ceil(index / this.num)
|
||||
if (num % 2 == 0) {
|
||||
if (index == this.num * num && this.nameList.length != index) {
|
||||
return false
|
||||
}
|
||||
} else {
|
||||
if (index > this.num) {
|
||||
if (index == this.num * (num - 1) + 1) {
|
||||
return false
|
||||
}
|
||||
}
|
||||
}
|
||||
return true
|
||||
},
|
||||
isVerticalLine(index) {
|
||||
let num = Math.ceil(index / this.num)
|
||||
if (index % this.num == 0 && this.nameList.length != index) {
|
||||
return true
|
||||
}
|
||||
if (num == index / this.num && num % 3 == 0) {
|
||||
return true
|
||||
}
|
||||
if (num == index / this.num && index <= this.num) {
|
||||
return true
|
||||
}
|
||||
return false
|
||||
},
|
||||
isProcessEnd(index) {
|
||||
let num = Math.ceil(index / this.num)
|
||||
if (num % 2 == 0) {
|
||||
return false
|
||||
} else {
|
||||
if (num == index / this.num && index <= this.num) {
|
||||
return false
|
||||
}
|
||||
if (num == index / this.num && num % 3 == 0) {
|
||||
return false
|
||||
}
|
||||
return true
|
||||
}
|
||||
},
|
||||
isProcessEndOne(index) {
|
||||
let num = Math.ceil(index / this.num)
|
||||
if (num == index / this.num && index <= this.num) {
|
||||
return true
|
||||
}
|
||||
if (num == index / this.num && num % 3 == 0) {
|
||||
return true
|
||||
}
|
||||
return false
|
||||
},
|
||||
backdrop(status) {
|
||||
if (status == 'done') {
|
||||
return {
|
||||
background: '#bcddff',
|
||||
border: '1px #79c8ff solid',
|
||||
}
|
||||
} else if (status == 'todo') {
|
||||
return {
|
||||
background: '#ebfccf',
|
||||
border: '1px #8bcb71 solid',
|
||||
}
|
||||
} else {
|
||||
return {
|
||||
background: '#fff',
|
||||
border: '1px #d6d6d6 solid',
|
||||
}
|
||||
}
|
||||
},
|
||||
// 请求转换流程图
|
||||
processNum() {
|
||||
axios.request({
|
||||
url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
|
||||
responseType: 'blob',
|
||||
method: 'get',
|
||||
params: {
|
||||
prcNum: this.prcNum
|
||||
}
|
||||
}).then(res => {
|
||||
// let blob = new Blob([res.data], {type: 'image/jpg'})
|
||||
// let url = window.URL.createObjectURL(res.data)
|
||||
this.processStep = window.URL.createObjectURL(res.data)
|
||||
})
|
||||
},
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped lang="less">
|
||||
.flow-chart-box {
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
.flow-chart {
|
||||
width: 100%;
|
||||
height: 45%;
|
||||
background: #F0F0F0;
|
||||
border: 1px solid #CCCDCE;
|
||||
border-bottom: none;
|
||||
padding: 10px;
|
||||
overflow-x: hidden;
|
||||
overflow-y: auto;
|
||||
margin-bottom: 16px;
|
||||
}
|
||||
|
||||
.flow-group-process {
|
||||
width: 100%;
|
||||
height: auto;
|
||||
min-height: 100%;
|
||||
padding: 20px;
|
||||
box-sizing: border-box;
|
||||
/*display: flex;*/
|
||||
/*align-items: center;*/
|
||||
/*flex-wrap: wrap;*/
|
||||
|
||||
.flow-group-process-stard {
|
||||
width: 100px;
|
||||
border-radius: 20px;
|
||||
height: 40px;
|
||||
background: #bcddff;
|
||||
border: 1px #79c8ff solid;
|
||||
font-size: 12px;
|
||||
color: #000;
|
||||
text-align: center;
|
||||
line-height: 40px;
|
||||
font-weight: 600;
|
||||
float: inline-start;
|
||||
margin-top: 18px;
|
||||
}
|
||||
|
||||
.flow-group-process-end {
|
||||
width: 100px;
|
||||
border-radius: 20px;
|
||||
height: 40px;
|
||||
background: #bcddff;
|
||||
border: 1px #79c8ff solid;
|
||||
font-size: 12px;
|
||||
color: #000;
|
||||
text-align: center;
|
||||
line-height: 40px;
|
||||
font-weight: 600;
|
||||
float: inline-end;
|
||||
margin-top: 20px;
|
||||
}
|
||||
|
||||
.flow-group-process-end-left {
|
||||
float: inline-start;
|
||||
}
|
||||
|
||||
.flow-group-process-end-one {
|
||||
margin-top: 0;
|
||||
margin-right: 17px;
|
||||
}
|
||||
|
||||
.flow-group-process-arrow {
|
||||
width: 100px;
|
||||
height: 1px;
|
||||
background: #c1c1c1;
|
||||
margin-right: 8px;
|
||||
}
|
||||
|
||||
.flow-group-process-arrow::after {
|
||||
content: "";
|
||||
display: inline-block;
|
||||
position: relative;
|
||||
left: 100px;
|
||||
top: -7px;
|
||||
border-left: 8px solid #c1c1c1;
|
||||
border-top: 4px solid transparent;
|
||||
border-bottom: 4px solid transparent;
|
||||
}
|
||||
|
||||
.flow-group-process-arrow-one {
|
||||
width: 30px;
|
||||
height: 1px;
|
||||
background: #c1c1c1;
|
||||
margin-right: 8px;
|
||||
transform: rotate(90deg);
|
||||
right: 44px;
|
||||
position: absolute;
|
||||
bottom: -16px;
|
||||
|
||||
}
|
||||
|
||||
.flow-group-process-arrow-one::after {
|
||||
content: "";
|
||||
display: inline-block;
|
||||
position: relative;
|
||||
left: 30px;
|
||||
top: -7px;
|
||||
border-left: 8px solid #c1c1c1;
|
||||
border-top: 4px solid transparent;
|
||||
border-bottom: 4px solid transparent;
|
||||
}
|
||||
|
||||
.flow-group-process-arrow-left {
|
||||
width: 100px;
|
||||
height: 1px;
|
||||
background: #c1c1c1;
|
||||
margin-right: 0;
|
||||
margin-left: 8px;
|
||||
}
|
||||
|
||||
.flow-group-process-arrow-left::after {
|
||||
content: "";
|
||||
display: inline-block;
|
||||
position: relative;
|
||||
left: -8px;
|
||||
top: -7px;
|
||||
border-right: 8px solid #c1c1c1;
|
||||
border-left: none;
|
||||
border-top: 4px solid transparent;
|
||||
border-bottom: 4px solid transparent;
|
||||
}
|
||||
|
||||
.flow-group-process-box {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
float: inline-start;
|
||||
position: relative;
|
||||
margin-bottom: 40px;
|
||||
}
|
||||
|
||||
.flow-group-process-box-one {
|
||||
float: inline-end;
|
||||
}
|
||||
|
||||
.flow-group-process-content {
|
||||
min-height: 80px;
|
||||
width: 140px;
|
||||
background: #bcddff;
|
||||
border: 1px #79c8ff solid;
|
||||
font-size: 12px;
|
||||
color: #000;
|
||||
text-align: center;
|
||||
padding: 0 6px;
|
||||
box-sizing: border-box;
|
||||
font-weight: 600;
|
||||
|
||||
.flow-group-process-content-top {
|
||||
width: 100%;
|
||||
height: 40px;
|
||||
line-height: 40px;
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
.flow-group-process-content-bottom {
|
||||
width: 100%;
|
||||
font-size: 12px;
|
||||
line-height: 1.4;
|
||||
word-break: break-all;
|
||||
text-overflow: ellipsis;
|
||||
display: -webkit-box;
|
||||
-webkit-box-orient: vertical;
|
||||
-webkit-line-clamp: 2; /* 超出几行省略 */
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.flow-group-process-arrow-dis {
|
||||
margin-left: 200px;
|
||||
}
|
||||
}
|
||||
|
||||
.flow-group-process-content-dis {
|
||||
margin-left: 208px;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@@ -171,61 +171,66 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="content" v-show="active === '2'">
|
||||
<el-table
|
||||
height="100%"
|
||||
ref="selection"
|
||||
:data="histortData"
|
||||
tooltip-effect="dark"
|
||||
style="width: 100%"
|
||||
border
|
||||
row-key="id"
|
||||
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
|
||||
<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="创建时间"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="endTime"
|
||||
label="完成时间"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="comment"
|
||||
label="流程信息"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.commentText }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="completeFlag"
|
||||
label="状态"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.endTime ? '已完成' : scope.row.receiveStatus ? '已接收' : '未完成' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<loading :loading="loading">数据获取中</loading>
|
||||
<processNodeInformation
|
||||
:prcId="this.$route.query.prcId"
|
||||
:prcType="this.$route.query.prcType"
|
||||
:prcNum="this.$route.query.prcNum"
|
||||
/>
|
||||
<!-- <el-table-->
|
||||
<!-- height="100%"-->
|
||||
<!-- ref="selection"-->
|
||||
<!-- :data="histortData"-->
|
||||
<!-- tooltip-effect="dark"-->
|
||||
<!-- style="width: 100%"-->
|
||||
<!-- border-->
|
||||
<!-- row-key="id"-->
|
||||
<!-- :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">-->
|
||||
<!-- <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="创建时间"-->
|
||||
<!-- align="center">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column-->
|
||||
<!-- prop="endTime"-->
|
||||
<!-- label="完成时间"-->
|
||||
<!-- align="center">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column-->
|
||||
<!-- prop="comment"-->
|
||||
<!-- label="流程信息"-->
|
||||
<!-- align="center">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <span>{{ scope.row.commentText }}</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column-->
|
||||
<!-- prop="completeFlag"-->
|
||||
<!-- label="状态"-->
|
||||
<!-- align="center">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <span>{{ scope.row.endTime ? '已完成' : scope.row.receiveStatus ? '已接收' : '未完成' }}</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- </el-table>-->
|
||||
<!-- <loading :loading="loading">数据获取中</loading>-->
|
||||
</div>
|
||||
<el-dialog
|
||||
title="查看修改前内容"
|
||||
@@ -384,7 +389,7 @@ export default {
|
||||
}
|
||||
},
|
||||
mounted () {
|
||||
this.getHistoryData()
|
||||
// this.getHistoryData()
|
||||
this.getData()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -116,67 +116,72 @@
|
||||
<!--</el-collapse>-->
|
||||
</div>
|
||||
<div class="content" v-show="active === '2'">
|
||||
<el-table
|
||||
height="100%"
|
||||
ref="selection"
|
||||
:data="histortData"
|
||||
tooltip-effect="dark"
|
||||
style="width: 100%"
|
||||
border
|
||||
row-key="id"
|
||||
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
|
||||
<el-table-column
|
||||
label="序号"
|
||||
align="center"
|
||||
type="index"
|
||||
width="50">
|
||||
</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="创建时间"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="endTime"
|
||||
label="完成时间"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="comment"
|
||||
label="流程信息"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.commentText }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="completeFlag"
|
||||
label="状态"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.endTime ? '已完成' : scope.row.receiveStatus ? '已接收' : '未完成' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<loading :loading="loading">数据获取中</loading>
|
||||
<processNodeInformation
|
||||
:prcId="this.$route.query.prcId"
|
||||
:prcType="this.$route.query.prcType"
|
||||
:prcNum="this.$route.query.prcNum"
|
||||
/>
|
||||
<!-- <el-table-->
|
||||
<!-- height="100%"-->
|
||||
<!-- ref="selection"-->
|
||||
<!-- :data="histortData"-->
|
||||
<!-- tooltip-effect="dark"-->
|
||||
<!-- style="width: 100%"-->
|
||||
<!-- border-->
|
||||
<!-- row-key="id"-->
|
||||
<!-- :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">-->
|
||||
<!-- <el-table-column-->
|
||||
<!-- label="序号"-->
|
||||
<!-- align="center"-->
|
||||
<!-- type="index"-->
|
||||
<!-- width="50">-->
|
||||
<!-- </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="创建时间"-->
|
||||
<!-- align="center">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column-->
|
||||
<!-- prop="endTime"-->
|
||||
<!-- label="完成时间"-->
|
||||
<!-- align="center">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column-->
|
||||
<!-- prop="comment"-->
|
||||
<!-- label="流程信息"-->
|
||||
<!-- align="center">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <span>{{ scope.row.commentText }}</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column-->
|
||||
<!-- prop="completeFlag"-->
|
||||
<!-- label="状态"-->
|
||||
<!-- align="center">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <span>{{ scope.row.endTime ? '已完成' : scope.row.receiveStatus ? '已接收' : '未完成' }}</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- </el-table>-->
|
||||
<!-- <loading :loading="loading">数据获取中</loading>-->
|
||||
</div>
|
||||
<ProcessFooter
|
||||
show-submit
|
||||
@@ -432,7 +437,7 @@ export default {
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
this.getHistoryData();
|
||||
// this.getHistoryData();
|
||||
this.getData();
|
||||
}
|
||||
};
|
||||
|
||||
@@ -196,66 +196,71 @@
|
||||
<!--</el-collapse>-->
|
||||
</div>
|
||||
<div class="content" v-show="active === '2'">
|
||||
<el-table
|
||||
height="100%"
|
||||
ref="selection"
|
||||
:data="histortData"
|
||||
tooltip-effect="dark"
|
||||
style="width: 100%"
|
||||
border
|
||||
row-key="id"
|
||||
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
|
||||
<el-table-column
|
||||
label="序号"
|
||||
align="center"
|
||||
type="index"
|
||||
width="50">
|
||||
</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="创建时间"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="endTime"
|
||||
label="完成时间"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="comment"
|
||||
label="流程信息"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.commentText }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="completeFlag"
|
||||
label="状态"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.endTime ? '已完成' : scope.row.receiveStatus ? '已接收' : '未完成' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<processNodeInformation
|
||||
:prcId="this.$route.query.prcId"
|
||||
:prcType="this.$route.query.prcType"
|
||||
:prcNum="this.$route.query.prcNum"
|
||||
/>
|
||||
<!-- <el-table-->
|
||||
<!-- height="100%"-->
|
||||
<!-- ref="selection"-->
|
||||
<!-- :data="histortData"-->
|
||||
<!-- tooltip-effect="dark"-->
|
||||
<!-- style="width: 100%"-->
|
||||
<!-- border-->
|
||||
<!-- row-key="id"-->
|
||||
<!-- :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">-->
|
||||
<!-- <el-table-column-->
|
||||
<!-- label="序号"-->
|
||||
<!-- align="center"-->
|
||||
<!-- type="index"-->
|
||||
<!-- width="50">-->
|
||||
<!-- </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="创建时间"-->
|
||||
<!-- align="center">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column-->
|
||||
<!-- prop="endTime"-->
|
||||
<!-- label="完成时间"-->
|
||||
<!-- align="center">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column-->
|
||||
<!-- prop="comment"-->
|
||||
<!-- label="流程信息"-->
|
||||
<!-- align="center">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <span>{{ scope.row.commentText }}</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column-->
|
||||
<!-- prop="completeFlag"-->
|
||||
<!-- label="状态"-->
|
||||
<!-- align="center">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <span>{{ scope.row.endTime ? '已完成' : scope.row.receiveStatus ? '已接收' : '未完成' }}</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- </el-table>-->
|
||||
</div>
|
||||
<ProcessFooter
|
||||
:show-submit="submitShow"
|
||||
@@ -762,7 +767,7 @@
|
||||
this.data.push(form)
|
||||
}
|
||||
})
|
||||
this.getHistoryData()
|
||||
// this.getHistoryData()
|
||||
this.getData()
|
||||
},
|
||||
}
|
||||
|
||||
@@ -175,66 +175,71 @@
|
||||
<!--</el-collapse>-->
|
||||
</div>
|
||||
<div class="content" v-show="active === '2'">
|
||||
<el-table
|
||||
height="100%"
|
||||
ref="selection"
|
||||
:data="histortData"
|
||||
tooltip-effect="dark"
|
||||
style="width: 100%"
|
||||
border
|
||||
row-key="id"
|
||||
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
|
||||
<el-table-column
|
||||
label="序号"
|
||||
align="center"
|
||||
type="index"
|
||||
width="50">
|
||||
</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="创建时间"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="endTime"
|
||||
label="完成时间"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="comment"
|
||||
label="流程信息"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.commentText }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="completeFlag"
|
||||
label="状态"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.endTime ? '已完成' : scope.row.receiveStatus ? '已接收' : '未完成' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<processNodeInformation
|
||||
:prcId="this.$route.query.prcId"
|
||||
:prcType="this.$route.query.prcType"
|
||||
:prcNum="this.$route.query.prcNum"
|
||||
/>
|
||||
<!-- <el-table-->
|
||||
<!-- height="100%"-->
|
||||
<!-- ref="selection"-->
|
||||
<!-- :data="histortData"-->
|
||||
<!-- tooltip-effect="dark"-->
|
||||
<!-- style="width: 100%"-->
|
||||
<!-- border-->
|
||||
<!-- row-key="id"-->
|
||||
<!-- :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">-->
|
||||
<!-- <el-table-column-->
|
||||
<!-- label="序号"-->
|
||||
<!-- align="center"-->
|
||||
<!-- type="index"-->
|
||||
<!-- width="50">-->
|
||||
<!-- </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="创建时间"-->
|
||||
<!-- align="center">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column-->
|
||||
<!-- prop="endTime"-->
|
||||
<!-- label="完成时间"-->
|
||||
<!-- align="center">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column-->
|
||||
<!-- prop="comment"-->
|
||||
<!-- label="流程信息"-->
|
||||
<!-- align="center">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <span>{{ scope.row.commentText }}</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column-->
|
||||
<!-- prop="completeFlag"-->
|
||||
<!-- label="状态"-->
|
||||
<!-- align="center">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <span>{{ scope.row.endTime ? '已完成' : scope.row.receiveStatus ? '已接收' : '未完成' }}</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- </el-table>-->
|
||||
</div>
|
||||
<ProcessFooter
|
||||
show-submit
|
||||
@@ -503,7 +508,7 @@
|
||||
},
|
||||
},
|
||||
mounted() {
|
||||
this.getHistoryData()
|
||||
// this.getHistoryData()
|
||||
this.getData()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -167,66 +167,71 @@
|
||||
<!--</el-collapse>-->
|
||||
</div>
|
||||
<div class="content" v-show="active === '2'">
|
||||
<el-table
|
||||
height="100%"
|
||||
ref="selection"
|
||||
:data="histortData"
|
||||
tooltip-effect="dark"
|
||||
style="width: 100%"
|
||||
border
|
||||
row-key="id"
|
||||
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
|
||||
<el-table-column
|
||||
label="序号"
|
||||
align="center"
|
||||
type="index"
|
||||
width="50">
|
||||
</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="创建时间"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="endTime"
|
||||
label="完成时间"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="comment"
|
||||
label="流程信息"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.commentText }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="completeFlag"
|
||||
label="状态"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.endTime ? '已完成' : scope.row.receiveStatus ? '已接收' : '未完成' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<processNodeInformation
|
||||
:prcId="this.$route.query.prcId"
|
||||
:prcType="this.$route.query.prcType"
|
||||
:prcNum="this.$route.query.prcNum"
|
||||
/>
|
||||
<!-- <el-table-->
|
||||
<!-- height="100%"-->
|
||||
<!-- ref="selection"-->
|
||||
<!-- :data="histortData"-->
|
||||
<!-- tooltip-effect="dark"-->
|
||||
<!-- style="width: 100%"-->
|
||||
<!-- border-->
|
||||
<!-- row-key="id"-->
|
||||
<!-- :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">-->
|
||||
<!-- <el-table-column-->
|
||||
<!-- label="序号"-->
|
||||
<!-- align="center"-->
|
||||
<!-- type="index"-->
|
||||
<!-- width="50">-->
|
||||
<!-- </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="创建时间"-->
|
||||
<!-- align="center">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column-->
|
||||
<!-- prop="endTime"-->
|
||||
<!-- label="完成时间"-->
|
||||
<!-- align="center">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column-->
|
||||
<!-- prop="comment"-->
|
||||
<!-- label="流程信息"-->
|
||||
<!-- align="center">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <span>{{ scope.row.commentText }}</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column-->
|
||||
<!-- prop="completeFlag"-->
|
||||
<!-- label="状态"-->
|
||||
<!-- align="center">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <span>{{ scope.row.endTime ? '已完成' : scope.row.receiveStatus ? '已接收' : '未完成' }}</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- </el-table>-->
|
||||
</div>
|
||||
<ProcessFooter
|
||||
show-submit
|
||||
@@ -486,7 +491,7 @@
|
||||
},
|
||||
},
|
||||
mounted() {
|
||||
this.getHistoryData()
|
||||
// this.getHistoryData()
|
||||
this.getData()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -202,66 +202,71 @@
|
||||
<!--</el-collapse>-->
|
||||
</div>
|
||||
<div class="content" v-show="active === '2'">
|
||||
<el-table
|
||||
height="100%"
|
||||
ref="selection"
|
||||
:data="histortData"
|
||||
tooltip-effect="dark"
|
||||
style="width: 100%"
|
||||
border
|
||||
row-key="id"
|
||||
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
|
||||
<el-table-column
|
||||
label="序号"
|
||||
align="center"
|
||||
type="index"
|
||||
width="50">
|
||||
</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="创建时间"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="endTime"
|
||||
label="完成时间"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="comment"
|
||||
label="流程信息"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.commentText }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="completeFlag"
|
||||
label="状态"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.endTime ? '已完成' : scope.row.receiveStatus ? '已接收' : '未完成' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<processNodeInformation
|
||||
:prcId="this.$route.query.prcId"
|
||||
:prcType="this.$route.query.prcType"
|
||||
:prcNum="this.$route.query.prcNum"
|
||||
/>
|
||||
<!-- <el-table-->
|
||||
<!-- height="100%"-->
|
||||
<!-- ref="selection"-->
|
||||
<!-- :data="histortData"-->
|
||||
<!-- tooltip-effect="dark"-->
|
||||
<!-- style="width: 100%"-->
|
||||
<!-- border-->
|
||||
<!-- row-key="id"-->
|
||||
<!-- :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">-->
|
||||
<!-- <el-table-column-->
|
||||
<!-- label="序号"-->
|
||||
<!-- align="center"-->
|
||||
<!-- type="index"-->
|
||||
<!-- width="50">-->
|
||||
<!-- </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="创建时间"-->
|
||||
<!-- align="center">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column-->
|
||||
<!-- prop="endTime"-->
|
||||
<!-- label="完成时间"-->
|
||||
<!-- align="center">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column-->
|
||||
<!-- prop="comment"-->
|
||||
<!-- label="流程信息"-->
|
||||
<!-- align="center">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <span>{{ scope.row.commentText }}</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column-->
|
||||
<!-- prop="completeFlag"-->
|
||||
<!-- label="状态"-->
|
||||
<!-- align="center">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <span>{{ scope.row.endTime ? '已完成' : scope.row.receiveStatus ? '已接收' : '未完成' }}</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- </el-table>-->
|
||||
</div>
|
||||
<ProcessFooter
|
||||
show-submit
|
||||
@@ -772,7 +777,7 @@ export default {
|
||||
},
|
||||
},
|
||||
mounted() {
|
||||
this.getHistoryData()
|
||||
// this.getHistoryData()
|
||||
this.getData()
|
||||
window.addEventListener("storage", ev => {
|
||||
if(ev.key === 'freshClueNum'){
|
||||
|
||||
@@ -217,68 +217,73 @@
|
||||
<!--</el-collapse>-->
|
||||
</div>
|
||||
<div class="content" v-show="active === '2'">
|
||||
<el-table
|
||||
height="100%"
|
||||
ref="selection"
|
||||
:data="histortData"
|
||||
tooltip-effect="dark"
|
||||
style="width: 100%"
|
||||
border
|
||||
row-key="id"
|
||||
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
|
||||
<el-table-column
|
||||
label="序号"
|
||||
align="center"
|
||||
type="index"
|
||||
width="50">
|
||||
</el-table-column>
|
||||
<processNodeInformation
|
||||
:prcId="this.$route.query.prcId"
|
||||
:prcType="this.$route.query.prcType"
|
||||
:prcNum="this.$route.query.prcNum"
|
||||
/>
|
||||
<!-- <el-table-->
|
||||
<!-- height="100%"-->
|
||||
<!-- ref="selection"-->
|
||||
<!-- :data="histortData"-->
|
||||
<!-- tooltip-effect="dark"-->
|
||||
<!-- style="width: 100%"-->
|
||||
<!-- border-->
|
||||
<!-- row-key="id"-->
|
||||
<!-- :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">-->
|
||||
<!-- <el-table-column-->
|
||||
<!-- label="序号"-->
|
||||
<!-- align="center"-->
|
||||
<!-- type="index"-->
|
||||
<!-- width="50">-->
|
||||
<!-- </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="创建时间"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="endTime"
|
||||
label="完成时间"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="comment"
|
||||
label="流程信息"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.commentText }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="completeFlag"
|
||||
label="状态"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.endTime ? '已完成' : scope.row.receiveStatus ? '已接收' : '未完成' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<loading :loading="loading">数据获取中</loading>
|
||||
<!-- <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="创建时间"-->
|
||||
<!-- align="center">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column-->
|
||||
<!-- prop="endTime"-->
|
||||
<!-- label="完成时间"-->
|
||||
<!-- align="center">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column-->
|
||||
<!-- prop="comment"-->
|
||||
<!-- label="流程信息"-->
|
||||
<!-- align="center">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <span>{{ scope.row.commentText }}</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column-->
|
||||
<!-- prop="completeFlag"-->
|
||||
<!-- label="状态"-->
|
||||
<!-- align="center">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <span>{{ scope.row.endTime ? '已完成' : scope.row.receiveStatus ? '已接收' : '未完成' }}</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- </el-table>-->
|
||||
<!-- <loading :loading="loading">数据获取中</loading>-->
|
||||
</div>
|
||||
<ProcessFooter
|
||||
v-show="!disabledXX"
|
||||
@@ -762,7 +767,7 @@ export default {
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
this.getHistoryData();
|
||||
// this.getHistoryData();
|
||||
this.getData();
|
||||
}
|
||||
};
|
||||
|
||||
@@ -212,66 +212,71 @@
|
||||
<!--</el-collapse>-->
|
||||
</div>
|
||||
<div class="content" v-show="active === '2'">
|
||||
<el-table
|
||||
height="100%"
|
||||
ref="selection"
|
||||
:data="histortData"
|
||||
tooltip-effect="dark"
|
||||
style="width: 100%"
|
||||
border
|
||||
row-key="id"
|
||||
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
|
||||
<el-table-column
|
||||
label="序号"
|
||||
align="center"
|
||||
type="index"
|
||||
width="50">
|
||||
</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="创建时间"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="endTime"
|
||||
label="完成时间"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="comment"
|
||||
label="流程信息"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.commentText }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="completeFlag"
|
||||
label="状态"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.endTime ? '已完成' : scope.row.receiveStatus ? '已接收' : '未完成' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<processNodeInformation
|
||||
:prcId="this.$route.query.prcId"
|
||||
:prcType="this.$route.query.prcType"
|
||||
:prcNum="this.$route.query.prcNum"
|
||||
/>
|
||||
<!-- <el-table-->
|
||||
<!-- height="100%"-->
|
||||
<!-- ref="selection"-->
|
||||
<!-- :data="histortData"-->
|
||||
<!-- tooltip-effect="dark"-->
|
||||
<!-- style="width: 100%"-->
|
||||
<!-- border-->
|
||||
<!-- row-key="id"-->
|
||||
<!-- :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">-->
|
||||
<!-- <el-table-column-->
|
||||
<!-- label="序号"-->
|
||||
<!-- align="center"-->
|
||||
<!-- type="index"-->
|
||||
<!-- width="50">-->
|
||||
<!-- </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="创建时间"-->
|
||||
<!-- align="center">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column-->
|
||||
<!-- prop="endTime"-->
|
||||
<!-- label="完成时间"-->
|
||||
<!-- align="center">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column-->
|
||||
<!-- prop="comment"-->
|
||||
<!-- label="流程信息"-->
|
||||
<!-- align="center">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <span>{{ scope.row.commentText }}</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column-->
|
||||
<!-- prop="completeFlag"-->
|
||||
<!-- label="状态"-->
|
||||
<!-- align="center">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <span>{{ scope.row.endTime ? '已完成' : scope.row.receiveStatus ? '已接收' : '未完成' }}</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- </el-table>-->
|
||||
</div>
|
||||
<ProcessFooter
|
||||
show-submit
|
||||
@@ -740,7 +745,7 @@
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
this.getHistoryData();
|
||||
// this.getHistoryData();
|
||||
this.getData();
|
||||
}
|
||||
};
|
||||
|
||||
@@ -205,66 +205,71 @@
|
||||
<!--</el-collapse>-->
|
||||
</div>
|
||||
<div class="content" v-show="active === '2'">
|
||||
<el-table
|
||||
height="100%"
|
||||
ref="selection"
|
||||
:data="histortData"
|
||||
tooltip-effect="dark"
|
||||
style="width: 100%"
|
||||
border
|
||||
row-key="id"
|
||||
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
|
||||
<el-table-column
|
||||
label="序号"
|
||||
align="center"
|
||||
type="index"
|
||||
width="50">
|
||||
</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="创建时间"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="endTime"
|
||||
label="完成时间"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="comment"
|
||||
label="流程信息"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.commentText }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="completeFlag"
|
||||
label="状态"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.endTime ? '已完成' : scope.row.receiveStatus ? '已接收' : '未完成' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<processNodeInformation
|
||||
:prcId="this.$route.query.prcId"
|
||||
:prcType="this.$route.query.prcType"
|
||||
:prcNum="this.$route.query.prcNum"
|
||||
/>
|
||||
<!-- <el-table-->
|
||||
<!-- height="100%"-->
|
||||
<!-- ref="selection"-->
|
||||
<!-- :data="histortData"-->
|
||||
<!-- tooltip-effect="dark"-->
|
||||
<!-- style="width: 100%"-->
|
||||
<!-- border-->
|
||||
<!-- row-key="id"-->
|
||||
<!-- :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">-->
|
||||
<!-- <el-table-column-->
|
||||
<!-- label="序号"-->
|
||||
<!-- align="center"-->
|
||||
<!-- type="index"-->
|
||||
<!-- width="50">-->
|
||||
<!-- </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="创建时间"-->
|
||||
<!-- align="center">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column-->
|
||||
<!-- prop="endTime"-->
|
||||
<!-- label="完成时间"-->
|
||||
<!-- align="center">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column-->
|
||||
<!-- prop="comment"-->
|
||||
<!-- label="流程信息"-->
|
||||
<!-- align="center">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <span>{{ scope.row.commentText }}</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column-->
|
||||
<!-- prop="completeFlag"-->
|
||||
<!-- label="状态"-->
|
||||
<!-- align="center">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <span>{{ scope.row.endTime ? '已完成' : scope.row.receiveStatus ? '已接收' : '未完成' }}</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- </el-table>-->
|
||||
</div>
|
||||
<ProcessFooter
|
||||
show-submit
|
||||
@@ -600,7 +605,7 @@
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
this.getHistoryData();
|
||||
// this.getHistoryData();
|
||||
this.getData();
|
||||
}
|
||||
};
|
||||
|
||||
@@ -197,66 +197,71 @@
|
||||
<!--</el-collapse>-->
|
||||
</div>
|
||||
<div class="content" v-show="active === '2'">
|
||||
<el-table
|
||||
height="100%"
|
||||
ref="selection"
|
||||
:data="histortData"
|
||||
tooltip-effect="dark"
|
||||
style="width: 100%"
|
||||
border
|
||||
row-key="id"
|
||||
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
|
||||
<el-table-column
|
||||
label="序号"
|
||||
align="center"
|
||||
type="index"
|
||||
width="50">
|
||||
</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="创建时间"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="endTime"
|
||||
label="完成时间"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="comment"
|
||||
label="流程信息"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.commentText }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="completeFlag"
|
||||
label="状态"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.endTime ? '已完成' : scope.row.receiveStatus ? '已接收' : '未完成' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<processNodeInformation
|
||||
:prcId="this.$route.query.prcId"
|
||||
:prcType="this.$route.query.prcType"
|
||||
:prcNum="this.$route.query.prcNum"
|
||||
/>
|
||||
<!-- <el-table-->
|
||||
<!-- height="100%"-->
|
||||
<!-- ref="selection"-->
|
||||
<!-- :data="histortData"-->
|
||||
<!-- tooltip-effect="dark"-->
|
||||
<!-- style="width: 100%"-->
|
||||
<!-- border-->
|
||||
<!-- row-key="id"-->
|
||||
<!-- :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">-->
|
||||
<!-- <el-table-column-->
|
||||
<!-- label="序号"-->
|
||||
<!-- align="center"-->
|
||||
<!-- type="index"-->
|
||||
<!-- width="50">-->
|
||||
<!-- </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="创建时间"-->
|
||||
<!-- align="center">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column-->
|
||||
<!-- prop="endTime"-->
|
||||
<!-- label="完成时间"-->
|
||||
<!-- align="center">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column-->
|
||||
<!-- prop="comment"-->
|
||||
<!-- label="流程信息"-->
|
||||
<!-- align="center">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <span>{{ scope.row.commentText }}</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column-->
|
||||
<!-- prop="completeFlag"-->
|
||||
<!-- label="状态"-->
|
||||
<!-- align="center">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <span>{{ scope.row.endTime ? '已完成' : scope.row.receiveStatus ? '已接收' : '未完成' }}</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- </el-table>-->
|
||||
</div>
|
||||
<ProcessFooter
|
||||
show-submit
|
||||
@@ -548,7 +553,7 @@ export default {
|
||||
},
|
||||
},
|
||||
mounted() {
|
||||
this.getHistoryData()
|
||||
// this.getHistoryData()
|
||||
this.getData()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -197,66 +197,71 @@
|
||||
<!--</el-collapse>-->
|
||||
</div>
|
||||
<div class="content" v-show="active === '2'">
|
||||
<el-table
|
||||
height="100%"
|
||||
ref="selection"
|
||||
:data="histortData"
|
||||
tooltip-effect="dark"
|
||||
style="width: 100%"
|
||||
border
|
||||
row-key="id"
|
||||
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
|
||||
<el-table-column
|
||||
label="序号"
|
||||
align="center"
|
||||
type="index"
|
||||
width="50">
|
||||
</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="创建时间"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="endTime"
|
||||
label="完成时间"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="comment"
|
||||
label="流程信息"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.commentText }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="completeFlag"
|
||||
label="状态"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.endTime ? '已完成' : scope.row.receiveStatus ? '已接收' : '未完成' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<processNodeInformation
|
||||
:prcId="this.$route.query.prcId"
|
||||
:prcType="this.$route.query.prcType"
|
||||
:prcNum="this.$route.query.prcNum"
|
||||
/>
|
||||
<!-- <el-table-->
|
||||
<!-- height="100%"-->
|
||||
<!-- ref="selection"-->
|
||||
<!-- :data="histortData"-->
|
||||
<!-- tooltip-effect="dark"-->
|
||||
<!-- style="width: 100%"-->
|
||||
<!-- border-->
|
||||
<!-- row-key="id"-->
|
||||
<!-- :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">-->
|
||||
<!-- <el-table-column-->
|
||||
<!-- label="序号"-->
|
||||
<!-- align="center"-->
|
||||
<!-- type="index"-->
|
||||
<!-- width="50">-->
|
||||
<!-- </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="创建时间"-->
|
||||
<!-- align="center">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column-->
|
||||
<!-- prop="endTime"-->
|
||||
<!-- label="完成时间"-->
|
||||
<!-- align="center">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column-->
|
||||
<!-- prop="comment"-->
|
||||
<!-- label="流程信息"-->
|
||||
<!-- align="center">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <span>{{ scope.row.commentText }}</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column-->
|
||||
<!-- prop="completeFlag"-->
|
||||
<!-- label="状态"-->
|
||||
<!-- align="center">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <span>{{ scope.row.endTime ? '已完成' : scope.row.receiveStatus ? '已接收' : '未完成' }}</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- </el-table>-->
|
||||
</div>
|
||||
<ProcessFooter
|
||||
show-submit
|
||||
@@ -550,7 +555,7 @@ export default {
|
||||
},
|
||||
},
|
||||
mounted() {
|
||||
this.getHistoryData()
|
||||
// this.getHistoryData()
|
||||
this.getData()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -196,66 +196,71 @@
|
||||
<!--</el-collapse>-->
|
||||
</div>
|
||||
<div class="content" v-show="active === '2'">
|
||||
<el-table
|
||||
height="100%"
|
||||
ref="selection"
|
||||
:data="histortData"
|
||||
tooltip-effect="dark"
|
||||
style="width: 100%"
|
||||
border
|
||||
row-key="id"
|
||||
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
|
||||
<el-table-column
|
||||
label="序号"
|
||||
align="center"
|
||||
type="index"
|
||||
width="50">
|
||||
</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="创建时间"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="endTime"
|
||||
label="完成时间"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="comment"
|
||||
label="流程信息"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.commentText }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="completeFlag"
|
||||
label="状态"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.endTime ? '已完成' : scope.row.receiveStatus ? '已接收' : '未完成' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<processNodeInformation
|
||||
:prcId="this.$route.query.prcId"
|
||||
:prcType="this.$route.query.prcType"
|
||||
:prcNum="this.$route.query.prcNum"
|
||||
/>
|
||||
<!-- <el-table-->
|
||||
<!-- height="100%"-->
|
||||
<!-- ref="selection"-->
|
||||
<!-- :data="histortData"-->
|
||||
<!-- tooltip-effect="dark"-->
|
||||
<!-- style="width: 100%"-->
|
||||
<!-- border-->
|
||||
<!-- row-key="id"-->
|
||||
<!-- :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">-->
|
||||
<!-- <el-table-column-->
|
||||
<!-- label="序号"-->
|
||||
<!-- align="center"-->
|
||||
<!-- type="index"-->
|
||||
<!-- width="50">-->
|
||||
<!-- </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="创建时间"-->
|
||||
<!-- align="center">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column-->
|
||||
<!-- prop="endTime"-->
|
||||
<!-- label="完成时间"-->
|
||||
<!-- align="center">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column-->
|
||||
<!-- prop="comment"-->
|
||||
<!-- label="流程信息"-->
|
||||
<!-- align="center">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <span>{{ scope.row.commentText }}</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column-->
|
||||
<!-- prop="completeFlag"-->
|
||||
<!-- label="状态"-->
|
||||
<!-- align="center">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <span>{{ scope.row.endTime ? '已完成' : scope.row.receiveStatus ? '已接收' : '未完成' }}</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- </el-table>-->
|
||||
</div>
|
||||
<ProcessFooter
|
||||
show-submit
|
||||
@@ -548,7 +553,7 @@ export default {
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
this.getHistoryData();
|
||||
// this.getHistoryData();
|
||||
this.getData();
|
||||
}
|
||||
};
|
||||
|
||||
@@ -1422,7 +1422,6 @@
|
||||
flowType: this.$route.query.flowType,
|
||||
}
|
||||
} else {
|
||||
console.log(11111);
|
||||
url = 'lawss/activiti/get_list_by_instance'
|
||||
query = {
|
||||
prcNum: this.$route.query.prcNum,
|
||||
|
||||
@@ -937,6 +937,15 @@ export default {
|
||||
}
|
||||
break;
|
||||
case '3':
|
||||
let oldAndNew = ''
|
||||
const currentDate = new Date('2024-01-25 23:59:59').getTime();
|
||||
const date = new Date(row.creatTime);
|
||||
const timestamp = date.getTime();
|
||||
if (currentDate > timestamp){
|
||||
oldAndNew = 'old'
|
||||
}else{
|
||||
oldAndNew = 'new'
|
||||
}
|
||||
if (row.taskInfo === '任务分发') {
|
||||
routeUrl = this.$router.resolve({
|
||||
name: 'bzzqyjStep2',
|
||||
@@ -945,7 +954,8 @@ export default {
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
prcType: row.prcType,
|
||||
oldAndNew: oldAndNew
|
||||
}
|
||||
})
|
||||
} else if (row.taskInfo === '意见反馈') {
|
||||
@@ -956,7 +966,8 @@ export default {
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
prcType: row.prcType,
|
||||
oldAndNew: oldAndNew
|
||||
}
|
||||
})
|
||||
} else if (row.taskInfo === '意见汇总报批') {
|
||||
@@ -967,7 +978,8 @@ export default {
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
prcType: row.prcType,
|
||||
oldAndNew: oldAndNew
|
||||
}
|
||||
})
|
||||
} else if (row.taskInfo === '意见审批') {
|
||||
@@ -978,7 +990,8 @@ export default {
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
prcType: row.prcType,
|
||||
oldAndNew: oldAndNew
|
||||
}
|
||||
})
|
||||
} else if (row.taskInfo === '管理员') {
|
||||
@@ -989,7 +1002,8 @@ export default {
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
prcType: row.prcType,
|
||||
oldAndNew: oldAndNew
|
||||
}
|
||||
})
|
||||
} else if (row.taskInfo === '意见处理') {
|
||||
@@ -1000,7 +1014,8 @@ export default {
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
prcType: row.prcType,
|
||||
oldAndNew: oldAndNew
|
||||
}
|
||||
})
|
||||
} else if (row.taskInfo === '会签') {
|
||||
@@ -1011,7 +1026,8 @@ export default {
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
prcType: row.prcType,
|
||||
oldAndNew: oldAndNew
|
||||
}
|
||||
})
|
||||
} else if (row.taskInfo === '审核') {
|
||||
@@ -1022,7 +1038,8 @@ export default {
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
prcType: row.prcType,
|
||||
oldAndNew: oldAndNew
|
||||
}
|
||||
})
|
||||
} else if (row.taskInfo === '审定' ) {
|
||||
@@ -1033,7 +1050,8 @@ export default {
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
prcType: row.prcType,
|
||||
oldAndNew: oldAndNew
|
||||
}
|
||||
})
|
||||
} else if (row.taskInfo === '批准') {
|
||||
@@ -1044,7 +1062,8 @@ export default {
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
prcType: row.prcType,
|
||||
oldAndNew: oldAndNew
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user