From 077c839ecc118a88b2c625bf902e5642a78c175b Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期四, 21 八月 2025 16:34:55 +0800 Subject: [PATCH] fix: 签约 --- src/views/AgreementManage/AgreementManageList.vue | 4 ++-- src/services/api/typings.d.ts | 4 ++++ src/views/AgreementManage/components/TemplateAddDialog.vue | 2 +- src/views/AgreementManage/components/QrcodeDialog.vue | 11 ++++++++++- 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/services/api/typings.d.ts b/src/services/api/typings.d.ts index 9b8595f..2327163 100644 --- a/src/services/api/typings.d.ts +++ b/src/services/api/typings.d.ts @@ -2184,6 +2184,8 @@ name?: string; /** 妯℃澘 */ file?: string; + /** 灏忕▼搴忕爜 */ + wxmpQrCode?: string; /** 鍒剁増妯℃澘鐓х墖 */ templateEditData?: string; /** 鍒剁増鍙橀噺JSON */ @@ -2417,6 +2419,8 @@ code?: string; /** 妯℃澘 */ file?: string; + /** 灏忕▼搴忕爜 */ + wxmpQrCode?: string; status?: EnumContractTemplateStatus; /** 鍒剁増鏃堕棿 */ completedTime?: string; diff --git a/src/views/AgreementManage/AgreementManageList.vue b/src/views/AgreementManage/AgreementManageList.vue index 4ad2f3b..22100ad 100644 --- a/src/views/AgreementManage/AgreementManageList.vue +++ b/src/views/AgreementManage/AgreementManageList.vue @@ -57,7 +57,7 @@ </ProTableV2> </AppContainer> <TemplateAddDialog v-bind="dialogProps"></TemplateAddDialog> - <QrcodeDialog v-bind="dialogQrcodeProps"></QrcodeDialog> + <QrcodeDialog v-bind="dialogQrcodeProps" :useQrcode="false"></QrcodeDialog> </LoadingLayout> </template> @@ -254,7 +254,7 @@ function handlePreviewQrcode(row: API.GetEnterpriseContractTemplatesQueryResultItem) { handleEdit({ // qrcodeUrl: setOSSLink(row.file), - qrcodeUrl: 'https://www.baidu.com', + qrcodeUrl: row.wxmpQrCode, }); } </script> diff --git a/src/views/AgreementManage/components/QrcodeDialog.vue b/src/views/AgreementManage/components/QrcodeDialog.vue index aae81ec..9d44956 100644 --- a/src/views/AgreementManage/components/QrcodeDialog.vue +++ b/src/views/AgreementManage/components/QrcodeDialog.vue @@ -8,8 +8,15 @@ class="qrcode-dialog" > <div class="qrcode-wrapper"> - <vue-qrcode :value="form.qrcodeUrl" tag="img" :options="{ width: 180 }" ref="qrcode"> + <vue-qrcode + v-if="useQrcode" + :value="form.qrcodeUrl" + tag="img" + :options="{ width: 180 }" + ref="qrcode" + > </vue-qrcode> + <img v-else :src="form.qrcodeUrl" style="width: 180px; height: 180px" /> </div> </ProDialog> </template> @@ -27,10 +34,12 @@ form: { qrcodeUrl: string; }; + useQrcode?: boolean; }; const props = withDefaults(defineProps<Props>(), { modelValue: false, + useQrcode: true, }); const emit = defineEmits<{ diff --git a/src/views/AgreementManage/components/TemplateAddDialog.vue b/src/views/AgreementManage/components/TemplateAddDialog.vue index 8190b75..7269304 100644 --- a/src/views/AgreementManage/components/TemplateAddDialog.vue +++ b/src/views/AgreementManage/components/TemplateAddDialog.vue @@ -2,7 +2,7 @@ <ProDialog title="鏂板妯℃澘" v-model="visible" @close="onDialogClose" destroy-on-close draggable> <ProForm :model="form" ref="dialogForm" label-width="100px"> <ProFormItemV2 label="妯℃澘鍚嶇О:" prop="name" :check-rules="[{ message: '璇疯緭鍏ユā鏉垮悕绉�' }]"> - <ProFormText v-model.trim="form.name"> </ProFormText> + <ProFormText v-model.trim="form.name" placeholder="璇疯緭鍏ユā鏉垮悕绉�"> </ProFormText> </ProFormItemV2> <ProFormItemV2 label="涓婁紶妯℃澘:" -- Gitblit v1.9.1