Merge branch 'master' of https://gitee.com/beiwu/cmanager

src/api/tenant/serve.js

@@ -1,209 +1,206 @@
-import request from '@/router/axios';
+import request from "@/router/axios";
 /*获取人才列表*/
-export const getList =
-    (current, size, params, groupId) => {
-      return request({
-        url: '/api/jobslink-api/serve/list',
-        method: 'get',
-        params: {...params, current, size, groupId}
-      })
-    }
+export const getList = (current, size, params, groupId) => {
+  return request({
+    url: "/api/jobslink-api/serve/list",
+    method: "get",
+    params: { ...params, current, size, groupId }
+  });
+};
 
 /*新增人才*/
-export const add =
-    (row) => {
-      return request(
-          {url: '/api/jobslink-api/serve/save', method: 'post', data: row})
-    }
+export const add = row => {
+  return request({
+    url: "/api/jobslink-api/serve/save",
+    method: "post",
+    data: row
+  });
+};
 
 /*编辑人才*/
-export const update =
-    (row) => {
-      return request({
-        url: '/api/jobslink-api/serve/update',
-        method: 'post',
-        data: row
-      })
-    }
+export const update = row => {
+  return request({
+    url: "/api/jobslink-api/serve/update",
+    method: "post",
+    data: row
+  });
+};
 
 /*删除人才*/
-export const remove =
-    (ids) => {
-      return request({
-        url: '/api/jobslink-api/serve/remove',
-        method: 'post',
-        params: {ids}
-      })
-    }
+export const remove = ids => {
+  return request({
+    url: "/api/jobslink-api/serve/remove",
+    method: "post",
+    params: { ids }
+  });
+};
 
 /*人才详情*/
-export const detail =
-    (id) => {
-      return request({
-        url: '/api/jobslink-api/serve/detail',
-        method: 'get',
-        params: {id}
-      })
-    }
-
+export const detail = id => {
+  return request({
+    url: "/api/jobslink-api/serve/detail",
+    method: "get",
+    params: { id }
+  });
+};
 
 /*获取分组*/
-export const getDept =
-    () => {
-      return request({
-        url: '/api/jobslink-api/serve/group/listAll',
-        method: 'get',
-        params: {}
-      })
-    }
+export const getDept = () => {
+  return request({
+    url: "/api/jobslink-api/serve/group/listAll",
+    method: "get",
+    params: {}
+  });
+};
 
 /*新建分组*/
-export const addDept =
-    (row) => {
-      return request({
-        url: '/api/jobslink-api/serve/group/save',
-        method: 'post',
-        data: row
-      })
-    }
-
+export const addDept = row => {
+  return request({
+    url: "/api/jobslink-api/serve/group/save",
+    method: "post",
+    data: row
+  });
+};
 
 /*编辑分组*/
-export const updateDept =
-    (row) => {
-      return request({
-        url: '/api/jobslink-api/serve/group/update',
-        method: 'post',
-        data: row
-      })
-    }
-
+export const updateDept = row => {
+  return request({
+    url: "/api/jobslink-api/serve/group/update",
+    method: "post",
+    data: row
+  });
+};
 
 /*删除分组*/
-export const removeDept =
-    (ids) => {
-      return request({
-        url: '/api/jobslink-api/serve/group/remove',
-        method: 'post',
-        params: {ids}
-      })
-    }
-
+export const removeDept = ids => {
+  return request({
+    url: "/api/jobslink-api/serve/group/remove",
+    method: "post",
+    params: { ids }
+  });
+};
 
 /*转移分组*/
-export const transferDept =
-    (groupIds, ids) => {
-      return request({
-        url: '/api/jobslink-api/serve/updateAllGroup',
-        method: 'post',
-        params: {groupIds, ids}
-      })
-    }
+export const transferDept = (groupIds, ids) => {
+  return request({
+    url: "/api/jobslink-api/serve/updateAllGroup",
+    method: "post",
+    params: { groupIds, ids }
+  });
+};
 
 /*导入人才库*/
 export const upload = () => {
-  return `/api/jobslink-api/serve/group/import?isCovered=1`
-}
+  return `/api/jobslink-api/serve/group/import?isCovered=1`;
+};
 
 /*转移分组*/
