|
@@ -87,6 +87,7 @@ import AgreementBodyMunicipal from './components/AgreementBodyMunicipal.vue';
|
|
|
import type { AgreementYmdParts } from './components/AgreementDateWriteBlock.vue';
|
|
import type { AgreementYmdParts } from './components/AgreementDateWriteBlock.vue';
|
|
|
import { useSimpleDataLoader } from '@/composeables/useSimpleDataLoader';
|
|
import { useSimpleDataLoader } from '@/composeables/useSimpleDataLoader';
|
|
|
import { ArrowLeftOutlined } from '@ant-design/icons-vue';
|
|
import { ArrowLeftOutlined } from '@ant-design/icons-vue';
|
|
|
|
|
+import { injectAppConfiguration } from '@/api/system/useAppConfiguration.ts';
|
|
|
|
|
|
|
|
function formatErr(e: unknown): string {
|
|
function formatErr(e: unknown): string {
|
|
|
if (e instanceof RequestApiError)
|
|
if (e instanceof RequestApiError)
|
|
@@ -250,6 +251,7 @@ watch(
|
|
|
);
|
|
);
|
|
|
|
|
|
|
|
const submitLoading = ref(false);
|
|
const submitLoading = ref(false);
|
|
|
|
|
+const appConfiguration = injectAppConfiguration();
|
|
|
|
|
|
|
|
async function createAgreement() {
|
|
async function createAgreement() {
|
|
|
const now = new Date();
|
|
const now = new Date();
|
|
@@ -259,12 +261,12 @@ async function createAgreement() {
|
|
|
const basicInfo = await AssessmentContentApi.getInheritorBasic(uid);
|
|
const basicInfo = await AssessmentContentApi.getInheritorBasic(uid);
|
|
|
const detail = new AgreementDetail();
|
|
const detail = new AgreementDetail();
|
|
|
detail.userId = uid;
|
|
detail.userId = uid;
|
|
|
- detail.year = 2027;
|
|
|
|
|
|
|
+ detail.year = appConfiguration.value?.collectSignYear || now.getFullYear() + 1;
|
|
|
detail.level = basicInfo.level;
|
|
detail.level = basicInfo.level;
|
|
|
if (basicInfo.level === 24) {
|
|
if (basicInfo.level === 24) {
|
|
|
detail.partyA = '厦门市文化和旅游局';
|
|
detail.partyA = '厦门市文化和旅游局';
|
|
|
} else if (basicInfo.level === 25) {
|
|
} else if (basicInfo.level === 25) {
|
|
|
- detail.partyA = '';
|
|
|
|
|
|
|
+ detail.partyA = '厦门市文化和旅游局';
|
|
|
} else {
|
|
} else {
|
|
|
detail.partyA = '福建省文化和旅游厅';
|
|
detail.partyA = '福建省文化和旅游厅';
|
|
|
}
|
|
}
|