Merge remote-tracking branch 'origin/master'

src/utils/allPageData.js

@@ -21,5 +21,5 @@ const yesOrNo = [
 const isExam = [
   { value: '0', label: '待审核' },
   { value: '1', label: '已通过' },
-  { value: '2', label: '已审核' }
+  { value: '2', label: '已驳回' }
 ]

src/views/contentManagement/activity/index.vue

@@ -14,8 +14,8 @@
               style="width: 150px"
             />
           </el-form-item>
-          <el-form-item label="顶置:" prop="isTop">
-            <el-select v-model="queryParams.isTop" placeholder="请选择顶置状态" style="width: 150px" clearable>
+          <el-form-item label="置顶:" prop="isTop">
+            <el-select v-model="queryParams.isTop" placeholder="请选择置顶状态" style="width: 150px" clearable>
               <el-option v-for="item in yesOrNo" :key="item.value" :label="item.label" :value="item.value"/>
             </el-select>
           </el-form-item>
@@ -322,7 +322,7 @@ export default {
   // },
   data() {
     return {
-      yesOrNo,
+      yesOrNo, 
       pageKey: 0,
       hasAddPerm: ['sys:activity:add'],
       hasUpdatePerm: ['sys:activity:update'],

src/views/contentManagement/notice/index.vue

@@ -14,8 +14,8 @@
               style="width: 150px"
             />
           </el-form-item>
-          <el-form-item label="顶置:" prop="isTop">
-            <el-select v-model="queryParams.isTop" placeholder="请选择顶置状态" style="width: 150px" clearable>
+          <el-form-item label="置顶:" prop="isTop">
+            <el-select v-model="queryParams.isTop" placeholder="请选择置顶状态" style="width: 150px" clearable>
               <el-option v-for="item in yesOrNo" :key="item.value" :label="item.label" :value="item.value"/>
             </el-select>
           </el-form-item>

src/views/contentManagement/topic/index.vue

@@ -107,7 +107,7 @@
                     </template>
                   </el-table-column>-->
 
-          <el-table-column align="center" label="操作" min-width="160">
+          <el-table-column align="center" label="操作" min-width="180">
             <template slot-scope="scope">
               <el-button
                 v-has-permi="hasDetailPerm"
@@ -123,28 +123,29 @@
                 :size="commonField.size"
                 @click="handleUpdate(scope.row)"
               >编辑</el-button>
+              <el-dropdown
+              v-if="scope.row.examStatus !== '1'"
+              @command="handleExamOrNoExam(scope.row, $event)"
+              style="margin-left: 10px;margin-right:10px ;"
+              >
               <el-button
-                v-show="scope.row.examStatus !== '1'"
-                :class="commonField.resetPasClass"
-                :type="commonField.typeParent"
-                :size="commonField.size"
-                @click="handleExam(scope.row)"
-              >审核</el-button>
-              <el-button
-                v-show="scope.row.examStatus === '1'"
-                :class="commonField.resetPasClass"
-                :type="commonField.typeParent"
-                :size="commonField.size"
-                @click="handleNoExam(scope.row)"
-              >驳回审核
+              :class="commonField.resetPasClass"
+              :type="commonField.typeParent"
+              :size="commonField.size"
+              >审核操作<i class="el-icon-arrow-down el-icon--right"></i>
               </el-button>
+              <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item command="exam">审核</el-dropdown-item>
+              <el-dropdown-item command="noExam">驳回</el-dropdown-item>
+              </el-dropdown-menu>
+              </el-dropdown>
               <el-button
                 :class="commonField.resetPasClass"
                 :type="commonField.typeParent"
                 :size="commonField.size"
                 @click="removeCourse(scope.row)"
               >删除</el-button>
-            <!--              <el-button type="text" @click="handleView(scope.row)">查看</el-button>-->
+              <!--              <el-button type="text" @click="handleView(scope.row)">查看</el-button>-->
             </template>
           </el-table-column>
 
@@ -283,7 +284,21 @@ export default {
           value: '0'
         }
       ],
-
+      // 审核状态选项
+    examStatusOptions: [
+      {
+        label: '待审核',
+        value: '0'
+      },
+      {
+        label: '已通过',
+        value: '1'
+      },
+      {
+        label: '已驳回',
+        value: '2'
+      }
+    ],
       // 上传提交
       uploadList: {
         fm: ''
@@ -518,50 +533,39 @@ export default {
         })
       })
     },
-
     /** 审核按钮操作 */
-    handleExam(row) {
-      const text = row.examStatus === '1' ? '驳回审核' : '审核'
-      const params = {
+    handleExamOrNoExam(row, command) {
+    let text, params, api;
+    if (command === 'exam') {
+      text = '审核';
+      params = {
         businessId: row.businessId,
-        examStatus: row.examStatus
-      }
-      this.$confirm('是否确认操作?', '审核中', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(function() {
-        return updateExamStatus(params)
-      }).then(() => {
-        this.$message({
-          message: text + '成功',
-          type: 'success'
-        })
-        this.loadData()
-      })
-    },
-
-    /** 撤回审核按钮操作 */
-    handleNoExam(row) {
-      const text = row.examStatus === '1' ? '驳回审核' : '审核'
-      const params = {
+        examStatus: '1'
+      };
+      api = updateExamStatus;
+    } else if (command === 'noExam') {
+      text = '驳回';
+      params = {
         businessId: row.businessId,
-        examStatus: row.examStatus
-      }
-      this.$confirm('是否确认操作?', '驳回中', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(function() {
-        return updateNoExamStatus(params)
-      }).then(() => {
-        this.$message({
-          message: text + '成功',
-          type: 'success'
-        })
-        this.loadData()
-      })
-    },
+        examStatus: '2' // 驳回审核
+      };
+      api = updateExamStatus;
+    }
+
+    this.$confirm(`是否确认${text}操作?`, text, {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning'
+    }).then(() => {
+      return api(params);
+    }).then(() => {
+      this.$message({
+        message: `${text}成功`,
+        type: 'success'
+      });
+      this.loadData();
+    });
+  },
     /**
      * @description: 查看
      * @author: gaoyu