Z: Dot: next bar and keywords.

ybf_admin/src/api/in/mail.js

@@ -17,8 +17,15 @@ export function getNoGroupMember(data) {
     method: 'get',
     params: data
   })
+} 
+//  获取柜组用户  
+export function getGroupById(data) {
+  return request({
+    url: '/admin/auth/addressbook/getUserByShopId',
+    method: 'get',
+    params: data
+  })
 }
-
 // 根据部门id获取人员
 export function getMemberById(data) {
   return request({
@@ -65,4 +72,22 @@ export function getHistoryList(data) {
       method: 'put',
       data
     })
+  }
+
+  // 移动人员
+  export function moveMember(data) {
+    return request({
+      url: 'admin/auth/addressbook/updateStallClerkByUserId',
+      method: 'put',
+      params:data
+    })
+  }
+
+  // 模糊查询
+  export function search(data) {
+    return request({
+      url: '/admin/auth/addressbook/getUserByKeyWords',
+      method: 'get',
+      params:data
+    })
   }
\ No newline at end of file

ybf_admin/src/pages/in/contact/components/move.vue

@@ -77,7 +77,7 @@
 </template>
 
 <script>
-import { getGroup } from "@/api/in/mail";
+import { getGroup, moveMember } from "@/api/in/mail";
 import { log } from "util";
 
 export default {
@@ -85,6 +85,10 @@ export default {
     moveDialog: {
       type: Boolean,
       default: false
+    },
+    idList: {
+      type: Array,
+      default: () => []
     }
   },
   data() {
@@ -105,7 +109,15 @@ export default {
       this.$emit("handleCancel");
     },
     handleFinish() {
-      this.$emit("handleFinish", false);
+      let groupId = this.$refs.tree.getCheckedKeys()[0]
+      let data = {
+        stallIds: groupId,
+        userIds: this.idList+','
+      }
+      moveMember(data).then(res=> {
+        this.$emit("handleFinish", false);
+      })
+      
     },
     /* handleChange() {},
     handleClose() {

ybf_admin/src/pages/in/contact/mail.vue

@@ -10,7 +10,7 @@
               <span class="number">{{ allNumber }}</span>
             </div>
           </div>
-          <div class="ty" style="margin:15px 0;" @click="getNoGroupMember(1)">
+          <div class="ty" style="margin:15px 0;" @click="getNoGroupMember(1,1)">
             <div>
               <span>未分组</span>
               <span class="number">{{ wNumber }}</span>
@@ -18,29 +18,26 @@
           </div>
           <div class="tree">
             <el-tree
+              class="trees"
               :props="orgData"
               :data="data1"
               node-key="id"
-              :expand-on-click-node="false"
+              expand-on-click-node
               @node-click="handleTreeClick"
             >
-              <span class="custom-tree-node" slot-scope="{ node, data }">
+             <!--  <span class="custom-tree-node" slot-scope="{ node, data }">
                 <span>{{ node.label }}</span>
-              </span>
+              </span> -->
             </el-tree>
           </div>
         </div>
       </div>
-     <!--  <div class="end">
-        <span class="add-r" @click="addStore">添加门店/专柜</span>
-      </div> -->
     </div>
     <div class="right">
-      <!-- <div class="right-c"> -->
-      <div class="top">三号柜组（共18人）</div>
+      <div class="top"><span>{{title}}</span>  共（<span>{{totalNumber}}</span>）人  </div>
       <div class="searchs">
         <div class="buttons">
-          <el-button class="button buttondark" size="small" @click="handleMove"
+          <el-button class="button buttondark" size="small" @click="handleMove" :disabled="idList.length>0? false:true "
             >移动</el-button
           >
           <el-button
@@ -60,12 +57,12 @@
           <el-form-item label="关键词">
             <el-input
               size="small"
-              v-model="formData.keys"
+              v-model="formData.keywords"
               style="width:160px"
               placeholder="请输入关键词"
             />
           </el-form-item>
-          <el-button class="button buttondark" size="small">搜索</el-button>
+          <el-button class="button buttondark" size="small" @click="handleSearch">搜索</el-button>
         </el-form>
       </div>
       <el-table
@@ -76,6 +73,7 @@
         tooltip-effect="dark"
         style="width: 100%"
         height="calc(100% - 140px)"
+        @selection-change="handleMemberChange"
       >
         <el-table-column type="selection" width="60"></el-table-column>
         <el-table-column
@@ -93,11 +91,7 @@
           label="部门"
           align="center"
         ></el-table-column>
-        <el-table-column
-          prop="role"
-          label="角色"
-          align="center"
-        >
+        <el-table-column prop="role" label="角色" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.managerType == 0">店员</span>
             <span v-if="scope.row.managerType == 1">店长</span>
@@ -132,23 +126,22 @@
       :moveDialog="moveDialogShow"
       @handleCancel="moveDialogShow = false"
       @handleFinish="removeFinish"
+      :idList="idList"
     ></move-dialog>
-   <!--  <el-dialog title="提示" v-if="nameDialog" :visible.sync="nameDialog" width="30%" >
-      <div class="changeName">
-        <span style="margin:0 10px;">门店名称:</span>
-        <el-input v-model="store.name" placeholder="请输入名称"></el-input>
-      </div>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="nameDialog = false">取 消</el-button>
-        <el-button type="primary" @click="handleNameChange">确 定</el-button>
-      </span>
-    </el-dialog> -->
   </div>
 </template>
 
 <script>
 import MoveDialog from "./components/move";
-import { getOrgTree,getAllMemberList,getNoGroupMember,getMemberById,storeNameChange } from "@/api/in/mail";
+import {
+  getOrgTree,
+  getAllMemberList,
+  getNoGroupMember,
+  getMemberById,
+  storeNameChange,
+  getGroupById,
+  search
+} from "@/api/in/mail";
 export default {
   data() {
     const data1 = [
@@ -535,8 +528,7 @@ export default {
       tableData: [],
       isShow: false,
       formData: {
-        status: "",
-        keys: ""
+        keywords:""
       },
       statusList: [],
       page: {
@@ -556,62 +548,68 @@ export default {
         id: "id"
       },
       type: 1,
-      store: {
-        name: "",
-        id: ""
-      }
+      idList: [],
+      storeId: "",
+      groupId: "",
+      counterId: 0,
+      title: "全部",
+      totalNumber: ""
     };
   },
   components: {
-    MoveDialog,
+    MoveDialog
   },
   created() {
     this.getOrgTree();
-    this.getMailList(1);
+    this.getMailList(1,1);
   },
   methods: {
     getOrgTree() {
-       getOrgTree().then( res => {
-        let data = res.data
-        this.allNumber = data['用户的总数']
-        this.wNumber = data['未分组用户的总数']
-        this.data1 = data['所有的柜组']
-      })
+      getOrgTree().then(res => {
+        let data = res.data;
+        this.allNumber = data["用户的总数"];
+        this.wNumber = data["未分组用户的总数"];
+        this.data1 = data["所有的柜组"];
+      });
     },
     handleTreeClick(data) {
-      /* switch (data.id) {
-        case 1:
-          this.list1.main4 = this.list1.main6;
-          break;
-        case 5:
-          this.list1.main4 = this.list1.main1;
-          break;
-        case 6:
-          this.list1.main4 = this.list1.main2;
-          break;
-        case 7:
-          this.list1.main4 = this.list1.main3;
-          break;
-          case 2:
-          this.list1.main4 = this.list1.main5;
-          break;
-        default:
-          this.list1.main4 = this.list1.main3;
-          break;
-      } */
-      let params = {
-        pageNum: 1,
-        stallId:data.id
+      this.title = data.name
+      if(data.shopId) {
+        this.groupId = data.shopId
       }
-      getMemberById(params).then(res => {
-        this.tableData = res.data.list
-        this.page.total = Number(res.data.total) 
-      })
+      if(data.type){
+        this.storeId = data.id
+        this.getStoreMember(1,1)
+      }else {
+        this.groupId = data.id
+        this.getGroupMember(1,1)
+      }     
+    },
+    getGroupMember(page,ctPage) {
+      this.page.currentPage = ctPage
+      this.type = 3
+       let params = {
+        pageNum: page,
+        shopId: this.groupId
+      };
+      getGroupById(params).then(res => {
+        this.tableData = res.data.list;
+        this.page.total = this.totalNumber = Number(res.data.total);
+      });
     },
-    listPick() {},
-    testButtonClick() {},
-    pagesSizeChange() {},
-    pagesNowPageChange() {},
+    getStoreMember(page,ctPage) {
+      this.page.currentPage = ctPage
+       this.type = 4
+       let params = {
+        pageNum: page,
+        stallId: this.storeId
+      };
+      getMemberById(params).then(res => {
+        this.tableData = res.data.list;
+        this.page.total = Number(res.data.total);
+        this.totalNumber = Number(res.data.total)
+      });
+    },  
     synchronismMember() {
       this.isShow = true;
       this.$emit("isShow", this.isShow);
@@ -620,46 +618,102 @@ export default {
       this.moveDialogShow = true;
     },
     removeFinish() {
-      this.moveDialogShow = false;
+      this.handleTypeChange(1,1)
+      this.moveDialogShow = false;    
     },
     handleCurrentChange(val) {
-      console.log(val,"每页");
-    
+      let ctPage = val
+      this.handleTypeChange(val,ctPage)
     },
-    /* addCounter() {
-      this.$refs.addCounter.counterDialog = true;
-    }, */
-    /* addStore() {
-
-      this.$refs.addStore.addStoreDialog = true;
-    }, */
-    getMailList(page) {
-      this.type = 1
+    getMailList(page,ctPage) {
+      this.title = "全部"
+      this.type = 1;
+      this.page.currentPage = ctPage
       let params = {
         pageNum: page
-      }
+      };
       getAllMemberList(params).then(res => {
-        console.log(res,"res");
-        this.tableData = res.data.list 
-        this.page.total = Number(res.data.total)       
-      }) 
+        console.log(res, "res");
+        this.tableData = res.data.list;
+        this.page.total = this.totalNumber = this.allNumber = Number(res.data.total);
+      });
     },
     handleShopowner() {},
-    getNoGroupMember(page) {
-      this.type = 2
+    getNoGroupMember(page,ctPage) {
+      this.title = "未分组"
+      this.page.currentPage = ctPage
+      this.type = 2;
       let params = {
         pageNum: page
-      }
+      };
       getNoGroupMember(params).then(res => {
-        this.tableData = res.data.list
-        this.page.total = Number(res.data.total)
-      })
+        this.tableData = res.data.list;
+        this.page.total = this.totalNumber = this.wNumber = Number(res.data.total);
+
+      });
+    },
+    handleMemberChange(val) {
+      console.log(val,"val");
+      
+      let ids = []
+      val.map(function(item) {
+        ids.push(item.id) 
+      });
+      this.idList = ids  
+      console.log(this.idList,",");
+          
+    },
+    handleTypeChange(val,ctPage) {
+      if(this.type == 1) {
+        this.getMailList(val,ctPage)       
+      }else if (this.type == 2) {        
+        this.getNoGroupMember(val,ctPage)
+      }else if (this.type == 3) {        
+        this.getGroupMember(val,ctPage)
+      }
+      else {
+        this.getStoreMember(val,ctPage)
+      }
+    },
+    handleSearch() {
+      switch (this.type) {
+        case 1:
+        this.counterId = 0;
+        break
+        case 2:
+        this.counterId = -1;
+        break
+        case 3:
+        this.counterId = this.groupId;
+        break
+      }
+      let params = {
+        keyWords: this.formData.keywords,
+        stallId: this.counterId
+      }
+      search(params).then(res=>{
+        console.log(res,"搜索结果");
+        let array = []
+        array.push(res.data.userInfo)  
+        console.log(array,"???");
+        
+        this.tableData = array;
+        this.page.total = 1
+      })  
     }
   }
 };
 </script>
 
 <style scoped>
+.trees >>> .el-tree-node__content {
+  padding: 10px;
+  border-bottom: 1px solid #fff;
+}
+ .trees >>> .el-tree-node__children .el-tree-node__content {
+  background-color: #dadad97a;
+  
+}
 .btn >>> .el-button + .el-button {
   margin-left: 5px;
 }