-export const getServeListTalents =
-  (params) => {
-    return request({
-      url: '/api/jobslink-api/serve/listTalents',
-      method: 'get',
-      params: params
-    })
-  }
+export const getServeListTalents = params => {
+  return request({
+    url: "/api/jobslink-api/serve/listTalents",
+    method: "get",
+    params: params
+  });
+};
 
 /*匹配岗位和任务*/
-export const getMatchWorkStation =
-  (params) => {
-    return request({
-      url: '/api/jobslink-api/tenant/mainServeUserPost/postPage',
-      method: 'get',
-      params: params
-    })
-  }
+export const getMatchWorkStation = params => {
+  return request({
+    url: "/api/jobslink-api/tenant/mainServeUserPost/postPage",
+    method: "get",
+    params: params
+  });
+};
 
 /*匹配政策*/
-export const getMatchPolicy =
-  (params) => {
-    return request({
-      url: '/api/jobslink-api/serve/listPolicy',
-      method: 'get',
-      params: params
-    })
-  }
+export const getMatchPolicy = params => {
+  return request({
+    url: "/api/jobslink-api/serve/listPolicy",
+    method: "get",
+    params: params
+  });
+};
 
 /*服务日志*/
-export const getMatchServeList =
-  (params) => {
-    return request({
-      url: '/api/jobslink-api/tenant/mainserveuserlog/page',
-      method: 'get',
-      params: params
-    })
-  }
+export const getMatchServeList = params => {
+  return request({
+    url: "/api/jobslink-api/tenant/mainserveuserlog/page",
+    method: "get",
+    params: params
+  });
+};
 
-  export const getListAllPolicy =
-  (params) => {
-    return request({
-      url: '/api/jobslink-api/serve/listAllPolicy',
-      method: 'get',
-      params: params
-    })
-  }
+export const getListAllPolicy = params => {
+  return request({
+    url: "/api/jobslink-api/serve/listAllPolicy",
+    method: "get",
+    params: params
+  });
+};
 
+export const getListAllByLabels = params =>
+  request({
+    url: "/api/jobslink-api/tenant/talents/listAllByLabels",
+    method: "get",
+    params: params
+  });
+export const getListGroupByLabels = params =>
+  request({
+    url: "/api/jobslink-api/tenant/talents/listGroupByLabels",
+    method: "get",
+    params: params
+  });
+export const getListAllByPolicy = params =>
+  request({
+    url: "/api/jobslink-api/tenant/talents/listAllByPolicy",
+    method: "get",
+    params: params
+  });
 
-  export const getListAllByLabels = (params) => request({
-      url: '/api/jobslink-api/tenant/talents/listAllByLabels',
-      method: 'get',
-      params: params
-    })
-  export const getListGroupByLabels = (params) => request({
-      url: '/api/jobslink-api/tenant/talents/listGroupByLabels',
-      method: 'get',
-      params: params
-    })
-  export const getListAllByPolicy = (params) => request({
-      url: '/api/jobslink-api/tenant/talents/listAllByPolicy',
-      method: 'get',
-      params: params
-    })
+export const getServeAllPolicyList = params =>
+  request({
+    url: "/api/jobslink-api/serve/listAllPolicy",
+    method: "get",
+    params: params
+  });
 
-  export const getServeAllPolicyList = (params) => request({
-      url: '/api/jobslink-api/serve/listAllPolicy',
-      method: 'get',
-      params: params
-    })
+export const getListByids = params =>
+  request({
+    url: "/api/jobslink-api/policy/listByids",
+    method: "get",
+    params: params
+  });
 
- export const getListByids = (params) => request({
-      url: '/api/jobslink-api/policy/listByids',
-      method: 'get',
-      params: params
-    })
+export const getSearchAll = params =>
+  request({
+    url: "/api/jobslink-api/serve/searchAll",
+    method: "get",
+    params: params
+  });
+export const getSearchAllByUserId = params =>
+  request({
+    url: "/api/jobslink-api/serve/pushSearchList",
+    method: "get",
+    params: params
+  });
 
