- {{ item.nodeName }}
+ {{ item.name }}
|
- {{ item.nodeDesc }}
+ {{ item.description }}
@@ -185,7 +258,7 @@ const printObj = ref({
--
Gitee
From cf357cb1a29a51c7ff90ec4b04feac90ca8c6700 Mon Sep 17 00:00:00 2001
From: YunaiV
Date: Sat, 6 Sep 2025 10:39:43 +0800
Subject: [PATCH 13/17] =?UTF-8?q?fix=EF=BC=9A=E3=80=90system=20=E7=B3=BB?=
=?UTF-8?q?=E7=BB=9F=E7=AE=A1=E7=90=86=E3=80=91=E9=82=AE=E7=AE=B1=E6=A8=A1?=
=?UTF-8?q?=E7=89=88=E7=9A=84=E5=88=97=E8=A1=A8=E5=AE=BD=E5=BA=A6=E5=A4=AA?=
=?UTF-8?q?=E5=B0=8F=EF=BC=8C=E6=A0=B7=E5=BC=8F=E4=B8=91=E7=9A=84=E9=97=AE?=
=?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/system/mail/template/index.vue | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/views/system/mail/template/index.vue b/src/views/system/mail/template/index.vue
index 03ea34ede..5913f3013 100644
--- a/src/views/system/mail/template/index.vue
+++ b/src/views/system/mail/template/index.vue
@@ -61,7 +61,6 @@
--
Gitee
From bfd918271f30d3a33aa4c6fbdc2a57cbb8512853 Mon Sep 17 00:00:00 2001
From: LesanOuO <1960681385@qq.com>
Date: Sat, 6 Sep 2025 12:02:12 +0800
Subject: [PATCH 14/17] =?UTF-8?q?fix:=20=E4=BB=A3=E7=A0=81=E8=AF=84?=
=?UTF-8?q?=E5=AE=A1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../model/form/PrintTemplate/MentionModal.vue | 2 +-
.../processInstance/detail/PrintDialog.vue | 98 ++++---------------
2 files changed, 22 insertions(+), 78 deletions(-)
diff --git a/src/views/bpm/model/form/PrintTemplate/MentionModal.vue b/src/views/bpm/model/form/PrintTemplate/MentionModal.vue
index 598867e2f..badeb420e 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 37ce48a04..4be26eed6 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({
表单内容
|
-