Merge remote-tracking branch 'origin/master'

xiangpei

2025-02-22 39b926f58718ba6e27d7ca27b9f0623ff78318e1

 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>
<!--            &lt;!&ndash; projectSubType插槽 &ndash;&gt;-->
<!--            <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