- export const getSearchAll = (params) => request({
-      url: '/api/jobslink-api/serve/searchAll',
-      method: 'get',
-      params: params
-    })
+export const pushPolicyUserServe = params =>
+  request({
+    url: "/api/jobslink-api/serve/push/policyUserServe",
+    method: "post",
+    data: params
+  });
 
- export const pushPolicyUserServe  = (params) => request({
-      url: '/api/jobslink-api/serve/push/policyUserServe',
-      method: 'post',
-      data: params
-    })
-
- export const pushPostUserServe  = (params) => request({
-      url: '/api/jobslink-api/serve/push/postUserServe',
-      method: 'post',
-      data: params
-    })
-
- export const getListAllTalents  = (params) => request({
-      url: '/api/jobslink-api/serve/listAllTalents',
-      method: 'get',
-      params
-    })
+export const pushPostUserServe = params =>
+  request({
+    url: "/api/jobslink-api/serve/push/postUserServe",
+    method: "post",
+    data: params
+  });
 
+export const getListAllTalents = params =>
+  request({
+    url: "/api/jobslink-api/serve/listAllTalents",
+    method: "get",
+    params
+  });

src/views/tenant/main/serve/Dialog/pushService.vue

@@ -1,85 +1,62 @@
 <template>
-  <el-drawer
-    size="100%"
-    append-to-body
-    title="推送服务"
-    :visible.sync="viewDrawer"
-  >
-     <div>
-       <div class="content">
-         <!--  用户板块  -->
-         <div class="content-left relative">
-           <avue-crud
-             height="900"
-             ref="crud1"
-             :data="leftUserDataList"
-             :option="leftUserOptions"
-             :page.sync="leftPages"
-             @current-change="leftCurrentPageChange"
-             @size-change="leftSizePageChange"
-             @selection-change="leftSelectionChange"
-           >
-             <template slot="menuLeft">
-               <div class="leftInput">
-                 <el-input size="small" v-model="formInline.userName" class="input-with-select" placeholder="用户名">
-                   <el-select size="small" v-model="formInline.groupId" slot="prepend" class="selectWidth" placeholder="请选择">
-                     <el-option
-                       v-for="item in leftServeOptions"
-                       :key="item.id"
-                       :label="item.groupName"
-                       :value="item.value">
-                     </el-option>
-                   </el-select>
-                   <el-button size="small" slot="append" class="input-search" @click="leftSearch">搜索</el-button>
-                 </el-input>
-               </div>
-             </template>
-             <template slot="labelsBase" slot-scope="{row}">
-               <TextTooltip :content="row.labelsBase" length="20"></TextTooltip>
-             </template>
-           </avue-crud>
-           <CustomLoading :visible="leftLoading" loading-text="用户数据加载中"></CustomLoading>
-         </div>
-         <!--  操作  -->
-         <div class="content-center">
-           <div><el-button type="primary" size="small" @click="changeTabs(0)">匹配政策</el-button></div>
-           <div style="margin-top: 30px"><el-button type="primary" @click="changeTabs(1)" size="small">匹配岗位</el-button></div>
-         </div>
-         <!--  列表  -->
-         <div class="content-right relative">
-             <avue-crud
-               height="900"
-               ref="crud2"
-               :data="rightDataList"
-               :option="rightTabs ? rightPostOptions : rightPolicyOptions"
-               :page.sync="rightPages"
-               @selection-change="rightSelectionChange"
-             >
-               <template slot="menuLeft" >
-                 <el-input
-                   style="width: 300px"
-                   placeholder="搜索岗位"
-                   v-show="rightTabs === 1"
-                   prefix-icon="el-icon-search"
-                   @input="searchInputChange"
-                   v-model="searchInput"
-                   clearable>
-                 </el-input>
-               </template>
-               <template slot="labelName" slot-scope="{row}">
-                 <TextTooltip :content="row.labelName" length="40"></TextTooltip>
-               </template>
-               <template slot="jobDescription" slot-scope="{row}">
-                 <TextTooltip :content="row.jobDescription" length="40"></TextTooltip>
-               </template>
-             </avue-crud>
-             <CustomLoading :visible="rightLoading" loading-text="智能分析匹配中"></CustomLoading>
-         </div>
-       </div>
-     </div>
+  <el-drawer size="100%" append-to-body title="推送服务" :visible.sync="viewDrawer">
+    <div>
+      <div class="content">
+        <!--  用户板块  -->
+        <div class="content-left relative">
+          <avue-crud height="900" ref="crud1" :data="leftUserDataList" :option="leftUserOptions" :page.sync="leftPages"
+            @current-change="leftCurrentPageChange" @size-change="leftSizePageChange"
+            @selection-change="leftSelectionChange">
+            <template slot="menuLeft">
+              <div class="leftInput">
+                <el-input size="small" v-model="formInline.userName" class="input-with-select" placeholder="用户名">
+                  <el-select size="small" v-model="formInline.groupId" slot="prepend" class="selectWidth"
+                    placeholder="请选择">
+                    <el-option v-for="item in leftServeOptions" :key="item.id" :label="item.groupName"
+                      :value="item.value">
+                    </el-option>
+                  </el-select>
+                  <el-button size="small" slot="append" class="input-search" @click="leftSearch">搜索</el-button>
+                </el-input>
+              </div>
+            </template>
+            <template slot="labelsBase" slot-scope="{row}">
+              <TextTooltip :content="row.labelsBase" length="20"></TextTooltip>
+            </template>
+          </avue-crud>
+          <CustomLoading :visible="leftLoading" loading-text="用户数据加载中"></CustomLoading>
+        </div>
+        <!--  操作  -->
+        <div class="content-center">
+          <div><el-button type="primary" size="small" @click="changeTabs(0)">匹配政策</el-button></div>
+          <div style="margin-top: 30px"><el-button :disabled="leftUserSelections.length > 0 ? false : true"
+              type="primary" @click="changeTabs(1)" size="small">匹配岗位</el-button>
+          </div>
+        </div>
+        <!--  列表  -->
+        <div class="content-right relative">
+          <avue-crud height="900" ref="crud2" :data="rightDataList"
+            :option="rightTabs ? rightPostOptions : rightPolicyOptions" :page.sync="rightPages"
+            @selection-change="rightSelectionChange">
+            <template slot="menuLeft">
+              <el-input style="width: 300px" placeholder="搜索岗位" v-show="rightTabs === 1" prefix-icon="el-icon-search"
+                @input="searchInputChange" v-model="searchInput" clearable>
+              </el-input>
+            </template>
+            <template slot="labelName" slot-scope="{row}">
+              <TextTooltip :content="row.labelName" length="40"></TextTooltip>
+            </template>
+            <template slot="jobDescription" slot-scope="{row}">
+              <TextTooltip :content="row.jobDescription" length="40"></TextTooltip>
+            </template>
+          </avue-crud>
+          <CustomLoading :visible="rightLoading" loading-text="智能分析匹配中"></CustomLoading>
+        </div>
+      </div>
+    </div>
     <div class="content-footer">
       <el-button type="primary" style="width: 80px" size="small" :disabled="pushState" @click="onSubmit">
