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

src/pages/config/pages/attributeCustom/components/standSystem.vue

@@ -58,7 +58,7 @@
             class="common-button-primary"
             icon="el-icon-check"
             type="primary"
-            @click="handleSubmit('productModelAdd')">提交</el-button>
+            @click="handleSubmit">提交</el-button>
         <el-button
             class="common-button-default"
             icon="el-icon-close"
@@ -221,6 +221,13 @@ export default {
       }
     },
     async handleSubmit () {
+      let flag = true
+      await this.$refs.addModelRef.validate((valid) => {
+        if (!valid) {
+          flag = false
+        }
+      })
+      if (!flag) return;
       let res = {}
       switch (this.drawerTitle) {
         case '新增体系':

src/pages/policyRegulation/meeting/components/TopicsTable.vue

@@ -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

@@ -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

@@ -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

@@ -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"

src/pages/processCenter/pages/creatProcess/policyTopicParticipation/components/RetrieveTopics.vue

@@ -94,6 +94,7 @@
                 align="center">
             </el-table-column>
             <el-table-column
+                show-overflow-tooltip
                 prop="topicName"
                 label="课题名称"
                 align="center"
@@ -101,6 +102,7 @@
             >
             </el-table-column>
             <el-table-column
+                show-overflow-tooltip
                 prop="organizer"
                 label="课题承办单位"
                 align="center"
@@ -108,6 +110,8 @@
             >
             </el-table-column>
             <el-table-column
+                show-overflow-tooltip
+                width="150"
                 prop="startTime"
                 label="启动时间"
                 align="center"
@@ -115,6 +119,8 @@
             >
             </el-table-column>
             <el-table-column
+                show-overflow-tooltip
+                width="120"
                 prop="topicStatus"
                 label="课题状态"
                 align="center"

src/pages/processCenter/pages/creatProcess/policyWarehousing/components/SearchResult.vue

@@ -78,10 +78,11 @@
             <el-table-column
                 type="index"
                 label="序号"
-                width="80"
+                width="55"
                 align="center"
             ></el-table-column>
             <el-table-column
+                show-overflow-tooltip
                 label="政策文号"
                 align="center"
             >
@@ -90,17 +91,21 @@
               </template>
             </el-table-column>
             <el-table-column
+                show-overflow-tooltip
                 prop="lawsName"
                 label="政策名称"
                 align="center">
             </el-table-column>
             <el-table-column
+                show-overflow-tooltip
                 prop="lawsEnName"
                 label="英文名称"
                 align="center">
             </el-table-column>
             <el-table-column
+                show-overflow-tooltip
                 prop="textStatus"
+                width="120"
                 label="文本状态"
                 align="center">
               <template slot-scope="scope">
@@ -285,7 +290,11 @@ export default {
 
 <style scoped lang="less">
 .standard-content{
-  flex: 1;
+  height: calc(100% - 61px);
+}
+.content {
+  height: calc(100% - 56px);
+  overflow-y: auto;
 }
 .demo-drawer-footer{
   height: 61px!important;