From 297611130d38f9e3fd0c2d08faa2e4e62d0ad1cb Mon Sep 17 00:00:00 2001
From: mkh <mkh@qq.com>
Date: Sun, 28 Nov 2021 14:21:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/member/newsmember-list.vue | 24 ++++++++++++--------
 src/views/modules/member/newsmember.vue      |  6 ++---
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/views/modules/member/newsmember-list.vue b/src/views/modules/member/newsmember-list.vue
index b9c0f12..971b9de 100644
--- a/src/views/modules/member/newsmember-list.vue
+++ b/src/views/modules/member/newsmember-list.vue
@@ -42,11 +42,15 @@
                       prop="newsApprovalState">
           <el-select v-model="dataForm.newsApprovalState"
                      placeholder="审核状态" @change="resetPage" clearable>
-            <el-option v-for="item in approvalOptions"
+              <el-option value="0" label="未审核"> 
+              </el-option>
+              <el-option value="1" label="驳回">
+              </el-option>
+            <!-- <el-option v-for="item in approvalOptions"
                        :key="item.id"
                        :label="item.title"
                        :value="item.id">
-            </el-option>
+            </el-option> -->
           </el-select>
         </el-form-item>
         <el-form-item>
@@ -80,11 +84,11 @@
         </el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
-            <el-button v-if="$hasPermission('member:newsmember: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('member:newsmember:review') && scope.row.newsUpDownState === '0'" type="text" size="small" @click="DownStateChange(scope.row.id)">下线</el-button>
+            <!-- <el-button v-if="$hasPermission('member:newsmember: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('member:newsmember:review') && scope.row.newsUpDownState === '0'" type="text" size="small" @click="DownStateChange(scope.row.id)">下线</el-button> -->
             <el-button v-if="$hasPermission('member:newsmember:review') && scope.row.newsApprovalState === '0'" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">审核</el-button>
-            <!-- <el-button v-if="($hasPermission('member:newsmember:view') && scope.row.newsApprovalState === '2') || ($hasPermission('honest:newshonest:review') && scope.row.newsApprovalState !== '0')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">查看</el-button> -->
-            <el-button v-if="$hasPermission('member:newsmember:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="($hasPermission('member:newsmember: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>
@@ -99,14 +103,15 @@
       </el-pagination>
       <!-- 弹窗, 新增 / 修改 -->
       <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+      <add-or-update v-if="UpdateVisible" ref="Update" @refreshDataList="getDataList"></add-or-update>
+
     </div>
   </el-card>
 </template>
 
 <script>
 import mixinViewModule from '@/mixins/view-module'
-// import AddOrUpdate from './allnewsmember-add-or-update'
-import AddOrUpdate from './newsmember-add-or-update'
+import AddOrUpdate from './allnewsmember-add-or-update'
 export default {
   mixins: [mixinViewModule],
   data () {
@@ -139,7 +144,8 @@ export default {
       ],
       newsCateroryIds: [],
       newsSubCateroryIds: [],
-      options: []
+      options: [],
+      UpdateVisible: false
     }
   },
   components: {
diff --git a/src/views/modules/member/newsmember.vue b/src/views/modules/member/newsmember.vue
index 89d4d59..c22c3d6 100644
--- a/src/views/modules/member/newsmember.vue
+++ b/src/views/modules/member/newsmember.vue
@@ -70,7 +70,7 @@
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
             <el-button v-if="$hasPermission('member:newsmember:update') && scope.row.newsApprovalState === '2' && scope.row.newsUpDownState === '1'" type="text" size="small" @click="UpStateChange(scope.row.id)">上线</el-button>
-            <el-button v-if="$hasPermission('member:newsmember:update') && scope.row.newsUpDownState === '0'" type="text" size="small" @click="DownStateChange(scope.row.id)">下线</el-button>
+            <el-button v-if="$hasPermission('member:newsmember:update') && scope.row.newsApprovalState === '2' && scope.row.newsUpDownState === '0'" type="text" size="small" @click="DownStateChange(scope.row.id)">下线</el-button>
             <el-button v-if="$hasPermission('member:newsmember:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
             <el-button v-if="$hasPermission('member:newsmember:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
@@ -196,7 +196,7 @@ export default {
       }).then(() => {
       this.dataForm.id = id
       this.dataForm.newsUpDownState = 1
-      //this.dataForm.newsApprovalState = 2
+      this.dataForm.newsApprovalState = 2
       this.$http['post']('/news/newsmember/review', this.dataForm).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
@@ -224,7 +224,7 @@ export default {
       }).then(() => {
       this.dataForm.id = id
       this.dataForm.newsUpDownState = 0
-      //this.dataForm.newsApprovalState = 2
+      this.dataForm.newsApprovalState = 2
       this.$http['post']('/news/newsmember/review', this.dataForm).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)