FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# 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
This commit is contained in:
zhoulingpo
2023-11-22 10:59:25 +08:00
parent f3923ce3ef 8ac293770e
commit e2f8529f21
7 changed files with 42 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/policyRegulation/meeting/components/TopicsTable.vue
+4
View File
@@ -102,6 +102,7 @@
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="topicName"
label="课题名称"
align="center"
@@ -112,6 +113,7 @@
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="organizer"
label="课题承办单位"
align="center"
@@ -119,6 +121,7 @@
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="startTime"
label="启动时间"
align="center"
@@ -126,6 +129,7 @@
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="topicStatus"
label="课题状态"
align="center"
src/pages/policyRegulation/meeting/index.vue
+5
View File
@@ -114,6 +114,7 @@
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="meetingName"
label="会议名称"
align="center"
@@ -124,6 +125,7 @@
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="meetingOrganizer"
label="会议主办单位"
align="center"
@@ -131,6 +133,7 @@
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="meetingTime"
label="会议时间"
align="center"
@@ -138,6 +141,7 @@
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="meetingAddress"
label="会议地点"
align="center"
@@ -145,6 +149,7 @@
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="agendaName"
label="议题名称"
align="center"
src/pages/policyRegulation/policyTopics/index.vue
+4
View File
@@ -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"
src/pages/policyRegulation/regulatoryMaterials/components/RegulatoryMaterialsMain.vue
+4
View File
@@ -131,6 +131,7 @@
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="firstTypeName"
label="1级资料类别"
align="center"
@@ -138,6 +139,7 @@
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="secondTypeName"
label="2级资料类别"
align="center"
@@ -145,6 +147,7 @@
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="name"
label="资料名称"
align="center"
@@ -172,6 +175,7 @@
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="description"
label="资料说明"
align="center"