diff --git a/src/utils/formBuilder.js b/src/utils/formBuilder.js index f946704..a96c46d 100644 --- a/src/utils/formBuilder.js +++ b/src/utils/formBuilder.js @@ -514,6 +514,7 @@ export default function formBuilder(device, info, h, row, pWrite = false,pReadab flowList('all', { page: 1, page_size: 9999, + is_simple: 1, custom_model_id: info.stub }).then(res => { this.$set(this.flows, info.name, res.data.data) @@ -784,6 +785,7 @@ export default function formBuilder(device, info, h, row, pWrite = false,pReadab flowList('all', { page: 1, page_size: 9999, + is_simple: 1, custom_model_id: info.stub }).then(res => { this.$set(this.flows, info.name, res.data.data) @@ -921,7 +923,7 @@ export default function formBuilder(device, info, h, row, pWrite = false,pReadab alt: log.user?.name } }) : '', - h('br'), + info.is_sign ? h('br') : '', h('span', log.updated_at ? this.$moment(log.updated_at).format('YYYY年MM月DD') : '') ])) } @@ -1274,6 +1276,7 @@ export default function formBuilder(device, info, h, row, pWrite = false,pReadab flowList('all', { page: 1, page_size: 9999, + is_simple: 1, custom_model_id: info.stub }).then(res => { this.$set(this.flows, info.name, res.data.data) @@ -1558,6 +1561,7 @@ export default function formBuilder(device, info, h, row, pWrite = false,pReadab flowList('all', { page: 1, page_size: 9999, + is_simple: 1, custom_model_id: info.stub }).then(res => { this.$set(this.flows, info.name, res.data.data) diff --git a/src/utils/print.js b/src/utils/print.js index 327bd22..3241147 100644 --- a/src/utils/print.js +++ b/src/utils/print.js @@ -37,6 +37,8 @@ export async function print(printJs, isLog, form, logContent) { download: false, }) let subFormBody = subForm.content.match(//g)[0] + let subFormStyle = subForm.content.match(/',`${subFormStyle}`) printStr = printStr.replace(fieldMath,subFormBody) console.log(fieldMath, printStr) } else { diff --git a/src/views/flow/DesktopForm.vue b/src/views/flow/DesktopForm.vue index 134a061..da5db3b 100644 --- a/src/views/flow/DesktopForm.vue +++ b/src/views/flow/DesktopForm.vue @@ -5,9 +5,12 @@ import {PopupManager} from "element-ui/lib/utils/popup"; import request from '@/utils/request' import moment from "moment/moment"; import {defaultModalSize} from "@/settings"; - +import {getToken} from '@/utils/auth' export default { props: { + config: { + type: Object + }, isFirstNode: { type: Boolean, default: true, @@ -178,6 +181,7 @@ export default { }; }, methods: { + getToken, request, async validate() { const $elForm = this.$refs['elForm'] diff --git a/src/views/flow/MobileForm.vue b/src/views/flow/MobileForm.vue index 95ab65a..29dcb5d 100644 --- a/src/views/flow/MobileForm.vue +++ b/src/views/flow/MobileForm.vue @@ -5,11 +5,15 @@ import MobileMultipleSelect from "@/components/MobileMultipleSelect/index.vue"; import {deepCopy} from "@/utils"; import {PopupManager} from "element-ui/lib/utils/popup"; import request from '@/utils/request' +import {getToken} from '@/utils/auth' export default { components: { MobileMultipleSelect }, props: { + config: { + type: Object + }, isFirstNode: { type: Boolean, default: true @@ -101,6 +105,7 @@ export default { }, methods: { request, + getToken, async validate() { const $vanForm = this.$refs['vanForm'] if ($vanForm) { diff --git a/src/views/flow/create.vue b/src/views/flow/create.vue index b39af83..0df163e 100644 --- a/src/views/flow/create.vue +++ b/src/views/flow/create.vue @@ -50,6 +50,7 @@ i.name === key) + if (myField && this.writeableFields.indexOf(myField.id) === -1) { + delete copyForm[key] + } + } copyForm["current_node_id"] = this.config.currentNode.id; - try { let callback; switch (type) {