From 1b3d015ebf23534ed2911be8e7ae552793ebfb66 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期一, 27 十月 2025 19:37:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into dev-auto-sign
---
src/views/ProtocolManage/EditTemplate.vue | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/src/views/ProtocolManage/EditTemplate.vue b/src/views/ProtocolManage/EditTemplate.vue
index 833779c..16a8129 100644
--- a/src/views/ProtocolManage/EditTemplate.vue
+++ b/src/views/ProtocolManage/EditTemplate.vue
@@ -181,11 +181,15 @@
showDownloadBtn: false,
formatter: (row: API.GetEnterpriseContractTemplatesQueryResultItem) => setOSSLink(row.file),
},
+ isAutoSign: {
+ formatter: (row: API.GetEnterpriseContractTemplatesQueryResultItem) =>
+ row.isAutoSign ? '鏄�' : '鍚�',
+ },
},
}
);
-const { dialogProps, handleEdit, handleAdd, editForm } = useFormDialog({
+const { dialogProps, handleEdit, handleAdd, editForm, dialogState } = useFormDialog({
onConfirm: handleAddOrEdit,
defaultFormParams: {
id: '',
@@ -198,7 +202,10 @@
isEnterpriseUserCreated: false,
templateEditData: '',
enterpriseId: '',
+ isAutoSign: false,
+ autoSignPowerAttorneyUrl: [] as UploadUserFile[],
},
+ closeAfterConfirm: false,
});
async function openDialog(row?: API.GetEnterpriseContractTemplatesQueryResultItem) {
@@ -214,6 +221,8 @@
access: row.access,
isEnterpriseUserCreated: detail.isEnterpriseUserCreated,
templateEditData: detail.templateEditData,
+ isAutoSign: detail.isAutoSign ?? false,
+ autoSignPowerAttorneyUrl: convertApi2FormUrlOnlyOne(detail.autoSignPowerAttorneyUrl),
enterpriseId: enterpriseId,
});
} else {
@@ -233,6 +242,7 @@
code: editForm.code,
access: editForm.access,
templateId: editForm.templateId,
+ autoSignPowerAttorneyUrl: editForm.autoSignPowerAttorneyUrl?.[0]?.path ?? '',
templateEditData: JSON.stringify(
pdfToImage.map(
(x) =>
@@ -244,6 +254,11 @@
)
),
};
+ if (editForm.access === EnumElectronSignAccess.BestSign) {
+ params.isAutoSign = editForm.isAutoSign;
+ } else {
+ params.isAutoSign = false;
+ }
if (isEdit) {
params.id = editForm.id;
}
@@ -251,8 +266,11 @@
if (res) {
Message.successMessage('鎿嶄綔鎴愬姛');
getList();
+ dialogState.dialogVisible = false;
}
- } catch (error) {}
+ } catch (error) {
+ dialogState.dialogVisible = true;
+ }
}
function handleDownload(row: API.GetEnterpriseContractTemplatesQueryResultItem) {
--
Gitblit v1.9.1