diff --git a/src/views/bpm/model/form/PrintTemplate/MentionModal.vue b/src/views/bpm/model/form/PrintTemplate/MentionModal.vue index 598867e2..badeb420 100644 --- a/src/views/bpm/model/form/PrintTemplate/MentionModal.vue +++ b/src/views/bpm/model/form/PrintTemplate/MentionModal.vue @@ -13,7 +13,7 @@ const list = ref([ { id: 'startTime', name: '发起时间' }, { id: 'endTime', name: '结束时间' }, { id: 'processStatus', name: '流程状态' }, - { id: 'printUsername', name: '打印人' }, + { id: 'printUser', name: '打印人' }, { id: 'printTime', name: '打印时间' } ]) const searchedList = computed(() => { diff --git a/src/views/bpm/processInstance/detail/PrintDialog.vue b/src/views/bpm/processInstance/detail/PrintDialog.vue index 37ce48a0..4be26eed 100644 --- a/src/views/bpm/processInstance/detail/PrintDialog.vue +++ b/src/views/bpm/processInstance/detail/PrintDialog.vue @@ -3,9 +3,7 @@ import * as ProcessInstanceApi from '@/api/bpm/processInstance' import { useUserStore } from '@/store/modules/user' import { formatDate } from '@/utils/formatTime' import { DICT_TYPE, getDictLabel } from '@/utils/dict' -import { decodeFields, setConfAndFields2 } from '@/utils/formCreate' -import type { ApiAttrs } from '@form-create/element-ui/types/config' -import formCreate from "@form-create/element-ui"; +import { decodeFields } from '@/utils/formCreate' const userStore = useUserStore() @@ -18,21 +16,6 @@ const printTime = ref(formatDate(new Date(), 'YYYY-MM-DD HH:mm')) const formFields = ref() const printDataMap = ref({}) -const fApi = ref() -const detailForm = ref({ - rule: [], - option: {}, - value: {} -}) - -const fApiH = ref() -const detailFormH = ref({ - rule: [], - option: {}, - value: {} -}) -const fcRef = ref() - const open = async (id: string) => { loading.value = true try { @@ -47,37 +30,9 @@ const open = async (id: string) => { defineExpose({ open }) const parseFormFields = () => { - const processInstance = printData.value.processInstance - const processDefinition = processInstance.processDefinition - setConfAndFields2( - detailForm, - processDefinition.formConf, - processDefinition.formFields, - processInstance.formVariables - ) - detailForm.value.option = { - submitBtn: false, - resetBtn: false, - form: { - disabled: true - } - } - setConfAndFields2( - detailFormH, - processDefinition.formConf, - processDefinition.formFields, - processInstance.formVariables - ) - detailFormH.value.option = { - submitBtn: false, - resetBtn: false, - form: { - disabled: true - } - } - return // TODO @lesan:form field 有可能基于 form-create 什么 api 生成么?好像也挺难的 = = - const formFieldsObj = decodeFields(printData.value.formFields) + // TODO @芋艿:默认打印可以直接用form-create的预览表单模式,但是自定义模板打印就没法这么做 + const formFieldsObj = decodeFields(printData.value.processInstance.processDefinition.formFields) const processVariables = printData.value.processInstance.formVariables let res: any = [] for (const item of formFieldsObj) { @@ -109,7 +64,7 @@ const initPrintDataMap = () => { DICT_TYPE.BPM_PROCESS_INSTANCE_STATUS, printData.value.processInstance.status ) - printDataMap.value['printUsername'] = userName.value + printDataMap.value['printUser'] = userName.value printDataMap.value['printTime'] = printTime.value } @@ -161,25 +116,6 @@ const getPrintTemplateHTML = () => { return doc.body.innerHTML } -const html = ref('') -const handleDialogOpened = async () => { - const processInstance = printData.value.processInstance - const processDefinition = processInstance.processDefinition - let fcData = { - rule: [], - option: {}, - value: {} - } - setConfAndFields2( - fcData, - processDefinition.formConf, - processDefinition.formFields, - processInstance.formVariables - ) - const api = formCreate.create(fcData.rule,fcData.option) - console.log(api) -} - const printObj = ref({ id: 'printDivTag', popTitle: ' ', @@ -226,14 +162,22 @@ const printObj = ref({

表单内容

- - - + + + + + + + + + + + + + {{ item.name }} + + +
@@ -258,7 +202,7 @@ const printObj = ref({