From 757a2b913349554680c8b0cbbc6ae11e80c55ef0 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Wed, 2 Sep 2020 10:44:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7=E8=AE=BF?=
 =?UTF-8?q?=E9=97=AE=E6=95=B0=E6=8D=AE=E7=9A=84=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/honest/allnewshonest-add-or-update.vue |  4 ----
 .../modules/honest/newshonest-add-or-update.vue    | 14 ++++++++++----
 src/views/modules/honest/newshonest-list.vue       |  2 +-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/views/modules/honest/allnewshonest-add-or-update.vue b/src/views/modules/honest/allnewshonest-add-or-update.vue
index 6eb93e8..137c7cc 100644
--- a/src/views/modules/honest/allnewshonest-add-or-update.vue
+++ b/src/views/modules/honest/allnewshonest-add-or-update.vue
@@ -181,10 +181,6 @@ export default {
           return this.$message.error(res.msg)
         }
         this.dataForm = { ...this.dataForm, ...res.data }
-        console.log("this.quillEditor.root.innerHTML")
-        console.log(this.quillEditor.root.innerHTML)
-        console.log("res.data.newsContent")
-        console.log(res.data.newsContent)
         this.quillEditor.root.innerHTML = res.data.newsContent
         let business = this.options.find(item=>{
           return item.code === this.dataForm.businessId
diff --git a/src/views/modules/honest/newshonest-add-or-update.vue b/src/views/modules/honest/newshonest-add-or-update.vue
index e0f8635..21e1178 100644
--- a/src/views/modules/honest/newshonest-add-or-update.vue
+++ b/src/views/modules/honest/newshonest-add-or-update.vue
@@ -6,6 +6,7 @@
              @close="visible= false">
     <el-form :model="dataForm"
              :rules="dataRule"
+             v-loading="loading"
              ref="dataForm"
              :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
       <el-form-item label="新闻模块"
@@ -108,8 +109,8 @@ export default {
         newsProperty: '',
         newsColumn: '',
         newsTitle: '',
-        newsReleaseStartTime: '',
-        newsReleaseEndTime: '',
+        newsApprovalState: '',
+        approvalReason: '',
         newsContent: '',
         newsImageUrl: '',
         allDeptIdsShow: []
@@ -226,12 +227,12 @@ export default {
     },
     // 获取信息
     getInfo () {
+      this.loading = true
       this.$http.get(`/news/newshonest/${this.dataForm.id}`).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
         this.dataForm = { ...this.dataForm, ...res.data }
-        this.resetRegistTime()
         this.quillEditor.root.innerHTML = res.data.newsContent
         // 类别
         this.$http
@@ -259,7 +260,10 @@ export default {
             .catch(() => {
               this.loading = false
             })
-      }).catch(() => { })
+        this.loading = false
+      }).catch(() => {
+        this.loading = false
+      })
     },
     // 获取部门列表
     getDeptInfoList (dataReceiver, faDeptId) {
@@ -376,6 +380,8 @@ export default {
     dataFormSubmitHandle: debounce(function () {
       this.dataForm.newsProperty = this.$refs.newsCateroryName.selectedLabel
       this.dataForm.newsColumn = this.$refs.newsSubCateroryName.selectedLabel
+      this.dataForm.newsApprovalState = '0'
+      this.dataForm.approvalReason = ''
       // if ((this.dataForm.newsContent).length > 10000) {
       //   return this.$message.error('您输入的的内容已超过字数不能提交')
       // }
diff --git a/src/views/modules/honest/newshonest-list.vue b/src/views/modules/honest/newshonest-list.vue
index 9380033..8d1dcdc 100644
--- a/src/views/modules/honest/newshonest-list.vue
+++ b/src/views/modules/honest/newshonest-list.vue
@@ -82,7 +82,7 @@
             <el-button v-if="$hasPermission('honest:newshonest:review') && scope.row.newsApprovalState === '2' && scope.row.newsUpDownState === '1'" type="text" size="small" @click="UpStateChange(scope.row.id)">上线</el-button>
             <el-button v-if="$hasPermission('honest:newshonest:review') && scope.row.newsUpDownState === '0'" type="text" size="small" @click="DownStateChange(scope.row.id)">下线</el-button>
             <el-button v-if="$hasPermission('honest:newshonest:review') && scope.row.newsApprovalState === '0'" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">审核</el-button>
-            <el-button v-if="!$hasPermission('honest:newshonest:review') || ($hasPermission('honest:newshonest:review') && scope.row.newsApprovalState !== '0')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">查看</el-button>
+            <el-button v-if="($hasPermission('honest:newshonest:view') && scope.row.newsApprovalState === '2') || ($hasPermission('honest:newshonest:review') && scope.row.newsApprovalState !== '0')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">查看</el-button>
           </template>
         </el-table-column>
       </el-table>