Merge branch 'dev-liveSix-20200817' of...

Merge branch 'dev-liveSix-20200817' of http://192.168.110.53/com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-liveSix-20200817

src/utils/yqrange/memberApi.js

@@ -68,6 +68,16 @@ export const moOption = (params) => {
   })
 };
 
+export const moOptionBlackList = (params) => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`circle/memberSelect/black/option`),
+    method: 'post',
+    data: params,
+    description: '黑名单- 勾选操作',
+  })
+};
+
 export const moSave = (params) => {
   return fetch({
     headers,
@@ -78,6 +88,16 @@ export const moSave = (params) => {
   })
 };
 
+export const moSaveBlackList = (params) => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`circle/memberSelect/black/save`),
+    method: 'post',
+    data: params,
+    description: '添加黑名单-保存',
+  })
+};
+
 export const moOrgSearch = (params) => {
   return fetch({
     headers,
@@ -97,6 +117,15 @@ export const clearCacheOrg = (circleId) => {
   })
 };
 
+export const clearBlackListCacheOrg = (circleId) => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`circle/memberSelect/black/option/clearCache/${circleId}`),
+    method: 'get',
+    description: '黑名单-清除缓存',
+  })
+};
+
 export const mpRelSearch = (params) => {
   return fetch({
     headers,

src/views/yqrange/admin-manage.vue

@@ -29,7 +29,7 @@
           </el-col>
           <el-col :span="6" style="padding:0;text-align:right;padding-right:10px;">
             <el-button type="primary" size="small" @click="searchList()">搜索</el-button>
-            <el-button type="default" size="small" @click="resetForm" style="margin-left:0;">重置</el-button>
+            <el-button type="default" size="small" @click="resetForm" style="margin-left:0;">取消搜索</el-button>
           </el-col>
         </el-form>
       </el-row>
@@ -276,11 +276,11 @@ export default {
         openLoading(vm);
         vm.POST("circle/circle/role/manager/update", req).then(res => {
           closeLoading(vm);
-          if (res.data == -1) {
-            vm.$message.error("暂不能升级，请先将该成员移除黑明单;同时不做升级操作");
-          }
-          vm.$message(res.message);
-          vm.search();
+          if (res.code == "000000") {
+       vm.search();
+      } else {
+        vm.$message(res.message);
+      }  
         });
     },
     complete() {

src/views/yqrange/blacklist-manage.vue

 <template>
   <div class="yqrange-index-wrapper">
-    <bread-crumb :curmbFirst="curmbFirst" :curmbSecond="curmbSecond" :curmbThird="curmbThird" :jumPathThird="jumPathThird" :jumPathFouth="jumPathFouth"></bread-crumb>
+    <bread-crumb
+      :curmbFirst="curmbFirst"
+      :curmbSecond="curmbSecond"
+      :curmbThird="curmbThird"
+      :jumPathThird="jumPathThird"
+      :jumPathFouth="jumPathFouth"
+    ></bread-crumb>
     <div class="yqrange-index-content screenSet" id="screenSet">
       <div class="header-title">黑名单</div>
       <el-form
@@ -10,8 +16,12 @@
         label-suffix=":"
         :inline="true"
       >
-        <el-row :gutter="30" type="flex" style="margin-top: 10px">
-          <p class="add_btn" @click="resetForm">+ 添加人员至黑名单</p>
+        <el-row :gutter="10" type="flex" style="margin-top: 10px">
+          <!-- <p class="add_btn" @click="openDialogBlackList()">+ 添加人员至黑名单</p> -->
+          <el-col class="add-organization">
+            <i class="el-icon-circle-plus-outline" @click="openDialogBlackList()"></i>
+            <i class="text" @click="openDialogBlackList()">添加人员至黑名单</i>
+          </el-col>
           <el-col :span="8">
             <el-form-item label="机构">
               <el-input size="small" v-model="searchForm.organization" placeholder="请输入机构名称"></el-input>
@@ -22,9 +32,9 @@
               <el-input size="small" v-model="searchForm.staffName" placeholder="请输入人员名称"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="4" style="text-align: right;margin-top: 5px">
+          <el-col :span="7" style="text-align: right;margin-top: 5px">
             <el-button type="primary" size="small" @click="search">搜索</el-button>
-            <el-button type="default" size="small" @click="resetForm" style="margin-left:0;">取消搜索</el-button>
+            <el-button type="default" size="small" @click="searchCancel" style="margin-left:0;">取消搜索</el-button>
           </el-col>
         </el-row>
       </el-form>
@@ -56,26 +66,27 @@
       </div>
     </div>
 
-    <!-- <el-dialog
-      title
-      :visible.sync="dialogDeleteVisible"
-      width="500px"
-      :close-on-click-modal="false"
-      center
+    <el-dialog
+      title="添加人员至黑名单"
+      :visible.sync="dialogBlackList"
+      width="80%"
+      top="5vh"
+      :before-close="handleClose"
     >
-      <p>
-        确定将"<span>{{ row. }}</span>"移除黑名单？
-      </p>
-    </el-dialog> -->
+      <checkBlackList :circleId="circleId" @addOrg="addOrg" @handleClose="handleClose"></checkBlackList>
+      <!-- :roleType="roleType" -->
+    </el-dialog>
   </div>
 </template>
 <script>
 let vm = null;
 import BreadCrumb from "@/components/yqrange/breadcrumb-range.vue";
 // import * as operationData from "../../../utils/operation";
+import checkBlackList from "./checkBlackList";
 export default {
   components: {
     BreadCrumb,
+    checkBlackList,
   },
   data() {
     vm = this;
@@ -85,7 +96,7 @@ export default {
       curmbFirst: "云鹊小圈",
       curmbSecond: "",
       curmbThird: "黑名单",
-      jumPathThird: '/yq-range',
+      jumPathThird: "/yq-range",
       searchForm: {
         organization: "",
         staffName: "",
@@ -96,15 +107,23 @@ export default {
       tableData: [],
       selfRoleId: 0,
       docIds: [],
+      dialogBlackList: false,
     };
   },
   created() {
     vm = this;
-    this.circleId = this.$route.query.circleId;
+    // this.circleId = this.$route.query.id;
+    this.circleId = 131;
+    // this.circleId = this.$route.query.circleId;
     this.idType = localStorage.getItem("storageIdType");
     this.circleName = this.$route.query.circleName;
     this.curmbSecond = "圈子管理-" + this.circleName;
-    this.jumPathFouth = "/range-manage?id=" + this.circleId + "&name=" + this.circleName + "&activeName=first";
+    this.jumPathFouth =
+      "/range-manage?id=" +
+      this.circleId +
+      "&name=" +
+      this.circleName +
+      "&activeName=first";
     console.log("alex storageIdType = " + this.idType + ", id = " + this.id);
     this.searchList();
   },
@@ -114,6 +133,11 @@ export default {
       this.searchForm.pageNo = 1;
       this.searchList();
     },
+    searchCancel() {
+      this.searchForm.organization = "";
+      this.searchForm.staffName = "";
+      this.searchList();
+    },
 
     searchList() {
       console.log("查询");
@@ -139,6 +163,9 @@ export default {
           vm.$message.error(error);
         });
     },
+    openDialogBlackList() {
+      this.dialogBlackList = true;
+    },
     resetForm() {
       console.log("重置");
       this.searchForm.organization = "";
@@ -156,15 +183,12 @@ export default {
       })
         .then(() => {
           console.log("移出： row.name = " + row.name);
-          this.docIds = [ row.id ];
+          this.docIds = [row.id];
           let req = {
             circleId: this.circleId,
             docIds: this.docIds,
           };
-          vm.POST(
-            "circle/memberSelect/black/related/deletePeople",
-            req
-          )
+          vm.POST("circle/memberSelect/black/related/deletePeople", req)
             .then((res) => {
               if (res.code == "000000") {
                 vm.$message({
@@ -194,6 +218,13 @@ export default {
       this.searchForm.pageNo = val;
       this.searchList();
     },
+    handleClose() {
+      this.dialogBlackList = false;
+    },
+    addOrg() {
+      this.handleClose();
+      this.search();
+    },
   },
 };
 </script>
@@ -235,5 +266,16 @@ export default {
     margin-top: 10px;
     margin-left: 20px;
   }
+  .add-organization {
+    margin-left: 0px;
+    line-height: 20px;
+    width: 200px;
+    cursor: pointer;
+    padding-top: 10px;
+    i {
+      font-size: 16px;
+      margin-right: 2px;
+    }
+  }
 }
 </style>

src/views/yqrange/yq-range.vue

@@ -331,8 +331,7 @@ export default {
     //成员管理
     roleManage(row) {
       this.$router.push({
-        // path: '/role-manage?id=' + row.id,
-        path: '/blacklist-manage?id=' + row.id,
+        path: '/role-manage?id=' + row.id,
       })
     },
     //编辑