|
|
@@ -3,10 +3,11 @@
|
|
|
<el-collapse v-model="activeName" @change="handleChange" v-if="nodeBusinessInfo.currentNodeInstanceId">
|
|
|
<el-collapse-item>
|
|
|
<template slot="title" >
|
|
|
- <span style="font-size:20px; margin-left:20px;letter-spacing:2px;color:red">
|
|
|
- <i class="el-icon-warning"></i>
|
|
|
- <span> 当前节点：{{currentNode==null ?'???':currentNode.nodeName?currentNode.nodeName:'结束'}}</span>
|
|
|
- <span style="margin-left:30px">该流程已取：<el-tag type="success" v-if="statementNo">{{statementNo}}</el-tag><el-tag type="danger" v-if="reportNo">{{reportNo}}</el-tag></span>
|
|
|
+ <span style="font-size:20px; color:RGB(168,168,168)">
|
|
|
+ <i class="el-icon-star-on"></i>
|
|
|
+ <span> {{currentNode==null ?'???':currentNode.nodeName?currentNode.nodeName:'结束'}}</span>
|
|
|
+ <span style="margin-left:30px" v-if="reportNo || statementNo">已取号：<span style="font-style:italic;" v-if="statementNo">{{statementNo}}</span>
|
|
|
+ <span style="font-style:italic;margin-left:30px" v-if="reportNo">{{reportNo}}</span></span>
|
|
|
</span>
|
|
|
<span style="font-size:15px; margin-left:15px;letter-spacing:2px; color:RGB(168,168,168)">
|
|
|
点击展开查看实时流程图
|
|
|
@@ -2167,6 +2168,15 @@
|
|
|
}
|
|
|
},
|
|
|
deep: true
|
|
|
+ },
|
|
|
+ nodeBusinessInfo: {
|
|
|
+ handler(newValue, oldValue) {
|
|
|
+ const board = this.$refs.board;
|
|
|
+ if (board){
|
|
|
+ board.getInstanceQueue();
|
|
|
+ }
|
|
|
+ },
|
|
|
+ deep: true,
|
|
|
}
|
|
|
},
|
|
|
|
|
|
@@ -2443,6 +2453,7 @@
|
|
|
this.showBtn = this.$route.query.showBtn ==='true';
|
|
|
this.couldBack = this.$route.query.couldBack ==='true';
|
|
|
this.reportNo = this.$route.query.reportNo;
|
|
|
+ this.production = this.$route.query.pt;
|
|
|
this.statementNo = this.$route.query.statementNo;
|
|
|
this.saveOrderBtn = this.$route.query.saveOrderBtn;
|
|
|
this.majorId = this.$route.query.id;
|
|
|
@@ -2460,7 +2471,8 @@
|
|
|
this.getCurrentNodeInfo();
|
|
|
}
|
|
|
if (this.activeTagName === 'order'){
|
|
|
- this.getAllotDepartment();
|
|
|
+ this.getAllotDepartment();
|
|
|
+ this.getLandTargetList();
|
|
|
}
|
|
|
if (this.activeTagName === 'evaluate'){
|
|
|
if (this.major.businessObjectType==='土地'){
|
|
|
@@ -2476,11 +2488,11 @@
|
|
|
if (this.activeTagName === 'quality'){
|
|
|
this.getPerformance(this.majorId,(this.reportNo==null?this.statementNo:this.reportNo));
|
|
|
}
|
|
|
- if (this.nodeBusinessInfo.currentNodeInstanceId){
|
|
|
- setTimeout(() => {
|
|
|
- this.$refs.board.getInstanceQueue();
|
|
|
- }, 1000);
|
|
|
- }
|
|
|
+ // if (this.nodeBusinessInfo.currentNodeInstanceId){
|
|
|
+ // setTimeout(() => {
|
|
|
+ // this.$refs.board.getInstanceQueue();
|
|
|
+ // }, 1000);
|
|
|
+ // }
|
|
|
},
|
|
|
methods: {
|
|
|
handleChange(){
|
|
|
@@ -2664,14 +2676,26 @@
|
|
|
const obj = new Object();
|
|
|
obj.majorId = this.majorId;
|
|
|
obj.statementNo =this.statementNo;
|
|
|
- if (this.feedback.production.includes("REPORT")){
|
|
|
- obj.reportNo = this.reportNo;
|
|
|
+ if (!this.production){
|
|
|
+ if (this.feedback.production.includes("REPORT")){
|
|
|
+ obj.reportNo = this.reportNo;
|
|
|
+ }else{
|
|
|
+ obj.letterNo = this.reportNo;
|
|
|
+ }
|
|
|
}else{
|
|
|
- obj.letterNo = this.reportNo;
|
|
|
+ if (this.production === 'STATEMENT'){
|
|
|
+ obj.statementNo = this.reportNo;
|
|
|
+ } else if (this.production === 'REPORT'){
|
|
|
+ obj.reportNo = this.reportNo;
|
|
|
+ }else{
|
|
|
+ obj.letterNo = this.reportNo;
|
|
|
+ }
|
|
|
}
|
|
|
+
|
|
|
this.$api.majorTarget.list(obj).then(res=>{
|
|
|
if (res.code === 200){
|
|
|
this.evaluateLandData = res.data;
|
|
|
+ this.statementNo = this.evaluateLandData[0].statementNo
|
|
|
let totalAcreages = [];
|
|
|
let totalValues = this.evaluateLandData.map(item=>item.evaluateValue);
|
|
|
if (this.major.businessObjectType === '土地'){
|
|
|
@@ -2694,6 +2718,7 @@
|
|
|
}
|
|
|
},
|
|
|
getWorkflowLogs(){
|
|
|
+ console.log(this.statementNo);
|
|
|
let param = {
|
|
|
businessId:this.majorId,
|
|
|
businessSubId: this.statementNo,
|
