rollback^2
xy 9 months ago
parent 9e1da1cd49
commit 1223a4d28f

@ -46,7 +46,17 @@
</div> </div>
<div class="form-container" id="print-content"> <div class="form-container" id="print-content">
<template v-if="device === 'desktop'"> <el-form :model="flowLinkForm" label-position="right" label-width="130px">
<el-form-item label="out_pay_id">
<el-input v-model="flowLinkForm.out_pay_id"></el-input>
</el-form-item>
<el-form-item label="out_away_id">
<el-input v-model="flowLinkForm.out_away_id"></el-input>
</el-form-item>
<el-form-item label="out_contract_id">
<el-input v-model="flowLinkForm.out_contract_id"></el-input>
</el-form-item>
</el-form>
<DesktopForm <DesktopForm
:device="device" :device="device"
ref="desktopForm" ref="desktopForm"
@ -61,23 +71,6 @@
:sub-rules="{}" :sub-rules="{}"
:logs="config.logs" :logs="config.logs"
></DesktopForm> ></DesktopForm>
</template>
<template v-else>
<MobileForm
:device="device"
ref="mobileForm"
:config="config"
:is-first-node="isFirstNode"
:sub-form="subConfig"
:fields="fields"
:original-form="form"
:readable="readableFields"
:writeable="writeableFields"
:rules="{}"
:sub-rules="{}"
:logs="config.logs"
></MobileForm>
</template>
</div> </div>
</template> </template>
@ -243,6 +236,11 @@ export default {
[0, ""], [0, ""],
[1, "success"], [1, "success"],
]), ]),
flowLinkForm: {
out_pay_id: '',
out_away_id: '',
out_contract_id: ''
},
form: {}, form: {},
result: {}, result: {},
@ -503,6 +501,10 @@ export default {
this.generateForm(this.form, fields); this.generateForm(this.form, fields);
this.form = Object.assign({}, this.form); this.form = Object.assign({}, this.form);
const { data } = res?.flow; 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) { for (let key in data) {
try { try {
let jsonObj = JSON.parse(data[key]); let jsonObj = JSON.parse(data[key]);
@ -557,7 +559,6 @@ export default {
return return
} }
let copyForm; let copyForm;
if (this.device === "desktop") {
try { try {
await this.$refs['desktopForm'].validate() await this.$refs['desktopForm'].validate()
} catch (err) { } catch (err) {
@ -566,16 +567,6 @@ export default {
return return
} }
copyForm = deepCopy(this.$refs["desktopForm"].form); 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);
}
const uploadHandler = (form) => { const uploadHandler = (form) => {
let keys = Object.keys(form) let keys = Object.keys(form)
keys.forEach(key => { keys.forEach(key => {
@ -610,7 +601,7 @@ export default {
copyForm.id = this.$route.query.flow_id; copyForm.id = this.$route.query.flow_id;
const { flow, is_last_handled_log } = await save( const { flow, is_last_handled_log } = await save(
this.$route.query.flow_id, this.$route.query.flow_id,
copyForm Object.assign(copyForm, this.flowLinkForm)
); );
this.result = flow; this.result = flow;
this.$message.success("操作成功") this.$message.success("操作成功")
@ -684,7 +675,7 @@ export default {
]; ];
}, },
isFirstNode() { 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() { created() {

Loading…
Cancel
Save