From 1e68742ef31e97045f9fdd73db51fcbca9acf3f6 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Thu, 23 Jul 2020 09:08:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BC=96=E8=BE=91=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=97=B6=E7=9A=84=E5=8F=91=E5=B8=83=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/news/allnews-add-or-update.vue |  3 +++
 src/views/modules/news/news-add-or-update.vue    | 12 +++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/news/allnews-add-or-update.vue b/src/views/modules/news/allnews-add-or-update.vue
index 862b98e..5631ca9 100644
--- a/src/views/modules/news/allnews-add-or-update.vue
+++ b/src/views/modules/news/allnews-add-or-update.vue
@@ -221,6 +221,9 @@ export default {
           return this.$message.error(res.msg)
         }
         this.dataForm = { ...this.dataForm, ...res.data }
+        if (new Date(this.dataForm.newsReleaseEndTime) < new Date()) {
+          this.dataForm.newsUpDownState = '1'
+        }
         this.resetRegistTime()
         this.quillEditor.root.innerHTML = res.data.newsContent
         if (this.dataForm.streetId) {
diff --git a/src/views/modules/news/news-add-or-update.vue b/src/views/modules/news/news-add-or-update.vue
index f94df65..e2a9b91 100644
--- a/src/views/modules/news/news-add-or-update.vue
+++ b/src/views/modules/news/news-add-or-update.vue
@@ -123,8 +123,9 @@ export default {
         newsImageUrl: '',
         sectionCode: '',
         allDeptIdsShow: [],
-        newsUpDownState: '0'
+        newsUpDownState: ''
       },
+      newsUpDownStateOld: '',
       time: [],
       options: [],
       categorys: [],
@@ -217,6 +218,10 @@ export default {
           return this.$message.error(res.msg)
         }
         this.dataForm = { ...this.dataForm, ...res.data }
+        this.newsUpDownStateOld = this.dataForm.newsUpDownState
+        if (new Date(this.dataForm.newsReleaseEndTime) < new Date()) {
+          this.dataForm.newsUpDownState = '1'
+        }
         this.getListCategory(this.dataForm.sectionCode)
         this.resetRegistTime()
         this.quillEditor.root.innerHTML = res.data.newsContent
@@ -281,6 +286,11 @@ export default {
     setRegistTime () {
       this.dataForm.newsReleaseStartTime = this.time[0]
       this.dataForm.newsReleaseEndTime = this.time[1]
+      if (new Date(this.dataForm.newsReleaseEndTime) < new Date()) {
+        this.dataForm.newsUpDownState = '1'
+      } else if (this.newsUpDownStateOld == '0'){
+        this.dataForm.newsUpDownState = '0'
+      }
     },
     resetRegistTime () {
       this.time = [this.dataForm.newsReleaseStartTime.substr(0, 10), this.dataForm.newsReleaseEndTime.substr(0, 10)]