diff --git a/src/api/budget/budgetCollectionPackage.js b/src/api/budget/budgetCollectionPackage.js index e087f68..115dfe9 100644 --- a/src/api/budget/budgetCollectionPackage.js +++ b/src/api/budget/budgetCollectionPackage.js @@ -156,4 +156,5 @@ export function getEconomicClassifications(params) { method: 'get', params }) -} \ No newline at end of file +} + diff --git a/src/api/budget/departmentSubmission.js b/src/api/budget/departmentSubmission.js index de284f5..241cefd 100644 --- a/src/api/budget/departmentSubmission.js +++ b/src/api/budget/departmentSubmission.js @@ -100,3 +100,20 @@ export function getChildrenPerformanceIndicators(parentId) { params: { parent_id: parentId } }) } + +// 获取多包汇总提交数据 +export function getMultiPackageDecomposition(packageId) { + return request({ + url: `/api/ht/budget-decompositions/${packageId}`, + method: 'get' + }) +} + +// 提交多包汇总分解表(原多包汇总提交) +export function submitMultiPackageDecomposition(data) { + return request({ + url: '/api/ht/budget-decompositions/multi-package', + method: 'post', + data + }) +} diff --git a/src/views/budget/collection/components/BigPackageDetailView.vue b/src/views/budget/collection/components/BigPackageDetailView.vue new file mode 100644 index 0000000..7ef0339 --- /dev/null +++ b/src/views/budget/collection/components/BigPackageDetailView.vue @@ -0,0 +1,388 @@ + + + + + \ No newline at end of file diff --git a/src/views/budget/collection/components/BudgetSubmissionForm.vue b/src/views/budget/collection/components/BudgetSubmissionForm.vue index ea2fcbe..a4b8a3b 100644 --- a/src/views/budget/collection/components/BudgetSubmissionForm.vue +++ b/src/views/budget/collection/components/BudgetSubmissionForm.vue @@ -800,8 +800,8 @@ export default { console.warn('获取项目名称失败:', error.message) } - // 加载父级package的submission信息 - if (this.packageData.level == 2) { + // 加载package的submission信息 + if (this.packageData.level == 1 || this.packageData.level == 2) { this.parentSubmissionInfo = { application_basis: (this.packageData.application_basis) || '', application_purpose: (this.packageData.application_purpose) || '', diff --git a/src/views/budget/collection/components/LeadDepartmentSummaryForm.vue b/src/views/budget/collection/components/LeadDepartmentSummaryForm.vue index 6076a8b..6a6d89a 100644 --- a/src/views/budget/collection/components/LeadDepartmentSummaryForm.vue +++ b/src/views/budget/collection/components/LeadDepartmentSummaryForm.vue @@ -879,6 +879,7 @@ export default { }, async initFormData() { + console.log('initFormData', this.packageData) this.formData.packageId = this.packageData.id this.formData.leadDepartmentName = this.packageData.lead_department ? this.packageData.lead_department.name : '' this.formData.budgetYear = this.packageData.budget_year ? this.packageData.budget_year.year + '年' : '' @@ -1198,7 +1199,7 @@ export default { otherNotes: data.otherNotes || data.other_notes || '' } - console.log('从API获取的汇总数据:', this.formData) + console.log('从API获取的数据:', this.formData) // 填充经济分类汇总数据 if (data.economicSummary && data.economicSummary.length > 0) { diff --git a/src/views/budget/collection/components/MultiPackageSubmitForm.vue b/src/views/budget/collection/components/MultiPackageSubmitForm.vue new file mode 100644 index 0000000..8efa2bb --- /dev/null +++ b/src/views/budget/collection/components/MultiPackageSubmitForm.vue @@ -0,0 +1,1929 @@ + + + + + \ No newline at end of file diff --git a/src/views/budget/collection/package.vue b/src/views/budget/collection/package.vue index eb43298..18c2eea 100644 --- a/src/views/budget/collection/package.vue +++ b/src/views/budget/collection/package.vue @@ -117,7 +117,7 @@ - + @@ -238,7 +257,7 @@ - + @@ -430,7 +468,16 @@ @@ -508,7 +555,16 @@ @@ -591,7 +647,16 @@ @@ -755,11 +820,258 @@ + + + + + + + + + + + + + + +
+ + + +
+
+ + 经济分类基本信息 +
+ +
+
+
+ +
{{ currentEconomicData.name || '暂无' }}
+
+
+
+
+ +
{{ currentEconomicData.code || '暂无' }}
+
+
+
+
+ +
{{ getEconomicBudgetYear() }}
+
+
+
+ +
+
+
+ +
{{ getEconomicPackageName() }}
+
+
+
+
+ +
{{ getDepartmentName(currentEconomicData.department_id) }}
+
+
+
+
+ +
{{ formatCurrency(currentEconomicData.allocated_amount) }} 万元
+
+
+
+
+ + +
+
+ + 计算依据详情 +
+ +
+
+ +
{{ currentEconomicData.calculation_basis || '暂无计算依据' }}
+
+ +
+ +
{{ currentEconomicData.calculation_formula }}
+
+ +
+ +
{{ currentEconomicData.unit_price }} 元
+
+ +
+ +
{{ currentEconomicData.quantity }} {{ currentEconomicData.unit || '个' }}
+
+
+
+ + +
+
+ + 分解情况汇总 +
+ + + + + + + + + + + + + + + + +
+ + +
+
+ + 统计信息 +
+ +
+
+
预算金额
+
{{ formatCurrency(currentEconomicData.allocated_amount) }}
+
万元
+
+
+
已分解金额
+
{{ formatCurrency(getTotalBreakdownAmount()) }}
+
万元
+
+
+
分解项目数
+
{{ getEconomicBreakdownData().length }}
+
+
+
+
分解比例
+
{{ getBreakdownPercentage() }}
+
%
+
+
+
+ +
+ + +
+ + + + + + + + + + +