8ae8550b by 任超

style:流程图功能的完成

1 parent 8b261606
......@@ -68,15 +68,9 @@ import BpmnViewer from 'bpmn-js/lib/Viewer'
import MoveCanvasModule from 'diagram-js/lib/navigation/movecanvas'
export default {
props: {
xml: {
type: String
},
finishedInfo: {
type: Object
},
// 所有节点审批记录
allCommentList: {
type: Array
formData: {
type: Object,
default: {}
}
},
data () {
......@@ -97,24 +91,10 @@ export default {
hoverTimer: null
}
},
// watch: {
// xml: {
// handler (newXml) {
// this.importXML(newXml)
// },
// immediate: true
// },
// finishedInfo: {
// handler (newInfo) {
// this.setProcessStatus(newInfo)
// },
// immediate: true
// }
// },
created () {
this.$nextTick(() => {
this.importXML(this.xml)
this.setProcessStatus(this.finishedInfo);
this.importXML(this.formData.xml)
this.setProcessStatus(this.formData.finishedInfo);
})
},
destroyed () {
......
......@@ -63,10 +63,10 @@
</div>
</div>
<fqsqDialog v-model="isDialog" :djywbm="$route.query.sqywbm" :isJump="true" @updateDialog="updateDialog" />
<dialogBox title="流程图" width="60%" v-model="myValue" @closeDialog="closeDialog">
<!-- <dialogBox title="流程图" width="60%" v-model="myValue" @closeDialog="closeDialog">
<process-viewer :key="`designer-${loadIndex}`" style="height:500px" :xml="xmlData" :finished-info="finishedInfo"
:all-comment-list="historyTaskList" @ch="changeLoadIndex" />
</dialogBox>
</dialogBox> -->
</div>
</template>
......@@ -97,11 +97,6 @@ export default {
return {
isDialog: false,
// 流程图
myValue: false,
loadIndex: 0,
xmlData: '',
finishedInfo: {},
historyTaskList: [],
// 折叠
isShowdrawer: true,
// 默认选中
......@@ -212,7 +207,7 @@ export default {
this.tabList.forEach(function (item, index) {
if (item.value == "clxx") {
that.clxxIndex = index;
that.clxxForm = getForm(item.value,that.$route.query.sqywbm);
that.clxxForm = getForm(item.value, that.$route.query.sqywbm);
that.clxxTab = item;
}
});
......@@ -234,31 +229,21 @@ export default {
case "B1":
getWorkFlowImage(this.bsmSlsq, this.$route.query.bestepid).then(res => {
let { result } = res
this.myValue = true
this.loadIndex++
this.xmlData = result.xml
this.finishedInfo = {
finishedTaskSet: result.finishedTaskSet,
unfinishedTaskSet: result.unfinishedTaskSet,
rejectedTaskSet: result.rejectedTaskSet,
finishedSequenceFlowSet: result.finishedSequenceFlowSet
}
this.allCommentList = result.historyTaskList
// this.$popup({
// title: "流程图",
// height: '500px',
// editItem: "workflow/components/processViewer",
// formData: {
// xml: result.xml,
// finishedInfo: {
// finishedTaskSet: result.finishedTaskSet,
// unfinishedTaskSet: result.unfinishedTaskSet,
// rejectedTaskSet: result.rejectedTaskSet,
// finishedSequenceFlowSet: result.finishedSequenceFlowSet
// },
// allCommentList: result.historyTaskList
// }
// })
this.$popup({
title: "流程图",
height: '500px',
editItem: "workflow/components/processViewer",
formData: {
xml: result.xml,
finishedInfo: {
finishedTaskSet: result.finishedTaskSet,
unfinishedTaskSet: result.unfinishedTaskSet,
rejectedTaskSet: result.rejectedTaskSet,
finishedSequenceFlowSet: result.finishedSequenceFlowSet
},
allCommentList: result.historyTaskList
}
})
})
break;
case "B2": //材料分屏按钮
......@@ -390,7 +375,7 @@ export default {
},
//切换选项卡内容组件
getFromRouter (tabname) {
this.componentTag = getForm(tabname,this.$route.query.sqywbm);
this.componentTag = getForm(tabname, this.$route.query.sqywbm);
},
//发送下一个环节
send (obj) {
......