zhouchengcheng/ctms
1
1
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

整合合同费用并移除旧财务合同

Browse Source
This commit is contained in:
Cheng Zhou
2026-05-28 10:49:08 +08:00
parent 2c85742040
commit 8da7fc715c
20 changed files with 400 additions and 948 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/views/fees/ContractFeeDetail.vue
+16 -8
View File
@@ -12,7 +12,7 @@
<el-card class="detail-card unified-shell" shadow="never">
<template #header>
<div class="card-header actions-header">
<span class="header-title">{{ TEXT.common.labels.basicInfo }}</span>
<span class="header-title">{{ TEXT.modules.feeContracts.contractInfoTitle }}</span>
<div class="actions">
<el-button type="primary" :disabled="!canWrite || isReadOnly" @click="goEdit" class="header-action-btn copy-btn">
<el-icon class="el-icon--left"><Edit /></el-icon>
@@ -24,10 +24,16 @@
</div>
</div>
</template>
<el-descriptions :column="2" border class="custom-descriptions">
<el-descriptions :column="4" border class="custom-descriptions">
<el-descriptions-item :label="TEXT.common.fields.site" label-class-name="desc-label">
{{ centerName || TEXT.common.fallback }}
</el-descriptions-item>
<el-descriptions-item :label="TEXT.common.fields.contractNo" label-class-name="desc-label">
{{ detail.contract_no || TEXT.common.fallback }}
</el-descriptions-item>
<el-descriptions-item :label="TEXT.common.fields.signedDate" label-class-name="desc-label">
{{ displayDate(detail.signed_date) }}
</el-descriptions-item>
<el-descriptions-item :label="TEXT.modules.feeContracts.contractAmount" label-class-name="desc-label">
<span class="amount-text">{{ formatAmountWan(detail.contract_amount) }}</span>
</el-descriptions-item>
@@ -37,11 +43,11 @@
<el-descriptions-item :label="TEXT.modules.feeContracts.actualCases" label-class-name="desc-label">
{{ detail.actual_cases ?? TEXT.common.fallback }}
</el-descriptions-item>
<el-descriptions-item :label="TEXT.modules.feeContracts.settlementAmount" label-class-name="desc-label">
<span class="amount-text">{{ formatAmountWan(detail.settlement_amount) }}</span>
<el-descriptions-item :label="TEXT.common.fields.currency" label-class-name="desc-label">
{{ detail.currency || TEXT.common.fields.currencyDefault }}
</el-descriptions-item>
<el-descriptions-item :label="TEXT.modules.feeContracts.finalPaymentAmount" label-class-name="desc-label">
<span class="amount-text">{{ formatAmountWan(detail.final_payment_amount) }}</span>
<el-descriptions-item :label="TEXT.common.fields.remark" label-class-name="desc-label" :span="4">
{{ detail.remark || TEXT.common.fallback }}
</el-descriptions-item>
</el-descriptions>
</el-card>
@@ -133,11 +139,13 @@ const contractId = route.params.contractId as string;
const loading = ref(false);
const errorMessage = ref("");
const detail = reactive<any>({
contract_no: "",
signed_date: "",
contract_amount: 0,
currency: "CNY",
remark: "",
contract_cases: 0,
actual_cases: null,
settlement_amount: null,
final_payment_amount: null,
payments: [],
});
const sites = ref<any[]>([]);
frontend/src/views/fees/ContractFeeForm.test.ts
+33
View File
@@ -0,0 +1,33 @@
import { describe, expect, it } from "vitest";
import { readFileSync } from "node:fs";
import { resolve } from "node:path";
const readSource = () => readFileSync(resolve(__dirname, "./ContractFeeForm.vue"), "utf8");
describe("ContractFeeForm.vue", () => {
it("keeps contract fields in a four-column contract info section", () => {
const source = readSource();
expect(source).toContain("contractInfoTitle");
expect(source).not.toContain("feeSettlementTitle");
expect(source).not.toContain("settlement_amount");
expect(source).not.toContain("final_payment_amount");
expect(source).toContain(':lg="6"');
expect(source).toContain('prop="contract_no"');
expect(source).toContain('prop="signed_date"');
expect(source).toContain('prop="currency"');
expect(source).toContain('prop="remark"');
expect(source).toContain("form.contract_no");
expect(source).toContain("form.signed_date");
expect(source).toContain("form.currency");
expect(source).toContain("form.remark");
});
it("allows system admins to edit without project permission matrix entries", () => {
const source = readSource();
expect(source).toContain("useAuthStore");
expect(source).toContain("isSystemAdmin");
expect(source).toContain("if (isAdmin.value) return true;");
});
});
frontend/src/views/fees/ContractFeeForm.vue
+58 -37
View File
@@ -13,12 +13,12 @@
<el-card class="form-card unified-shell" shadow="never">
<template #header>
<div class="card-header actions-header">
<span class="header-title">{{ TEXT.common.labels.basicInfo }}</span>
<span class="header-title">{{ TEXT.modules.feeContracts.contractInfoTitle }}</span>
<el-button @click="goBack">{{ TEXT.common.actions.back }}</el-button>
</div>
</template>
<el-row :gutter="24">
<el-col :span="12">
<el-col :xs="24" :sm="12" :lg="6">
<el-form-item :label="TEXT.common.fields.site" prop="center_id" required>
<el-select
v-model="form.center_id"
@@ -36,7 +36,24 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :xs="24" :sm="12" :lg="6">
<el-form-item :label="TEXT.common.fields.contractNo" prop="contract_no">
<el-input v-model="form.contract_no" :disabled="isReadOnly" :placeholder="TEXT.common.placeholders.input" />
</el-form-item>
</el-col>
<el-col :xs="24" :sm="12" :lg="6">
<el-form-item :label="TEXT.common.fields.signedDate" prop="signed_date">
<el-date-picker
v-model="form.signed_date"
:disabled="isReadOnly"
type="date"
value-format="YYYY-MM-DD"
:placeholder="TEXT.common.placeholders.select"
class="full-width"
/>
</el-form-item>
</el-col>
<el-col :xs="24" :sm="12" :lg="6">
<el-form-item :label="TEXT.modules.feeContracts.contractAmount" prop="contract_amount" required>
<el-input-number
v-model="form.contract_amount"
@@ -49,40 +66,28 @@
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :xs="24" :sm="12" :lg="6">
<el-form-item :label="TEXT.modules.feeContracts.contractCases" prop="contract_cases" required>
<el-input-number v-model="form.contract_cases" :disabled="isReadOnly" :min="0" :step="1" class="full-width" controls-position="right" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :xs="24" :sm="12" :lg="6">
<el-form-item :label="TEXT.modules.feeContracts.actualCases" prop="actual_cases">
<el-input-number v-model="form.actual_cases" :disabled="isReadOnly" :min="0" :step="1" class="full-width" controls-position="right" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="TEXT.modules.feeContracts.settlementAmount" prop="settlement_amount">
<el-input-number
v-model="form.settlement_amount"
:disabled="isReadOnly"
:min="0"
:precision="2"
:step="1000"
class="full-width"
controls-position="right"
/>
<el-col :xs="24" :sm="12" :lg="6">
<el-form-item :label="TEXT.common.fields.currency" prop="currency">
<el-select v-model="form.currency" :disabled="isReadOnly" :placeholder="TEXT.common.placeholders.select" class="full-width">
<el-option label="CNY" value="CNY" />
<el-option label="USD" value="USD" />
<el-option label="EUR" value="EUR" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="TEXT.modules.feeContracts.finalPaymentAmount" prop="final_payment_amount">
<el-input-number
v-model="form.final_payment_amount"
:disabled="isReadOnly"
:min="0"
:precision="2"
:step="1000"
class="full-width"
controls-position="right"
/>
<el-col :span="24">
<el-form-item :label="TEXT.common.fields.remark" prop="remark">
<el-input v-model="form.remark" :disabled="isReadOnly" type="textarea" :rows="2" :placeholder="TEXT.common.placeholders.input" />
</el-form-item>
</el-col>
</el-row>
@@ -100,7 +105,7 @@
</template>
<div v-if="payments.length === 0" class="section-empty">
<StateEmpty :description="TEXT.modules.feeContracts.paymentEmpty" />
{{ TEXT.modules.feeContracts.paymentEmpty }}
</div>
<div v-else class="payment-list">
@@ -217,16 +222,19 @@ import {
} from "../../api/feeContracts";
import { fetchSites } from "../../api/sites";
import { useStudyStore } from "../../store/study";
import { useAuthStore } from "../../store/auth";
import StateEmpty from "../../components/StateEmpty.vue";
import StateError from "../../components/StateError.vue";
import StateLoading from "../../components/StateLoading.vue";
import FeeAttachmentPanel from "../../components/fees/FeeAttachmentPanel.vue";
import { TEXT } from "../../locales";
import { isApiPermissionAllowed } from "../../utils/apiPermissionValue";
import { isSystemAdmin } from "../../utils/roles";
const route = useRoute();
const router = useRouter();
const study = useStudyStore();
const auth = useAuthStore();
const loading = ref(false);
const saving = ref(false);
@@ -244,11 +252,13 @@ const form = reactive({
id: "",
project_id: "",
center_id: "",
contract_no: "",
signed_date: "",
contract_amount: 0,
currency: "CNY",
remark: "",
contract_cases: 0,
actual_cases: null as number | null,
settlement_amount: null as number | null,
final_payment_amount: null as number | null,
});
const payments = ref<any[]>([]);
@@ -258,7 +268,9 @@ const paymentErrors = ref<Record<string, string>[]>([]);
const contractId = computed(() => route.params.contractId as string | undefined);
const isEdit = computed(() => !!contractId.value);
const projectRole = computed(() => study.currentStudyRole || (study.currentStudy as any)?.role_in_study || "");
const isAdmin = computed(() => isSystemAdmin(auth.user));
const canMutate = computed(() => {
if (isAdmin.value) return true;
const operationKey = isEdit.value ? "fees_contracts:update" : "fees_contracts:create";
return isApiPermissionAllowed(study.currentPermissions?.[projectRole.value]?.[operationKey]);
});
@@ -315,11 +327,13 @@ const loadDetail = async () => {
id: detail.id || contractId.value,
project_id: detail.project_id || study.currentStudy?.id || "",
center_id: detail.center_id || "",
contract_no: detail.contract_no || "",
signed_date: detail.signed_date || "",
contract_amount: Number(detail.contract_amount || 0) / 10000,
currency: detail.currency || "CNY",
remark: detail.remark || "",
contract_cases: Number(detail.contract_cases || 0),
actual_cases: detail.actual_cases ?? null,
settlement_amount: detail.settlement_amount !== null && detail.settlement_amount !== undefined ? Number(detail.settlement_amount) / 10000 : null,
final_payment_amount: detail.final_payment_amount !== null && detail.final_payment_amount !== undefined ? Number(detail.final_payment_amount) / 10000 : null,
});
payments.value = (detail.payments || []).map((payment: any) => ({
id: payment.id,
@@ -437,18 +451,22 @@ const submit = async () => {
const payload = {
project_id: study.currentStudy.id,
center_id: form.center_id,
contract_no: form.contract_no || null,
signed_date: form.signed_date || null,
contract_amount: Number(form.contract_amount || 0) * 10000,
currency: form.currency || "CNY",
remark: form.remark || null,
contract_cases: Number(form.contract_cases || 0),
actual_cases: form.actual_cases === null ? null : Number(form.actual_cases),
settlement_amount: form.settlement_amount === null ? null : Number(form.settlement_amount) * 10000,
final_payment_amount: form.final_payment_amount === null ? null : Number(form.final_payment_amount) * 10000,
};
const updatePayload = {
contract_amount: payload.contract_amount,
contract_no: payload.contract_no,
signed_date: payload.signed_date,
currency: payload.currency,
remark: payload.remark,
contract_cases: payload.contract_cases,
actual_cases: payload.actual_cases,
settlement_amount: payload.settlement_amount,
final_payment_amount: payload.final_payment_amount,
};
let savedId = contractId.value || form.id;
@@ -553,9 +571,12 @@ onMounted(async () => {
}
.section-empty {
padding: 24px 0;
padding: 28px 0;
display: flex;
justify-content: center;
color: #8a97ab;
font-size: 14px;
line-height: 1.6;
}
.payment-list {