Merge remote-tracking branch 'origin/dev_20230829_change' into dev_20230829_change

# Conflicts: # src/pages/policyRegulation/meeting/components/TopicsTable.vue # src/pages/policyRegulation/meeting/index.vue # src/pages/policyRegulation/policyTopics/index.vue # src/pages/policyRegulation/regulatoryMaterials/components/RegulatoryMaterialsMain.vue
2023-11-22 10:59:25 +08:00
parent f3923ce3ef 8ac293770e
commit e2f8529f21
7 changed files with 42 additions and 3 deletions
@@ -127,6 +127,7 @@
          </template>
        </el-table-column>
        <el-table-column
+            show-overflow-tooltip
            prop="topicName"
            label="课题名称"
            align="center"
@@ -137,6 +138,7 @@
          </template>
        </el-table-column>
        <el-table-column
+            show-overflow-tooltip
            prop="organizer"
            label="课题承办单位"
            align="center"
@@ -144,6 +146,7 @@
        >
        </el-table-column>
        <el-table-column
+            show-overflow-tooltip
            prop="startTime"
            label="启动时间"
            align="center"
@@ -151,6 +154,7 @@
        >
        </el-table-column>
        <el-table-column
+            show-overflow-tooltip
            prop="topicStatus"
            label="课题状态"
            align="center"