-        {{pushState ? '推送中...' : rightTabs ? '推送岗位' : '推送政策' }}
+        {{ pushState ? '推送中...' : rightTabs ? '推送岗位' : '推送政策' }}
       </el-button>
     </div>
   </el-drawer>
@@ -92,13 +69,14 @@ import {
   getServeAllPolicyList,
   getListByids,
   getSearchAll,
+  getSearchAllByUserId,
   pushPolicyUserServe,
   pushPostUserServe,
   getListAllByPolicy
 } from "@/api/tenant/serve.js";
 import TextTooltip from "@/components/text-tooltip/index.vue";
-import {debounce} from '@/util/util'
-import {DateTime} from "@/util/dateTime";
+import { debounce } from '@/util/util'
+import { DateTime } from "@/util/dateTime";
 import CustomLoading from "@/components/Custom-Loading/index.vue";
 const pages = { pagerCount: 3, total: 0, size: 10, currentPage: 1 }
 const baseOptions = {
@@ -112,7 +90,7 @@ const baseOptions = {
   border: true,
   columnBtn: false,
   refreshBtn: false,
-  menu:false,
+  menu: false,
   tip: false,
   selection: true,
 }
@@ -121,13 +99,13 @@ let leftUserOptions = {
   column: [{
     label: '姓名',
     prop: 'name',
-  },{
+  }, {
     label: '身份证',
     prop: 'idNumber',
-  },{
+  }, {
     label: '手机号',
     prop: 'telphone',
-  },{
+  }, {
     label: '个人标签',
     prop: 'labelsBase',
     slot: true,
@@ -159,7 +137,7 @@ let rightPostOptions = {
   }]
 }
 export default {
-  components: {TextTooltip, CustomLoading},
+  components: { TextTooltip, CustomLoading },
   data() {
     return {
       formInline: {},
@@ -183,8 +161,8 @@ export default {
   },
   props: {
     visible: Boolean,
-    rowData: { default: null, type: Function  },
-    changeVisible: { default: null, type: Function  },
+    rowData: { default: null, type: Function },
+    changeVisible: { default: null, type: Function },
   },
   computed: {
     viewDrawer: {
@@ -197,12 +175,12 @@ export default {
     },
   },
   watch: {
-    viewDrawer(val) { val ? this.onPageLoad() : this.onPageInit()}
+    viewDrawer(val) { val ? this.onPageLoad() : this.onPageInit() }
   },
   methods: {
     onPageLoad() {
       console.log('row', this.rowData)
-      if(!this.rowData) return
+      if (!this.rowData) return
       this.getLeftSignGroupList()
       this.getLeftUserList()
       // this.getRightListPolicy()
@@ -233,8 +211,9 @@ export default {
       this.rightTabs = type
       this.rightDataSelections = []
       this.$message.success('智能分析匹配中');
+
       type === 0 && this.getRightListPolicy()
-      type === 1 && this.getRightSearch()
+      type === 1 && this.getRightSearchByUserId()
     },
     searchInputChange: debounce(function (val) {
       this.getRightSearch()
@@ -256,14 +235,15 @@ export default {
     },
     leftSelectionChange(val) {
       this.leftUserSelections = val
+      console.log(val, '--------------------00000');
     },
     rightSelectionChange(val) {
       this.rightDataSelections = val
     },
     onSubmit() {
-      if( !this.leftUserSelections.length ) return this.$message.info('请选择推送用户')
-      if( !this.rightDataSelections.length ) return this.$message.info('请选择推送政策或岗位')
-      if(this.rightTabs === 0) {
+      if (!this.leftUserSelections.length) return this.$message.info('请选择推送用户')
+      if (!this.rightDataSelections.length) return this.$message.info('请选择推送政策或岗位')
+      if (this.rightTabs === 0) {
         this.pushPolicyAndUser()
       } else {
         this.pushPostAndUser()
@@ -277,11 +257,11 @@ export default {
       const createTime = Date.now() + 2000
       let params = {
         serveId: this.rowData.id,
-        posts: this.rightDataSelections.map((item) => ({id: item.id, type: item.type1})),
-        users: this.leftUserSelections.map((item) => ({idNumber: item.idNumber, talentsId: item.id}))
+        posts: this.rightDataSelections.map((item) => ({ id: item.id, type: item.type1 })),
+        users: this.leftUserSelections.map((item) => ({ idNumber: item.idNumber, talentsId: item.id }))
       }
       let resData = await pushPostUserServe(params)
-      if(resData.data.code === 200) {
+      if (resData.data.code === 200) {
         const timed = createTime - Date.now() > 0 ? createTime - Date.now() : 0
         setTimeout(() => {
           this.$message.success('岗位推送成功')
@@ -298,10 +278,10 @@ export default {
       let params = {
         serveId: this.rowData.id,
         policyIds: this.rightDataSelections.map((item) => item.id),
-        users: this.leftUserSelections.map((item) => ({idNumber: item.idNumber, talentsId: item.id}))
+        users: this.leftUserSelections.map((item) => ({ idNumber: item.idNumber, talentsId: item.id }))
       }
       let resData = await pushPolicyUserServe(params)
-      if(resData.data.code === 200) {
+      if (resData.data.code === 200) {
         const timed = createTime - Date.now() > 0 ? createTime - Date.now() : 0
         setTimeout(() => {
           this.$message.success('政策推送成功')
@@ -312,11 +292,11 @@ export default {
       }
     },
     async getRightSearch() {
-      let params = {keywords: this.searchInput || '1'}
+      let params = { keywords: this.searchInput || '1' }
       const createTime = Date.now() + 3000
       this.rightLoading = true
       let resData = await getSearchAll(params)
-      if(resData.data.code === 200){
+      if (resData.data.code === 200) {
         const timed = createTime - Date.now() > 0 ? createTime - Date.now() : 0
         setTimeout(() => {
           this.rightLoading = false
@@ -325,12 +305,25 @@ export default {
 
       }
     },
+    async getRightSearchByUserId() {
+      const ids = this.leftUserSelections.map(item => item.userId).join(',');
+      const createTime = Date.now() + 3000
+      this.rightLoading = true
+      let resData = await getSearchAllByUserId({ ids })
+      if (resData.data.code === 200) {
+        const timed = createTime - Date.now() > 0 ? createTime - Date.now() : 0
+        setTimeout(() => {
+          this.rightLoading = false
+          this.rightDataList = resData.data.data
+        }, timed)
+      }
+    },
     async getRightListPolicy() {
-      let params = {ids: this.rowData.policyIds}
+      let params = { ids: this.rowData.policyIds }
       const createTime = Date.now() + 3000
       this.rightLoading = true
       let resData = await getListByids(params)
-      if(resData.data.code === 200){
+      if (resData.data.code === 200) {
         const timed = createTime - Date.now() > 0 ? createTime - Date.now() : 0
         setTimeout(() => {
           this.rightLoading = false
@@ -339,7 +332,7 @@ export default {
       }
     },
     async getLeftUserList(type) {
-      const {currentPage, size} = this.leftPages
+      const { currentPage, size } = this.leftPages
       const createTime = Date.now() + 3000
       let params = {
         ...this.formInline,
@@ -351,7 +344,7 @@ export default {
       // params.labels = '未分组'
       this.leftLoading = true
       let resData = await getListAllByPolicy(params)
-      if ( resData.data.code === 200 ) {
+      if (resData.data.code === 200) {
         const timed = createTime - Date.now() > 0 ? createTime - Date.now() : 0
         setTimeout(() => {
           const { records, total, size, current } = resData.data.data
@@ -365,7 +358,7 @@ export default {
     },
     async getLeftSignGroupList() {
       const arr = this.rowData.talentsNames.map((v) => ({ groupName: v, value: v }))
-      this.leftServeOptions = [{groupName: '全部' }, ...arr]
+      this.leftServeOptions = [{ groupName: '全部' }, ...arr]
       // let params = { labels: this.rowData.talentsNames.join(',') }
       // params.labels = '未分组'
       // let resData = await getListAllByPolicy(params)
@@ -378,14 +371,14 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.content{
+.content {
   display: grid;
   grid-template-columns: 1fr 60px 1fr;
   grid-gap: 20px;
-  .content-left{
 
-  }
-  .content-center{
+  .content-left {}
+
+  .content-center {
     width: 100%;
     height: 100%;
     display: flex;
@@ -393,41 +386,50 @@ export default {
     justify-content: center;
     flex-direction: column;
   }
-  .content-right{
+
+  .content-right {
+
     //修改动画的大小  给文字加粗效果
-    .right-search{
+    .right-search {
       width: 100%;
     }
 
   }
-  .leftInput{
+
+  .leftInput {
     width: 500px;
-    .selectWidth{
+
+    .selectWidth {
       width: 160px !important;
     }
-    .el-input__inner{
+
+    .el-input__inner {
       width: 300px;
     }
-    .input-search{
+
+    .input-search {
       margin-right: -15px;
       margin-bottom: -10px;
     }
   }
 
 }
-/deep/.el-loading-spinner{
+
+/deep/.el-loading-spinner {
   font-size: 80px;
   font-weight: bold;
 }
-/deep/.el-loading-spinner .circular{
+
+/deep/.el-loading-spinner .circular {
   width: 80px;
   height: 80px;
 }
 
-.content-footer{
+.content-footer {
   float: right;
 }
-.relative{
+
+.relative {
   position: relative;
 }
 </style>