From 5f28f07fc445c44851622cfa2eafe7e0b6789b70 Mon Sep 17 00:00:00 2001 From: xy <271556543@qq.com> Date: Mon, 30 Dec 2024 13:42:40 +0800 Subject: [PATCH] 1 --- src/utils/formBuilder.js | 12 +++++++---- src/utils/print.js | 2 +- src/views/attendance/SignHandle.vue | 32 +++++++++++++++++++++-------- 3 files changed, 32 insertions(+), 14 deletions(-) diff --git a/src/utils/formBuilder.js b/src/utils/formBuilder.js index ed703a0..dba14e3 100644 --- a/src/utils/formBuilder.js +++ b/src/utils/formBuilder.js @@ -516,7 +516,8 @@ export default function formBuilder(device, info, h, row, pWrite = false,pReadab page: 1, page_size: 9999, is_simple: 1, - custom_model_id: info.stub + custom_model_id: info.stub, + is_auth: 1, }).then(res => { this.$set(this.flows, info.name, res.data.data) }) @@ -788,7 +789,8 @@ export default function formBuilder(device, info, h, row, pWrite = false,pReadab page: 1, page_size: 9999, is_simple: 1, - custom_model_id: info.stub + custom_model_id: info.stub, + is_auth: 1 }).then(res => { this.$set(this.flows, info.name, res.data.data) }) @@ -1370,7 +1372,8 @@ export default function formBuilder(device, info, h, row, pWrite = false,pReadab page: 1, page_size: 9999, is_simple: 1, - custom_model_id: info.stub + custom_model_id: info.stub, + is_auth: 1 }).then(res => { this.$set(this.flows, info.name, res.data.data) }) @@ -1663,7 +1666,8 @@ export default function formBuilder(device, info, h, row, pWrite = false,pReadab page: 1, page_size: 9999, is_simple: 1, - custom_model_id: info.stub + custom_model_id: info.stub, + is_auth: 1 }).then(res => { this.$set(this.flows, info.name, res.data.data) }) diff --git a/src/utils/print.js b/src/utils/print.js index fa91400..124c16f 100644 --- a/src/utils/print.js +++ b/src/utils/print.js @@ -10,7 +10,7 @@ export async function print(printJs, isLog, form, logContent) { const staticMap = new Map([ ['apply_name', `${form.creator?.name}`], ['apply_department_name', `${form.creator_department?.name}`], - ['apply_sign', `${form.creator?.name}`], + ['apply_sign', form.creator?.sign_file ? `${form.creator?.name}` : `${form.creator?.name}`], ['created_at', `${form.created_at}`], ]) diff --git a/src/views/attendance/SignHandle.vue b/src/views/attendance/SignHandle.vue index da362db..8e14a0c 100644 --- a/src/views/attendance/SignHandle.vue +++ b/src/views/attendance/SignHandle.vue @@ -4,15 +4,11 @@ @@ -37,17 +33,35 @@