取 消
diff --git a/src/views/bpm/model/form/PrintTemplate/MentionModal.vue b/src/views/bpm/model/form/PrintTemplate/MentionModal.vue
index c990ea0e6..fe96d66fe 100644
--- a/src/views/bpm/model/form/PrintTemplate/MentionModal.vue
+++ b/src/views/bpm/model/form/PrintTemplate/MentionModal.vue
@@ -14,7 +14,7 @@ const list = ref([
{id: 'endTime', name: '发起时间'},
{id: 'processStatus', name: '流程状态'},
{id: 'processResult', name: '流程结果'},
- {id: 'printUsername', name: '打印人'},
+ {id: 'printUser', name: '打印人'},
{id: 'printTime', name: '打印时间'},
])
const searchedList = computed(() => {
@@ -41,7 +41,17 @@ const insertMentionHandler = (id, name) => {
emit('hideMentionModal')
}
+const formFields = inject('formFieldsObj')
onMounted(()=> {
+ if (formFields.value && formFields.value.length > 0) {
+ const cloneFormField = formFields.value.map((item) => {
+ return {
+ name: '[表单]'+item.title,
+ id: item.field
+ }
+ })
+ list.value.push(...cloneFormField)
+ }
const domSelection = document.getSelection()
const domRange = domSelection?.getRangeAt(0)
if (domRange == null) return
--
Gitee
From d445845bdb8bd9299236035bd6af5ae6a6c226ae Mon Sep 17 00:00:00 2001
From: Lesan <1960681385@qq.com>
Date: Fri, 29 Aug 2025 15:09:04 +0800
Subject: [PATCH 4/7] =?UTF-8?q?fix:=20=E5=BC=95=E5=85=A5=E8=B7=AF=E5=BE=84?=
=?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/bpm/model/form/PrintTemplate/Index.vue | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/views/bpm/model/form/PrintTemplate/Index.vue b/src/views/bpm/model/form/PrintTemplate/Index.vue
index 9b95f6d6b..6dff06d6a 100644
--- a/src/views/bpm/model/form/PrintTemplate/Index.vue
+++ b/src/views/bpm/model/form/PrintTemplate/Index.vue
@@ -34,6 +34,7 @@ const dialogVisible = ref(false)
const open = async (template) => {
dialogVisible.value = true
valueHtml.value = template
+ console.log(template)
}
defineExpose({open})
const handleConfirm = () => {
@@ -108,4 +109,4 @@ onBeforeUnmount(() => {
-
+
--
Gitee
From df3efa9ca5da9dcfcdad16032f210425638d3d7d Mon Sep 17 00:00:00 2001
From: Lesan <1960681385@qq.com>
Date: Fri, 29 Aug 2025 15:31:44 +0800
Subject: [PATCH 5/7] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E6=89=93?=
=?UTF-8?q?=E5=8D=B0=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/bpm/processInstance/detail/index.vue | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/views/bpm/processInstance/detail/index.vue b/src/views/bpm/processInstance/detail/index.vue
index c3f83cf06..fc32d2f42 100644
--- a/src/views/bpm/processInstance/detail/index.vue
+++ b/src/views/bpm/processInstance/detail/index.vue
@@ -8,7 +8,10 @@
:src="auditIconsMap[processInstance.status]"
alt=""
/>
-
编号:{{ id }}
+
{{ processInstance.name }}
@@ -295,6 +298,10 @@ const refresh = () => {
getDetail()
}
+const handlePrint = () => {
+ // TODO 打印
+}
+
/** 当前的Tab */
const activeTab = ref('form')
--
Gitee
From 29b2ad4492f7dfcabe4c51d3921226c53c68dece Mon Sep 17 00:00:00 2001
From: Lesan <1960681385@qq.com>
Date: Tue, 2 Sep 2025 17:04:01 +0800
Subject: [PATCH 6/7] =?UTF-8?q?chore:=20=E6=B7=BB=E5=8A=A0=E6=89=93?=
=?UTF-8?q?=E5=8D=B0=E6=89=80=E9=9C=80=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
package.json | 1 +
1 file changed, 1 insertion(+)
diff --git a/package.json b/package.json
index a79cec967..84341f3cd 100644
--- a/package.json
+++ b/package.json
@@ -76,6 +76,7 @@
"vue-i18n": "9.10.2",
"vue-router": "4.4.5",
"vue-types": "^5.1.1",
+ "vue3-print-nb": "^0.1.4",
"vue3-signature": "^0.2.4",
"vuedraggable": "^4.1.0",
"web-storage-cache": "^1.1.1",
--
Gitee
From 4118112423d0fddac161552edf3f0c91f4a4070a Mon Sep 17 00:00:00 2001
From: Lesan <1960681385@qq.com>
Date: Tue, 2 Sep 2025 17:04:31 +0800
Subject: [PATCH 7/7] =?UTF-8?q?feat:=20=E5=AE=9E=E7=8E=B0=E6=B5=81?=
=?UTF-8?q?=E7=A8=8B=E6=89=93=E5=8D=B0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/bpm/processInstance/index.ts | 5 +
src/main.ts | 4 +
.../processInstance/detail/PrintDialog.vue | 107 ++++++++++++++++++
.../bpm/processInstance/detail/index.vue | 7 +-
4 files changed, 121 insertions(+), 2 deletions(-)
create mode 100644 src/views/bpm/processInstance/detail/PrintDialog.vue
diff --git a/src/api/bpm/processInstance/index.ts b/src/api/bpm/processInstance/index.ts
index 6b7921300..1e8f04dac 100644
--- a/src/api/bpm/processInstance/index.ts
+++ b/src/api/bpm/processInstance/index.ts
@@ -108,3 +108,8 @@ export const getFormFieldsPermission = async (params: any) => {
export const getProcessInstanceBpmnModelView = async (id: string) => {
return await request.get({ url: '/bpm/process-instance/get-bpmn-model-view?id=' + id })
}
+
+// 获取流程实例打印数据
+export const getProcessInstancePrintData = async (id: string) => {
+ return await request.get({ url: '/bpm/process-instance/get-print-data?processInstanceId=' + id })
+}
diff --git a/src/main.ts b/src/main.ts
index 211ecfbc3..3ffa5f0c9 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -45,6 +45,8 @@ import VueDOMPurifyHTML from 'vue-dompurify-html' // 解决v-html 的安全隐
// wangeditor插件注册
import {setupWangeditorPlugin} from "@/views/bpm/model/form/PrintTemplate";
+import print from 'vue3-print-nb' // 打印插件
+
// 创建实例
const setupAll = async () => {
const app = createApp(App)
@@ -71,6 +73,8 @@ const setupAll = async () => {
app.use(VueDOMPurifyHTML)
+ app.use(print)
+
app.mount('#app')
}
diff --git a/src/views/bpm/processInstance/detail/PrintDialog.vue b/src/views/bpm/processInstance/detail/PrintDialog.vue
new file mode 100644
index 000000000..498e46b64
--- /dev/null
+++ b/src/views/bpm/processInstance/detail/PrintDialog.vue
@@ -0,0 +1,107 @@
+
+
+
+
+
+
+
+
{{ printData.processName }}
+
{{ '打印人员: ' + userName }}
+
+
{{ '流程编号: ' + printData.processInstanceId }}
+
{{ '打印时间: ' + printTime }}
+
+
+
+
+ 发起人 |
+ {{ printData.startUser }} |
+ 发起时间 |
+ {{ printData.startTime }} |
+
+
+ 所属部门 |
+ {{ printData.startUserDept }} |
+ 流程状态 |
+ {{ printData.processStatusShow }} |
+
+
+
+ 表单内容
+ |
+
+
+
+ {{ item.formName }}
+ |
+
+
+ |
+
+
+
+ 流程节点
+ |
+
+
+
+ {{ item.nodeName }}
+ |
+
+ {{ item.nodeDesc }}
+
+ ![]()
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/bpm/processInstance/detail/index.vue b/src/views/bpm/processInstance/detail/index.vue
index fc32d2f42..b952560cd 100644
--- a/src/views/bpm/processInstance/detail/index.vue
+++ b/src/views/bpm/processInstance/detail/index.vue
@@ -128,6 +128,7 @@
+