Merge branch 'dev_20240123_LCZG' into 'dev_2024325_LCZGF_39'

Dev 20240123 lczg

See merge request laws-foton-slrs/foton-laws-system-front!162
This commit is contained in:
高嵩
2024-03-25 02:01:00 +00:00
36 changed files with 4593 additions and 3311 deletions
+2
View File
@@ -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,558 @@
<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"
:key="item.id"
: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] &&
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">
<loading :loading="loadingImg">流程列表加载中</loading>
</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,
loadingImg: false,
}
},
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.loadingImg = true
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'
this.loadingImg = false
})
}, 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 {
width: 100%;
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>
@@ -170,61 +170,67 @@
</el-table>
</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>
<div class="content" v-if="active === '2'">
<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="查看修改前内容"
@@ -248,6 +254,7 @@ export default {
name: "bzzqyjStep1-9",
data() {
return {
loading:false,
itermsConditionsFlag: false,
itermsConditionsTitle: '',
histortData: [],
@@ -298,10 +305,12 @@ export default {
}
},
getHistoryData () {
this.loading = true
this.$http.get('lawss/activiti/get_list_by_instance', {
prcNum: this.$route.query.prcNum,
}, {}, res => {
this.histortData = res
this.loading = false
}, e => {})
},
upload(row, title) {
@@ -380,7 +389,7 @@ export default {
}
},
mounted () {
this.getHistoryData()
// this.getHistoryData()
this.getData()
}
}
@@ -115,67 +115,73 @@
<!-- </el-collapse-item>-->
<!--</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>
<div class="content" v-if="active === '2'">
<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
@@ -216,6 +222,7 @@ export default {
name: "bzzqyjStep2",
data() {
return {
loading:false,
commentText2: '',
onlyKey: '',
drawerModal: false,
@@ -312,10 +319,12 @@ export default {
window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id
},
getHistoryData() {
this.loading = true
this.$http.get("lawss/activiti/get_list_by_instance", {
prcNum: this.$route.query.prcNum
}, {}, res => {
this.histortData = res;
this.loading = false
}, e => {
});
},
@@ -428,7 +437,7 @@ export default {
}
},
mounted() {
this.getHistoryData();
// this.getHistoryData();
this.getData();
}
};
@@ -195,67 +195,72 @@
<!-- </el-collapse-item>-->
<!--</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>
<div class="content" v-if="active === '2'">
<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()
},
}
@@ -174,67 +174,72 @@
<!-- </el-collapse-item>-->
<!--</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>
<div class="content" v-if="active === '2'">
<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()
}
}
@@ -166,67 +166,72 @@
<!-- </el-collapse-item>-->
<!--</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>
<div class="content" v-if="active === '2'">
<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()
}
}
@@ -201,67 +201,72 @@
<!-- </el-collapse-item>-->
<!--</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>
<div class="content" v-if="active === '2'">
<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'){
@@ -216,68 +216,74 @@
<!-- </el-collapse-item>-->
<!--</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>
<div class="content" v-if="active === '2'">
<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>
<!-- <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"
@@ -385,6 +391,7 @@ export default {
name: "bzzqyjStep5-1",
data() {
return {
loading:false,
disabledXX:!!this.$route.query.disabledXX,
activeNames: '1',
clickFlag: false,
@@ -614,10 +621,12 @@ export default {
window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id
},
getHistoryData() {
this.loading = true
this.$http.get("lawss/activiti/get_list_by_instance", {
prcNum: this.$route.query.prcNum
}, {}, res => {
this.histortData = res;
this.loading = false
}, e => {
});
},
@@ -758,7 +767,7 @@ export default {
}
},
mounted() {
this.getHistoryData();
// this.getHistoryData();
this.getData();
}
};
@@ -211,67 +211,72 @@
<!-- </el-collapse-item>-->
<!--</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>
<div class="content" v-if="active === '2'">
<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();
}
};
@@ -204,67 +204,72 @@
<!-- </el-collapse-item>-->
<!--</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>
<div class="content" v-if="active === '2'">
<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();
}
};
@@ -196,67 +196,72 @@
<!-- </el-collapse-item>-->
<!--</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>
<div class="content" v-if="active === '2'">
<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()
}
}
@@ -196,67 +196,72 @@
<!-- </el-collapse-item>-->
<!--</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>
<div class="content" v-if="active === '2'">
<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()
}
}
@@ -195,67 +195,72 @@
<!-- </el-collapse-item>-->
<!--</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>
<div class="content" v-if="active === '2'">
<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();
}
};
@@ -9,7 +9,7 @@
<!-- <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">模块信息</div>-->
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
</div>
<div class="content">
<div class="content" v-show="active === '1'">
<el-form
ref="form"
:model="form"
@@ -17,7 +17,7 @@
class="label-input-form"
label-width="210px"
>
<div style="flex: auto;" v-show="active === '1'">
<div style="flex: auto;" >
<formList
:form = "form"
:FBGBUSSFileList = "FBGBUSSFileList"
@@ -64,75 +64,80 @@
<!-- </el-collapse>-->
<!--</div>-->
</div>
<div class="block" style="padding-top: 20px;" v-show="active === '3'">
<div class="flow-list">
<el-table
:height="tablePHeight"
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'}"
>
<el-table-column
type="index"
width="55"
label="序号"
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="创建时间"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</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') : '' }}</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>
</div>
</el-form>
</div>
<div class="content" v-if="active === '3'">
<processNodeInformation
:prcId="this.$route.query.prcId"
:prcType="this.$route.query.prcType"
:prcNum="this.$route.query.prcNum"
/>
<!-- <div class="flow-list">-->
<!-- <el-table-->
<!-- :height="tablePHeight"-->
<!-- 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'}"-->
<!-- >-->
<!-- <el-table-column-->
<!-- type="index"-->
<!-- width="55"-->
<!-- label="序号"-->
<!-- 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="创建时间"-->
<!-- align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</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') : '' }}</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>-->
</div>
<!-- 保存||提交-->
<ProcessFooter
v-show="verifySarStandard"
@@ -2300,7 +2305,7 @@
},
mounted () {
this.getData()
this.processTable()
// this.processTable()
this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this
}, res => {
@@ -9,7 +9,7 @@
<div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">会签评分</div>
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
</div>
<div class="content">
<div class="content" v-show="active === '1' || active === '2'">
<el-form
ref="form"
:model="form"
@@ -69,69 +69,74 @@
<div class="block" id="active2" v-show="active === '2'">
<AllScore></AllScore>
</div>
<div class="block" style="padding-top: 20px;" v-show="active === '3'">
<div class="flow-list">
<el-table
:height="tablePHeight"
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'}"
>
<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') : '' }}</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') : '' }}</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>
</div>
</el-form>
</div>
<div class="content" v-if="active === '3'">
<processNodeInformation
:prcId="this.$route.query.prcId"
:prcType="this.$route.query.prcType"
:prcNum="this.$route.query.prcNum"
/>
<!-- <div class="flow-list">-->
<!-- <el-table-->
<!-- :height="tablePHeight"-->
<!-- 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'}"-->
<!-- >-->
<!-- <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') : '' }}</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') : '' }}</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>-->
</div>
<!-- 保存||提交-->
<ProcessFooter
v-if="false"
@@ -2314,7 +2319,7 @@
},
created () {
this.getData()
this.processTable()
// this.processTable()
this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this
}, res => {
@@ -9,7 +9,7 @@
<!-- <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">模块信息</div>-->
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
</div>
<div class="content">
<div class="content" v-show="active === '1'">
<el-form
ref="form"
:model="form"
@@ -17,7 +17,7 @@
class="label-input-form"
label-width="210px"
>
<div style="flex: auto;" v-show="active === '1'">
<div style="flex: auto;" >
<formList
:form = "form"
:FBGBUSSFileList = "FBGBUSSFileList"
@@ -64,75 +64,80 @@
<!-- </el-collapse>-->
<!--</div>-->
</div>
<div class="block" style="padding-top: 20px;" v-show="active === '3'">
<div class="flow-list">
<el-table
:height="tablePHeight"
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'}"
>
<el-table-column
type="index"
width="55"
label="序号"
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="创建时间"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</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') : '' }}</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>
</div>
</el-form>
</div>
<div class="content" v-if="active === '3'">
<processNodeInformation
:prcId="this.$route.query.prcId"
:prcType="this.$route.query.prcType"
:prcNum="this.$route.query.prcNum"
/>
<!-- <div class="flow-list">-->
<!-- <el-table-->
<!-- :height="tablePHeight"-->
<!-- 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'}"-->
<!-- >-->
<!-- <el-table-column-->
<!-- type="index"-->
<!-- width="55"-->
<!-- label="序号"-->
<!-- 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="创建时间"-->
<!-- align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</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') : '' }}</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>-->
</div>
<!-- 保存||提交-->
<ProcessFooter
v-show="verifySarStandard"
@@ -2297,7 +2302,7 @@
},
mounted () {
this.getData()
this.processTable()
// this.processTable()
this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this
}, res => {
@@ -10,7 +10,7 @@
<!-- <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">模块信息</div>-->
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
</div>
<div class="content">
<div class="content" v-show="active === '1'">
<el-form
ref="form"
:model="form"
@@ -18,7 +18,7 @@
class="label-input-form"
label-width="210px"
>
<div v-show="active === '1'" style="flex: auto;">
<div style="flex: auto;">
<formEditList
:key="formKey"
:formSub="form"
@@ -79,80 +79,85 @@
<!-- </el-collapse>-->
<!--</div>-->
</div>
<div v-show="active === '3'" class="block" style="padding-top: 20px;">
<div class="flow-list">
<el-table
ref="selection"
:height="tablePHeight"
:data="detailData"
tooltip-effect="dark"
style="width: 100%"
border
row-key="id"
:no-data-text="listNoDataText"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
>
<el-table-column
type="index"
width="55"
label="序号"
align="center"
<
el-table-column
>
<el-table-column
prop="name"
label="任务步骤"
align="center"
/>
<el-table-column
prop="assignee"
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') : '' }}</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') : '' }}</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-column>
</el-table>
<loading :loading="loading">流程列表加载中</loading>
</div>
</div>
</el-form>
</div>
<div v-if="active === '3'" class="content">
<processNodeInformation
:prcId="this.$route.query.prcId"
:prcType="this.$route.query.prcType"
:prcNum="this.$route.query.prcNum"
/>
<!-- <div class="flow-list">-->
<!-- <el-table-->
<!-- ref="selection"-->
<!-- :height="tablePHeight"-->
<!-- :data="detailData"-->
<!-- tooltip-effect="dark"-->
<!-- style="width: 100%"-->
<!-- border-->
<!-- row-key="id"-->
<!-- :no-data-text="listNoDataText"-->
<!-- :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"-->
<!-- >-->
<!-- <el-table-column-->
<!-- type="index"-->
<!-- width="55"-->
<!-- label="序号"-->
<!-- align="center"-->
<!-- <-->
<!-- el-table-column-->
<!-- >-->
<!-- <el-table-column-->
<!-- prop="name"-->
<!-- label="任务步骤"-->
<!-- align="center"-->
<!-- />-->
<!-- <el-table-column-->
<!-- prop="assignee"-->
<!-- 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') : '' }}</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') : '' }}</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-column>-->
<!-- </el-table>-->
<!-- <loading :loading="loading">流程列表加载中</loading>-->
<!-- </div>-->
</div>
<!-- 保存||提交-->
<ProcessFooter
v-show="verifySarStandard"
@@ -1115,7 +1120,7 @@ export default {
mounted () {
// this.getTaskId()
this.getData()
this.processTable()
// this.processTable()
this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this
}, res => {
@@ -10,7 +10,7 @@
<!-- <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">模块信息</div>-->
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
</div>
<div class="content">
<div class="content" v-show="active === '1'">
<el-form
ref="form"
:model="form"
@@ -18,7 +18,7 @@
class="label-input-form"
label-width="210px"
>
<div v-show="active === '1'" style="flex: auto;">
<div style="flex: auto;">
<formEditList
:key="formKey"
:form="form"
@@ -84,77 +84,82 @@
<!-- </el-collapse>-->
<!--</div>-->
</div>
<div v-show="active === '3'" class="block" style="padding-top: 20px;">
<div class="flow-list">
<el-table
ref="selection"
:height="tablePHeight"
:data="detailData"
tooltip-effect="dark"
style="width: 100%"
border
row-key="id"
:no-data-text="listNoDataText"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
>
<el-table-column
type="index"
width="55"
label="序号"
align="center"
/>
<el-table-column
prop="name"
label="任务步骤"
align="center"
/>
<el-table-column
prop="assignee"
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') : '' }}</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') : '' }}</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>
</div>
</el-form>
</div>
<div v-if="active === '3'" class="content">
<processNodeInformation
:prcId="this.$route.query.prcId"
:prcType="this.$route.query.prcType"
:prcNum="this.$route.query.prcNum"
/>
<!-- <div class="flow-list">-->
<!-- <el-table-->
<!-- ref="selection"-->
<!-- :height="tablePHeight"-->
<!-- :data="detailData"-->
<!-- tooltip-effect="dark"-->
<!-- style="width: 100%"-->
<!-- border-->
<!-- row-key="id"-->
<!-- :no-data-text="listNoDataText"-->
<!-- :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"-->
<!-- >-->
<!-- <el-table-column-->
<!-- type="index"-->
<!-- width="55"-->
<!-- label="序号"-->
<!-- align="center"-->
<!-- />-->
<!-- <el-table-column-->
<!-- prop="name"-->
<!-- label="任务步骤"-->
<!-- align="center"-->
<!-- />-->
<!-- <el-table-column-->
<!-- prop="assignee"-->
<!-- 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') : '' }}</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') : '' }}</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>-->
</div>
<!-- 保存||提交-->
<ProcessFooter
v-show="verifySarStandard"
@@ -1222,7 +1227,7 @@ export default {
mounted () {
// this.getTaskId()
this.getData()
this.processTable()
// this.processTable()
this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this
}, res => {
@@ -11,7 +11,7 @@
<!-- <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">模块信息</div>-->
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
</div>
<div class="content">
<div class="content" v-show="active === '1' || active === '2'">
<el-form
ref="form"
:model="form"
@@ -187,75 +187,80 @@
<!-- </el-collapse>-->
<!--</div>-->
</div>
<div class="block" style="padding-top: 20px;" v-show="active === '3'">
<div class="flow-list">
<el-table
:height="tablePHeight"
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'}"
>
<el-table-column
type="index"
width="55"
label="序号"
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="创建时间"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</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') : '' }}</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>
</div>
</el-form>
</div>
<div class="content" v-if="active === '3'">
<processNodeInformation
:prcId="this.$route.query.prcId"
:prcType="this.$route.query.prcType"
:prcNum="this.$route.query.prcNum"
/>
<!-- <div class="flow-list">-->
<!-- <el-table-->
<!-- :height="tablePHeight"-->
<!-- 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'}"-->
<!-- >-->
<!-- <el-table-column-->
<!-- type="index"-->
<!-- width="55"-->
<!-- label="序号"-->
<!-- 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="创建时间"-->
<!-- align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</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') : '' }}</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>-->
</div>
<!-- 保存||提交-->
<ProcessFooter
v-show="verifySarStandard"
@@ -2661,7 +2666,7 @@
mounted () {
this.getTaskId()
this.getData()
this.processTable()
// this.processTable()
this.tablePHeight = $('.content').height()
window.onresize = () => {
this.tablePHeight = $('.content').height()
@@ -10,7 +10,7 @@
<!-- <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">模块信息</div>-->
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
</div>
<div class="content">
<div class="content" v-show="active === '1'">
<el-form
ref="form"
:model="form"
@@ -18,7 +18,7 @@
class="label-input-form"
label-width="210px"
>
<div v-show="active === '1'" style="flex: auto;">
<div style="flex: auto;">
<formEditList
:key="formKey"
:formSub="form"
@@ -125,77 +125,82 @@
<!-- </el-collapse>-->
<!--</div>-->
</div>
<div v-show="active === '3'" class="block" style="padding-top: 20px;">
<div class="flow-list">
<el-table
ref="selection"
:height="tablePHeight"
:data="detailData"
tooltip-effect="dark"
style="width: 100%"
border
row-key="id"
:no-data-text="listNoDataText"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
>
<el-table-column
type="index"
width="55"
label="序号"
align="center"
/>
<el-table-column
prop="name"
label="任务步骤"
align="center"
/>
<el-table-column
prop="assignee"
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') : '' }}</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') : '' }}</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>
</div>
</el-form>
</div>
<div v-if="active === '3'" class="content">
<processNodeInformation
:prcId="this.$route.query.prcId"
:prcType="this.$route.query.prcType"
:prcNum="this.$route.query.prcNum"
/>
<!-- <div class="flow-list">-->
<!-- <el-table-->
<!-- ref="selection"-->
<!-- :height="tablePHeight"-->
<!-- :data="detailData"-->
<!-- tooltip-effect="dark"-->
<!-- style="width: 100%"-->
<!-- border-->
<!-- row-key="id"-->
<!-- :no-data-text="listNoDataText"-->
<!-- :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"-->
<!-- >-->
<!-- <el-table-column-->
<!-- type="index"-->
<!-- width="55"-->
<!-- label="序号"-->
<!-- align="center"-->
<!-- />-->
<!-- <el-table-column-->
<!-- prop="name"-->
<!-- label="任务步骤"-->
<!-- align="center"-->
<!-- />-->
<!-- <el-table-column-->
<!-- prop="assignee"-->
<!-- 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') : '' }}</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') : '' }}</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>-->
</div>
<!-- 保存||提交-->
<ProcessFooter
v-show="verifySarStandard"
@@ -1149,7 +1154,7 @@ export default {
mounted () {
// this.getTaskId()
this.getData()
this.processTable()
// this.processTable()
this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this
}, res => {
@@ -1,4 +1,5 @@
<template><div class="bzrkStep1">
<template>
<div class="bzrkStep1">
<!-- 标准入库流程-->
<ProcessHeader toggle>
<template slot="proName">企标制修订-技术标准</template>
@@ -9,7 +10,7 @@
<!-- <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">模块信息</div>-->
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
</div>
<div class="content">
<div class="content" v-show="active === '1'">
<el-form
ref="form"
:model="form"
@@ -17,7 +18,7 @@
class="label-input-form"
label-width="210px"
>
<div style="flex: auto;" v-show="active === '1'">
<div style="flex: auto;">
<formList
:form = "form"
:isTrue="false"
@@ -67,75 +68,80 @@
<!-- </el-collapse>-->
<!--</div>-->
</div>
<div class="block" style="padding-top: 20px;" v-show="active === '3'">
<div class="flow-list">
<el-table
:height="tablePHeight"
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'}"
>
<el-table-column
type="index"
width="55"
label="序号"
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="创建时间"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</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') : '' }}</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>
</div>
</el-form>
</div>
<div class="content" v-if="active === '3'">
<processNodeInformation
:prcId="this.$route.query.prcId"
:prcType="this.$route.query.prcType"
:prcNum="this.$route.query.prcNum"
/>
<!-- <div class="flow-list">-->
<!-- <el-table-->
<!-- :height="tablePHeight"-->
<!-- 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'}"-->
<!-- >-->
<!-- <el-table-column-->
<!-- type="index"-->
<!-- width="55"-->
<!-- label="序号"-->
<!-- 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="创建时间"-->
<!-- align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</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') : '' }}</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>-->
</div>
<!-- 保存||提交-->
<ProcessFooter
v-show="verifySarStandard"
@@ -2307,7 +2313,7 @@
},
mounted () {
this.getData()
this.processTable()
// this.processTable()
this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this
}, res => {
@@ -10,7 +10,7 @@
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">会签评分</div>
<div class="headerTabsItem" :class="active === '4' ? 'active' : ''" @click="handleTabs('4')">审批历史</div>
</div>
<div class="content">
<div class="content" v-show="active === '1' || active === '2' || active === '3'">
<el-form
ref="form"
:model="form"
@@ -286,75 +286,80 @@
</div>
</template>
</div>
<div class="block" style="padding-top: 20px;" v-show="active === '4'">
<div class="flow-list">
<el-table
:height="tablePHeight"
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'}"
>
<el-table-column
type="index"
width="55"
label="序号"
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="创建时间"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</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') : '' }}</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>
</div>
</el-form>
</div>
<div class="content" v-if="active === '4'">
<processNodeInformation
:prcId="this.$route.query.prcId"
:prcType="this.$route.query.prcType"
:prcNum="this.$route.query.prcNum"
/>
<!-- <div class="flow-list">-->
<!-- <el-table-->
<!-- :height="tablePHeight"-->
<!-- 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'}"-->
<!-- >-->
<!-- <el-table-column-->
<!-- type="index"-->
<!-- width="55"-->
<!-- label="序号"-->
<!-- 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="创建时间"-->
<!-- align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</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') : '' }}</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>-->
</div>
<!-- 保存||提交-->
<ProcessFooter
v-show="verifySarStandard"
@@ -3020,7 +3025,7 @@
mounted () {
// this.getTaskId()
this.getData()
this.processTable()
// this.processTable()
this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this
}, res => {
@@ -11,7 +11,7 @@
<!-- <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">模块信息</div>-->
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
</div>
<div class="content">
<div class="content" v-show="active === '1' || active === '2'">
<el-form
ref="form"
:model="form"
@@ -344,77 +344,82 @@
</div>
</template>
</div>
<div v-show="active === '3'" class="block" style="padding-top: 20px;">
<div class="flow-list">
<el-table
ref="selection"
:height="tablePHeight"
:data="detailData"
tooltip-effect="dark"
style="width: 100%"
border
row-key="id"
:no-data-text="listNoDataText"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
>
<el-table-column
type="index"
width="55"
label="序号"
align="center"
/>
<el-table-column
prop="name"
label="任务步骤"
align="center"
/>
<el-table-column
prop="assignee"
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') : '' }}</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') : '' }}</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>
</div>
</el-form>
</div>
<div v-if="active === '3'" class="content">
<processNodeInformation
:prcId="this.$route.query.prcId"
:prcType="this.$route.query.prcType"
:prcNum="this.$route.query.prcNum"
/>
<!-- <div class="flow-list">-->
<!-- <el-table-->
<!-- ref="selection"-->
<!-- :height="tablePHeight"-->
<!-- :data="detailData"-->
<!-- tooltip-effect="dark"-->
<!-- style="width: 100%"-->
<!-- border-->
<!-- row-key="id"-->
<!-- :no-data-text="listNoDataText"-->
<!-- :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"-->
<!-- >-->
<!-- <el-table-column-->
<!-- type="index"-->
<!-- width="55"-->
<!-- label="序号"-->
<!-- align="center"-->
<!-- />-->
<!-- <el-table-column-->
<!-- prop="name"-->
<!-- label="任务步骤"-->
<!-- align="center"-->
<!-- />-->
<!-- <el-table-column-->
<!-- prop="assignee"-->
<!-- 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') : '' }}</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') : '' }}</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>-->
</div>
<!-- 保存||提交-->
<ProcessFooter
v-show="verifySarStandard"
@@ -1423,7 +1428,7 @@ export default {
mounted () {
// this.getTaskId()
this.getData()
this.processTable()
// this.processTable()
this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this
}, res => {
@@ -11,7 +11,7 @@
<!-- <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">模块信息</div>-->
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
</div>
<div class="content">
<div class="content" v-show="active === '1' || active === '2'">
<el-form
ref="form"
:model="form"
@@ -168,75 +168,80 @@
@emitDataLoading="emitDataLoading"
></formList>
</div>
<div class="block" style="padding-top: 20px;" v-show="active === '3'">
<div class="flow-list">
<el-table
:height="tablePHeight"
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'}"
>
<el-table-column
type="index"
width="55"
label="序号"
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="创建时间"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</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') : '' }}</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>
</div>
</el-form>
</div>
<div class="content" v-if="active === '3'">
<processNodeInformation
:prcId="this.$route.query.prcId"
:prcType="this.$route.query.prcType"
:prcNum="this.$route.query.prcNum"
/>
<!-- <div class="flow-list">-->
<!-- <el-table-->
<!-- :height="tablePHeight"-->
<!-- 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'}"-->
<!-- >-->
<!-- <el-table-column-->
<!-- type="index"-->
<!-- width="55"-->
<!-- label="序号"-->
<!-- 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="创建时间"-->
<!-- align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</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') : '' }}</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>-->
</div>
<!-- 保存||提交-->
<ProcessFooter
v-show="verifySarStandard"
@@ -2605,7 +2610,7 @@
mounted() {
// this.getTaskId()
this.getData()
this.processTable()
// this.processTable()
this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this
}, res => {
@@ -9,7 +9,7 @@
<!-- <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">模块信息</div>-->
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
</div>
<div class="content">
<div class="content" v-show="active === '1'">
<el-form
ref="form"
:model="form"
@@ -17,7 +17,7 @@
class="label-input-form"
label-width="210px"
>
<div style="flex: auto;" v-show="active === '1'">
<div style="flex: auto;" >
<formList
:form = "form"
:FBGBUSSFileList = "FBGBUSSFileList"
@@ -64,75 +64,80 @@
<!-- </el-collapse>-->
<!--</div>-->
</div>
<div class="block" style="padding-top: 20px;" v-show="active === '3'">
<div class="flow-list">
<el-table
:height="tablePHeight"
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'}"
>
<el-table-column
type="index"
width="55"
label="序号"
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="创建时间"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</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') : '' }}</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>
</div>
</el-form>
</div>
<div class="content" v-if="active === '3'">
<processNodeInformation
:prcId="this.$route.query.prcId"
:prcType="this.$route.query.prcType"
:prcNum="this.$route.query.prcNum"
/>
<!-- <div class="flow-list">-->
<!-- <el-table-->
<!-- :height="tablePHeight"-->
<!-- 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'}"-->
<!-- >-->
<!-- <el-table-column-->
<!-- type="index"-->
<!-- width="55"-->
<!-- label="序号"-->
<!-- 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="创建时间"-->
<!-- align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</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') : '' }}</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>-->
</div>
<!-- 保存||提交-->
<ProcessFooter
v-show="verifySarStandard"
@@ -2434,7 +2439,7 @@
mounted () {
this.getTaskId()
this.getData()
this.processTable()
// this.processTable()
this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this
}, res => {
@@ -10,7 +10,7 @@
<!-- <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">模块信息</div>-->
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
</div>
<div class="content">
<div class="content" v-show="active === '1' || active === '2'">
<el-form
ref="form"
:model="form"
@@ -173,75 +173,80 @@
@emitDataLoading="emitDataLoading"
></formList>
</div>
<div class="block" style="padding-top: 20px;" v-show="active === '3'">
<div class="flow-list">
<el-table
:height="tablePHeight"
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'}"
>
<el-table-column
type="index"
width="55"
label="序号"
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="创建时间"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</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') : '' }}</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>
</div>
</el-form>
</div>
<div class="content" v-if="active === '3'">
<processNodeInformation
:prcId="this.$route.query.prcId"
:prcType="this.$route.query.prcType"
:prcNum="this.$route.query.prcNum"
/>
<!-- <div class="flow-list">-->
<!-- <el-table-->
<!-- :height="tablePHeight"-->
<!-- 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'}"-->
<!-- >-->
<!-- <el-table-column-->
<!-- type="index"-->
<!-- width="55"-->
<!-- label="序号"-->
<!-- 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="创建时间"-->
<!-- align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</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') : '' }}</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>-->
</div>
<!-- 保存||提交-->
<ProcessFooter
v-show="verifySarStandard"
@@ -2615,7 +2620,7 @@
mounted () {
// this.getTaskId()
this.getData()
this.processTable()
// this.processTable()
this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this
}, res => {
@@ -11,7 +11,7 @@
<!-- <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">模块信息</div>-->
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
</div>
<div class="content">
<div class="content" v-show="active === '1' || active === '2'">
<el-form
ref="form"
:model="form"
@@ -206,77 +206,82 @@
<!-- </el-collapse>-->
<!--</div>-->
</div>
<div v-show="active === '3'" class="block" style="padding-top: 20px;">
<div class="flow-list">
<el-table
ref="selection"
:height="tablePHeight"
:data="detailData"
tooltip-effect="dark"
style="width: 100%"
border
row-key="id"
:no-data-text="listNoDataText"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
>
<el-table-column
type="index"
width="55"
label="序号"
align="center"
/>
<el-table-column
prop="name"
label="任务步骤"
align="center"
/>
<el-table-column
prop="assignee"
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') : '' }}</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') : '' }}</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>
</div>
</el-form>
</div>
<div v-if="active === '3'" class="content">
<processNodeInformation
:prcId="this.$route.query.prcId"
:prcType="this.$route.query.prcType"
:prcNum="this.$route.query.prcNum"
/>
<!-- <div class="flow-list">-->
<!-- <el-table-->
<!-- ref="selection"-->
<!-- :height="tablePHeight"-->
<!-- :data="detailData"-->
<!-- tooltip-effect="dark"-->
<!-- style="width: 100%"-->
<!-- border-->
<!-- row-key="id"-->
<!-- :no-data-text="listNoDataText"-->
<!-- :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"-->
<!-- >-->
<!-- <el-table-column-->
<!-- type="index"-->
<!-- width="55"-->
<!-- label="序号"-->
<!-- align="center"-->
<!-- />-->
<!-- <el-table-column-->
<!-- prop="name"-->
<!-- label="任务步骤"-->
<!-- align="center"-->
<!-- />-->
<!-- <el-table-column-->
<!-- prop="assignee"-->
<!-- 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') : '' }}</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') : '' }}</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>-->
</div>
<!-- 保存||提交-->
<ProcessFooter
v-show="verifySarStandard"
@@ -1226,7 +1231,7 @@ export default {
},
mounted () {
this.getData()
this.processTable()
// this.processTable()
this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this
}, res => {
@@ -10,7 +10,7 @@
<!-- <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">模块信息</div>-->
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
</div>
<div class="content">
<div class="content" v-show="active === '1'">
<el-form
ref="form"
:model="form"
@@ -18,7 +18,7 @@
class="label-input-form"
label-width="210px"
>
<div v-show="active === '1'" style="flex: auto;">
<div style="flex: auto;overflow: auto">
<formEditList
:key="formKey"
:formSub="form"
@@ -132,71 +132,76 @@
<!-- </el-collapse>-->
<!--</div>-->
</div>
<div v-show="active === '3'" class="block" style="padding-top: 20px;">
<div class="flow-list">
<el-table
ref="selection"
:height="tablePHeight"
:data="detailData"
tooltip-effect="dark"
style="width: 100%"
border
row-key="id"
:no-data-text="listNoDataText"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
>
<el-table-column
prop="name"
label="任务步骤"
align="center"
/>
<el-table-column
prop="assignee"
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') : '' }}</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') : '' }}</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>
</div>
</el-form>
</div>
<div v-if="active === '3'" class="content">
<processNodeInformation
:prcId="this.$route.query.prcId"
:prcType="this.$route.query.prcType"
:prcNum="this.$route.query.prcNum"
/>
<!-- <div class="flow-list">-->
<!-- <el-table-->
<!-- ref="selection"-->
<!-- :height="tablePHeight"-->
<!-- :data="detailData"-->
<!-- tooltip-effect="dark"-->
<!-- style="width: 100%"-->
<!-- border-->
<!-- row-key="id"-->
<!-- :no-data-text="listNoDataText"-->
<!-- :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"-->
<!-- >-->
<!-- <el-table-column-->
<!-- prop="name"-->
<!-- label="任务步骤"-->
<!-- align="center"-->
<!-- />-->
<!-- <el-table-column-->
<!-- prop="assignee"-->
<!-- 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') : '' }}</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') : '' }}</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>-->
</div>
<!-- 保存||提交-->
<ProcessFooter
v-show="verifySarStandard"
@@ -1146,7 +1151,7 @@ export default {
mounted () {
// this.getTaskId()
this.getData()
this.processTable()
// this.processTable()
this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this
}, res => {
@@ -11,7 +11,7 @@
<!-- <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">模块信息</div>-->
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
</div>
<div class="content">
<div class="content" v-show="active === '1' || active === '2'">
<el-form
ref="form"
:model="form"
@@ -344,77 +344,82 @@
</div>
</template>
</div>
<div v-show="active === '3'" class="block" style="padding-top: 20px;">
<div class="flow-list">
<el-table
ref="selection"
:height="tablePHeight"
:data="detailData"
tooltip-effect="dark"
style="width: 100%"
border
row-key="id"
:no-data-text="listNoDataText"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
>
<el-table-column
type="index"
width="55"
label="序号"
align="center"
/>
<el-table-column
prop="name"
label="任务步骤"
align="center"
/>
<el-table-column
prop="assignee"
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') : '' }}</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') : '' }}</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>
</div>
</el-form>
</div>
<div v-if="active === '3'" class="content">
<processNodeInformation
:prcId="this.$route.query.prcId"
:prcType="this.$route.query.prcType"
:prcNum="this.$route.query.prcNum"
/>
<!-- <div class="flow-list">-->
<!-- <el-table-->
<!-- ref="selection"-->
<!-- :height="tablePHeight"-->
<!-- :data="detailData"-->
<!-- tooltip-effect="dark"-->
<!-- style="width: 100%"-->
<!-- border-->
<!-- row-key="id"-->
<!-- :no-data-text="listNoDataText"-->
<!-- :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"-->
<!-- >-->
<!-- <el-table-column-->
<!-- type="index"-->
<!-- width="55"-->
<!-- label="序号"-->
<!-- align="center"-->
<!-- />-->
<!-- <el-table-column-->
<!-- prop="name"-->
<!-- label="任务步骤"-->
<!-- align="center"-->
<!-- />-->
<!-- <el-table-column-->
<!-- prop="assignee"-->
<!-- 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') : '' }}</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') : '' }}</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>-->
</div>
<!-- 保存||提交-->
<ProcessFooter
v-show="verifySarStandard"
@@ -1418,7 +1423,7 @@ export default {
mounted () {
// this.getTaskId()
this.getData()
this.processTable()
// this.processTable()
this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this
}, res => {
@@ -9,7 +9,7 @@
<!-- <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">模块信息</div>-->
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
</div>
<div class="content">
<div class="content" v-show="active === '1'">
<el-form
ref="form"
:model="form"
@@ -17,7 +17,7 @@
class="label-input-form"
label-width="210px"
>
<div style="flex: auto;" v-show="active === '1'">
<div style="flex: auto;" >
<formList
:form = "form"
:FBGBUSSFileList = "FBGBUSSFileList"
@@ -31,75 +31,80 @@
@emitDataLoading="emitDataLoading"
></formList>
</div>
<div class="block" style="padding-top: 20px;" v-show="active === '3'">
<div class="flow-list">
<el-table
:height="tablePHeight"
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'}"
>
<el-table-column
type="index"
width="55"
label="序号"
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="创建时间"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</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') : '' }}</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>
</div>
</el-form>
</div>
<div class="content" v-if="active === '3'">
<processNodeInformation
:prcId="this.$route.query.prcId"
:prcType="this.$route.query.prcType"
:prcNum="this.$route.query.prcNum"
/>
<!-- <div class="flow-list">-->
<!-- <el-table-->
<!-- :height="tablePHeight"-->
<!-- 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'}"-->
<!-- >-->
<!-- <el-table-column-->
<!-- type="index"-->
<!-- width="55"-->
<!-- label="序号"-->
<!-- 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="创建时间"-->
<!-- align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</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') : '' }}</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>-->
</div>
<el-dialog width='400px' :visible.sync="fileMadel" title="上传文件" v-dragDialogWidth :close-on-click-modal="false">
<el-upload
multiple
@@ -2191,7 +2196,7 @@
},
mounted () {
this.getData()
this.processTable()
// this.processTable()
this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this
}, res => {
File diff suppressed because it is too large Load Diff
@@ -239,11 +239,23 @@ export default {
this.queryProcess()
},
dealWith (row) { //
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'
}
const routeUrl = this.$router.resolve({
name: 'ProcessDetail',
query: {
prcNum: row.prcNum,
tabsName: 'AlreadyProcess'
tabsName: 'AlreadyProcess',
actiProcInstId: row.prcId,
flowType: row.prcType,
oldAndNew:oldAndNew,
}
})
window.open(routeUrl.href, '_blank');
@@ -269,11 +269,23 @@ export default {
this.queryProcess()
},
dealWith (row) { //
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'
}
const routeUrl = this.$router.resolve({
name: 'ProcessDetail',
query: {
prcNum: row.prcNum,
tabsName: 'AlreadySend'
tabsName: 'AlreadySend',
actiProcInstId: row.prcId,
flowType: row.prcType,
oldAndNew:oldAndNew,
}
})
window.open(routeUrl.href, '_blank');
@@ -242,12 +242,24 @@ export default {
this.queryProcess()
},
dealWith (row) { //
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'
}
const routeUrl = this.$router.resolve({
name: 'ProcessDetail',
query: {
bpnId: row.id,
prcNum: row.prcNum,
tabsName: 'MonitorProcess'
tabsName: 'MonitorProcess',
actiProcInstId: row.prcId,
flowType: row.prcType,
oldAndNew:oldAndNew,
}
})
window.open(routeUrl.href, '_blank');
@@ -156,7 +156,7 @@
<i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item v-btn-permission="'4219fdb5e33dbbc84d845af98c947e66'" :command="[scope.row, '办理']">办理</el-dropdown-item>
<el-dropdown-item v-btn-permission="'5cf95d4e0eaae6118e1375f677a0a08d'":command="[scope.row, '转办']">转办</el-dropdown-item>
<el-dropdown-item v-btn-permission="'5cf95d4e0eaae6118e1375f677a0a08d'" :command="[scope.row, '转办']">转办</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
@@ -348,6 +348,15 @@ export default {
}
break
case 'buss1':
let oldAndNewBuss = ''
const currentDateBuss = new Date('2024-01-25 23:59:59').getTime();
const dateBuss = new Date(row.creatTime);
const timestampBuss = dateBuss.getTime();
if (currentDateBuss > timestampBuss){
oldAndNewBuss = 'old'
}else{
oldAndNewBuss = 'new'
}
if (row.taskInfo === '企标编写') {
routeUrl = this.$router.resolve({
name: 'bussLibrary2',
@@ -356,7 +365,8 @@ export default {
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
prcType: row.prcType,
oldAndNew: oldAndNewBuss
}
})
}else if (row.taskInfo === '企标编写汇总') {
@@ -367,7 +377,8 @@ export default {
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
prcType: row.prcType,
oldAndNew: oldAndNewBuss
}
})
}else if (row.taskInfo === '重新起草') {
@@ -378,7 +389,8 @@ export default {
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
prcType: row.prcType,
oldAndNew: oldAndNewBuss
}
})
}else if (row.taskInfo === '标准化初审') {
@@ -389,7 +401,8 @@ export default {
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
prcType: row.prcType,
oldAndNew: oldAndNewBuss
}
})
}else if (row.taskInfo === '重新企标编写汇总') {
@@ -400,7 +413,8 @@ export default {
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
prcType: row.prcType,
oldAndNew: oldAndNewBuss
}
})
}else if (row.taskInfo === '征求意见') {
@@ -411,7 +425,8 @@ export default {
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
prcType: row.prcType,
oldAndNew: oldAndNewBuss
}
})
}else if (row.taskInfo === '技术委员会评审、评审意见修改') {
@@ -422,7 +437,8 @@ export default {
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
prcType: row.prcType,
oldAndNew: oldAndNewBuss
}
})
}else if (row.taskInfo === '标准化复审') {
@@ -433,7 +449,8 @@ export default {
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
prcType: row.prcType,
oldAndNew: oldAndNewBuss
}
})
}else if (row.taskInfo === '重新技术委员会评审、评审意见修改') {
@@ -444,7 +461,8 @@ export default {
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
prcType: row.prcType,
oldAndNew: oldAndNewBuss
}
})
}else if (row.taskInfo === '起草单位高级经理审核') {
@@ -455,7 +473,8 @@ export default {
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
prcType: row.prcType,
oldAndNew: oldAndNewBuss
}
})
}else if (row.taskInfo === '标准法规部高级经理审核') {
@@ -466,7 +485,8 @@ export default {
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
prcType: row.prcType,
oldAndNew: oldAndNewBuss
}
})
}else if (row.taskInfo === '审定') {
@@ -477,7 +497,8 @@ export default {
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
prcType: row.prcType,
oldAndNew: oldAndNewBuss
}
})
}else if (row.taskInfo === '批准') {
@@ -488,7 +509,8 @@ export default {
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
prcType: row.prcType,
oldAndNew: oldAndNewBuss
}
})
}else if (row.taskInfo === '主起草人培训') {
@@ -499,7 +521,8 @@ export default {
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
prcType: row.prcType,
oldAndNew: oldAndNewBuss
}
})
}else if (row.taskInfo === '发布') {
@@ -510,7 +533,8 @@ export default {
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
prcType: row.prcType,
oldAndNew: oldAndNewBuss
}
})
}
@@ -937,6 +961,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 +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 === '意见反馈') {
@@ -956,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 === '意见汇总报批') {
@@ -967,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 === '意见审批') {
@@ -978,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 === '管理员') {
@@ -989,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 === '意见处理') {
@@ -1000,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 === '会签') {
@@ -1011,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 === '审核') {
@@ -1022,7 +1062,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 +1074,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 +1086,8 @@ export default {
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
prcType: row.prcType,
oldAndNew: oldAndNew
}
})
}