Merge remote-tracking branch 'origin/dev-circle-nine-20201231' into dev-circle-nine-20201231

src/utils/filter.js

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

src/views/activitymanagement/activity-management.vue

@@ -172,7 +172,7 @@ export default {
         closeLoading(this);
         if(res.code == "000000") {
           this.tableData = res.data.activityModelList;
-          this.totalRows = res.data.count;
+          this.totalRows = res.data.total;
         } else {
           this.tableData = [];
         }

src/views/activitymanagement/create-activity.vue

 <template>
   <div class="yqrange-index-wrapper">
-    <bread-crumb :curmbFirst="curmbFirst" :curmbSecond="curmbSecond"></bread-crumb>
+    <bread-crumb :curmbFirst="curmbFirst" :curmbSecond="curmbSecond" :curmbThird="curmbThird" :jumPathThird="jumPathThird" :jumPathFouth="jumPathFouth"></bread-crumb>
     <div class="yqrange-index-content screenSet" id="screenSet">
       <el-row class="step-content">
         <el-col :span="14">
@@ -33,6 +33,9 @@
         enterType: 1,//1.creat 2.edit
         curmbFirst: '活动管理',
         curmbSecond: '新建活动',
+        curmbThird:'',
+        jumPathThird: '/activity-management',
+        jumPathFouth:'',
         active: 0,
         //页面展示位置
         stepData: [true, false],

src/views/activitymanagement/range-apply.vue

@@ -42,11 +42,11 @@
         <el-table-column prop="townName" label="所属街道" min-width="100" align="center"></el-table-column>
         <el-table-column prop="auditStatus" label="审核状态" min-width="100" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.auditStatus | circleApplyStatus }}</span>
+            <span>{{ scope.row.auditStatus | auditApplyStatus }}</span>
           </template>
         </el-table-column>
         <el-table-column label="操作" min-width="200" align="center">
-          <template slot-scope="scope"> <!-- 1待审核 2已通过 3已拒绝 -->
+          <template slot-scope="scope"> <!-- 0全部 1待审核 2已通过 3已拒绝 -->
             <div>
               <el-button @click="approve(scope.row)" type="text" size="small" v-if="scope.row.auditStatus == 1">通过</el-button>
               <el-button @click="reject(scope.row)" type="text" size="small" v-if="scope.row.auditStatus == 1">拒绝</el-button>
@@ -88,7 +88,7 @@
           doctorName: '',
           titleManager: '',
           // endTime: '',
-          auditStatus: 1,
+          auditStatus: 0,
           pageNo: 1,
           pageSize: 10,
         },
@@ -100,6 +100,10 @@
           settingData: []
         },
         statusList: [
+          {
+            value: 0,
+            label: "全部"
+          },
           {
             value: 1,
             label: "待审核"
@@ -195,7 +199,7 @@
       resetForm() {
         this.searchForm.doctorName = "";
         this.searchForm.titleManager = "";
-        this.searchForm.auditStatus = 1;
+        this.searchForm.auditStatus = 0;
         console.log('重置')
         this.search();
       },
@@ -234,7 +238,7 @@
       //拒绝
       reject(row) {
         let params = {
-          "accept": true,
+          "accept": false,
           "auditRecordId": row.auditRecordId,
         };
         this.$confirm(`拒绝后"${row.doctorName}"将无法访问"${row.activityName}"`, `确认拒绝`, {