黑名单优化

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="openDialogBlackList()">+ 添加人员至黑名单</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,7 +32,7 @@
               <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="searchCancel" style="margin-left:0;">取消搜索</el-button>
           </el-col>
@@ -57,17 +67,13 @@
     </div>
 
     <el-dialog
-      title="添加机构"
+      title="添加人员至黑名单"
       :visible.sync="dialogBlackList"
       width="80%"
       top="5vh"
       :before-close="handleClose"
     >
-      <checkBlackList
-        :circleId="circleId"
-        @addOrg="addOrg"
-        @handleClose="handleClose"
-      ></checkBlackList>
+      <checkBlackList :circleId="circleId" @addOrg="addOrg" @handleClose="handleClose"></checkBlackList>
       <!-- :roleType="roleType" -->
     </el-dialog>
   </div>
@@ -90,7 +96,7 @@ export default {
       curmbFirst: "云鹊小圈",
       curmbSecond: "",
       curmbThird: "黑名单",
-      jumPathThird: '/yq-range',
+      jumPathThird: "/yq-range",
       searchForm: {
         organization: "",
         staffName: "",
@@ -107,12 +113,17 @@ export default {
   created() {
     vm = this;
     // this.circleId = this.$route.query.id;
-    // this.circleId = 131;
-    this.circleId = this.$route.query.circleId;
+    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();
   },
@@ -123,7 +134,9 @@ export default {
       this.searchList();
     },
     searchCancel() {
-
+      this.searchForm.organization = "";
+      this.searchForm.staffName = "";
+      this.searchList();
     },
 
     searchList() {
@@ -212,7 +225,7 @@ export default {
       this.handleClose();
       this.search();
     },
-  }
+  },
 };
 </script>
 <style lang="scss">
@@ -253,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/checkBlackList.vue

@@ -48,7 +48,7 @@
         <div slot="empty">
           <div class="table-empty">
             <img src="../../assets/image/no-content1.png">
-            <p>没有机构信息</p>
+            <p>没有相关信息</p>
           </div>
         </div>
       </el-table>
@@ -150,7 +150,9 @@ export default {
       this.searchList();
     },
     searchCancel() {
-
+      this.formOrganization.organization = "";
+      this.formOrganization.name = "";
+      this.searchList();
     },
     searchList() {
       console.log("黑名单搜索 " + this.circleId);

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,
       })
     },
     //编辑