From 40a40373147d8781c53be0ac97e4b8ccbc50fb52 Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Tue, 21 Nov 2023 15:25:40 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=2078589=20=E9=85=8D=E7=BD=AE=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86-=E6=A0=87=E5=87=86=E4=BD=93=E7=B3=BB-=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=97=B6=E5=81=9A=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/attributeCustom/components/standSystem.vue     | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/pages/config/pages/attributeCustom/components/standSystem.vue b/src/pages/config/pages/attributeCustom/components/standSystem.vue
index a33fc2aac..56a18b401 100644
--- a/src/pages/config/pages/attributeCustom/components/standSystem.vue
+++ b/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 '新增体系':

From caca657510d148d34a05fd6bbb37f9164e9bb2fd Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Wed, 22 Nov 2023 09:57:57 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E6=94=BF=E7=AD=96-=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E5=86=85=E5=AE=B9=E8=BF=87=E9=95=BF=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../policyRegulation/meeting/components/TopicsTable.vue    | 4 ++++
 src/pages/policyRegulation/meeting/index.vue               | 5 +++++
 src/pages/policyRegulation/policyTopics/index.vue          | 4 ++++
 .../components/RegulatoryMaterialsMain.vue                 | 4 ++++
 .../policyTopicParticipation/components/RetrieveTopics.vue | 6 ++++++
 .../policyWarehousing/components/SearchResult.vue          | 7 ++++++-
 6 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/src/pages/policyRegulation/meeting/components/TopicsTable.vue b/src/pages/policyRegulation/meeting/components/TopicsTable.vue
index 69ed77451..68677d3c2 100644
--- a/src/pages/policyRegulation/meeting/components/TopicsTable.vue
+++ b/src/pages/policyRegulation/meeting/components/TopicsTable.vue
@@ -93,6 +93,7 @@
             align="center">
         </el-table-column>
         <el-table-column
+            show-overflow-tooltip
             prop="topicName"
             label="课题名称"
             align="center"
@@ -103,6 +104,7 @@
           </template>
         </el-table-column>
         <el-table-column
+            show-overflow-tooltip
             prop="organizer"
             label="课题承办单位"
             align="center"
@@ -110,6 +112,7 @@
         >
         </el-table-column>
         <el-table-column
+            show-overflow-tooltip
             prop="startTime"
             label="启动时间"
             align="center"
@@ -117,6 +120,7 @@
         >
         </el-table-column>
         <el-table-column
+            show-overflow-tooltip
             prop="topicStatus"
             label="课题状态"
             align="center"
diff --git a/src/pages/policyRegulation/meeting/index.vue b/src/pages/policyRegulation/meeting/index.vue
index 17b595e91..64b57c6af 100644
--- a/src/pages/policyRegulation/meeting/index.vue
+++ b/src/pages/policyRegulation/meeting/index.vue
@@ -105,6 +105,7 @@
             align="center">
         </el-table-column>
         <el-table-column
+            show-overflow-tooltip
             prop="meetingName"
             label="会议名称"
             align="center"
@@ -115,6 +116,7 @@
           </template>
         </el-table-column>
         <el-table-column
+            show-overflow-tooltip
             prop="meetingOrganizer"
             label="会议主办单位"
             align="center"
@@ -122,6 +124,7 @@
         >
         </el-table-column>
         <el-table-column
+            show-overflow-tooltip
             prop="meetingTime"
             label="会议时间"
             align="center"
@@ -129,6 +132,7 @@
         >
         </el-table-column>
         <el-table-column
+            show-overflow-tooltip
             prop="meetingAddress"
             label="会议地点"
             align="center"
@@ -136,6 +140,7 @@
         >
         </el-table-column>
         <el-table-column
+            show-overflow-tooltip
             prop="agendaName"
             label="议题名称"
             align="center"
