审核列表

src/utils/filter.js

@@ -482,6 +482,17 @@ const vueFilter = {
       }else {
         return '-'
       }
+    },
+   circleApplyStatus: (value) => {
+    if(value == 0){
+      return '拒绝'
+    }
+    else  if(value == 1){
+      return '待审核'
+    }
+    else  if(value == 2){
+      return '通过'
+    }
   },
     // 圈子状态 0:暂存 10:待发布（已保存） 20:已发布（已提交待审核、审核被拒绝） 30:已上架（审核通过）40：下架 50：解散
     rangeStatus: (value) => {

src/views/yqrange/create-live.vue

@@ -642,6 +642,7 @@
         pullFlag: false, // 是否显示拉流地址
         dialogVisible: false,
         uploadProgress1: 0,
+        searchList: [],
         formData: {
           circleId: "",// 圈子ID
           name: '',// 直播名称
@@ -746,8 +747,7 @@
           // 一天是24*60*60*1000 = 86400000 = 8.64e7
           // console.log('this.maxDate',this.maxDate)
           return time.getTime() < Date.now() - 8.64e7
-        },
-          searchList: null
+        }
       },
         rules: {
         name: [

src/views/yqrange/range-apply.vue

@@ -49,8 +49,8 @@
         <el-table-column label="操作" min-width="370" align="center">
           <template slot-scope="scope">
             <div v-if="scope.row.status != 50">
-              <el-button @click="approve(scope.row)" type="text" size="small" v-if="showAllFlag && scope.row.status != 0">通过</el-button>
-              <el-button @click="reject(scope.row)" type="text" size="small" v-if="scope.row.status != 0">拒绝</el-button>
+              <el-button @click="approve(scope.row)" type="text" size="small" v-if="scope.row.status != 0 && scope.row.status != 2">通过</el-button>
+              <el-button @click="reject(scope.row)" type="text" size="small" v-if="scope.row.status != 0 && scope.row.status != 2">拒绝</el-button>
             </div>
           </template>
         </el-table-column>
@@ -76,7 +76,7 @@
 <script>
   import { openLoading, closeLoading } from "../../utils/utils";
   import BreadCrumb from "@/components/breadcrumb.vue";
-  import { getRangeList,updateRangeStatus, getCircleSettingList, saveCircleSetting, applyList, applyUpdate} from "../../utils/yqrange/yqrangeApi";
+  import { applyList, applyUpdate} from "../../utils/yqrange/yqrangeApi";
   export default {
     components: {
       BreadCrumb
@@ -198,71 +198,66 @@
       resetForm() {
         this.searchForm.name = "";
         this.searchForm.circleName = "";
-        this.searchForm.status = "";
+        this.searchForm.status = -1;
         console.log('重置')
         this.search();
       },
 
 
       // 更新圈子状态（上线，下线）
-      updateStatus(id, status){
-        let params = {"doctorId": id, circleId: this.circleId, "status": status};
-        updateRangeStatus(params).then((res) => {
+      updateStatus(params){
+        applyUpdate(params).then((res) => {
           closeLoading(this);
           if(res.code == "000000") {
-            if(status == 2){
-              this.$message.success("成功通过");
-            } else if(status == 0) {
-              this.$message.success("拒绝成功");
-            }
+            this.$message.success("成功");
             this.searchList();
           } else {
-            if(status == 2){
-              this.$message.success("通过失败");
-            } else if(status == 0) {
-              this.$message.success("拒绝失败");
-            }
-
-
+            this.$message.success("失败");
           }
         }).catch((error) => {
           // this.$message({
           //   message: error,
           //   type: 'error'
           // });
-          if(status == "40"){
-            this.$message.error("下线失败，请重试");
-          } else if(status == "30") {
-            this.$message.error("上线失败，请重试");
-          }else if(status == "50") {
-            this.$message.error("解散失败，请重试");
-          }
+          this.$message.error("请重试");
+
         })
 
 
       },
 
-      rangeManage(row) {
-        this.$router.push({
-          path: '/range-manage',
-          query: {
-            id: row.id,
-            name: row.name,
-            activeName: 'first',
-            roleType: row.roleId
-          }
-        })
+     // 0:拒绝，1:待审核；2.通过
+      approve(row){
+
+        let params = {
+          applyList: [{
+            "circleId": row.circleId,
+            "doctorId": row.doctorId,
+            "status": 2
+          }]
+        };
+
+        this.updateStatus(params);
       },
 
       //拒绝
       reject(row) {
-        this.$confirm(``, `确定拒绝“${row.name}”吗？`, {
+
+        let params = {
+          applyList: [{
+            "circleId": row.circleId,
+            "doctorId": row.doctorId,
+            "status": 0
+          }]
+        };
+        this.$confirm(`确定拒绝吗？`, `“${row.name}”申请加入"${row.circleName}"圈子`, {
           confirmButtonText: '拒绝',
           cancelButtonText: '取消',
           type: 'warning',
           customClass: 'range-make-box',
         }).then(() => {
-          this.updateStatus(row.doctorId, 0);
+          this.updateStatus(params);
+
           //  confirm
         }).catch(() => {
           //  cancel

src/views/yqrange/yq-range.vue

@@ -117,7 +117,7 @@
       </el-dialog>
         </el-tab-pane>
 
-        <el-tab-pane label="审核列表" name="second">
+        <el-tab-pane label="审核列表" name="second" v-if="showApplyFlag">
           <range-apply></range-apply>
         </el-tab-pane>
 
@@ -148,6 +148,7 @@ export default {
       activeName: 'first',
       showAllFlag: false,
       showNewFlag: false,
+      showApplyFlag: true,
       searchForm: {
         name: '',
         createdTime: '',
@@ -193,7 +194,6 @@ export default {
         setTimeout(() => {
            this.getUserAuth();
         },1500)
-
       }
 
     },
@@ -203,6 +203,13 @@ export default {
       let highMainManager = localStorage.getItem('highMainManager');
       let mainManager = localStorage.getItem('mainManager');
       let manager = localStorage.getItem('manager');
+      let ordinary = localStorage.getItem('ordinary');
+      if(ordinary == "1"){
+        this.showApplyFlag = false;
+      }
+      else {
+        this.showApplyFlag = true;
+      }
 
       if(highMainManager == "1" || mainManager == "1"){
         this.showNewFlag = true;