From 1980b2a6868d7b82a64246171177908b7675ad90 Mon Sep 17 00:00:00 2001 From: dengbf Date: Mon, 2 Dec 2024 17:47:23 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20#[1302178218606592]IT?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1-=E6=B5=81=E7=A8=8B=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E9=A1=B5=E6=94=AF=E6=8C=81=E6=9F=A5=E7=9C=8B=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E5=A4=87=E4=BB=BD=E7=9A=84=E6=B5=81=E7=A8=8B=E5=9B=BE=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=20http://192.168.0.96:8090/demo/rdm.html#/story-detai?= =?UTF-8?q?l/939050947543040/939050947543042/1302178218606592?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/resources/api/process/process/process.js | 9 ++++++ .../pages/process/flow/flow-edit-new.vue | 32 +++++++++++++++---- .../process/flow/flowedit/FlowSetting.vue | 6 +++- .../process/flow/flowedit/TacticsSetting.vue | 4 +++ .../autoexec/setting/autoexec-config.vue | 6 +++- .../autoexec/setting/config-list-dialog.vue | 6 +++- .../autoexec/setting/joppolicy/base.vue | 6 +++- .../flowedit/components/automatic-node.vue | 3 ++ .../flow/flowedit/components/base-config.vue | 6 +++- .../flowedit/components/condition-node.vue | 3 ++ .../autoexecservice-createjob-config.vue | 6 +++- .../createjob/config-list-dialog.vue | 6 +++- .../components/createjob/createjob-config.vue | 8 +++-- .../components/createjob/filter-list.vue | 6 +++- .../components/createjob/params/job-param.vue | 6 +++- .../flow/flowedit/components/nodemixin.js | 6 +++- .../components/nodesetting/action-setting.vue | 18 +++-------- .../nodesetting/action/action-edit.vue | 4 +++ .../components/nodesetting/assign-setting.vue | 1 - .../nodesetting/form-tag-setting.vue | 6 +++- .../nodesetting/formscene-setting.vue | 7 +++- .../process/task/process-topo-dialog.vue | 17 +++++++--- .../common/processtask-topo-dialog.vue | 14 ++++++-- .../pages/process/task/task-dispatch.vue | 7 +++- 24 files changed, 149 insertions(+), 44 deletions(-) diff --git a/src/resources/api/process/process/process.js b/src/resources/api/process/process/process.js index 39cc7600..5efc5ff6 100644 --- a/src/resources/api/process/process/process.js +++ b/src/resources/api/process/process/process.js @@ -157,6 +157,15 @@ const process = { }, saveTransferablestep(params) { //保存转交步骤 return axios.post('/api/rest/eoa/step/transfer', params); + }, + getProcessForm(data) { //工单表单 + return axios.post('/api/rest/process/form/get', data); + }, + getProcessFormTagList(data) { //工单表单标签列表 + return axios.post('/api/rest/process/form/tag/list', data); + }, + getProcessFormAttributeList(data) { //工单表单组件属性列表 + return axios.post('/api/rest/process/form/attribute/list', data); } }; diff --git a/src/views/pages/process/flow/flow-edit-new.vue b/src/views/pages/process/flow/flow-edit-new.vue index 7bffa4e5..fcbddcdc 100644 --- a/src/views/pages/process/flow/flow-edit-new.vue +++ b/src/views/pages/process/flow/flow-edit-new.vue @@ -17,7 +17,7 @@ {{ $t('term.process.relcatalog') }} {{ referenceCount }} -
+
@@ -26,7 +26,7 @@ - +
@@ -258,7 +258,8 @@ export default { dnd: null, flowConfig: {}, //流程设计器的设置 flowData: { process: { formConfig: {} } }, //流程数据 - allowDispatchStepWorkerNode: [] //允许指派任务的节点 + allowDispatchStepWorkerNode: [], //允许指派任务的节点 + processTaskId: null }; }, beforeCreate() {}, @@ -278,6 +279,11 @@ export default { //从策略页面跳转过滤，定位tab this.activeTab = this.$route.query.activeTab; } + if (this.$route.query.processTaskId) { + //工单id + this.processTaskId = Math.floor(this.$route.query.processTaskId); + this.flowObj.processTaskId = this.processTaskId; + } }, async mounted() { // 获取节点列表数据 @@ -582,7 +588,13 @@ export default { async getProcessByUuid() { if (this.processUuid) { this.isFlowReady = false; - await this.$api.process.process.getProcess({ uuid: this.processUuid }).then(res => { + let data = { + uuid: this.processUuid + }; + if (this.processTaskId) { + data.processTaskId = this.processTaskId; + } + await this.$api.process.process.getProcess(data).then(res => { this.flowData = res.Return.config; //console.log(JSON.stringify(this.flowData, null, 2)); this.processName = res.Return.name; @@ -994,7 +1006,11 @@ export default { //节点设置needformscene为true时，需要更新节点的表单场景id this.formSceneUuidList = []; if (formUuid) { - this.$api.framework.form.getFormByVersionUuid({ uuid: formUuid }).then(res => { + let data = { uuid: formUuid }; + if (this.flowObj && this.flowObj.processTaskId) { + data.processTaskId = this.flowObj.processTaskId; + } + this.$api.process.process.getProcessForm(data).then(res => { this.$set(this.flowData.process.formConfig, 'uuid', formUuid); const formConfig = res.Return.formConfig; let defaultSceneUuid = formConfig.defaultSceneUuid || formConfig.uuid; @@ -1285,7 +1301,11 @@ export default { async getFormSceneuuidList(uuid) { //获取表单指定版本的数据，渲染表单 if (uuid) { - await this.$api.framework.form.getFormByVersionUuid({ uuid: uuid }).then(res => { + let data = { uuid: uuid }; + if (this.flowObj && this.flowObj.processTaskId) { + data.processTaskId = this.flowObj.processTaskId; + } + await this.$api.process.process.getProcessForm(data).then(res => { if (res.Status == 'OK') { try { let formConfig = res.Return.formConfig || {}; diff --git a/src/views/pages/process/flow/flowedit/FlowSetting.vue b/src/views/pages/process/flow/flowedit/FlowSetting.vue index 7fecebd2..4bb30044 100644 --- a/src/views/pages/process/flow/flowedit/FlowSetting.vue +++ b/src/views/pages/process/flow/flowedit/FlowSetting.vue @@ -125,6 +125,7 @@ export default { TsFormSwitch: () => import('@/resources/plugins/TsForm/TsFormSwitch'), TsSheet: () => import('@/resources/plugins/TsSheet/TsSheet.vue') }, + inject: ['flowObj'], props: { uuid: { //流程uuid @@ -243,7 +244,10 @@ export default { let data = { uuid: uuid }; - this.$api.framework.form.getFormByVersionUuid(data).then(res => { + if (this.flowObj && this.flowObj.processTaskId) { + data.processTaskId = this.flowObj.processTaskId; + } + this.$api.process.process.getProcessForm(data).then(res => { if (res.Status == 'OK') { this.currentVersionUuid = res.Return.currentVersionUuid; if (!this.$utils.isEmpty(res.Return.formConfig)) { diff --git a/src/views/pages/process/flow/flowedit/TacticsSetting.vue b/src/views/pages/process/flow/flowedit/TacticsSetting.vue index eb1430ea..f3b31ed3 100644 --- a/src/views/pages/process/flow/flowedit/TacticsSetting.vue +++ b/src/views/pages/process/flow/flowedit/TacticsSetting.vue @@ -598,6 +598,7 @@ export default { noticeSetting, ...formItems }, + inject: ['flowObj'], props: { slaListPorps: { type: Array, @@ -1540,6 +1541,9 @@ export default { let data = { formUuid: this.formUuid }; + if (this.flowObj && this.flowObj.processTaskId) { + data.processTaskId = this.flowObj.processTaskId; + } this.getFormItem(data); } else { let data = {}; diff --git a/src/views/pages/process/flow/flowedit/components/autoexec/setting/autoexec-config.vue b/src/views/pages/process/flow/flowedit/components/autoexec/setting/autoexec-config.vue index 8b5f3eaa..0f622e9c 100644 --- a/src/views/pages/process/flow/flowedit/components/autoexec/setting/autoexec-config.vue +++ b/src/views/pages/process/flow/flowedit/components/autoexec/setting/autoexec-config.vue @@ -114,6 +114,7 @@ export default { Singlejobpolicy: () => import('./joppolicy/singlejobpolicy.vue'), FormTagSetting: () => import('@/views/pages/process/flow/flowedit/components/nodesetting/form-tag-setting.vue') // 表单扩展数据标签 }, + inject: ['flowObj'], props: { formUuid: String, defaultAllFormitemList: Array, @@ -387,7 +388,10 @@ export default { formUuid: this.formUuid, tag: tag }; - this.$api.framework.form.getFormItemList(data).then(res => { + if (this.flowObj && this.flowObj.processTaskId) { + data.processTaskId = this.flowObj.processTaskId; + } + this.$api.process.process.getProcessFormAttributeList(data).then(res => { if (res.Status == 'OK') { this.allFormitemList = res.Return || []; } diff --git a/src/views/pages/process/flow/flowedit/components/autoexec/setting/config-list-dialog.vue b/src/views/pages/process/flow/flowedit/components/autoexec/setting/config-list-dialog.vue index 85a8f2bc..656ce5c0 100644 --- a/src/views/pages/process/flow/flowedit/components/autoexec/setting/config-list-dialog.vue +++ b/src/views/pages/process/flow/flowedit/components/autoexec/setting/config-list-dialog.vue @@ -43,6 +43,7 @@ export default { components: { AutoexecConfig: () => import('./autoexec-config.vue') }, + inject: ['flowObj'], props: { formUuid: String, list: Array @@ -89,7 +90,10 @@ export default { formUuid: this.formUuid, tag: 'common' }; - return this.$api.framework.form.getFormItemList(data).then(res => { + if (this.flowObj && this.flowObj.processTaskId) { + data.processTaskId = this.flowObj.processTaskId; + } + return this.$api.process.process.getProcessFormAttributeList(data).then(res => { if (res.Status == 'OK') { this.allFormitemList = res.Return || []; } diff --git a/src/views/pages/process/flow/flowedit/components/autoexec/setting/joppolicy/base.vue b/src/views/pages/process/flow/flowedit/components/autoexec/setting/joppolicy/base.vue index 2e2c3b43..38176800 100644 --- a/src/views/pages/process/flow/flowedit/components/autoexec/setting/joppolicy/base.vue +++ b/src/views/pages/process/flow/flowedit/components/autoexec/setting/joppolicy/base.vue @@ -13,6 +13,7 @@ export default { TsTable: () => import('@/resources/components/TsTable/TsTable.vue'), MappingmodeExpression: () => import('@/views/pages/process/flow/flowedit/components/autoexec/setting/joppolicy/mappingmode-expression.vue') }, + inject: ['flowObj'], props: { config: Object, allFormitemList: Array @@ -41,7 +42,10 @@ export default { textName: 'label', valueName: 'name', border: 'border', - transfer: true + transfer: true, + params: { + processTaskId: this.flowObj && this.flowObj.processTaskId + } } }; }, diff --git a/src/views/pages/process/flow/flowedit/components/automatic-node.vue b/src/views/pages/process/flow/flowedit/components/automatic-node.vue index 6ca37040..19115947 100644 --- a/src/views/pages/process/flow/flowedit/components/automatic-node.vue +++ b/src/views/pages/process/flow/flowedit/components/automatic-node.vue @@ -717,6 +717,9 @@ export default { formUuid: this.formUuid, tag: this.formTag || 'common' }; + if (this.flowObj && this.flowObj.processTaskId) { + data.processTaskId = this.flowObj.processTaskId; + } return this.$api.process.process.processParamList(data).then(res => { if (res.Status == 'OK') { let defaultParamConditionList = res.Return; diff --git a/src/views/pages/process/flow/flowedit/components/base-config.vue b/src/views/pages/process/flow/flowedit/components/base-config.vue index 47b94fc1..d66bbf84 100644 --- a/src/views/pages/process/flow/flowedit/components/base-config.vue +++ b/src/views/pages/process/flow/flowedit/components/base-config.vue @@ -66,6 +66,7 @@ export default { AssignSetting: () => import('./nodesetting/assign-setting.vue'), //分派处理人 FormsceneSetting: () => import('./nodesetting/formscene-setting') // 表单场景 }, + inject: ['flowObj'], mixins: [], props: { formUuid: String, @@ -149,7 +150,10 @@ export default { let data = { uuid: uuid }; - this.$api.framework.form.getFormByVersionUuid(data).then(res => { + if (this.flowObj && this.flowObj.processTaskId) { + data.processTaskId = this.flowObj.processTaskId; + } + this.$api.process.process.getProcessForm(data).then(res => { if (res.Status == 'OK') { try { let formConfig = res.Return.formConfig || {}; 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 4945a9c6..9caf83b9 100644 --- a/src/views/pages/process/flow/flowedit/components/condition-node.vue +++ b/src/views/pages/process/flow/flowedit/components/condition-node.vue @@ -700,6 +700,9 @@ export default { tag: this.formTag || 'common', isAll: 1 }; + if (this.flowObj && this.flowObj.processTaskId) { + data.processTaskId = this.flowObj.processTaskId; + } this.$api.process.process.conditionList(data).then(res => { if (res.Status == 'OK') { this.formAttrList = res.Return; diff --git a/src/views/pages/process/flow/flowedit/components/createjob/autoexecservice-createjob-config.vue b/src/views/pages/process/flow/flowedit/components/createjob/autoexecservice-createjob-config.vue index 9ab58506..7d164a60 100644 --- a/src/views/pages/process/flow/flowedit/components/createjob/autoexecservice-createjob-config.vue +++ b/src/views/pages/process/flow/flowedit/components/createjob/autoexecservice-createjob-config.vue @@ -23,6 +23,7 @@ export default { TsFormItem: () => import('@/resources/plugins/TsForm/TsFormItem') }, filters: {}, + inject: ['flowObj'], props: { formUuid: String, defaultAllFormitemList: Array, //默认表单项列表 @@ -80,7 +81,10 @@ export default { formUuid: this.formUuid, tag: tag }; - this.$api.framework.form.getFormItemList(data).then(res => { + if (this.flowObj && this.flowObj.processTaskId) { + data.processTaskId = this.flowObj.processTaskId; + } + this.$api.process.process.getProcessFormAttributeList(data).then(res => { if (res.Status == 'OK') { this.allFormitemList = res.Return || []; } diff --git a/src/views/pages/process/flow/flowedit/components/createjob/config-list-dialog.vue b/src/views/pages/process/flow/flowedit/components/createjob/config-list-dialog.vue index 212fc945..b649981d 100644 --- a/src/views/pages/process/flow/flowedit/components/createjob/config-list-dialog.vue +++ b/src/views/pages/process/flow/flowedit/components/createjob/config-list-dialog.vue @@ -70,6 +70,7 @@ export default { CreatejobConfig: () => import('./createjob-config.vue'), AutoexecserviceCreatejobConfig: () => import('./autoexecservice-createjob-config.vue') }, + inject: ['flowObj'], props: { formUuid: String, list: Array @@ -126,7 +127,10 @@ export default { formUuid: this.formUuid, tag: 'common' }; - return this.$api.framework.form.getFormItemList(data).then(res => { + if (this.flowObj && this.flowObj.processTaskId) { + data.processTaskId = this.flowObj.processTaskId; + } + return this.$api.process.process.getProcessFormAttributeList(data).then(res => { if (res.Status == 'OK') { this.allFormitemList = res.Return || []; } diff --git a/src/views/pages/process/flow/flowedit/components/createjob/createjob-config.vue b/src/views/pages/process/flow/flowedit/components/createjob/createjob-config.vue index bd5c3e9c..bfbc0ee8 100644 --- a/src/views/pages/process/flow/flowedit/components/createjob/createjob-config.vue +++ b/src/views/pages/process/flow/flowedit/components/createjob/createjob-config.vue @@ -151,8 +151,7 @@ export default { JobParam: () => import('./params/job-param.vue'), FormTagSetting: () => import('@/views/pages/process/flow/flowedit/components/nodesetting/form-tag-setting.vue') // 表单扩展数据标签 }, - filters: { - }, + inject: ['flowObj'], props: { formUuid: String, defaultAllFormitemList: Array, //默认表单项列表 @@ -385,7 +384,10 @@ export default { formUuid: this.formUuid, tag: tag }; - this.$api.framework.form.getFormItemList(data).then(res => { + if (this.flowObj && this.flowObj.processTaskId) { + data.processTaskId = this.flowObj.processTaskId; + } + this.$api.process.process.getProcessFormAttributeList(data).then(res => { if (res.Status == 'OK') { this.allFormitemList = res.Return || []; } diff --git a/src/views/pages/process/flow/flowedit/components/createjob/filter-list.vue b/src/views/pages/process/flow/flowedit/components/createjob/filter-list.vue index b6078c92..19cf8d9c 100644 --- a/src/views/pages/process/flow/flowedit/components/createjob/filter-list.vue +++ b/src/views/pages/process/flow/flowedit/components/createjob/filter-list.vue @@ -139,6 +139,7 @@ export default { TsFormSelect: () => import('@/resources/plugins/TsForm/TsFormSelect'), TsFormSwitch: () => import('@/resources/plugins/TsForm/TsFormSwitch') }, + inject: ['flowObj'], props: { value: String, filterList: Array, @@ -194,7 +195,10 @@ export default { valueName: 'name', border: 'border', transfer: true, - validateList: ['required'] + validateList: ['required'], + params: { + processTaskId: this.flowObj && this.flowObj.processTaskId + } } }; }, diff --git a/src/views/pages/process/flow/flowedit/components/createjob/params/job-param.vue b/src/views/pages/process/flow/flowedit/components/createjob/params/job-param.vue index 91bdb925..4c39b0cf 100644 --- a/src/views/pages/process/flow/flowedit/components/createjob/params/job-param.vue +++ b/src/views/pages/process/flow/flowedit/components/createjob/params/job-param.vue @@ -139,6 +139,7 @@ export default { MappingmodeExpression: () => import('./mappingmode-expression.vue'), FilterList: () => import('../filter-list.vue') }, + inject: ['flowObj'], props: { jobParamMappingGroupList: Array, allFormitemList: Array, @@ -170,7 +171,10 @@ export default { textName: 'label', valueName: 'name', border: 'border', - transfer: true + transfer: true, + params: { + processTaskId: this.flowObj && this.flowObj.processTaskId + } } }; }, diff --git a/src/views/pages/process/flow/flowedit/components/nodemixin.js b/src/views/pages/process/flow/flowedit/components/nodemixin.js index 159048c9..e2153b91 100644 --- a/src/views/pages/process/flow/flowedit/components/nodemixin.js +++ b/src/views/pages/process/flow/flowedit/components/nodemixin.js @@ -1,4 +1,5 @@ export default { + inject: ['flowObj'], props: { nodeConfig: Object, //节点数据 formConfig: Object, @@ -84,7 +85,10 @@ export default { let data = { uuid: uuid }; - this.$api.framework.form.getFormByVersionUuid(data).then(res => { + if (this.flowObj && this.flowObj.processTaskId) { + data.processTaskId = this.flowObj.processTaskId; + } + this.$api.process.process.getProcessForm(data).then(res => { if (res.Status == 'OK') { try { let formConfig = res.Return.formConfig || {}; diff --git a/src/views/pages/process/flow/flowedit/components/nodesetting/action-setting.vue b/src/views/pages/process/flow/flowedit/components/nodesetting/action-setting.vue index c08e828a..8e6ddfde 100644 --- a/src/views/pages/process/flow/flowedit/components/nodesetting/action-setting.vue +++ b/src/views/pages/process/flow/flowedit/components/nodesetting/action-setting.vue @@ -70,6 +70,7 @@ export default { TsFormSwitch: () => import('@/resources/plugins/TsForm/TsFormSwitch'), ActionEdit: () => import('./action/action-edit.vue') }, + inject: ['flowObj'], props: { actionList: { type: Array, @@ -145,19 +146,6 @@ export default { this.$set(this, 'triggerList', res.Return || []); }); }, - // getParaConditionList(uuid) { - // //参数条件选择 - // let data = {}; - // if (uuid) { - // data.formUuid = uuid; - // } - // this.paraConditionList = []; - // this.$api.process.process.processParamList(data).then(res => { - // if (res.Status == 'OK') { - // this.$set(this, 'paraConditionList', res.Return || []); - // } - // }); - // }, getIntegrationList(val) { //获取外部数据源选中的列表回显需要的列表 this.integrationList = []; @@ -174,6 +162,9 @@ export default { formUuid: this.formUuid, tag: formTag }; + if (this.flowObj && this.flowObj.processTaskId) { + data.processTaskId = this.flowObj.processTaskId; + } this.$api.process.process.processParamList(data).then(res => { if (res.Status == 'OK') { let processParamList = res.Return || []; @@ -281,7 +272,6 @@ export default { 'formConfig.uuid': { handler: function(val, oldval) { this.formUuid = val; - // this.getParaConditionList(val); }, deep: true, immediate: true diff --git a/src/views/pages/process/flow/flowedit/components/nodesetting/action/action-edit.vue b/src/views/pages/process/flow/flowedit/components/nodesetting/action/action-edit.vue index 5bef5e10..3759c16a 100644 --- a/src/views/pages/process/flow/flowedit/components/nodesetting/action/action-edit.vue +++ b/src/views/pages/process/flow/flowedit/components/nodesetting/action/action-edit.vue @@ -192,6 +192,7 @@ export default { TsFormInput: () => import('@/resources/plugins/TsForm/TsFormInput.vue'), FormTagSetting: () => import('@/views/pages/process/flow/flowedit/components/nodesetting/form-tag-setting.vue') // 表单扩展数据标签 }, + inject: ['flowObj'], props: { isShow: { type: Boolean, @@ -417,6 +418,9 @@ export default { formUuid: this.formUuid, tag: this.formTag || 'common' }; + if (this.flowObj && this.flowObj.processTaskId) { + data.processTaskId = this.flowObj.processTaskId; + } this.processParamList = []; this.$api.process.process.processParamList(data).then(res => { if (res.Status == 'OK') { diff --git a/src/views/pages/process/flow/flowedit/components/nodesetting/assign-setting.vue b/src/views/pages/process/flow/flowedit/components/nodesetting/assign-setting.vue index c18047d0..a5f31c91 100644 --- a/src/views/pages/process/flow/flowedit/components/nodesetting/assign-setting.vue +++ b/src/views/pages/process/flow/flowedit/components/nodesetting/assign-setting.vue @@ -301,7 +301,6 @@ export default { PrestepassignDialog: () => import('./assign/prestepassign-dialog.vue'), ...dispatcherComponent }, - inject: ['flowObj'], props: { prevNodes: { type: Array, diff --git a/src/views/pages/process/flow/flowedit/components/nodesetting/form-tag-setting.vue b/src/views/pages/process/flow/flowedit/components/nodesetting/form-tag-setting.vue index 210b6b51..d174942c 100644 --- a/src/views/pages/process/flow/flowedit/components/nodesetting/form-tag-setting.vue +++ b/src/views/pages/process/flow/flowedit/components/nodesetting/form-tag-setting.vue @@ -59,7 +59,11 @@ export default { getFormTagList() { this.formTagList = []; if (this.formUuid) { - this.$api.framework.form.getFormTagList({formUuid: this.formUuid}).then(res => { + let data = { formUuid: this.formUuid }; + if (this.flowObj && this.flowObj.processTaskId) { + data.processTaskId = this.flowObj.processTaskId; + } + this.$api.process.process.getProcessFormTagList(data).then(res => { if (res.Return) { let tbodyList = res.Return.tbodyList || []; if (!this.$utils.isEmpty(tbodyList)) { diff --git a/src/views/pages/process/flow/flowedit/components/nodesetting/formscene-setting.vue b/src/views/pages/process/flow/flowedit/components/nodesetting/formscene-setting.vue index 4765a7f7..92976f13 100644 --- a/src/views/pages/process/flow/flowedit/components/nodesetting/formscene-setting.vue +++ b/src/views/pages/process/flow/flowedit/components/nodesetting/formscene-setting.vue @@ -49,6 +49,7 @@ export default { TsFormSelect: () => import('@/resources/plugins/TsForm/TsFormSelect'), FormPreview: () => import('@/resources/plugins/TsSheet/form-preview.vue') }, + inject: ['flowObj'], mixins: [nodemixin, itemmixin], props: { value: { @@ -107,7 +108,11 @@ export default { this.dataList = []; } this.formPreviewContent = {}; - await this.$api.framework.form.getFormByVersionUuid({uuid: this.formConfig.uuid}).then(res => { + let data = {uuid: this.formConfig.uuid}; + if (this.flowObj && this.flowObj.processTaskId) { + data.processTaskId = this.flowObj.processTaskId; + } + await this.$api.process.process.getProcessForm(data).then(res => { if (res.Status == 'OK') { try { let formConfig = res.Return.formConfig || {}; diff --git a/src/views/pages/process/task/process-topo-dialog.vue b/src/views/pages/process/task/process-topo-dialog.vue index ab9717dd..2714454a 100644 --- a/src/views/pages/process/task/process-topo-dialog.vue +++ b/src/views/pages/process/task/process-topo-dialog.vue @@ -1,7 +1,10 @@