From 32d43c8ec2c8a9b33bb8fb1710bf57908dcaa366 Mon Sep 17 00:00:00 2001
From: fengchenchen <syxysoft.com>
Date: Fri, 22 Jul 2022 17:56:57 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90update=E3=80=91=20=E4=BC=9A=E8=AE=AE?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E6=98=AF=E9=97=AE=E9=A2=98=E5=BE=81=E9=9B=86=E7=9A=84=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/meetingActivity/MeetingActivity.vue | 33 ++++++++++++++++++-
 .../meeting/MeetingList.vue                   | 30 +++++++++++++++++
 2 files changed, 62 insertions(+), 1 deletion(-)

diff --git a/src/views/meetingActivity/MeetingActivity.vue b/src/views/meetingActivity/MeetingActivity.vue
index 6311f5e..773e63c 100644
--- a/src/views/meetingActivity/MeetingActivity.vue
+++ b/src/views/meetingActivity/MeetingActivity.vue
@@ -98,6 +98,13 @@
             <p class="item-meeting-img item-meeting-meetingDirector">
               <img src="../../assets/meetingImgs/meeting-user.png"/>
               负责人：{{ item.directorName }}
+              <!--  增加是否有问题征集的图标 ，如果可以填写，则存在-->
+              <a-icon
+                v-if="item.hasQuestionIcon"
+                class="question-icon"
+                type="profile"
+                title="可填写问题征集"
+              />
             </p>
             <p class="item-meeting-img item-meeting-meetingAddress">
               <img src="../../assets/meetingImgs/meeting-address.png"/>
@@ -226,7 +233,7 @@ import UploadMeetingCertificateModal from '@views/MessagePage/UploadMeetingCerti
 import {getAction} from '@api/manage'
 import JEllipsis from '@comp/jero/JEllipsis'
 import MeetingDetailModal from '@views/MessagePage/MeetingDetailModal'
-import {SignUpStatusEnum, MeetingStatusEnums, MeetingSignUpTypeEnums, MeetIdentifyTypeEnums} from '@/enums/commonEnum'
+import {SignUpStatusEnum, MeetingStatusEnums, MeetingSignUpTypeEnums, MeetIdentifyTypeEnums, MeetingTypeEnums} from '@/enums/commonEnum'
 import { compareCurrentTime } from '../../utils/meetingJudgeUtil'
 
 export default {
@@ -241,6 +248,7 @@ export default {
   },
   data() {
     return {
+      MeetingTypeEnums,
       SignUpStatusEnum,
       MeetingStatusEnums,
       MeetingSignUpTypeEnums,
@@ -347,6 +355,13 @@ export default {
       this.pageNo = pageNo
       this.initData()
     },
+    canOpe(endTimeAddQuestion) {
+      if(!endTimeAddQuestion) {
+        return false
+      } else {
+        return !compareCurrentTime(endTimeAddQuestion)
+      }
+    },
     /*
     * 初始化加载数据
     * */
@@ -366,6 +381,16 @@ export default {
       getAction(this.url.list, params).then((res) => {
         if (res.success) {
           this.tableData = [...res.result.records] || res.result
+          // 判断当前的会议是否有问题征集的图标，用 hasQuestionIcon 做标识
+          this.tableData.map(item => {
+            // 会议类型是标协会议 && 有问题征集
+            if(item.meetingType === MeetingTypeEnums.standard.index && Number(item.isAddQuestion)) {
+              item.hasQuestionIcon = true
+              if(!this.canOpe(item.endTimeAddQuestion)) {
+                item.hasQuestionIcon = false
+              }
+            }
+          })
           this.current = res.result.current
           if (res.result.total) {
             this.total = res.result.total
@@ -602,4 +627,10 @@ export default {
     top: -4px;
   }
 }
+
+// 问题征集的图标
+.question-icon{
+  color: #069F99;
+  font-size: 14px;
+}
 </style>
diff --git a/src/views/standardsAssociation/meeting/MeetingList.vue b/src/views/standardsAssociation/meeting/MeetingList.vue
index 5320190..3263c6b 100644
--- a/src/views/standardsAssociation/meeting/MeetingList.vue
+++ b/src/views/standardsAssociation/meeting/MeetingList.vue
@@ -88,6 +88,13 @@
             <p class="item-meeting-img item-meeting-meetingDirector">
               <img src="@/assets/meetingImgs/meeting-user.png" />
               负责人：{{ item.directorName }}
+              <!--  增加是否有问题征集的图标 ，如果可以填写，则存在-->
+              <a-icon
+                v-if="item.hasQuestionIcon"
+                class="question-icon"
+                type="profile"
+                title="可填写问题征集"
+              />
             </p>
             <p class="item-meeting-img item-meeting-meetingTime">
               <img src="@/assets/meetingImgs/meeting-time.png" />
@@ -324,6 +331,13 @@ export default {
       this.pageNo = pageNo
       this.initData()
     },
+    canOpe(endTimeAddQuestion) {
+      if(!endTimeAddQuestion) {
+        return false
+      } else {
+        return !compareCurrentTime(endTimeAddQuestion)
+      }
+    },
     /*
     * 初始化加载数据
     * */
@@ -343,6 +357,16 @@ export default {
       getAction(this.url.list, params).then((res) => {
         if (res.success) {
           this.tableData = [...res.result.records] || res.result
+          // 判断当前的会议是否有问题征集的图标，用 hasQuestionIcon 做标识
+          this.tableData.map(item => {
+            // 会议类型是标协会议 && 有问题征集
+            if(item.meetingType === MeetingTypeEnums.standard.index && Number(item.isAddQuestion)) {
+              item.hasQuestionIcon = true
+              if(!this.canOpe(item.endTimeAddQuestion)) {
+                item.hasQuestionIcon = false
+              }
+            }
+          })
           this.current = res.result.current
           if (res.result.total) {
             this.total = res.result.total
@@ -549,4 +573,10 @@ export default {
   }
 }
 
+// 问题征集的图标
+.question-icon{
+  color: #069F99;
+  font-size: 14px;
+}
+
 </style>