From 81b9e52ae55a1382779bb8e7ca726b5df423b7ae Mon Sep 17 00:00:00 2001 From: dengbf Date: Mon, 8 Jan 2024 14:25:00 +0800 Subject: [PATCH] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]=20=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E8=8A=82=E7=82=B9-=E6=B5=81=E8=BD=AC=E8=A7=84=E5=88=99?= =?UTF-8?q?=E4=B8=AD=E6=B5=81=E8=BD=AC=E8=87=B3=E7=9A=84=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E6=A1=86=E4=B8=AD=E6=AF=8F=E4=B8=AA=E6=AD=A5=E9=AA=A4=E5=8F=AA?= =?UTF-8?q?=E8=83=BD=E9=80=89=E6=8B=A9=E4=B8=80=E6=AC=A1=20=20=20=20-=20[?= =?UTF-8?q?=E5=85=B3=E8=81=94]=20#[1064302411218944]=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E8=8A=82=E7=82=B9-=E6=B5=81=E8=BD=AC=E8=A7=84=E5=88=99?= =?UTF-8?q?=E4=B8=AD=E6=B5=81=E8=BD=AC=E8=87=B3=E7=9A=84=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E6=A1=86=E4=B8=AD=E6=AF=8F=E4=B8=AA=E6=AD=A5=E9=AA=A4=E5=8F=AA?= =?UTF-8?q?=E8=83=BD=E9=80=89=E6=8B=A9=E4=B8=80=E6=AC=A1=20http://192.168.?= =?UTF-8?q?0.96:8090/demo/rdm.html#/bug-detail/939050947543040/93905094754?= =?UTF-8?q?3057/1064302411218944?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../flowedit/components/condition-node.vue | 33 ++++++++++++++++--- .../process/task/processdetail/detailmixin.js | 3 +- .../workorder/actiondialog/lookSitemap.vue | 15 ++++----- .../pages/process/task/task-dispatch.vue | 9 +++-- 4 files changed, 43 insertions(+), 17 deletions(-) diff --git a/src/views/pages/process/flow/flowedit/components/condition-node.vue b/src/views/pages/process/flow/flowedit/components/condition-node.vue index cc484c26..fbc3b903 100644 --- a/src/views/pages/process/flow/flowedit/components/condition-node.vue +++ b/src/views/pages/process/flow/flowedit/components/condition-node.vue @@ -240,10 +240,10 @@ export default { value: 'always', text: this.$t('term.process.alwaystransfer') }, - { - value: 'negative', - text: this.$t('term.process.nottransfer') - }, + // { + // value: 'negative', + // text: this.$t('term.process.nottransfer') + // }, { value: 'optional', text: this.$t('page.custom') @@ -548,10 +548,33 @@ export default { return joinText; }, getChildrenNode(targetStepList, type) { + let dataList = []; + if (!this.$utils.isEmpty(this.moveonConfigList)) { + let list = []; + this.moveonConfigList.forEach(item => { + list.push(...item.targetStepList); + }); + this.newChildrenNode.forEach(item => { + let obj = this.$utils.deepClone(item); + if (list.includes(obj.uuid)) { + if (this.$utils.isEmpty(targetStepList)) { + this.$set(obj, '_disabled', true); + } else { + let findItem = targetStepList.find(t => t === obj.uuid); + if (!findItem) { + this.$set(obj, '_disabled', true); + } + } + } + dataList.push(obj); + }); + } else { + dataList = this.$utils.deepClone(this.newChildrenNode); + } //获取子节点/type this.ruleFormData.forEach(item => { if (item.name == 'targetStepList') { - item.dataList = this.newChildrenNode; + item.dataList = dataList; item.value = targetStepList; } if (item.name == 'type') { diff --git a/src/views/pages/process/task/processdetail/detailmixin.js b/src/views/pages/process/task/processdetail/detailmixin.js index 7fa0d8e4..8874c13b 100644 --- a/src/views/pages/process/task/processdetail/detailmixin.js +++ b/src/views/pages/process/task/processdetail/detailmixin.js @@ -430,7 +430,8 @@ export default { this.sitemapFullscreen = false; if (data.Status == 'OK') { this.processConfig = data.Return.config; - // this.sitemapTitle = '流程图';// + this.processConfig.process.processConfig.name; + this.sitemapTitle = this.processConfig.process.processConfig.name; + this.tsDialoglookSitemap.flowUuid = this.processConfig.process.processConfig.uuid; this.initTopo(data.Return); } }, diff --git a/src/views/pages/process/task/processdetail/workorder/actiondialog/lookSitemap.vue b/src/views/pages/process/task/processdetail/workorder/actiondialog/lookSitemap.vue index 971c2f44..5b910dfc 100644 --- a/src/views/pages/process/task/processdetail/workorder/actiondialog/lookSitemap.vue +++ b/src/views/pages/process/task/processdetail/workorder/actiondialog/lookSitemap.vue @@ -3,7 +3,6 @@ + +
@@ -132,7 +135,6 @@ export default { validCardOpen: false, isShowFlowmap: false, //展示流程图 flowmapConfig: { - title: this.$t('term.process.viewflowchart'), width: 'medium', height: '600px', fullscreen: true, @@ -325,10 +327,13 @@ export default { this.sitemapFullscreen = false; if (data.Status == 'OK') { this.processConfig = data.Return.config; - // this.flowmapConfig.title = '流程图' + this.processConfig.process.processConfig.name; + this.flowmapConfig.title = this.processConfig.process.processConfig.name; this.initTopo(data.Return); } }, + openFlow() { + window.open(HOME + '/process.html#/flow-edit?uuid=' + this.processConfig.process.processConfig.uuid, '_blank'); + }, initTopo(data) { //获取流程图 if (!data) return; let viewOpts = { -- Gitee