diff --git a/src/api/tjt/profit/index.ts b/src/api/tjt/profit/index.ts index 92ecd93..4fe13aa 100644 --- a/src/api/tjt/profit/index.ts +++ b/src/api/tjt/profit/index.ts @@ -12,6 +12,7 @@ export interface ProjectProfitVO { subcontractPlanningAmount?: number specialSubcontractPlanningAmount?: number sourceCoopSubcontractPlanningAmount?: number + comprehensiveSubcontractPlanningAmount?: number majorOutputValue?: number majorExpectedPerformance?: number innovationOutputRate?: number diff --git a/src/views/tjt/employee/index.vue b/src/views/tjt/employee/index.vue index 62edd58..b1d7fab 100644 --- a/src/views/tjt/employee/index.vue +++ b/src/views/tjt/employee/index.vue @@ -142,7 +142,7 @@ width="180" :formatter="dateFormatter" /> - + @@ -495,15 +487,6 @@ const submitForm = async () => { } } -const handleDelete = async (id: number) => { - try { - await message.delConfirm() - await EmployeeApi.deleteEmployee(id) - message.success(t('common.delSuccess')) - await getList() - } catch {} -} - let activatedOnce = false onMounted(async () => { diff --git a/src/views/tjt/output-split/index.vue b/src/views/tjt/output-split/index.vue index 03cc43e..61898fe 100644 --- a/src/views/tjt/output-split/index.vue +++ b/src/views/tjt/output-split/index.vue @@ -292,6 +292,7 @@ import { formatAmountText, fromPercentValue, getOwnershipTypeLabel, + OUTPUT_SPLIT_SPECIALTY, OUTPUT_SPLIT_SPECIALTY_OPTIONS, QUARTER_OPTIONS, toPercentValue @@ -299,15 +300,7 @@ import { defineOptions({ name: 'TjtOutputSplit' }) -type AnnualCategoryKey = - | 'project_lead' - | 'arch' - | 'decor' - | 'struct' - | 'water' - | 'elec' - | 'hvac' - | 'digital' +type AnnualCategoryKey = (typeof OUTPUT_SPLIT_SPECIALTY)[keyof typeof OUTPUT_SPLIT_SPECIALTY] interface QuarterYearRow { distributionYear: number @@ -315,14 +308,14 @@ interface QuarterYearRow { } const annualCategoryOptions: { label: string; value: AnnualCategoryKey }[] = [ - { label: '项目经理/工程负责人', value: 'project_lead' }, - { label: '建筑专业', value: 'arch' }, - { label: '装修专业', value: 'decor' }, - { label: '结构专业', value: 'struct' }, - { label: '水专业', value: 'water' }, - { label: '电气专业', value: 'elec' }, - { label: '暖通专业', value: 'hvac' }, - { label: '数字化设计专业', value: 'digital' } + { label: '项目经理/工程负责人', value: OUTPUT_SPLIT_SPECIALTY.projectLead }, + { label: '建筑专业', value: OUTPUT_SPLIT_SPECIALTY.arch }, + { label: '装修专业', value: OUTPUT_SPLIT_SPECIALTY.decor }, + { label: '结构专业', value: OUTPUT_SPLIT_SPECIALTY.struct }, + { label: '水专业', value: OUTPUT_SPLIT_SPECIALTY.water }, + { label: '电气专业', value: OUTPUT_SPLIT_SPECIALTY.elec }, + { label: '暖通专业', value: OUTPUT_SPLIT_SPECIALTY.hvac }, + { label: '数字化设计专业', value: OUTPUT_SPLIT_SPECIALTY.digital } ] const message = useMessage() @@ -339,7 +332,7 @@ const currentPlanning = ref() const formData = ref() const editForm = ref() const quarterRows = ref([]) -const selectedAnnualCategory = ref('project_lead') +const selectedAnnualCategory = ref(OUTPUT_SPLIT_SPECIALTY.projectLead) const dialogVisible = ref(false) const queryFormRef = ref() const projectTableRef = ref() @@ -438,7 +431,7 @@ const annualCategoryMeta = computed(() => { if (!model || !option) { return { label: '-', ratio: 0, totalAmount: 0 } } - if (selectedAnnualCategory.value === 'project_lead') { + if (selectedAnnualCategory.value === OUTPUT_SPLIT_SPECIALTY.projectLead) { const ratio = Number(toNumeric(model.projectLeadRatio).toFixed(4)) return { label: option.label, diff --git a/src/views/tjt/output/PlanningOutputForm.vue b/src/views/tjt/output/PlanningOutputForm.vue index ac370d1..24b7f79 100644 --- a/src/views/tjt/output/PlanningOutputForm.vue +++ b/src/views/tjt/output/PlanningOutputForm.vue @@ -301,7 +301,7 @@ - + - + + + +