diff --git a/src/api/tjt/profit/index.ts b/src/api/tjt/profit/index.ts index d9cfd5f..92ecd93 100644 --- a/src/api/tjt/profit/index.ts +++ b/src/api/tjt/profit/index.ts @@ -10,6 +10,8 @@ export interface ProjectProfitVO { effectiveSettlementAmount?: number comprehensivePlanningAmount?: number subcontractPlanningAmount?: number + specialSubcontractPlanningAmount?: number + sourceCoopSubcontractPlanningAmount?: number majorOutputValue?: number majorExpectedPerformance?: number innovationOutputRate?: number diff --git a/src/views/tjt/output/PlanningOutputForm.vue b/src/views/tjt/output/PlanningOutputForm.vue index 9a54da4..ac370d1 100644 --- a/src/views/tjt/output/PlanningOutputForm.vue +++ b/src/views/tjt/output/PlanningOutputForm.vue @@ -105,7 +105,7 @@ - + - + - + - - - - - + + + + - + - + - + - + - + + + + + + - + - + diff --git a/src/views/tjt/profit/index.vue b/src/views/tjt/profit/index.vue index d7ee701..a73908d 100644 --- a/src/views/tjt/profit/index.vue +++ b/src/views/tjt/profit/index.vue @@ -78,21 +78,21 @@ - + - + - + - + - + - + + + + - + @@ -135,14 +140,14 @@ {{ formatAmountText(scope.row.otherCost) }} - + - + - + - + - + ({ - label: OWNERSHIP_TYPE_LABELS[index] || item.label, - value: item.value -})) +const ownershipTypeOptions = OWNERSHIP_TYPE_OPTIONS const { t } = useI18n() const message = useMessage() diff --git a/src/views/tjt/project/ProjectForm.vue b/src/views/tjt/project/ProjectForm.vue index e0ae6d0..371a931 100644 --- a/src/views/tjt/project/ProjectForm.vue +++ b/src/views/tjt/project/ProjectForm.vue @@ -16,7 +16,7 @@ - + - + - + ({ projectName: [{ required: true, message: '项目名称不能为空', trigger: 'blur' }], - contractAmount: [{ required: true, message: '合同产值不能为空', trigger: 'blur' }], - totalConstructionArea: [{ required: true, message: '工程总面积不能为空', trigger: 'blur' }], + contractAmount: [{ required: true, message: '合同总产值不能为空', trigger: 'blur' }], + totalConstructionArea: [{ required: true, message: '建筑面积不能为空', trigger: 'blur' }], projectStartYear: [{ required: true, message: '项目开始年度不能为空', trigger: 'change' }], projectStatus: [{ required: true, message: '项目状态不能为空', trigger: 'change' }], pauseReason: [ diff --git a/src/views/tjt/project/index.vue b/src/views/tjt/project/index.vue index 63f6f7e..7c0f8ca 100644 --- a/src/views/tjt/project/index.vue +++ b/src/views/tjt/project/index.vue @@ -188,7 +188,7 @@ {{ getProjectTypeText(currentProject.projectType) }} - + {{ getProjectCategoryText(currentProject.projectCategory) }} @@ -218,10 +218,10 @@ > {{ currentProject.terminateReason || '-' }} - + {{ formatAmountText(currentProject.contractAmount) }} - + {{ formatAreaText(currentProject.totalConstructionArea) }} @@ -353,7 +353,7 @@ const cleanOptionLabels = (options: Array<{ label: string; value: T }>, labe })) const contractSignOptions = cleanOptionLabels(CONTRACT_SIGN_OPTIONS, ['已签约', '未签约']) -const ownershipTypeOptions = cleanOptionLabels(OWNERSHIP_TYPE_OPTIONS, ['专业所', '综合所', '专业分包']) +const ownershipTypeOptions = OWNERSHIP_TYPE_OPTIONS const projectTypeOptions = cleanOptionLabels(PROJECT_TYPE_OPTIONS, [ '建筑工程', '精装工程', diff --git a/src/views/tjt/report-budget/index.vue b/src/views/tjt/report-budget/index.vue index be344ff..bf84469 100644 --- a/src/views/tjt/report-budget/index.vue +++ b/src/views/tjt/report-budget/index.vue @@ -91,12 +91,12 @@ prop="engineeringPrincipalName" /> - + - + @@ -140,10 +140,10 @@ {{ currentProject.engineeringPrincipalName || '-' }} - + {{ formatAmountText(currentProject.contractAmount) }} - + {{ formatAreaText(currentProject.totalConstructionArea) }} diff --git a/src/views/tjt/report-specialty-person/index.vue b/src/views/tjt/report-specialty-person/index.vue index bf3abbc..87ab8c0 100644 --- a/src/views/tjt/report-specialty-person/index.vue +++ b/src/views/tjt/report-specialty-person/index.vue @@ -112,7 +112,7 @@
{{ currentPlanning.planningContent }}
- 按当前年度和专业预览专业内人员计取结果 + 按当前合约规划、年度和专业预览专业内人员计取结果
@@ -160,10 +160,9 @@
季度金额单位:万元
@@ -205,7 +204,7 @@
- +