diff --git a/src/views/pages/process/flow/flow-edit.vue b/src/views/pages/process/flow/flow-edit.vue index 51ade4ddaf310e7d90675c28bd488577f408ee5f..ed2bf9e91be8e15741c99ff97f48a1b2c4b1bc75 100644 --- a/src/views/pages/process/flow/flow-edit.vue +++ b/src/views/pages/process/flow/flow-edit.vue @@ -772,7 +772,6 @@ export default { saveData.config && saveData.config.process && saveData.config.process.stepList.length > 0 && saveData.config.process.stepList.forEach((item) => { if (item && item.stepConfig && item.stepConfig.hasOwnProperty('formSceneUuid') && item.stepConfig.formSceneUuid) { // 如果某些步骤节点,找不到匹配的场景名称时,回填失败,表单场景下拉框处为空 - item.stepConfig['formSceneName'] = !this.formSceneUuidList.includes(item.stepConfig.formSceneUuid) ? '' : item.stepConfig.formSceneName; item.stepConfig['formSceneUuid'] = !this.formSceneUuidList.includes(item.stepConfig.formSceneUuid) ? '' : item.stepConfig.formSceneUuid; } }); @@ -1127,6 +1126,7 @@ export default { if (res.Status == 'OK') { try { let formConfig = res.Return.formConfig || {}; + let defaultSceneUuid = formConfig.defaultSceneUuid || formConfig.uuid; formConfig.sceneList && formConfig.sceneList.forEach((item) => { if (item.uuid) { this.formSceneUuidList.push(item.uuid); @@ -1137,8 +1137,7 @@ export default { } this.stepList && !this.$utils.isEmpty(this.stepList) && this.stepList.forEach((item) => { if (item && item.handler && !noFormSceneNodeList.includes(item.handler) && item.stepConfig) { - this.$set(item.stepConfig, 'formSceneUuid', (formConfig && formConfig.uuid) ? formConfig.uuid : ''); - this.$set(item.stepConfig, 'formSceneName', (formConfig && formConfig.name) ? formConfig.name : ''); + this.$set(item.stepConfig, 'formSceneUuid', (formConfig && formConfig.uuid) ? defaultSceneUuid : ''); } }); } catch (error) { @@ -1150,7 +1149,6 @@ export default { this.stepList && !this.$utils.isEmpty(this.stepList) && this.stepList.forEach((item) => { if (item && item.handler && !noFormSceneNodeList.includes(item.handler) && item.stepConfig) { this.$set(item.stepConfig, 'formSceneUuid', ''); - this.$set(item.stepConfig, 'formSceneName', ''); } }); } diff --git a/src/views/pages/process/flow/flowedit/components/nodemixin.js b/src/views/pages/process/flow/flowedit/components/nodemixin.js index f5d9ade53bb19d1448c314db1da37e4c4a863acc..5eb2e50209a6d814d12e25e7c2a00d769a1e08d2 100644 --- a/src/views/pages/process/flow/flowedit/components/nodemixin.js +++ b/src/views/pages/process/flow/flowedit/components/nodemixin.js @@ -140,7 +140,6 @@ export default { }, updateScene(sceneConfig) { // 更新表单场景值 - this.$set(this.configData.stepConfig, 'formSceneName', sceneConfig.text); this.$set(this.configData.stepConfig, 'formSceneUuid', sceneConfig.value); }, clearNodeData(stepConfig) { diff --git a/src/views/pages/process/task/processdetail/detailmixin.js b/src/views/pages/process/task/processdetail/detailmixin.js index ff6944dd0fcd9819b1dc734ef5b29f9e8de6d117..8a8dd619e1867c3c1b42bd7954f91b92f7b8f176 100644 --- a/src/views/pages/process/task/processdetail/detailmixin.js +++ b/src/views/pages/process/task/processdetail/detailmixin.js @@ -286,7 +286,8 @@ export default { let formSceneUuid = this.processTaskConfig.currentProcessTaskStep ? this.processTaskConfig.currentProcessTaskStep.formSceneUuid : null; let formConfig = this.processTaskConfig.formConfig; this.formConfig = formConfig; - if (this.formConfig._type == 'new') { + if (this.formConfig._type == 'new' && !this.$utils.isEmpty(this.processTask.currentProcessTaskStep)) { + //步骤进行中展示设置的节点场景或者默认场景 this.formConfig = this.initNewFormConfig(formSceneUuid, this.formConfig); } } diff --git a/src/views/pages/process/task/taskcommon/dealNewFormData.js b/src/views/pages/process/task/taskcommon/dealNewFormData.js index d7ad2fe8f6a8ad00159bb0a2fe19981ef0c3bd3a..c6be17c1b1478e2992db7f76a5664ade34d8c90f 100644 --- a/src/views/pages/process/task/taskcommon/dealNewFormData.js +++ b/src/views/pages/process/task/taskcommon/dealNewFormData.js @@ -3,8 +3,9 @@ export default { initNewFormConfig(formSceneUuid, formConfig) { let data = this.$utils.deepClone(formConfig); let formItemList = []; - if (formSceneUuid && formSceneUuid != this.formConfig.uuid) { - let sceneConfig = this.formConfig.sceneList.find(item => item.uuid === formSceneUuid); + let currentSceneUuid = formSceneUuid || formConfig.defaultSceneUuid || this.formConfig.uuid; + if (currentSceneUuid && currentSceneUuid != this.formConfig.uuid) { + let sceneConfig = this.formConfig.sceneList.find(item => item.uuid === currentSceneUuid); if (sceneConfig) { if (formConfig.tableList) { formConfig.tableList.forEach(item => {