diff --git a/src/views/flow/edit.vue b/src/views/flow/edit.vue index d3364c3..dca6b0e 100644 --- a/src/views/flow/edit.vue +++ b/src/views/flow/edit.vue @@ -46,38 +46,31 @@ @@ -243,6 +236,11 @@ export default { [0, ""], [1, "success"], ]), + flowLinkForm: { + out_pay_id: '', + out_away_id: '', + out_contract_id: '' + }, form: {}, result: {}, @@ -503,6 +501,10 @@ export default { this.generateForm(this.form, fields); this.form = Object.assign({}, this.form); const { data } = res?.flow; + this.flowLinkForm.out_contract_id = res?.flow?.out_contract_id; + this.flowLinkForm.out_away_id = res?.flow?.out_away_id; + this.flowLinkForm.out_pay_id = res?.flow?.out_pay_id; + for (let key in data) { try { let jsonObj = JSON.parse(data[key]); @@ -557,25 +559,14 @@ export default { return } let copyForm; - if (this.device === "desktop") { - try { - await this.$refs['desktopForm'].validate() - } catch (err) { - console.warn(err) - this.$message.warning('数据校验失败') - return - } - copyForm = deepCopy(this.$refs["desktopForm"].form); - } else { - try { - await this.$refs['mobileForm'].validate() - } catch (err) { - console.warn(err) - this.$message.warning('数据校验失败') - return - } - copyForm = deepCopy(this.$refs["mobileForm"].form); + try { + await this.$refs['desktopForm'].validate() + } catch (err) { + console.warn(err) + this.$message.warning('数据校验失败') + return } + copyForm = deepCopy(this.$refs["desktopForm"].form); const uploadHandler = (form) => { let keys = Object.keys(form) keys.forEach(key => { @@ -610,7 +601,7 @@ export default { copyForm.id = this.$route.query.flow_id; const { flow, is_last_handled_log } = await save( this.$route.query.flow_id, - copyForm + Object.assign(copyForm, this.flowLinkForm) ); this.result = flow; this.$message.success("操作成功") @@ -684,7 +675,7 @@ export default { ]; }, isFirstNode() { - return this.config?.logs?.length === 0 || this.config?.currentNode?.category === 'start' + return this.config?.logs?.length === 0 || this.config?.currentNode?.category === 'start' || this.$route.path === '/flow/edit' } }, created() {