From 496c21a857eca79f35cb2d961c77503e28077b97 Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Fri, 10 Nov 2023 10:08:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=20=E4=BF=AE=E6=94=B9=E4=B8=8A=E4=BC=A0=E9=99=90?=
 =?UTF-8?q?=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/hzwlComponents/UploadFormItem.vue    | 13 +++++--------
 .../policyMeetings/components/Topics.vue            |  2 +-
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/components/hzwlComponents/UploadFormItem.vue b/src/components/hzwlComponents/UploadFormItem.vue
index 944f4c34f..12787889f 100644
--- a/src/components/hzwlComponents/UploadFormItem.vue
+++ b/src/components/hzwlComponents/UploadFormItem.vue
@@ -121,17 +121,14 @@ export default {
       const fileSuffix = fileName.slice(fileName.lastIndexOf('.') + 1)
       // 判断上传文件格式
       const acceptArr = this.accept.split(',').map(type => type.slice(type.lastIndexOf('.') + 1))
-      if (acceptArr.includes(fileSuffix)) {
-        return true
-      } else {
-        this.$message.error('文件' + file.name + `格式不正确，请上传${acceptArr.join(',')}文件`)
+      // 判断上传文件格式
+      if (!acceptArr.includes(fileSuffix)) {
+        this.$message.error(`文件${file.name}格式不正确，请上传${acceptArr.join('、')}文件`)
         return false
       }
       // 判断文件上传大小
-      if (file.size / 1024 / 1024 <= this.size) {
-        return true
-      } else {
-        this.$message.error('文件' + file.name + `大小不超过${this.size}M`)
+      if (file.size / 1024 / 1024 > this.size) {// eslint-disable-line
+        this.$message.error('文件' + file.name + `大小不超过${ this.size }M`)
         return false
       }
       return true
diff --git a/src/pages/processCenter/pages/creatProcess/policyMeetings/components/Topics.vue b/src/pages/processCenter/pages/creatProcess/policyMeetings/components/Topics.vue
index 4595b8a1b..90aa27c2e 100644
--- a/src/pages/processCenter/pages/creatProcess/policyMeetings/components/Topics.vue
+++ b/src/pages/processCenter/pages/creatProcess/policyMeetings/components/Topics.vue
@@ -64,7 +64,7 @@ export default {
       required: true
     },
     rules: {
-      type: Array
+      type: Object
     },
     disabled: {
       type: Boolean,