From 39b926f58718ba6e27d7ca27b9f0623ff78318e1 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期六, 22 二月 2025 17:23:33 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/views/projectEngineering/projectLibrary/index.vue | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/projectEngineering/projectLibrary/index.vue b/src/views/projectEngineering/projectLibrary/index.vue index 29818cd..b4b9fc1 100644 --- a/src/views/projectEngineering/projectLibrary/index.vue +++ b/src/views/projectEngineering/projectLibrary/index.vue @@ -224,10 +224,10 @@ <template v-if="item.slotName === 'projectType'"> <dict-tag :options="dict.type.sys_project_type" :value="scope.row.projectType"/> </template> -<!-- <!– projectSubType鎻掓Ы –>--> -<!-- <template v-if="item.slotName === 'projectSubType'">--> -<!-- {{ getProjectSubType(scope.row.projectType, scope.row.projectSubType) }}--> -<!-- </template>--> + <!-- projectSubType鎻掓Ы --> + <template v-if="item.slotName === 'attractInvestment'"> + <dict-tag :options="dict.type.sys_project_type" :value="scope.row.attractInvestment"/> + </template> <!-- constructionNature鎻掓Ы --> <template v-if="item.slotName === 'constructionNature'"> <dict-tag :options="dict.type.construction_nature" :value="scope.row.constructionNature"/> @@ -330,7 +330,7 @@ export default { dicts: ['sys_administrative_divisions', 'sys_investment_type', 'sys_project_phases', 'sys_funding_type', 'sys_association_status', 'sys_project_status', 'sys_project_code', - 'sys_project_tags', 'sys_key_categories', 'sys_project_type','sys_used_status', 'construction_nature'], + 'sys_project_tags', 'sys_key_categories', 'sys_project_type','sys_used_status', 'construction_nature', 'attract_investment'], name: "ProjectInfo", components: { FileDialog -- Gitblit v1.8.0