diff --git a/src/pages/policyRegulation/policyTopics/index.vue b/src/pages/policyRegulation/policyTopics/index.vue
index af726654f..48650f990 100644
--- a/src/pages/policyRegulation/policyTopics/index.vue
+++ b/src/pages/policyRegulation/policyTopics/index.vue
@@ -118,6 +118,7 @@
             align="center">
         </el-table-column>
         <el-table-column
+            show-overflow-tooltip
             prop="topicName"
             label="课题名称"
             align="center"
@@ -128,6 +129,7 @@
           </template>
         </el-table-column>
         <el-table-column
+            show-overflow-tooltip
             prop="organizer"
             label="课题承办单位"
             align="center"
@@ -135,6 +137,7 @@
         >
         </el-table-column>
         <el-table-column
+            show-overflow-tooltip
             prop="startTime"
             label="启动时间"
             align="center"
@@ -142,6 +145,7 @@
         >
         </el-table-column>
         <el-table-column
+            show-overflow-tooltip
             prop="topicStatus"
             label="课题状态"
             align="center"
diff --git a/src/pages/policyRegulation/regulatoryMaterials/components/RegulatoryMaterialsMain.vue b/src/pages/policyRegulation/regulatoryMaterials/components/RegulatoryMaterialsMain.vue
index 48c2d2723..17ffe712f 100644
--- a/src/pages/policyRegulation/regulatoryMaterials/components/RegulatoryMaterialsMain.vue
+++ b/src/pages/policyRegulation/regulatoryMaterials/components/RegulatoryMaterialsMain.vue
@@ -122,6 +122,7 @@
             align="center">
         </el-table-column>
         <el-table-column
+            show-overflow-tooltip
             prop="firstTypeName"
             label="1级资料类别"
             align="center"
@@ -129,6 +130,7 @@
         >
         </el-table-column>
         <el-table-column
+            show-overflow-tooltip
             prop="secondTypeName"
             label="2级资料类别"
             align="center"
@@ -136,6 +138,7 @@
         >
         </el-table-column>
         <el-table-column
+            show-overflow-tooltip
             prop="name"
             label="资料名称"
             align="center"
@@ -163,6 +166,7 @@
           </template>
         </el-table-column>
         <el-table-column
+            show-overflow-tooltip
             prop="description"
             label="资料说明"
             align="center"
diff --git a/src/pages/processCenter/pages/creatProcess/policyTopicParticipation/components/RetrieveTopics.vue b/src/pages/processCenter/pages/creatProcess/policyTopicParticipation/components/RetrieveTopics.vue
index c2e0c8330..a4afeeaba 100644
--- a/src/pages/processCenter/pages/creatProcess/policyTopicParticipation/components/RetrieveTopics.vue
+++ b/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"
diff --git a/src/pages/processCenter/pages/creatProcess/policyWarehousing/components/SearchResult.vue b/src/pages/processCenter/pages/creatProcess/policyWarehousing/components/SearchResult.vue
index 8f2bb0241..076b5fa0d 100644
--- a/src/pages/processCenter/pages/creatProcess/policyWarehousing/components/SearchResult.vue
+++ b/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">

From 8ac293770e175ec79b03d65cc9ec8303d12e3d78 Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Wed, 22 Nov 2023 10:25:31 +0800
Subject: [PATCH 3/3] =?UTF-8?q?style:=20=E6=94=BF=E7=AD=96=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93-=E5=B8=A6=E5=85=A5=E6=94=BF=E7=AD=96=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../policyWarehousing/components/SearchResult.vue           | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/pages/processCenter/pages/creatProcess/policyWarehousing/components/SearchResult.vue b/src/pages/processCenter/pages/creatProcess/policyWarehousing/components/SearchResult.vue
index 076b5fa0d..92cd00b59 100644
--- a/src/pages/processCenter/pages/creatProcess/policyWarehousing/components/SearchResult.vue
+++ b/src/pages/processCenter/pages/creatProcess/policyWarehousing/components/SearchResult.vue
@@ -290,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;