From 892bf6ed84ec8e33ac67876ff808d887943f07af Mon Sep 17 00:00:00 2001
From: Apcallover <1503963513@qq.com>
Date: Wed, 5 Jun 2024 14:47:10 +0800
Subject: [PATCH] =?UTF-8?q?flat:=206.5=20=E6=94=B9=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json                             |   22 +
 package.json                                  |    1 +
 src/api/tenant/personnelserve.js              |    6 +-
 src/api/tenant/serve.js                       |   25 +
 src/api/tenant/talents.js                     |   16 +
 src/components/promptDialog/index.vue         |   32 +-
 src/router/views/index.js                     |   30 +-
 .../manage/cuser/serve/Dialog/pushService.vue |    4 +-
 src/views/manage/cuser/serve/index.vue        |    4 +-
 .../tenant/main/serve/Dialog/addGroup.vue     |  423 ++++
 .../tenant/main/serve/Dialog/pushService.vue  |    4 +-
 src/views/tenant/main/serve/index.vue         | 1786 +++++------------
 .../Dialog/ServeDetail.vue                    |    0
 .../{serve => serveCopy}/Dialog/addGroups.vue |    0
 .../{serve => serveCopy}/Dialog/addLog.vue    |    0
 .../main/serveCopy/Dialog/pushService.vue     |  594 ++++++
 .../Dialog/transferGroups.vue                 |    0
 src/views/tenant/main/serveCopy/index.vue     | 1752 ++++++++++++++++
 .../tenant/main/talents/certain/index.vue     |  245 ++-
 .../tenant/main/talents/latent/index.vue      |  125 +-
 .../main/talents/personnelserve/index.vue     |  506 ++++-
 vue.config.js                                 |    2 +-
 22 files changed, 4201 insertions(+), 1376 deletions(-)
 create mode 100644 src/views/tenant/main/serve/Dialog/addGroup.vue
 rename src/views/tenant/main/{serve => serveCopy}/Dialog/ServeDetail.vue (100%)
 rename src/views/tenant/main/{serve => serveCopy}/Dialog/addGroups.vue (100%)
 rename src/views/tenant/main/{serve => serveCopy}/Dialog/addLog.vue (100%)
 create mode 100644 src/views/tenant/main/serveCopy/Dialog/pushService.vue
 rename src/views/tenant/main/{serve => serveCopy}/Dialog/transferGroups.vue (100%)
 create mode 100644 src/views/tenant/main/serveCopy/index.vue

diff --git a/package-lock.json b/package-lock.json
index 5efbf0e..749130f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6165,6 +6165,14 @@
         }
       }
     },
+    "dom7": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmmirror.com/dom7/-/dom7-3.0.0.tgz",
+      "integrity": "sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==",
+      "requires": {
+        "ssr-window": "^3.0.0-alpha.1"
+      }
+    },
     "domain-browser": {
       "version": "1.2.0",
       "resolved": "http://r.cnpmjs.org/domain-browser/download/domain-browser-1.2.0.tgz",
@@ -13065,6 +13073,11 @@
         "tweetnacl": "~0.14.0"
       }
     },
+    "ssr-window": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmmirror.com/ssr-window/-/ssr-window-3.0.0.tgz",
+      "integrity": "sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA=="
+    },
     "ssri": {
       "version": "6.0.1",
       "resolved": "http://r.cnpmjs.org/ssri/download/ssri-6.0.1.tgz",
@@ -13472,6 +13485,15 @@
         }
       }
     },
+    "swiper": {
+      "version": "6.8.4",
+      "resolved": "https://registry.npmmirror.com/swiper/-/swiper-6.8.4.tgz",
+      "integrity": "sha512-O+buF9Q+sMA0H7luMS8R59hCaJKlpo8PXhQ6ZYu6Rn2v9OsFd4d1jmrv14QvxtQpKAvL/ZiovEeANI/uDGet7g==",
+      "requires": {
+        "dom7": "^3.0.0",
+        "ssr-window": "^3.0.0"
+      }
+    },
     "table": {
       "version": "4.0.2",
       "resolved": "http://r.cnpmjs.org/table/download/table-4.0.2.tgz",
diff --git a/package.json b/package.json
index f247204..7c25ccb 100644
--- a/package.json
+++ b/package.json
@@ -30,6 +30,7 @@
     "nprogress": "^0.2.0",
     "portfinder": "^1.0.23",
     "script-loader": "^0.7.2",
+    "swiper": "^6.8.4",
     "vue": "^2.6.10",
     "vue-axios": "^2.1.2",
     "vue-baidu-map": "^0.21.22",
diff --git a/src/api/tenant/personnelserve.js b/src/api/tenant/personnelserve.js
index 27bef42..df81f8f 100644
--- a/src/api/tenant/personnelserve.js
+++ b/src/api/tenant/personnelserve.js
@@ -1,10 +1,10 @@
 import request from "@/router/axios";
 
 /*获取人才列表*/
-export const getList = (current, size, params, groupId) => {
+export const getList = (params) => {
   return request({
-    url: "/api/jobslink-api/serve/list",
+    url: "/api/jobslink-api/tenant/talents/list",
     method: "get",
-    params: {...params, current, size, groupId}
+    params
   });
 };
diff --git a/src/api/tenant/serve.js b/src/api/tenant/serve.js
index 3e28b1b..cf22332 100644
--- a/src/api/tenant/serve.js
+++ b/src/api/tenant/serve.js
@@ -63,6 +63,14 @@ export const getDept = () => {
   });
 };
 
+export const getDepTree = () => {
+  return request({
+    url: "/api/jobslink-api/serve/tree",
+    method: "get",
+    params: {}
+  });
+};
+
 /*新建分组*/
 export const addDept = row => {
   return request({
@@ -270,3 +278,20 @@ export const getMainServeUserLog = params => {
     params: params
   });
 };
+
+
+export const saveGroupServeInfo = (data) => {
+  return request({
+    url: "/api/jobslink-api/serve/tree/save",
+    method: "post",
+    data
+  });
+};
+
+export const updateGroupServeInfo = (data) => {
+  return request({
+    url: "/api/jobslink-api/serve/tree/update",
+    method: "post",
+    data
+  });
+};
diff --git a/src/api/tenant/talents.js b/src/api/tenant/talents.js
index 67b9361..9f1adcb 100644
--- a/src/api/tenant/talents.js
+++ b/src/api/tenant/talents.js
@@ -121,3 +121,19 @@ export const getDeptAllTree = (params) => {
   })
 }
 
+export const talentsEliminate = (params) => {
+  return request({
+    url: '/api/jobslink-api/tenant/talents/eliminate',
+    method: 'post',
+    data: params
+  })
+}
+
+export const talentsApproval = (params) => {
+  return request({
+    url: '/api/jobslink-api/tenant/talents/approval',
+    method: 'post',
+    data: params
+  })
+}
+
diff --git a/src/components/promptDialog/index.vue b/src/components/promptDialog/index.vue
index bcb4e65..cdd489a 100644
--- a/src/components/promptDialog/index.vue
+++ b/src/components/promptDialog/index.vue
@@ -6,7 +6,9 @@
     :before-close="handleClose"
     append-to-body>
     <span>{{ subTitle }}</span>
-    <div v-if="status === 1">
+    <slot name="header"></slot>
+    <div v-if="flagState === 1">
+      <slot name="content"></slot>
       <div class="input_box">
         <el-input type="textarea" v-model="input" placeholder="请输入内容"></el-input>
       </div>
@@ -18,9 +20,10 @@
       </div>
     </div>
     <span slot="footer" class="dialog-footer">
+      <slot name="footer"></slot>
       <el-button @click="handleClose">取 消</el-button>
-        <el-button :type="btnTypes[status]" @click="handleCancel">驳 回</el-button>
-      <el-button type="primary" @click="handleConfirm">通 过</el-button>
+      <el-button v-if="backBtnHide" :type="btnTypes[flagState]" @click="handleCancel">驳 回</el-button>
+      <el-button type="primary" @click="handleConfirm">{{ submitText }}</el-button>
     </span>
   </el-dialog>
 </template>
@@ -50,6 +53,20 @@ export default {
     }
   },
   props: {
+    backBtnStatus: {
+      default: 0,
+      type: Number,
+      required: false,
+    },
+    submitText: {
+      default: '通 过',
+      type: String,
+      required: false,
+    },
+    backBtnHide: {
+      default: true,
+      type: Boolean,
+    },
     visible: {
       default: false,
       type: Boolean,
@@ -76,7 +93,14 @@ export default {
       }
     }
   },
-  computed: {},
+  computed: {
+    flagState() {
+      if (this.backBtnStatus) {
+        return 1
+      }
+      return this.status
+    }
+  },
   methods: {
     handleClose() {
       this.$emit('onClose')
diff --git a/src/router/views/index.js b/src/router/views/index.js
index e4291d4..f0d4093 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -9,10 +9,10 @@ export default [
     children: [{
       path: 'index',
       name: '首页',
-      meta: {i18n: 'dashboard',code: "wel"},
+      meta: {i18n: 'dashboard', code: "wel"},
       component: () =>
-          // import(/* webpackChunkName: "views" */ '@/views/wel/index')
-          import(/* webpackChunkName: "views" */ '@/views/workstation/workbench')
+        // import(/* webpackChunkName: "views" */ '@/views/wel/index')
+        import(/* webpackChunkName: "views" */ '@/views/workstation/workbench')
     }]
   },
   {
@@ -24,7 +24,7 @@ export default [
       name: '测试页',
       meta: {i18n: 'test'},
       component: () =>
-          import(/* webpackChunkName: "views" */ '@/views/util/test')
+        import(/* webpackChunkName: "views" */ '@/views/util/test')
     }]
   },
   {
@@ -36,7 +36,7 @@ export default [
       name: '字典管理',
       meta: {i18n: 'dict'},
       component: () => import(
-          /* webpackChunkName: "views" */ '@/views/util/demo/dict-horizontal')
+        /* webpackChunkName: "views" */ '@/views/util/demo/dict-horizontal')
     }]
   },
   {
@@ -48,7 +48,7 @@ export default [
       name: '字典管理',
       meta: {i18n: 'dict'},
       component: () => import(
-          /* webpackChunkName: "views" */ '@/views/util/demo/dict-vertical')
+        /* webpackChunkName: "views" */ '@/views/util/demo/dict-vertical')
     }]
   },
   {
@@ -60,7 +60,7 @@ export default [
       name: '个人信息',
       meta: {i18n: 'info'},
       component: () =>
-          import(/* webpackChunkName: "views" */ '@/views/system/userinfo')
+        import(/* webpackChunkName: "views" */ '@/views/system/userinfo')
     }]
   },
   {
@@ -76,7 +76,7 @@ export default [
           isTab: false,
         },
         component: () => import(
-            /* webpackChunkName: "views" */ '@/views/manage/mission/zpView')
+          /* webpackChunkName: "views" */ '@/views/manage/mission/zpView')
       },
     ]
   },
@@ -87,9 +87,9 @@ export default [
     children: [{
       path: 'index',
       name: '客户消息',
-      meta: {i18n: 'news',code:'news'},
+      meta: {i18n: 'news', code: 'news'},
       component: () =>
-          import(/* webpackChunkName: "views" */ '@/views/tenant/news/index')
+        import(/* webpackChunkName: "views" */ '@/views/tenant/news/index')
     }]
   },
   {
@@ -101,7 +101,7 @@ export default [
       name: '账户信息',
       meta: {i18n: 'accountsafe', code: 'accountsafe'},
       component: () =>
-          import(/* webpackChunkName: "views" */ '@/views/tenant/account/index')
+        import(/* webpackChunkName: "views" */ '@/views/tenant/account/index')
     }]
   },
   // {
@@ -147,7 +147,7 @@ export default [
         },
         props: true,
         component: () => import(
-            /* webpackChunkName: "views" */ '@/views/manage/policies/news/addNews')
+          /* webpackChunkName: "views" */ '@/views/manage/policies/news/addNews')
       }
     ]
   },
@@ -169,7 +169,7 @@ export default [
         },
         props: true,
         component: () => import(
-            /* webpackChunkName: "views" */ '@/views/manage/policies/article/allArticle/addNews')
+          /* webpackChunkName: "views" */ '@/views/manage/policies/article/allArticle/addNews')
       }
     ]
   },
@@ -191,7 +191,7 @@ export default [
         },
         props: true,
         component: () => import(
-            /* webpackChunkName: "views" */ '@/views/tenant/main/serve/Dialog/addLog')
+          /* webpackChunkName: "views" */ '@/views/tenant/main/serveCopy/Dialog/addLog')
       }
     ]
   },
@@ -213,7 +213,7 @@ export default [
         },
         props: true,
         component: () => import(
-            /* webpackChunkName: "views" */ '@/views/manage/recommend/manageContent/contentManage')
+          /* webpackChunkName: "views" */ '@/views/manage/recommend/manageContent/contentManage')
       }
     ]
   },
diff --git a/src/views/manage/cuser/serve/Dialog/pushService.vue b/src/views/manage/cuser/serve/Dialog/pushService.vue
index 9555fa8..46426eb 100644
--- a/src/views/manage/cuser/serve/Dialog/pushService.vue
+++ b/src/views/manage/cuser/serve/Dialog/pushService.vue
@@ -326,7 +326,7 @@ export default {
     }, 1000),
     leftSearch() {
       this.leftPages.currentPage = 1
-      this.getLeftUserList('serve')
+      this.getLeftUserList('serveCopy')
       console.log('leftpages:', this.leftPages)
     },
     leftCurrentPageChange(current) {
@@ -366,7 +366,7 @@ export default {
       }
     },
     groupNameChange() {
-      this.getLeftUserList('serve')
+      this.getLeftUserList('serveCopy')
     },
     async pushPostAndUser() {
       this.pushState = true
diff --git a/src/views/manage/cuser/serve/index.vue b/src/views/manage/cuser/serve/index.vue
index 28ad46d..21831a3 100644
--- a/src/views/manage/cuser/serve/index.vue
+++ b/src/views/manage/cuser/serve/index.vue
@@ -206,7 +206,7 @@
       </el-col>
 
     </el-row>
-    <!-- <serve-detail ref="copy" @back="backIndex" v-show="false"></serve-detail> -->
+    <!-- <serveCopy-detail ref="copy" @back="backIndex" v-show="false"></serveCopy-detail> -->
     <el-drawer
       size="85%"
       append-to-body
@@ -398,7 +398,7 @@ import workView from "./workMissionView.vue"
 import {serviceType} from "@/common/dic";
 import Tinymce from "@/components/Tinymce";
 import {deepClone} from "@/util/util";
-import PushService from "@/views/tenant/main/serve/Dialog/pushService.vue";
+import PushService from "@/views/tenant/main/serveCopy/Dialog/pushService.vue";
 import TextTooltip from "@/components/text-tooltip/index.vue";
 
 const page = {
diff --git a/src/views/tenant/main/serve/Dialog/addGroup.vue b/src/views/tenant/main/serve/Dialog/addGroup.vue
new file mode 100644
index 0000000..23513c0
--- /dev/null
+++ b/src/views/tenant/main/serve/Dialog/addGroup.vue
@@ -0,0 +1,423 @@
+<template>
+  <!-- 新建分组模板 -->
+  <el-dialog
+    :title="title"
+    append-to-body
+    :visible.sync="box"
+    :close-on-click-modal="false"
+    :close-on-press-escape="false"
+    @closed="closed"
+    width="70%"
+  >
+    <el-form
+      :model="form"
+      @submit.native.prevent
+      :rules="rules"
+      ref="groups"
+      label-position="right"
+      label-width="100px"
+    >
+      <el-collapse v-model="activeNames">
+        <el-collapse-item title="分组信息" name="1">
+          <el-form-item style="width: 400px" label="分组名称" prop="groupName">
+            <el-input v-model="form.groupName" placeholder="请输入 分组名称" size="small" :disabled="loading"
+                      maxlength="40"
+                      show-word-limit></el-input>
+          </el-form-item>
+          <el-form-item style="width: 400px" label="分组排序" prop="sort">
+            <el-input type="number" v-model="form.sort" min="0" placeholder="请输入 分组名称"
+                      size="small"></el-input>
+          </el-form-item>
+        </el-collapse-item>
+        <el-collapse-item title="服务信息" name="2">
+          <div class="scroll-row">
+            <el-card class="card-row" shadow="hover" v-for="(item, index) in serveAll" :key="index">
+              <div :class="`card-row-name ${selectServer.id === item.id && 'color-blue'}`" @click="changeCard(item)">
+                {{ item.name }}
+              </div>
+              <div class="del-btn" @click="delServer(item)">
+                <i style="font-size: 18px" class="el-icon-circle-close"></i>
+              </div>
+            </el-card>
+            <el-card class="card-row card-add" shadow="hover">
+              <div class="card-row-name" @click="changeCard(null)">添加<i
+                class="el-icon-circle-plus-outline"></i></div>
+            </el-card>
+          </div>
+          <div class="car-content" v-if="selectShow">
+            <el-form-item style="width: 400px" label="服务名称" prop="name">
+              <el-input v-model="serveForm.name" placeholder="请输入 服务名称" size="small"></el-input>
+            </el-form-item>
+            <!--            <el-form-item style="width: 400px" label="机构名称" prop="companyName">-->
+            <!--              <el-input v-model="serveForm.companyName" placeholder="请输入 机构名称" size="small"></el-input>-->
+            <!--            </el-form-item>-->
+            <el-form-item label="服务场景" prop="serveLabels">
+              <tag-select v-model="serveForm.serveLabels" :prop="{ label: 'name', value: 'name' }" :data="workDataList">
+              </tag-select>
+            </el-form-item>
+            <el-form-item label="政策指南" prop="policyIds">
+              <el-cascader
+                style="width: 100%"
+                size="small"
+                v-model="serveForm.policyIds"
+                :options="listAllPolicyTree"
+                :props="{ expandTrigger: 'hover', multiple: true, label: 'name', value: 'value', children: 'child'}"
+                @change="handleChange"
+                filterable
+              ></el-cascader>
+            </el-form-item>
+            <el-form-item label="重点人群" prop="talentsGroupId">
+              <el-select style="width: 100%" v-model="serveForm.talentsGroupId" multiple filterable
+                         placeholder="请输入 重点人群">
+                <el-option
+                  v-for="item in talentsList"
+                  :key="item.id"
+                  :label="item.groupName"
+                  :value="item.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="备注" prop="remarks">
+              <el-input type="textarea" v-model="serveForm.remarks" placeholder="请输入 备注"
+                        size="small"></el-input>
+            </el-form-item>
+          </div>
+        </el-collapse-item>
+      </el-collapse>
+    </el-form>
+    <div slot="footer" style="text-align:right">
+      <el-button
+        type="primary"
+        size="mini"
+        icon="el-icon-check"
+        @click="handleSubmit"
+        :loading="loading"
+      >提交
+      </el-button>
+      <el-button size="mini" icon="el-icon-circle-close" @click=" box = false" :loading="loading">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import {saveGroupServeInfo, updateDept, updateGroupServeInfo} from "@/api/tenant/serve";
+import {deepClone} from "@/util/util";
+
+const prefix = 'custom-'
+const initRule = {
+  groupName: [
+    {
+      required: true,
+      whitespace: true,
+      message: "请填写分组名称",
+      trigger: "change",
+    },
+  ],
+}
+const initFormValue = {
+  groupName: "",
+  sort: 0,
+}
+const initServeForm = {
+  companyName: '',
+  name: '',
+  serveLabels: [],
+  policyIds: [],
+  talentsGroupId: [],
+  remarks: '',
+}
+export default {
+  props: {
+    treeData: {
+      type: Array,
+      default: [],
+    },
+    listAllPolicyTree: {
+      type: Array,
+      default: [],
+    },
+    data: {
+      type: Array,
+      default: [],
+    },
+    worktypeDic: {
+      type: Object,
+      default: {},
+    },
+    talentsList: {
+      type: Array,
+      default: [],
+    }
+  },
+  data() {
+    return {
+      type: "",
+      title: "",
+      groupId: "",
+      loading: false,
+      box: false,
+      form: Object.assign({}, initFormValue),
+      serveForm: Object.assign({}, initServeForm),
+      rules: Object.assign({}, initRule),
+      activeNames: ['1', '2'],
+      serveAll: [],
+      selectServer: {},
+      selectShow: false,
+      selectLabelNameTypes: [],
+      tempWorkType: [],
+      tabDataSource: [],
+      editData: null,
+      customNum: 1,
+    };
+  },
+  created() {
+    console.log('watch', this.data)
+  },
+  computed: {
+    workDataList() {
+      let rel = deepClone(this.data)
+      for (let i = 0; i < this.tempWorkType.length; i++) {
+        const key = this.tempWorkType[i];
+        if (key && !this.worktypeDic.hasOwnProperty(key)) {
+          rel.push({name: key});
+        }
+      }
+      return rel
+    },
+  },
+  methods: {
+    closed() {
+      this.form = {
+        groupName: "",
+      };
+      if (this.$refs.groups) {
+        this.$refs.groups.resetFields();
+      }
+      this.loading = false;
+    },
+    openDialog(type, data) {
+      this.type = type;
+      if (this.type === "add") {
+        this.title = "新建分组";
+        this.form.groupName = '';
+        // this.form.sort = 0;
+        this.serveAll = []
+        this.editData = null
+        this.box = true;
+      } else if (this.type === "edit") {
+        this.title = "编辑分组";
+        this.groupId = data.id;
+        this.form.groupName = data.groupName;
+        // this.form.sort = data.sort;
+        this.serveAll = data.children
+        this.editData = data
+        this.box = true;
+      }
+      this.selectShow = false
+      this.selectServer = {}
+      this.serveForm = Object.assign({}, initServeForm)
+      this.customNum = 1
+    },
+    async handleSubmit() {
+      if (this.selectServer.id) {
+        let copyForm = deepClone(this.serveForm)
+        let serve = {
+          ...this.selectServer,
+          ...copyForm,
+          policyIds: copyForm.policyIds ? copyForm.policyIds.join(',') : '',
+          talentsGroupId: copyForm.talentsGroupId ? copyForm.talentsGroupId.join(',') : '',
+          serveLabels: copyForm.serveLabels ? copyForm.serveLabels.map((item) => item.name).join(',') : '',
+        }
+        if (this.tabDataSource.find((item) => item.id === serve.id)) {
+          this.tabDataSource = this.tabDataSource.map((item) => {
+            if (item.id === serve.id) {
+              return deepClone(serve)
+            }
+            return item
+          })
+        } else {
+          this.tabDataSource = [...this.tabDataSource.filter((item) => item.id !== serve.id), deepClone(serve)]
+        }
+      }
+      const serveAll = deepClone(this.serveAll)
+      const tabDataSource = deepClone(this.tabDataSource)
+      // prefix
+      const customList = tabDataSource.filter((item) => /^custom-/ig.test(item.id))
+      // 替换数据
+      for (let i = 0; i < tabDataSource.length; i++) {
+        for (let j = 0; j < serveAll.length; j++) {
+          if (serveAll[j].id === tabDataSource[i].id) {
+            serveAll[j] = tabDataSource[i]
+            break
+          }
+        }
+      }
+      serveAll.forEach((item) => {
+        if (/^custom-/ig.test(item.id)) {
+          delete item.id
+        }
+      })
+      let params, resData
+      switch (true) {
+        case this.type === 'add' :
+          params = {
+            ...this.form,
+            children: serveAll
+          }
+          if (this.form.groupName) {
+            this.loading = true;
+            resData = await saveGroupServeInfo(params)
+          } else {
+            this.$message.error('请输入分组名称');
+          }
+          break
+        case this.type === 'edit' :
+          params = {
+            ...this.editData,
+            ...this.form,
+            children: serveAll
+          }
+          if (this.form.groupName) {
+            this.loading = true;
+            resData = await updateGroupServeInfo(params)
+          } else {
+            this.$message.error('请输入分组名称');
+          }
+      }
+      if (resData.data.code === 200) {
+        this.$message.success('操作成功!');
+        this.loading = false;
+        this.$emit("refresh");
+        this.box = false;
+      } else {
+        this.loading = false;
+        this.$message.success('操作失败!');
+      }
+    },
+    changeCard(data) {
+      // 校验
+      if (this.selectServer.id) {
+        let copyForm = deepClone(this.serveForm)
+        let serve = {
+          ...this.selectServer,
+          ...copyForm,
+          policyIds: copyForm.policyIds ? copyForm.policyIds.join(',') : '',
+          talentsGroupId: copyForm.talentsGroupId ? copyForm.talentsGroupId.join(',') : '',
+          serveLabels: copyForm.serveLabels ? copyForm.serveLabels.map((item) => item.name).join(',') : '',
+        }
+        if (this.tabDataSource.find((item) => item.id === serve.id)) {
+          this.tabDataSource = this.tabDataSource.map((item) => {
+            if (item.id === serve.id) {
+              return deepClone(serve)
+            }
+            return item
+          })
+        } else {
+          this.tabDataSource = [...this.tabDataSource.filter((item) => item.id !== serve.id), deepClone(serve)]
+        }
+      }
+      // 新增
+      if (!data) {
+        const fm = {
+          ...Object.assign({}, initServeForm),
+          name: `自定义服务名${this.customNum}`,
+          id: `${prefix}${this.customNum}`
+        }
+        this.selectShow = true
+        this.selectServer = fm
+        this.serveForm = fm
+        this.tempWorkType = []
+        this.customNum++
+        this.serveAll = [...this.serveAll, deepClone(fm)]
+        this.tabDataSource.push(fm)
+        return
+      }
+
+      // 回填
+      let source = deepClone(data)
+      if (this.tabDataSource.find((item) => item.id === data.id)) {
+        source = deepClone(this.tabDataSource.filter((item) => (item.id === data.id))[0])
+      } else {
+        this.tabDataSource.push(data)
+      }
+      this.selectShow = true
+      this.selectServer = source
+      this.tempWorkType = source.serveLabels ? source.serveLabels.split(",") : [];
+      this.serveForm.talentsGroupId = source.talentsGroupId ? source.talentsGroupId.split(',') : []
+      this.serveForm.serveLabels = source.serveLabels ? source.serveLabels.split(',').map((item) => ({name: item})) : []
+      const policyIds = this.treeIteration(this.listAllPolicyTree, source.policyIds.split(','))
+      this.serveForm.policyIds = policyIds
+      // this.serveForm.companyName = source.companyName
+      this.serveForm.name = source.name
+      this.serveForm.remarks = source.remarks
+      this.serveForm.id = source.id
+    },
+    delServer(data) {
+      this.serveAll = this.serveAll.filter((item) => item.id !== data.id)
+      this.tabDataSource = this.tabDataSource.filter((item) => item.id !== data.id)
+    },
+    handleChange(policy) {
+      console.log(policy)
+      this.serveForm.policyIds = policy
+    },
+    treeIteration(tree, ids) {
+      if (!(tree.length && ids.length)) return;
+      let arr = []
+      tree.forEach((treeItem) => {
+        treeItem.child.forEach((item) => {
+          if (ids.some((id) => item.value === id)) {
+            arr.push([treeItem.value, item.value])
+          }
+        })
+      })
+      return arr;
+    },
+  },
+  watch: {}
+};
+</script>
+
+<style scoped>
+.color-blue {
+  color: blue;
+}
+
+.scroll-row {
+  overflow-x: scroll;
+  width: 100%;
+  height: fit-content;
+  display: -webkit-box;
+  padding: 10px;
+  margin-bottom: 10px;
+}
+
+.card-row {
+  width: fit-content;
+  margin-right: 10px;
+  display: flex;
+  align-content: center;
+  justify-content: center;
+  text-align: center;
+  position: relative;
+}
+
+.del-btn {
+  position: absolute;
+  right: 0;
+  top: 0;
+
+}
+
+.card-row-name {
+  width: 100%;
+  height: 100%;
+}
+
+.card-add {
+  color: #e5e5e5;
+}
+
+.car-content {
+
+}
+</style>
diff --git a/src/views/tenant/main/serve/Dialog/pushService.vue b/src/views/tenant/main/serve/Dialog/pushService.vue
index a881987..aba6d21 100644
--- a/src/views/tenant/main/serve/Dialog/pushService.vue
+++ b/src/views/tenant/main/serve/Dialog/pushService.vue
@@ -333,7 +333,7 @@ export default {
     }, 1000),
     leftSearch() {
       this.leftPages.currentPage = 1
-      this.getLeftUserList('serve')
+      this.getLeftUserList('serveCopy')
       console.log('leftpages:', this.leftPages)
     },
     leftCurrentPageChange(current) {
@@ -373,7 +373,7 @@ export default {
       }
     },
     groupNameChange() {
-      this.getLeftUserList('serve')
+      this.getLeftUserList('serveCopy')
     },
     async pushPostAndUser() {
       this.pushState = true
diff --git a/src/views/tenant/main/serve/index.vue b/src/views/tenant/main/serve/index.vue
index 9725549..cc9f6d8 100644
--- a/src/views/tenant/main/serve/index.vue
+++ b/src/views/tenant/main/serve/index.vue
@@ -1,13 +1,21 @@
 <template>
   <div>
     <el-row>
-      <el-col :span="5">
+      <el-col :span="6">
         <basic-container>
-          <p>服务分组管理</p>
-          <div class="box" :style="{ height: leftHeight }">
+          <div style="display: flex; justify-content: space-between; align-items: center">
+            <div>服务分组管理</div>
+            <div>
+              <el-button type="text" icon="el-icon-plus"
+                         v-if="vaildData(permission.tenant_main_serve_index_groupadd, false)"
+                         @click="updateGroups('add')">新建分组
+              </el-button>
+            </div>
+          </div>
+          <div class="box" :style="{height: leftHeight}">
             <el-scrollbar style="height: 100%">
-              <el-tree ref="tree" node-key="id" highlight-current :expand-on-click-node="false" @node-click="nodeClick"
-                       :data="treeData" :props="props">
+              <el-tree ref="tree" node-key="id" highlight-current @node-click="nodeClick"
+                       :default-expand-all="true" :data="treeData" :props="{ label: 'groupName', id: 'id'}">
               <span class="custom-tree-node" slot-scope="{ node, data }" style="width: 80%">
                 <span style="
                     flex-basis: 80%;
@@ -16,10 +24,10 @@
                     text-overflow: ellipsis;
                     flex-shrink: 1;
                   ">
-                  {{ node.label }}
-                  （{{ data.sumNum }}个）
+                  {{ data.groupName || data.name }}
+                  {{ data.sumNum ? `（${data.sumNum}个）` : '' }}
                 </span>
-                <span v-show="data.id && data.id !== '0'" style="flex-basis: 20%">
+                 <span v-show="data.children && data.id && data.id !== '0'" style="flex-basis: 20%">
                   <el-button type="text" icon="el-icon-edit" size="mini"
                              v-if="vaildData(permission.tenant_main_serve_index_groupedit, false)"
                              @click="() => updateGroups('edit', data)">
@@ -31,378 +39,197 @@
                 </span>
               </span>
               </el-tree>
-              <div class="footer" style="padding-left: 6px">
-                <el-button type="text" icon="el-icon-plus"
-                           v-if="vaildData(permission.tenant_main_serve_index_groupadd, false)"
-                           @click="updateGroups('add')">新建分组
-                </el-button>
-              </div>
             </el-scrollbar>
           </div>
         </basic-container>
       </el-col>
-      <el-col :span="19">
+      <el-col :span="18">
         <basic-container>
-          <!--搜索栏-->
-          <el-form size="small" label-position="right" :inline="true" style="padding-left: 10px; padding-right: 10px">
-            <el-row :span="24">
-              <el-form-item label="机构名称:">
-                <el-input v-model="query.companyName" placeholder="机构名称" clearable></el-input>
-              </el-form-item>
-              <el-form-item label="服务名称:">
-                <el-input v-model="query.name" placeholder="服务名称" clearable></el-input>
-              </el-form-item>
-
-              <div class="searchBtn">
-                <el-button type="primary" size="small" icon="el-icon-search" @click="searchChange1">搜 索</el-button>
-                <el-button size="small" icon="el-icon-delete" @click="searchReset1">清 空</el-button>
-              </div>
-            </el-row>
-          </el-form>
-          <!--/搜索栏-->
-          <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" v-model="obj"
-                     :permission="permissionList" :before-open="beforeOpen" @row-del="rowDel" @row-update="rowUpdate"
-                     @row-save="rowSave" @search-change="searchChange" @search-reset="searchReset"
-                     @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
-                     @refresh-change="refreshChange" class="customPage">
-            <!--自定义列-->
-            <template slot="worktypes" slot-scope="{ row }">
-              <el-tooltip effect="dark" :content="row.worktypes" placement="top">
-                <div slot="content">
-                  <div v-for="(item, index) in clipStr(row.worktypes)" :key="index">
-                    <div>{{ item }}</div>
-                  </div>
-                </div>
-                <div>{{ row.worktypes | ellipsis }}</div>
-              </el-tooltip>
-            </template>
-            <template slot="status" slot-scope="{ row }">
-              <div>
-              <span v-if="row.status == 1" style="color: green">
-                <b>{{ statusArr[row.status] }}</b>
-              </span>
-                <span v-if="row.status == 0" style="color: red">
-                <b>{{ statusArr[row.status] }}</b>
-              </span>
-              </div>
-            </template>
-            <template slot="resume" slot-scope="{ row }">
-              <div>
-                <el-button type="text" size="mini" @click="$refs.resume.openDialog(row)"
-                           v-if="row.userId && row.userId !== '0'">查看简历
-                </el-button>
-                <div v-else>暂无简历</div>
-              </div>
-            </template>
-            <template slot="serveLabels" slot-scope="{ row }">
-              <el-tooltip effect="dark" placement="top">
-                <div slot="content">
-                  <div v-for="(item, index) in clipStr(row.serveLabels)" :key="index">
-                    <div>{{ item }}</div>
-                  </div>
-                </div>
-                <span>{{
-                    row.serveLabels.length > 20 ? `${row.serveLabels.substring(0, 20)}...` : row.serveLabels
-                  }}</span>
-              </el-tooltip>
-            </template>
-            <!--/自定义列-->
-            <template slot="serveLabelsForm">
-              <tag-select v-model="selectLabelNameTypes" :prop="{ label: 'name', value: 'name' }" :data="worktypeData">
-              </tag-select>
-            </template>
-            <!--自定义按钮-->
+          <avue-crud
+            v-model="obj"
+            ref="crud"
+            :data="dataSource"
+            :option="option"
+            :search.sync="query"
+            :page.sync="page"
+            :table-loading="loading"
+            @search-change="serveSearchChange"
+            @search-reset="serveResetChange"
+            @size-change="infoSizeChange"
+            @current-change="infoCurrentChange">
             <template slot="menuLeft">
-              <el-button type="primary" size="small" icon="el-icon-delete"
-                         @click="() => { $refs.crud.rowAdd(); selectPolicyTree = []}"
-                         v-if="vaildData(permission.tenant_main_serve_index_add, false)">
-                新增
-              </el-button>
-              <el-button type="danger" size="small" icon="el-icon-delete" @click="handleDelete"
-                         :disabled="!selectionList.length" plain
-                         v-show="vaildData(permission.tenant_talents_groupdelete, false)">
-                删除
-              </el-button>
+              <el-button type="primary" size="small" @click="selectPushService">推送服务</el-button>
             </template>
-            <template slot="name" slot-scope="{row}">
-              <span>{{ row.name }}</span>
-              <!-- <span v-else>{{ row.name }}（<span style="color: red;">未实名</span>）</span> -->
-            </template>
-            <template slot="policyIdsForm" slot-scope="{row}">
-              <el-cascader
-                v-model="selectPolicyTree"
-                :options="listAllPolicyTree"
-                :props="{ expandTrigger: 'hover', multiple: true, label: 'name', value: 'value', children: 'child'}"
-                @change="handleChange"
-                filterable
-              ></el-cascader>
-            </template>
-            <!--/自定义按钮-->
             <template slot-scope="{row,index}" slot="menu">
               <el-button type="text"
                          icon="el-icon-document"
                          size="small"
-                         v-show="vaildData(permission.tenant_main_serve_index_pushserve, false)"
-                         @click="selectPushService(row)"
-              >推送服务
+                         @click="matchWorkStation(row)"
+              >匹配任务/岗位
               </el-button>
               <el-button type="text"
                          icon="el-icon-document"
                          size="small"
-                         @click="showKeyAudience(row)"
-              >服务详情
+                         @click="matchPolicy(row)"
+              >匹配政策
               </el-button>
               <el-button type="text"
-                         v-if="row.status == 0"
-                         icon="el-icon-video-play"
+                         icon="el-icon-document"
                          size="small"
-                         v-show="vaildData(permission.tenant_main_serve_index_off, false)"
-                         @click="playServe(row)"
-              >启用
-              </el-button>
-              <el-button type="text"
-                         v-if="row.status == 1"
-                         icon="el-icon-video-pause"
-                         size="small"
-                         v-show="vaildData(permission.tenant_main_serve_index_off, false)"
-                         @click="pauseServe(row)"
-              >关闭
+                         @click="serveLog(row)"
+              >服务日志
               </el-button>
             </template>
-            <template slot="talentsNamesForm" slot-scope="{row}">
-              <el-button type="text"
-                         v-if="row.status == 1"
-                         icon="el-icon-video-pause"
-                         size="small"
-                         @click="pauseServe(row)"
-              >关闭
-              </el-button>
-            </template>
-            <!--/父子表-->
           </avue-crud>
-
-          <!--批量导入-->
-          <el-dialog title="导入" append-to-body :visible.sync="excelBox" :close-on-click-modal="false" width="555px">
-            <avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter"
-                       :upload-before="beforeAvatarUpload" :upload-error="uploadError">
-              <template slot="excelTemplate">
-                <el-button type="primary" @click="handleTemplate()" :loading="templateLoading">
-                  点击下载
-                  <i class="el-icon-download el-icon--right"></i>
-                </el-button>
-              </template>
-            </avue-form>
-          </el-dialog>
-          <!--/批量导入-->
-          <!--新建 编辑分组dialog-->
-          <add-groups ref="addGroups" @refresh="refresh" :treeData="treeData"></add-groups>
-          <!--/新建 编辑分组dialog-->
-          <!--转移分组dialog-->
-          <transfer-groups ref="transferGroups" @refresh="refresh" :ids="ids"></transfer-groups>
-          <!--/转移分组dialog-->
-          <resume ref="resume" v-show="false"></resume>
         </basic-container>
-        <ied ref="ied"></ied>
       </el-col>
-
     </el-row>
-    <!-- <serve-detail ref="copy" @back="backIndex" v-show="false"></serve-detail> -->
+    <!--  匹配任务/岗位  -->
     <el-drawer
-      size="85%"
-      append-to-body
-      title="服务详情"
-      :visible.sync="drawer"
-      :direction="direction"
-      :before-close="handleClose">
+      title="匹配任务/岗位"
+      size="80%"
+      :append-to-body="true"
+      :before-close="() => innerDrawer1 = false"
+      :visible.sync="innerDrawer1">
       <avue-crud
-        :data="infoData"
-        :option="infoOption"
-        :search.sync="search"
-        :page.sync="infoPage"
-        @search-change="serveSearchChange"
-        @search-reset="serveResetChange"
-        @size-change="infoSizeChange"
-        @current-change="infoCurrentChange"
+        :data="workData"
+        :option="workOption"
+        :page.sync="workPage"
+        @size-change="workSizeChange"
+        @current-change="workCurrentChange"
       >
+        <template slot="missionDesc" slot-scope="{ row }">
+          <TextTooltip :content="row.missionDesc"></TextTooltip>
+        </template>
         <template slot-scope="{row,index}" slot="menu">
           <el-button type="text"
                      icon="el-icon-document"
                      size="small"
-                     @click="matchWorkStation(row)"
-          >匹配任务/岗位
-          </el-button>
-          <el-button type="text"
-                     icon="el-icon-document"
-                     size="small"
-                     @click="matchPolicy(row)"
-          >匹配政策
-          </el-button>
-          <el-button type="text"
-                     icon="el-icon-document"
-                     size="small"
-                     @click="serveLog(row)"
-          >服务日志
+                     @click="toWorkMissionDetail(row)"
+          >查看详情
           </el-button>
         </template>
       </avue-crud>
-      <el-drawer
-        title="匹配任务/岗位"
-        size="80%"
-        :append-to-body="true"
-        :before-close="handleCloseWork"
-        :visible.sync="innerDrawer1">
-        <avue-crud
-          :data="workData"
-          :option="workOption"
-          :page.sync="workPage"
-          @size-change="workSizeChange"
-          @current-change="workCurrentChange"
-        >
-          <template slot="missionDesc" slot-scope="{ row }">
-            <TextTooltip :content="row.missionDesc"></TextTooltip>
-          </template>
-          <template slot-scope="{row,index}" slot="menu">
-            <el-button type="text"
-                       icon="el-icon-document"
-                       size="small"
-                       @click="toWorkMissionDetail(row)"
-            >查看详情
-            </el-button>
-          </template>
-        </avue-crud>
-      </el-drawer>
-      <el-drawer
-        title="匹配政策"
-        size="80%"
-        :append-to-body="true"
-        :before-close="handleClosePolicy"
-        :visible.sync="innerDrawer2">
-        <avue-crud
-          :data="policyData"
-          :option="policyOption"
-          :page.sync="policyPage"
-          @size-change="policySizeChange"
-          @current-change="policyCurrentChange"
-        >
-          <template slot="policyContent" slot-scope="{ row }">
-            <el-tooltip class="item" effect="dark" placement="top-start">
-              <div slot="content">
-                <div v-for="(item, index) in clipStr(row.policyContent)" :key="index">
-                  <div>{{ item }}</div>
-                </div>
-              </div>
-              <span>{{ row.policyContent.length > 50 ? row.policyContent.substring(0, 50) : row.policyContent }}</span>
-            </el-tooltip>
-          </template>
-          <template slot="labelName" slot-scope="{ row }">
-            <el-tooltip class="item" effect="dark" placement="top-start">
-              <div slot="content">
-                <div v-for="(item, index) in clipStr(row.labelName)" :key="index">
-                  <div>{{ item }}</div>
-                </div>
-              </div>
-              <span>{{ row.labelName.length > 50 ? row.labelName.substring(0, 50) : row.labelName }}</span>
-            </el-tooltip>
-          </template>
-          <template slot="labelNameForm" slot-scope="{row}">
-            <div>
-              <el-tag style="margin: 4px 10px" v-for="(item, index) in row.labelName.split(',')" :key="index">{{
-                  item
-                }}
-              </el-tag>
-            </div>
-          </template>
-
-          <template slot="guidelineContentForm" slot-scope="{row}">
-            <div>
-              <Tinymce v-model="row.guidelineContent" :visibleToolbar="false" :visibleMenubar="false"></Tinymce>
-            </div>
-          </template>
-          <template slot="policyContentForm" slot-scope="{row}">
-            <div>
-              <Tinymce v-model="row.policyContent" :visibleToolbar="false" :visibleMenubar="false"></Tinymce>
-            </div>
-          </template>
-
-        </avue-crud>
-      </el-drawer>
-      <el-drawer
-        title="服务日志"
-        size="80%"
-        :append-to-body="true"
-        :before-close="handleCloseLog"
-        :visible.sync="innerDrawer3">
-        <!-- <div>
-          <span>姓名：</span>
-          <span>身份证号：</span>
-        </div> -->
-        <avue-crud
-          :data="logData"
-          :option="logOption"
-          @row-save="saveLog"
-          @row-update="saveUpdateLog"
-          @row-del="removeLog"
-          :page.sync="logPage"
-          @size-change="logSizeChange"
-          @current-change="logCurrentChange"
-        >
-          <!-- <template slot="menuLeft">
-            <el-button @click="addNewLog" icon="el-icon-plus" type="primary" size="mini">添加</el-button>
-          </template>
-          <template slot="menu" slot-scope="{row}">
-            <el-button type="text" @click="editLogInfo(row.id)" icon="el-icon-edit" size="mini">修改</el-button>
-            <el-button type="text" @click="editLogInfo(row.id)" icon="el-icon-edit" size="mini">查看附件</el-button>
-          </template> -->
-        </avue-crud>
-      </el-drawer>
     </el-drawer>
-    <mission-view :visible.sync="viewDrawer" :model="view"></mission-view>
-    <work-view :visible.sync="workViewDrawer" :model="workViewModel"></work-view>
+    <!--    匹配政策-->
+    <el-drawer
+      title="匹配政策"
+      size="80%"
+      :append-to-body="true"
+      :before-close="() => innerDrawer2 = false"
+      :visible.sync="innerDrawer2">
+      <avue-crud
+        :data="policyData"
+        :option="policyOption"
+        :page.sync="policyPage"
+        @size-change="policySizeChange"
+        @current-change="policyCurrentChange"
+      >
+        <template slot="policyContent" slot-scope="{ row }">
+          <el-tooltip class="item" effect="dark" placement="top-start">
+            <div slot="content">
+              <div v-for="(item, index) in clipStr(row.policyContent)" :key="index">
+                <div>{{ item }}</div>
+              </div>
+            </div>
+            <span>{{ row.policyContent.length > 50 ? row.policyContent.substring(0, 50) : row.policyContent }}</span>
+          </el-tooltip>
+        </template>
+        <template slot="labelName" slot-scope="{ row }">
+          <el-tooltip class="item" effect="dark" placement="top-start">
+            <div slot="content">
+              <div v-for="(item, index) in clipStr(row.labelName)" :key="index">
+                <div>{{ item }}</div>
+              </div>
+            </div>
+            <span>{{ row.labelName.length > 50 ? row.labelName.substring(0, 50) : row.labelName }}</span>
+          </el-tooltip>
+        </template>
+        <template slot="labelNameForm" slot-scope="{row}">
+          <div>
+            <el-tag style="margin: 4px 10px" v-for="(item, index) in row.labelName.split(',')" :key="index">{{
+                item
+              }}
+            </el-tag>
+          </div>
+        </template>
+
+        <template slot="guidelineContentForm" slot-scope="{row}">
+          <div>
+            <Tinymce v-model="row.guidelineContent" :visibleToolbar="false" :visibleMenubar="false"></Tinymce>
+          </div>
+        </template>
+        <template slot="policyContentForm" slot-scope="{row}">
+          <div>
+            <Tinymce v-model="row.policyContent" :visibleToolbar="false" :visibleMenubar="false"></Tinymce>
+          </div>
+        </template>
+
+      </avue-crud>
+    </el-drawer>
+    <!--    服务日志-->
+    <el-drawer
+      title="服务日志"
+      size="80%"
+      :append-to-body="true"
+      :before-close="() => innerDrawer3 = false"
+      :visible.sync="innerDrawer3">
+      <!-- <div>
+        <span>姓名：</span>
+        <span>身份证号：</span>
+      </div> -->
+      <avue-crud
+        :data="logData"
+        :option="logOption"
+        @row-save="saveLog"
+        @row-update="saveUpdateLog"
+        @row-del="removeLog"
+        :page.sync="logPage"
+        @size-change="logSizeChange"
+        @current-change="logCurrentChange"
+      >
+        <!-- <template slot="menuLeft">
+          <el-button @click="addNewLog" icon="el-icon-plus" type="primary" size="mini">添加</el-button>
+        </template>
+        <template slot="menu" slot-scope="{row}">
+          <el-button type="text" @click="editLogInfo(row.id)" icon="el-icon-edit" size="mini">修改</el-button>
+          <el-button type="text" @click="editLogInfo(row.id)" icon="el-icon-edit" size="mini">查看附件</el-button>
+        </template> -->
+      </avue-crud>
+    </el-drawer>
+    <!--新建 编辑分组dialog-->
+    <add-groups ref="addGroups" @refresh="refresh" :listAllPolicyTree="listAllPolicyTree"
+                :treeData="treeData" :data="worktypeData" :worktypeDic="worktypeDic"
+                :talentsList="talentsList"></add-groups>
     <PushService
       :visible.sync="PushServiceVisible"
       :rowData="selectPushServiceData"
     ></PushService>
+
+    <mission-view :visible.sync="viewDrawer" :model="view"></mission-view>
+
+    <work-view :visible.sync="workViewDrawer" :model="workViewModel"></work-view>
   </div>
 </template>
 
 <script>
 import {
+  addServeLog, detail,
+  getDepTree,
   getList,
-  remove,
-  update,
-  add,
-  detail,
-  getDept,
-  removeDept,
-  upload,
-  getServeListTalents,
-  getMatchWorkStation,
-  getMatchPolicy,
-  getMatchServeList,
   getListAllPolicy,
-  getListAllTalents,
-  addServeLog,
-  updateServeLog,
-  removeServeLog
+  getListAllTalents, getMatchPolicy, getMatchServeList, getMatchWorkStation,
+  getServeListTalents,
+  removeDept, removeServeLog, updateServeLog
 } from "@/api/tenant/serve";
-import {detail as missionDetail} from "@/api/tenant/mission";
-import {detail as workDetail} from "@/api/tenant/postzp";
-import {getLabelList, getWorkTypes} from "@/api/tenant/common";
 import {mapGetters} from "vuex";
-import addGroups from "./Dialog/addGroups";
-import transferGroups from "./Dialog/transferGroups";
-import Resume from "@/components/resume/index";
-import {check18IdCardNo, isvalidatemobile, isExcel} from "@/util/validate";
-import {getTemplate} from "@/api/resource/template";
-import ied from "@/views/util/import-error-dialog";
-import {excelAccept} from "@/common/accept";
+import addGroups from "./Dialog/addGroup";
+import {getLabelList} from "@/api/tenant/common";
 import missionView from "../../mission/Table/missionView.vue";
 import workView from "../../works/Table/missionView.vue"
-import {serviceType} from "@/common/dic";
-import Tinymce from "@/components/Tinymce";
-import {deepClone} from "@/util/util";
-import PushService from "@/views/tenant/main/serve/Dialog/pushService.vue";
 import TextTooltip from "@/components/text-tooltip/index.vue";
+import {serviceType} from "@/common/dic";
+import PushService from './Dialog/pushService.vue'
 
 const page = {
   pageSize: 10,
@@ -410,107 +237,39 @@ const page = {
   total: 0,
 }
 export default {
-  filters: {
-    ellipsis(value) {
-      if (!value) return "";
-      if (value.length > 15) {
-        return value.slice(0, 14) + "...";
-      }
-      return value;
-    },
-  },
-  name: "tenant_talents",
+  components: {addGroups, missionView, workView, TextTooltip, PushService},
   data() {
     return {
-      search: {
-        companyName: '',
-        name: ''
-      },
-      PushServiceVisible: false,
-      selectPushServiceData: null,
+      arr: [],
+      worktypeDic: {},
+      treeData: [],
+      loading: false,
+      tenantId: null,
+      page: Object.assign({}, page),
+      workPage: Object.assign({}, page),
+      dataSource: [],
+      tempWorkType: [],
+      talentsList: [],
+      query: {},
+      obj: {},
+      selectInfo: null,
+      innerDrawer1: false,
       viewDrawer: false,
       workViewDrawer: false,
-      view: {},
       workViewModel: {},
-      statusArr: {
-        0: "未启用",
-        1: "服务中",
-        2: "已完成",
-        3: "已关闭",
-      },
-      direction: 'rtl',
-      drawer: false,
-      innerDrawer1: false,
-      innerDrawer2: false,
-      innerDrawer3: false,
-      activeNames: "1",
-      isIndeterminate: false,
-      checkAll: false,
-      checked: false,
-      selectionList: [],
-      loading: true,
-      templateLoading: false,
-      query: {},
-      props: {
-        label: "groupName",
-        id: "id",
-      },
-      personTotal: 0,
-      treeData: [],
-      tenantId: "",
-      page: Object.assign({}, page),
-      tempWorkType: [],
-      worktypeDic: {},
-      arr: [],//////
-      excelOption: {
-        submitBtn: false,
-        emptyBtn: false,
-        column: [
-          {
-            label: "文件上传",
-            prop: "excelFile",
-            type: "upload",
-            drag: true,
-            loadText: "文件上传中，请稍等",
-            span: 24,
-            propsHttp: {
-              res: "data",
-            },
-            tip: "请上传 .xls,.xlsx 标准格式文件",
-            accept: excelAccept,
-            showFileList: false,
-            action: upload(),
-          },
-          {
-            label: "模板下载",
-            prop: "excelTemplate",
-            formslot: true,
-            span: 24,
-          },
-        ],
-      },
-      excelBox: false,
-      data: [],
-      visibleAudience: false,
-      selectInfo: null,
-      infoData: [],
+      view: {},
       workData: [],
       policyData: [],
-      logData: [],
-      infoPage: Object.assign({}, page),
-      workPage: Object.assign({}, page),
+      innerDrawer2: false,
       policyPage: Object.assign({}, page),
+      innerDrawer3: false,
+      logData: [],
       logPage: Object.assign({}, page),
-      obj: {},
-      excelForm: {isCovered: 1},
-      listAllPolicyTree: [],
-      selectPolicyTree: [],
-      talentsList: [],
       selectUserServeLog: null,
-    };
+      selectPushServiceData: null,
+      PushServiceVisible: false,
+    }
   },
-  components: {addGroups, transferGroups, Resume, ied, missionView, workView, Tinymce, PushService, TextTooltip},
-  watch: {},
   computed: {
     ...mapGetters(["permission", "userInfo"]),
     permissionList() {
@@ -521,13 +280,6 @@ export default {
         editBtn: this.vaildData(this.permission.tenant_main_serve_index_edit, false),
       };
     },
-    ids() {
-      let ids = [];
-      this.selectionList.forEach((ele) => {
-        ids.push(ele.id);
-      });
-      return ids.join(",");
-    },
     leftHeight: function () {
       //获取高度值
       if (document.getElementsByClassName("avue-crud__pagination")[0]) {
@@ -539,159 +291,66 @@ export default {
         return 725 + "px";
       }
     },
+    worktypeData() {
+      let rel = [];
+      for (let j = 0; j < this.arr.length; j++) {
+        const key = this.arr[j];
+        if (this.worktypeDic.hasOwnProperty(key)) {
+          rel.push({name: key})
+        }
+      }
+      // for (let i = 0; i < this.tempWorkType.length; i++) {
+      //   const key = this.tempWorkType[i];
+      //   if (key && !this.worktypeDic.hasOwnProperty(key)) {
+      //     rel.push({name: key});
+      //   }
+      // }
+      return rel;
+    },
     option() {
-      const self = this;
-      const IdCardNo = (rule, value, callback) => {
-        if (check18IdCardNo(value)) {
-          callback();
-        } else {
-          callback(new Error("身份证格式不正确"));
-        }
-      };
-      const validateTel = (rule, value, callback) => {
-        if (isvalidatemobile(value)[0]) {
-          callback(new Error(isvalidatemobile(value)[1]));
-        } else {
-          callback();
-        }
-      };
-      console.log(self.talentsList)
       return {
-        height: "auto",
-        dialogWidth: "60%",
-        calcHeight: 180,
-        align: "center",
-        menuAlign: "center",
-        tip: false,
-        columnBtn: false,
-        searchBtn: true,
-        searchShow: true,
-        addBtn: false,
-        viewBtn: true,
-        searchMenuSpan: 6,
-        border: true,
-        index: false,
-        indexLabel: "序号",
-        selection: true,
+        dialogWidth: "50%",
         dialogType: "drawer",
         dialogClickModal: false,
-        labelWidth: 120,
+        editBtn: false,
+        delBtn: false,
+        addBtn: false,
+        viewBtn: true,
+        border: true,
+        refreshBtn: false,
+        searchBtn: true,
+        searchShow: true,
+        searchMenuSpan: 6,
+        height: '100',
         column: [
           {
-            label: "机构名称",
-            prop: "companyName",
-            addDisplay: false,
-          },
-
-          {
-            label: "服务名称",
+            label: "姓名",
             prop: "name",
-            // search: true,
-            span: 24,
-            rules: [
-              {
-                required: true,
-                whitespace: true,
-                message: "请输入姓名",
-                trigger: "blur",
-              },
-            ],
-            slot: true
+            search: true,
+            searchLabelWidth: 50,
+            searchSpan: 7,
           },
           {
-            label: "服务分组",
-            prop: "groupId",
-            type: "tree",
-            span: 24,
-            display: true,
-            dicData: self.treeData,
-            hide: true,
-            props: {
-              label: "groupName",
-              value: "id",
-            },
-            rules: [
-              {
-                required: true,
-                message: "请选择分组",
-                trigger: "change",
-              },
-            ],
-            placeholder: "请选择 分组",
+            label: "身份证",
+            prop: "idNumber",
+            search: true,
+            searchLabelWidth: 60,
+            searchSpan: 7,
           },
           {
-            label: "政策指南",
-            prop: "policyIds",
-            // search: true,
-            span: 24,
-            hide: true,
-            // display: false,
-            formslot: true,
+            label: "手机号",
+            prop: "telphone",
           },
+          // {
+          //   label: "用户类型",
+          //   prop: "userId",
+          // },
           {
-            label: "用户类型",
-            prop: "userId",
-            type: "select",
-            dicData: [
-              {
-                value: "0",
-                label: "未注册用户",
-              },
-              {
-                value: "1",
-                label: "已注册用户",
-              },
-            ],
-            display: false,
-            hide: true,
-            // search: true
+            label: "身份标签",
+            prop: "labelsBase",
           },
-          {
-            label: "服务场景",
-            prop: "serveLabels",
-            rules: [
-              {
-                required: true,
-                message: "请选择标签",
-                trigger: ["blur"],
-              },
-            ],
-            slot: true,
-            formslot: true,
-          },
-          {
-            label: "重点人群",
-            prop: "talentsGroupId",
-            type: "select",
-            multiple: true,
-            hide: true,
-            display: true,
-            dicData: self.talentsList,
-            props: {
-              label: "groupName",
-              value: "id"
-            },
-            span: 24,
-          },
-          {
-            label: "服务状态",
-            prop: "status",
-            display: false,
-            span: 24,
-            slot: true,
-          },
-          {
-            label: "备注",
-            prop: "remarks",
-            type: "textarea",
-            slot: true,
-            hide: true,
-            span: 24,
-            maxlength: 100,
-            showWordLimit: true,
-          },
-        ],
-      };
+        ]
+      }
     },
     workOption() {
       return {
@@ -896,92 +555,234 @@ export default {
         }]
       }
     },
-    infoOption() {
-      return {
-        dialogWidth: "50%",
-        dialogType: "drawer",
-        dialogClickModal: false,
-        editBtn: false,
-        delBtn: false,
-        addBtn: false,
-        viewBtn: true,
-        border: true,
-        refreshBtn: false,
-        searchBtn: true,
-        searchShow: true,
-        searchMenuSpan: 6,
-        height: '100',
-        column: [
-          {
-            label: "姓名",
-            prop: "name",
-            search: true
-          },
-          {
-            label: "身份证",
-            prop: "idNumber",
-            search: true
-          },
-          {
-            label: "手机号",
-            prop: "telphone",
-          },
-          // {
-          //   label: "用户类型",
-          //   prop: "userId",
-          // },
-          {
-            label: "身份标签",
-            prop: "labelsBase",
-          },
-        ]
-      }
-    },
-    selectLabelNameTypes: {
-      get() {
-        if (!this.obj.serveLabels) {
-          return [];
-        }
-        const result = [];
-        const wt = this.obj.serveLabels ? this.obj.serveLabels.split(",") : [];
-        wt.forEach((item) => {
-          result.push({name: item});
-        });
-        return result;
-      },
-      set(val) {
-        const arr = [];
-        val.forEach((item) => {
-          arr.push(item.name);
-        });
-        this.obj.serveLabels = arr.join(",");
-      },
-    },
-    worktypeData() {
-      let rel = [];
-      for (let j = 0; j < this.arr.length; j++) {
-        const key = this.arr[j];
-        if (this.worktypeDic.hasOwnProperty(key)) {
-          rel.push({name: key})
-        }
-      }
-      for (let i = 0; i < this.tempWorkType.length; i++) {
-        const key = this.tempWorkType[i];
-        if (key && !this.worktypeDic.hasOwnProperty(key)) {
-          rel.push({name: key});
-        }
-      }
-      return rel;
-    },
   },
   created() {
     this.initDept();
-    // this.getWorkTypes();
-    this.getLabelList();
     this.getListAllPolicyTree()
+    this.getLabelList()
     this.ListAllTalents()
   },
   methods: {
+    /*点击分组加载相应人才列表*/
+    nodeClick(data) {
+      if (data.children) return;
+      this.selectInfo = data
+      this.tenantId = data.id ? data.id : "";
+      this.page.currentPage = 1;
+      this.onLoad(this.page, this.query);
+    },
+    /*加载分组*/
+    getLabelList() {
+      getLabelList().then((res) => {
+        const arr = res.data.data.flatMap(obj => obj.child.map(item => item.concatName));
+        this.arr = arr.map(concatName => {
+          this.worktypeDic[concatName] = 1;
+          return concatName;
+        });
+      });
+    },
+    async ListAllTalents() {
+      let resData = await getListAllTalents()
+      if (resData.data.code === 200) {
+        this.talentsList = resData.data.data
+      }
+    },
+    initDept(groupId) {
+      getDepTree().then((res) => {
+        const data = res.data.data.list.map((item) => ({
+          ...item,
+          disabled: true
+        }));
+        this.treeData = data;
+        // const column = this.findObject(this.option.column, "groupId");
+        // column.dicData = this.treeData;
+        if (groupId) {
+          this.$nextTick(function () {
+            this.$refs.tree.setCurrentKey(groupId);
+          }); //默认高亮
+          this.nodeClick({id: groupId});
+        } else {
+          if (this.treeData.length) {
+            const serveId2 = this.treeData[0].id
+            const serveId = this.treeData[0].children[0].id
+            this.$nextTick(function () {
+              this.$refs.tree.setCurrentKey(serveId);
+            }); //默认高亮第一个
+            this.nodeClick({id: serveId});
+          }
+        }
+        this.loading = false;
+      });
+    },
+    async getListAllPolicyTree() {
+      let resData = await getListAllPolicy({})
+      if (resData.data.code === 200) {
+        this.listAllPolicyTree = resData.data.data
+      }
+    },
+    updateGroups(type, data) {
+      this.$refs.addGroups.openDialog(type, data);
+    },
+    /*删除分组*/
+    removeGroups(data) {
+      //检验该分组是否存在人员,存在提示无法删除，不存在泽提示确定要删除此分组吗
+      const h = this.$createElement;
+      this.$confirm(
+        h("div", null, [
+          h("p", {style: "font-size: 16px"}, "您确定要删除此分组吗? "),
+          h("p", {style: "color: red"}, "一旦删除则无法找回"),
+        ]),
+        {
+          type: "warning",
+          showClose: false,
+          showCancelButton: true,
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          beforeClose: (action, instance, done) => {
+            if (action === "confirm") {
+              instance.confirmButtonLoading = true;
+              instance.cancelButtonLoading = true;
+              instance.closeOnPressEscape = false;
+              instance.closeOnClickModal = false;
+              setTimeout(() => {
+                done();
+                setTimeout(() => {
+                  instance.confirmButtonLoading = false;
+                  instance.cancelButtonLoading = false;
+                }, 300);
+              }, 1000);
+            } else {
+              done();
+            }
+          },
+        }
+      )
+        .then(() => {
+          removeDept(data.id).then(
+            () => {
+              this.$message({
+                type: "success",
+                message: "操作成功!",
+              });
+              this.refresh("del");
+            },
+            (error) => {
+              window.console.log(error);
+            }
+          );
+        })
+        .catch(() => {
+        });
+    },
+    /*加载人才列表 */
+    onLoad(page, params = {}) {
+      this.loading = true;
+      let paramsed = {
+        current: page.currentPage,
+        pageSize: page.pageSize,
+        id: this.tenantId,
+        ...params
+      }
+      getServeListTalents(paramsed).then((res) => {
+        const {records, current, size, total} = res.data.data
+        this.dataSource = records
+        this.loading = false;
+        console.log({
+          pageSize: size,
+          currentPage: current,
+          total: total,
+        })
+        this.page = {
+          pageSize: size,
+          currentPage: current,
+          total: total,
+        }
+        // this.selectionClear();
+      });
+    },
+    refresh(type) {
+      this.page.currentPage = 1;
+      this.query = {};
+      if (type === "del") {
+        //删除分组后重新选中分组为未分组
+        this.initDept();
+        // this.onLoad(this.page, this.query);
+      } else {
+        this.initDept(this.tenantId);
+        // this.onLoad(this.page, this.query);
+      }
+    },
+    serveSearchChange(params, done) {
+      this.page.currentPage = 1;
+      this.query = params
+      this.onLoad(this.page, this.query);
+      done();
+    },
+    serveResetChange() {
+      this.page.currentPage = 1;
+      this.query = {}
+      this.onLoad(this.page, this.query);
+    },
+    infoSizeChange(pageSize) {
+      this.onLoad(this.page, this.query);
+    },
+    infoCurrentChange(currentPage) {
+      this.onLoad(this.page, this.query);
+    },
+    // 匹配任务和岗位
+    matchWorkStation(row) {
+      getMatchWorkStation({
+        serveUserId: row.serveUserId,
+        serveId: this.selectInfo.id,
+        companyId: this.selectInfo.companyId
+      }).then(res => {
+        const {records, current, size, total} = res.data.data
+        this.innerDrawer1 = true
+        this.workData = records
+        this.workPage = {
+          pageSize: size,
+          currentPage: current,
+          total: total,
+        }
+      })
+    },
+    // 匹配政策
+    matchPolicy(row) {
+      console.log('匹配政策')
+      getMatchPolicy({id: row.id, serveId: this.selectInfo.id, serveUserId: row.serveUserId}).then(res => {
+        let _this = this;
+        const {records, current, size, total} = res.data.data
+        _this.policyData = records
+        _this.innerDrawer2 = true
+        _this.policyPage = {
+          pageSize: size,
+          currentPage: current,
+          total: total,
+        }
+      })
+    },
+    // 服务日志
+    serveLog(row) {
+      console.log('服务日志', row)
+      this.selectUserServeLog = row
+      getMatchServeList({
+        id: row.id,
+        serveId: this.selectInfo.id,
+        companyId: this.selectInfo.companyId,
+        current: this.logPage.currentPage,
+        size: this.logPage.pageSize
+      }).then(res => {
+        let _this = this;
+        const {records, current, size, total} = res.data.data
+        _this.logData = records
+        _this.innerDrawer3 = true
+        _this.logPage = {
+          pageSize: size,
+          currentPage: current,
+          total: total,
+        }
+      })
+    },
     async saveLog(row, index, done, loading) {
       let params = {
         ...row,
@@ -1039,10 +840,6 @@ export default {
           });
         });
     },
-    workSizeChange() {
-    },
-    workCurrentChange() {
-    },
     logSizeChange(pageSize) {
       this.logPage.pageSize = pageSize;
       this.serveLog(this.selectUserServeLog)
@@ -1051,615 +848,24 @@ export default {
       this.logPage.currentPage = currentPage;
       this.serveLog(this.selectUserServeLog)
     },
-    async ListAllTalents() {
-      let resData = await getListAllTalents()
-      if (resData.data.code === 200) {
-        this.talentsList = resData.data.data
-      }
+    workSizeChange() {
     },
-    selectPushService(row) {
-      console.log('点击')
-      detail(row.id).then((res) => {
+    workCurrentChange() {
+    },
+    policySizeChange() {
+    },
+    policyCurrentChange() {
+    },
+    selectPushService() {
+      detail(this.selectInfo.id).then((res) => {
         if (res.data.code === 200) {
           this.selectPushServiceData = res.data.data
           this.PushServiceVisible = true
         }
       })
-      // this.selectPushServiceData = deepClone(row)
+      // this.selectPushServiceData = deepClone(this.selectInfo)
       // this.PushServiceVisible = true
     },
-    handleChange(item) {
-      console.log(item)
-    },
-    async getListAllPolicyTree() {
-      let resData = await getListAllPolicy({})
-      if (resData.data.code === 200) {
-        this.listAllPolicyTree = resData.data.data
-      }
-    },
-    toPolicyDetail(row) {
-      console.log(row)
-      console.log()
-    },
-    clipStr(str) {
-      const clip = []
-      if (str && str.length > 50) {
-        for (let i = 0; i < Math.ceil(str.length / 50); i++) {
-          clip.push(str.slice(i * 50, i * 50 + 50))
-        }
-        return clip
-      }
-      return [str]
-    },
-    getLabelList() {
-      getLabelList().then((res) => {
-        const arr = res.data.data.flatMap(obj => obj.child.map(item => item.concatName));
-        this.arr = arr.map(concatName => {
-          this.worktypeDic[concatName] = 1;
-          return concatName;
-        });
-      });
-    },
-    showKeyAudience(row) {
-      this.selectInfo = row
-      this.getKeyAudience({
-        id: row.id
-      })
-      this.drawer = true;
-    },
-    getKeyAudience(params) {
-      const _this = this
-      return getServeListTalents(params).then((res) => {
-        if (res.data.code === 200) {
-          const {records, current, size, total} = res.data.data
-          _this.infoData = records
-          _this.visibleAudience = true
-          _this.infoPage = {
-            pageSize: size,
-            currentPage: current,
-            total: total,
-          }
-        }
-      })
-    },
-    infoSizeChange(pageSize) {
-      const {currentPage, total} = this.infoPage
-      this.getKeyAudience({
-        pageSize: pageSize,
-        current: currentPage,
-        total: total,
-        id: this.selectInfo.id
-      })
-    },
-    infoCurrentChange(currentPage) {
-      const {pageSize, total} = this.infoPage
-      this.getKeyAudience({
-        pageSize: pageSize,
-        current: currentPage,
-        total: total,
-        id: this.selectInfo.id
-      })
-    },
-    infoRefreshChange() {
-      const {currentPage, pageSize, total} = this.infoPage
-      this.getKeyAudience({
-        pageSize: pageSize,
-        current: currentPage,
-        total: total,
-        id: this.selectInfo.id
-      })
-    },
-    getWorkTypes() {
-
-      getWorkTypes(1).then((res) => {
-        for (let i = 0; i < res.data.data.length; i++) {
-          const element = res.data.data[i];
-          this.worktypeDic[element.name] = 1;
-          this.arr.push(element.name)
-        }
-      });
-    },
-    /*加载分组*/
-    initDept(groupId) {
-      getDept().then((res) => {
-        const data = res.data.data.list;
-        this.treeData = data;
-        let treeDataOne = {
-          companyId: "",
-          createTime: "",
-          groupName: "全部",
-          id: "",
-          remarks: "",
-          sort: '',
-          sumNum: res.data.data.sum,
-          type: '',
-        };
-        this.treeData.unshift(treeDataOne);
-        const column = this.findObject(this.option.column, "groupId");
-        column.dicData = this.treeData;
-        if (groupId) {
-          this.$nextTick(function () {
-            this.$refs.tree.setCurrentKey(groupId);
-          }); //默认高亮
-          this.nodeClick({id: groupId});
-        } else {
-          if (this.treeData.length) {
-            this.$nextTick(function () {
-              this.$refs.tree.setCurrentKey(this.treeData[0].id);
-            }); //默认高亮第一个
-            this.nodeClick({id: this.treeData[0].id});
-          }
-        }
-        this.personTotal = res.data.data.sum;
-        this.loading = false;
-      });
-    },
-    /*新建 编辑分组*/
-    updateGroups(type, data) {
-      this.$refs.addGroups.openDialog(type, data);
-    },
-    /*删除分组*/
-    removeGroups(data) {
-      //检验该分组是否存在人员,存在提示无法删除，不存在泽提示确定要删除此分组吗
-      const h = this.$createElement;
-      this.$confirm(
-        h("div", null, [
-          h("p", {style: "font-size: 16px"}, "您确定要删除此分组吗? "),
-          h("p", {style: "color: red"}, "一旦删除则无法找回"),
-        ]),
-        {
-          type: "warning",
-          showClose: false,
-          showCancelButton: true,
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          beforeClose: (action, instance, done) => {
-            if (action === "confirm") {
-              instance.confirmButtonLoading = true;
-              instance.cancelButtonLoading = true;
-              instance.closeOnPressEscape = false;
-              instance.closeOnClickModal = false;
-              setTimeout(() => {
-                done();
-                setTimeout(() => {
-                  instance.confirmButtonLoading = false;
-                  instance.cancelButtonLoading = false;
-                }, 300);
-              }, 1000);
-            } else {
-              done();
-            }
-          },
-        }
-      )
-        .then(() => {
-          removeDept(data.id).then(
-            () => {
-              this.$message({
-                type: "success",
-                message: "操作成功!",
-              });
-              this.refresh("del");
-            },
-            (error) => {
-              window.console.log(error);
-            }
-          );
-        })
-        .catch(() => {
-        });
-    },
-    /*批量转移分组 */
-    handleTransfer() {
-      if (this.selectionList.length === 0) {
-        this.$message.warning("请选择至少一条数据");
-        return;
-      }
-      this.$refs.transferGroups.openDialog();
-    },
-    /*点击分组加载相应人才列表*/
-    nodeClick(data) {
-      this.tenantId = data.id ? data.id : "";
-      this.page.currentPage = 1;
-      this.onLoad(this.page, this.query);
-    },
-    /*新增 编辑 转移  删除分组 更新人才后*/
-    refresh(type) {
-      this.page.currentPage = 1;
-      this.query = {};
-      if (type === "del") {
-        //删除分组后重新选中分组为未分组
-        this.initDept();
-        this.onLoad(this.page, this.query);
-      } else {
-        this.initDept(this.tenantId);
-        this.onLoad(this.page, this.query);
-      }
-    },
-    /*获取人才详情 */
-    beforeOpen(done, type) {
-      const self = this
-      if (["edit", "view", "add"].includes(type)) {
-        if (type === "edit" || type === "view") {
-          setTimeout(() => {
-            detail(this.obj.id).then(
-              (res) => {
-                this.obj = res.data.data;
-                this.tempWorkType = this.obj.serveLabels.split(",");
-                const policyIds = self.treeIteration(this.listAllPolicyTree, res.data.data.policyIds.split(','))
-                self.selectPolicyTree = policyIds
-                done();
-              },
-              (error) => {
-                window.console.log(error);
-              }
-            );
-          }, 0);
-        } else {
-          this.tempWorkType = [];
-          done();
-        }
-      }
-    },
-    treeIteration(tree, ids) {
-      if (!(tree.length && ids.length)) return;
-      let arr = []
-      tree.forEach((treeItem) => {
-        treeItem.child.forEach((item) => {
-          if (ids.some((id) => item.value === id)) {
-            arr.push([treeItem.value, item.value])
-          }
-        })
-      })
-      return arr;
-    },
-    /*新增人才*/
-    rowSave(row, done) {
-      let params = {
-        groupId: row.groupId,
-        name: row.name,
-        serveLabels: row.serveLabels,
-        remarks: row.remarks,
-        policyIds: this.selectPolicyTree.map((item) => item[1]).join(','),
-        talentsGroupId: row.talentsGroupId.join(',')
-      }
-      add(params).then(
-        () => {
-          this.$message({
-            type: "success",
-            message: "操作成功!",
-          });
-          done();
-          this.selectPolicyTree = []
-          this.refresh();
-        },
-        (error) => {
-          this.selectPolicyTree = []
-          window.console.log(error);
-          done();
-        }
-      );
-    },
-    /*编辑人才*/
-    rowUpdate(row, index, done) {
-
-      console.log(row)
-      update({
-        id: row.id,
-        groupId: row.groupId,
-        name: row.name,
-        serveLabels: row.serveLabels,
-        remarks: row.remarks,
-        policyIds: this.selectPolicyTree.map((item) => item[1]).join(','),
-        talentsGroupId: row.talentsGroupId
-      }).then(
-        () => {
-          done();
-          this.$message({
-            type: "success",
-            message: "操作成功!",
-          });
-          this.refresh();
-        },
-        (error) => {
-          window.console.log(error);
-          done();
-        }
-      );
-    },
-    /*删除人才 */
-    rowDel(row) {
-      const h = this.$createElement;
-      this.$confirm(
-        h("div", null, [
-          h("p", {style: "font-size: 16px"}, "您确定要删除此人才吗? "),
-          h("p", {style: "color: red"}, "一旦删除则无法找回"),
-        ]),
-        {
-          type: "warning",
-          showClose: false,
-          showCancelButton: true,
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          beforeClose: (action, instance, done) => {
-            if (action === "confirm") {
-              instance.confirmButtonLoading = true;
-              instance.cancelButtonLoading = true;
-              instance.closeOnPressEscape = false;
-              instance.closeOnClickModal = false;
-              setTimeout(() => {
-                done();
-                setTimeout(() => {
-                  instance.confirmButtonLoading = false;
-                  instance.cancelButtonLoading = false;
-                }, 300);
-              }, 1000);
-            } else {
-              done();
-            }
-          },
-        }
-      )
-        .then(() => {
-          remove(row.id).then(
-            () => {
-              this.$message({
-                type: "success",
-                message: "操作成功!",
-              });
-              this.refresh();
-            },
-            (error) => {
-              window.console.log(error);
-            }
-          );
-        })
-        .catch(() => {
-        });
-    },
-    /*批量删除人才*/
-    handleDelete() {
-      if (this.selectionList.length === 0) {
-        this.$message.warning("请选择至少一条数据");
-        return;
-      }
-      const h = this.$createElement;
-      this.$confirm(
-        h("div", null, [
-          h("p", {style: "font-size: 16px"}, "您确定要批量删除选中人才吗? "),
-        ]),
-        {
-          type: "warning",
-          showClose: false,
-          showCancelButton: true,
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          beforeClose: (action, instance, done) => {
-            if (action === "confirm") {
-              instance.confirmButtonLoading = true;
-              instance.cancelButtonLoading = true;
-              instance.closeOnPressEscape = false;
-              instance.closeOnClickModal = false;
-              setTimeout(() => {
-                done();
-                setTimeout(() => {
-                  instance.confirmButtonLoading = false;
-                  instance.cancelButtonLoading = false;
-                }, 300);
-              }, 1000);
-            } else {
-              done();
-            }
-          },
-        }
-      )
-        .then(() => {
-          remove(this.ids).then(
-            () => {
-              this.$message({
-                type: "success",
-                message: "操作成功!",
-              });
-              this.onLoad(this.page);
-              this.$refs.crud.toggleSelection();
-            },
-            (error) => {
-              window.console.log(error);
-            }
-          );
-        })
-        .catch(() => {
-        });
-    },
-    /*导入人才库*/
-    beforeAvatarUpload(file, done, loading) {
-      if (!isExcel(file)) {
-        loading();
-        this.$message.error("上传人才库信息只能是 .xls,.xlsx 标准格式文件!");
-      } else {
-        done();
-      }
-    },
-    uploadAfter(res, done) {
-      if (!(res instanceof Error) && !res.data) {
-        this.excelBox = false;
-      } else if (res.data && res.data.code === 900) {
-        const arr = [];
-        const data = res.data.data;
-        data.error &&
-        data.error.errorList.forEach((item) => {
-          arr.push(`${item.name} ${item.remarks}`);
-        });
-        data.auth &&
-        data.auth.authList.forEach((item) => {
-          arr.push(`${item.name} ${item.remarks}`);
-        });
-        this.$refs.ied.show(arr);
-      }
-      this.refreshChange();
-      this.initDept(this.tenantId);
-      done();
-    },
-    uploadError(error) {
-      if (error) {
-        this.$message.error(error);
-      }
-    },
-    handleImport() {
-      this.excelBox = true;
-    },
-    /*下载人才库模板 */
-    handleTemplate() {
-      this.templateLoading = true;
-      getTemplate("trc")
-        .then((rep) => {
-          this.templateLoading = false;
-          window.open(rep.data.data);
-        })
-        .catch(() => {
-          this.templateLoading = false;
-        });
-    },
-    /*人才列表切换页码 */
-    currentChange(currentPage) {
-      this.page.currentPage = currentPage;
-      this.refreshChange();
-    },
-    sizeChange(pageSize) {
-      this.page.pageSize = pageSize;
-      this.refreshChange();
-    },
-    refreshChange() {
-      this.onLoad(this.page, this.query);
-    },
-    /*搜索 */
-    searchReset() {
-      this.query = {};
-      this.onLoad(this.page);
-    },
-    searchChange(params, done) {
-      this.query = params;
-      this.page.currentPage = 1;
-      this.onLoad(this.page, params);
-      done();
-    },
-    serveSearchChange(params, done) {
-      console.log(params);
-      this.infoPage.currentPage = 1;
-      const {currentPage, pageSize} = this.infoPage
-      this.getKeyAudience({
-        current: currentPage,
-        pageSize,
-        id: this.selectInfo.id,
-        ...params
-      })
-      done();
-    },
-    searchReset1() {
-      this.query = {};
-      this.onLoad(this.page);
-    },
-    searchChange1() {
-      this.page.currentPage = 1;
-      this.onLoad(this.page, this.query);
-    },
-    /*人才列表多选 */
-    selectionChange(list) {
-      this.selectionList = list;
-    },
-    selectionClear() {
-      this.selectionList = [];
-      this.$refs.crud.toggleSelection();
-    },
-    /*加载人才列表 */
-    onLoad(page, params = {}) {
-      this.loading = true;
-      getList(
-        page.currentPage,
-        page.pageSize,
-        Object.assign(params, this.query),
-        this.tenantId
-      ).then((res) => {
-        const data = res.data.data;
-        this.page.total = data.total;
-        console.log(data.records)
-        this.data = data.records.map((item) => ({
-          ...item, talentsGroupId: item.talentsGroupId.split(',')
-        }));
-        this.loading = false;
-        this.selectionClear();
-      });
-    },
-    // 匹配任务和岗位
-    matchWorkStation(row) {
-      console.log('匹配任务和岗位')
-      getMatchWorkStation({
-        serveUserId: row.serveUserId,
-        serveId: this.selectInfo.id,
-        companyId: this.selectInfo.companyId
-      }).then(res => {
-        const {records, current, size, total} = res.data.data
-        this.innerDrawer1 = true
-        this.workData = records
-        this.workPage = {
-          pageSize: size,
-          currentPage: current,
-          total: total,
-        }
-      })
-    },
-    // 匹配政策
-    matchPolicy(row) {
-      console.log('匹配政策')
-      getMatchPolicy({id: row.id, serveId: this.selectInfo.id, serveUserId: row.serveUserId}).then(res => {
-        let _this = this;
-        const {records, current, size, total} = res.data.data
-        _this.policyData = records
-        _this.innerDrawer2 = true
-        _this.policyPage = {
-          pageSize: size,
-          currentPage: current,
-          total: total,
-        }
-      })
-    },
-    // 服务日志
-    serveLog(row) {
-      console.log('服务日志', row)
-      this.selectUserServeLog = row
-      getMatchServeList({
-        id: row.id,
-        serveId: this.selectInfo.id,
-        companyId: this.selectInfo.companyId,
-        current: this.logPage.currentPage,
-        size: this.logPage.pageSize
-      }).then(res => {
-        let _this = this;
-        const {records, current, size, total} = res.data.data
-        _this.logData = records
-        _this.innerDrawer3 = true
-        _this.logPage = {
-          pageSize: size,
-          currentPage: current,
-          total: total,
-        }
-      })
-    },
-    /**/
-    handleClose() {
-      this.drawer = false;
-      this.innerDrawer3 = false
-      this.infoData = null;
-    },
-    handleCloseWork() {
-      this.innerDrawer1 = false
-    },
-    handleClosePolicy() {
-      this.innerDrawer2 = false
-    },
-    handleCloseLog() {
-      this.innerDrawer3 = false
-    },
     /*查看*/
     toWorkMissionDetail(row) {
       if (row.type == 0) {
@@ -1675,78 +881,20 @@ export default {
       }
 
     },
-    // 启用服务
-    playServe(row) {
-      this.$confirm('是否确认启用该服务？', {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      }).then(() => {
-        return update({id: row.id, status: 1})
-      }).then(
-        () => {
-          this.$message({
-            type: "success",
-            message: "启用成功!",
-          });
-          this.refresh();
-        },
-        (error) => {
-          window.console.log(error);
-        })
+    clipStr(str) {
+      const clip = []
+      if (str && str.length > 50) {
+        for (let i = 0; i < Math.ceil(str.length / 50); i++) {
+          clip.push(str.slice(i * 50, i * 50 + 50))
+        }
+        return clip
+      }
+      return [str]
     },
-    pauseServe(row) {
-      this.$confirm('是否确认关闭该服务？', {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      }).then(() => {
-        return update({id: row.id, status: 0})
-      }).then(
-        () => {
-          this.$message({
-            type: "success",
-            message: "关闭成功!",
-          });
-          this.refresh();
-        },
-        (error) => {
-          window.console.log(error);
-        })
-    },
-    addNewLog() {
-      console.log('add log')
-      this.$router.push({name: '添加/修改日志log', params: {type: 'add', id: null}})
-    },
-    editLogInfo() {
-      console.log('edit log')
-      this.$router.push({name: '添加/修改日志log', params: {type: 'edit', id: null}})
-    }
-  },
-};
+  }
+}
 </script>
 
-<style scoped>
-.el-tree {
-  font-size: 14px;
-}
+<style lang="scss" scoped>
 
-.custom-tree-node {
-  flex: 1;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  font-size: 14px;
-  padding-right: 8px;
-}
-
-.el-form-item {
-  margin-bottom: 18px;
-  padding: 0 10px;
-}
-
-.searchBtn {
-  display: inline-block;
-  margin-bottom: 18px;
-}
 </style>
diff --git a/src/views/tenant/main/serve/Dialog/ServeDetail.vue b/src/views/tenant/main/serveCopy/Dialog/ServeDetail.vue
similarity index 100%
rename from src/views/tenant/main/serve/Dialog/ServeDetail.vue
rename to src/views/tenant/main/serveCopy/Dialog/ServeDetail.vue
diff --git a/src/views/tenant/main/serve/Dialog/addGroups.vue b/src/views/tenant/main/serveCopy/Dialog/addGroups.vue
similarity index 100%
rename from src/views/tenant/main/serve/Dialog/addGroups.vue
rename to src/views/tenant/main/serveCopy/Dialog/addGroups.vue
diff --git a/src/views/tenant/main/serve/Dialog/addLog.vue b/src/views/tenant/main/serveCopy/Dialog/addLog.vue
similarity index 100%
rename from src/views/tenant/main/serve/Dialog/addLog.vue
rename to src/views/tenant/main/serveCopy/Dialog/addLog.vue
diff --git a/src/views/tenant/main/serveCopy/Dialog/pushService.vue b/src/views/tenant/main/serveCopy/Dialog/pushService.vue
new file mode 100644
index 0000000..aba6d21
--- /dev/null
+++ b/src/views/tenant/main/serveCopy/Dialog/pushService.vue
@@ -0,0 +1,594 @@
+<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" width="500" 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" size="largeXXL" 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"
+                     @current-change="rightCurrentPageChange" @size-change="rightSizePageChange"
+                     @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>
+            <template slot="address" slot-scope="{row}">
+              <TextTooltip :content="row.address" length="40"></TextTooltip>
+            </template>
+          </avue-crud>
+          <CustomLoading :visible="rightLoading" size="largeXXL" 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 ? '推送岗位' : '推送政策' }}
+      </el-button>
+    </div>
+  </el-drawer>
+</template>
+
+<script>
+import {
+  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 CustomLoading from "@/components/Custom-Loading/index.vue";
+
+const pages = {pagerCount: 3, total: 0, size: 10, currentPage: 1}
+const baseOptions = {
+  size: 'medium',
+  dateBtn: false,
+  addBtn: false,
+  editBtn: false,
+  delBtn: false,
+  height: "auto",
+  reserveSelection: false,
+  border: true,
+  columnBtn: false,
+  refreshBtn: false,
+  menu: false,
+  tip: false,
+  selection: true,
+  align: 'center',
+}
+let leftUserOptions = {
+  ...baseOptions,
+  column: [
+    {
+      label: '机构名称',
+      prop: 'companyName',
+      fixed: true,
+    }, {
+      label: '姓名',
+      prop: 'name',
+      fixed: true,
+    }, {
+      label: '姓别',
+      prop: 'aac004',
+      type: 'select',
+      dicUrl: "/api/jobslink-api/system/dict-biz/tadict?code=AAC004",
+      props: {
+        label: "dictValue",
+        value: "dictKey",
+      },
+      rules: [
+        {
+          required: true,
+          message: "请输入性别",
+          trigger: "blur",
+        },
+      ],
+    }, {
+      label: '身份证',
+      prop: 'idNumber',
+      width: 150,
+    }, {
+      label: '手机号',
+      prop: 'telphone',
+    }, {
+      label: "求职意愿",
+      prop: "willingJob",
+    }, {
+      label: "民族",
+      prop: "aac005",
+      type: 'select',
+      dicUrl: "/api/jobslink-api/system/dict-biz/tadict?code=AAC005",
+      props: {
+        label: "dictValue",
+        value: "dictKey",
+      },
+      rules: [
+        {
+          required: true,
+          message: "请输入民族",
+          trigger: "blur",
+        },
+      ],
+    }, {
+      label: "户口性质",
+      prop: "aac009",
+      type: 'select',
+      dicUrl: "/api/jobslink-api/system/dict-biz/tadict?code=AAC009",
+      props: {
+        label: "dictValue",
+        value: "dictKey",
+      },
+      rules: [
+        {
+          required: true,
+          message: "请输入户口性质",
+          trigger: "blur",
+        },
+      ],
+    }, {
+      label: "户口所在地",
+      prop: "aac010",
+      width: 150,
+    }, {
+      label: "文化程度",
+      prop: "aac011",
+      type: 'select',
+      dicUrl: "/api/jobslink-api/system/dict-biz/tadict?code=AAC011",
+      props: {
+        label: "dictValue",
+        value: "dictKey",
+      },
+      rules: [
+        {
+          required: true,
+          message: "请输入文化程度",
+          trigger: "blur",
+        },
+      ],
+    }, {
+      label: '个人标签',
+      prop: 'labelsBase',
+      width: 150,
+      slot: true,
+    },
+  ]
+}
+let rightPolicyOptions = {
+  ...baseOptions,
+  column: [{
+    label: '政策名称',
+    prop: 'name',
+  }, {
+    label: '政策标签',
+    prop: 'labelName',
+    slot: true,
+  }]
+}
+let rightPostOptions = {
+  ...baseOptions,
+  column: [
+    {
+      label: '岗位名称',
+      prop: 'jobName',
+    }, {
+      label: '用工单位',
+      prop: 'companyName',
+    }, {
+      label: '详细地址',
+      prop: 'address',
+      slot: true,
+    }, {
+      label: '岗位描述',
+      prop: 'jobDescription',
+      slot: true,
+    }, {
+      label: "岗位类型",
+      prop: "type1",
+      type: "select",
+      dicData: [
+        {
+          value: "0",
+          label: "零工岗位",
+        },
+        {
+          value: "1",
+          label: "全职岗位",
+        },
+      ],
+      display: false,
+      hide: true,
+    },
+  ]
+}
+export default {
+  components: {TextTooltip, CustomLoading},
+  data() {
+    return {
+      formInline: {},
+      leftServeOptions: [],
+      leftUserDataList: [],
+      leftUserPages: {},
+      leftUserSelections: [],
+      leftPages: Object.assign({}, pages),
+      leftUserOptions: Object.assign({}, leftUserOptions),
+      leftLoading: false,
+      rightLoading: false,
+      rightDataList: [],
+      rightDataSelections: [],
+      rightPages: Object.assign({}, pages),
+      rightPolicyOptions: Object.assign({}, rightPolicyOptions),
+      rightPostOptions: Object.assign({}, rightPostOptions),
+      searchInput: '',
+      rightTabs: 0, // 0： 政策， 1： 岗位
+      pushState: false,
+    }
+  },
+  props: {
+    visible: Boolean,
+    rowData: {default: null, type: Function},
+    changeVisible: {default: null, type: Function},
+  },
+  computed: {
+    viewDrawer: {
+      get() {
+        return this.visible;
+      },
+      set(val) {
+        this.$emit("update:visible", val);
+      },
+    },
+  },
+  watch: {
+    viewDrawer(val) {
+      val ? this.onPageLoad() : this.onPageInit()
+    }
+  },
+  methods: {
+    onPageLoad() {
+      console.log('row', this.rowData)
+      if (!this.rowData) return
+      this.getLeftSignGroupList()
+      this.getLeftUserList()
+      // this.getRightListPolicy()
+    },
+    onPageInit() {
+      this.formInline = {}
+      this.leftServeOptions = []
+      this.leftUserDataList = []
+      this.leftUserSelections = []
+      this.leftUserPages = Object({}, pages)
+      this.leftPages = Object.assign({}, pages)
+      this.leftUserOptions = Object.assign({}, leftUserOptions)
+      this.leftLoading = false
+      this.rightLoading = false
+      this.rightDataList = []
+      this.rightDataSelections = []
+      this.rightPages = Object.assign({}, pages)
+      this.rightPolicyOptions = Object.assign({}, rightPolicyOptions)
+      this.rightPostOptions = Object.assign({}, rightPostOptions)
+      this.searchInput = ''
+      this.rightTabs = 0 // 0： 政策
+      this.pushState = false
+      this.$refs.crud1.selectClear()
+      this.$refs.crud2.selectClear()
+    },
+    changeTabs(type) {
+      this.rightDataList = []
+      this.rightTabs = type
+      this.rightDataSelections = []
+      this.$message.success('智能分析匹配中');
+
+      type === 0 && this.getRightListPolicy()
+      type === 1 && this.getRightSearchByUserId()
+    },
+    searchInputChange: debounce(function (val) {
+      this.getRightSearch()
+    }, 1000),
+    leftSearch() {
+      this.leftPages.currentPage = 1
+      this.getLeftUserList('serveCopy')
+      console.log('leftpages:', this.leftPages)
+    },
+    leftCurrentPageChange(current) {
+      this.leftPages.currentPage = current
+      this.getLeftUserList()
+      console.log('leftpages:', this.leftPages)
+    },
+    leftSizePageChange(current) {
+      this.leftPages.size = current
+      this.getLeftUserList()
+      console.log('leftpages:', this.leftPages)
+    },
+    rightCurrentPageChange(current) {
+      this.rightPages.currentPage = current
+      this.rightTabs === 0 && this.getRightListPolicy()
+      this.rightTabs === 1 && this.getRightSearchByUserId()
+    },
+    rightSizePageChange(current) {
+      this.rightPages.size = current
+      this.rightTabs === 0 && this.getRightListPolicy()
+      this.rightTabs === 1 && this.getRightSearchByUserId()
+    },
+    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) {
+        this.pushPolicyAndUser()
+      } else {
+        this.pushPostAndUser()
+      }
+    },
+    groupNameChange() {
+      this.getLeftUserList('serveCopy')
+    },
+    async pushPostAndUser() {
+      this.pushState = true
+      const createTime = Date.now() + 2000
+      // console.log(this.rightDataSelections,);
+      let params = {
+        serveId: this.rowData.id,
+        posts: this.rightDataSelections.map((item) => ({id: item.id, type: item.type1, jobName: item.jobName})),
+        users: this.leftUserSelections.map((item) => ({
+          idNumber: item.idNumber,
+          talentsId: item.id,
+          userId: item.userId,
+          userName: item.name
+        }))
+      }
+      console.log(params, "999999999999999999999999999");
+      let resData = await pushPostUserServe(params)
+      if (resData.data.code === 200) {
+        const timed = createTime - Date.now() > 0 ? createTime - Date.now() : 0
+        setTimeout(() => {
+          this.$message.success('岗位推送成功')
+          this.$refs.crud1.selectClear()
+          this.$refs.crud2.selectClear()
+          this.pushState = false
+        }, timed)
+
+      }
+    },
+    async pushPolicyAndUser() {
+      this.pushState = true
+      const createTime = Date.now() + 2000
+      let params = {
+        serveId: this.rowData.id,
+        policyIds: this.rightDataSelections.map((item) => item.id),
+        users: this.leftUserSelections.map((item) => ({
+          idNumber: item.idNumber,
+          talentsId: item.id,
+          userId: item.userId,
+          userName: item.name
+        }))
+      }
+      let resData = await pushPolicyUserServe(params)
+      if (resData.data.code === 200) {
+        const timed = createTime - Date.now() > 0 ? createTime - Date.now() : 0
+        setTimeout(() => {
+          this.$message.success('政策推送成功')
+          this.$refs.crud1.selectClear()
+          this.$refs.crud2.selectClear()
+          this.pushState = false
+        }, timed)
+      }
+    },
+    async getRightSearch() {
+      let params = {keywords: this.searchInput || '1'}
+      const createTime = Date.now() + 3000
+      this.rightLoading = true
+      let resData = await getSearchAll(params)
+      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 getRightSearchByUserId() {
+      const {currentPage, size} = this.rightPages
+      const idNumbers = this.leftUserSelections.map(item => item.idNumber).join(',');
+      const willingJobs = this.leftUserSelections.map(item => item.willingJob);
+      const createTime = Date.now() + 3000
+      this.rightLoading = true
+      let params = {
+        idNumbers,
+        current: currentPage,
+        size,
+      }
+      let paramsBody = {
+        willingJobs: willingJobs
+      }
+      console.log(params, paramsBody)
+      let resData = await getSearchAllByUserId(params, paramsBody)
+      if (resData.data.code === 200) {
+        const timed = createTime - Date.now() > 0 ? createTime - Date.now() : 0
+        setTimeout(() => {
+          const {records, total, size, current} = resData.data.data
+          this.rightLoading = false
+          this.rightDataList = records
+          this.rightPages = {total, size, currentPage: current}
+        }, timed)
+      }
+    },
+    async getRightListPolicy() {
+      const {currentPage, size} = this.rightPages
+      let params = {
+        ids: this.rowData.policyIds,
+        current: currentPage,
+        size,
+      }
+      const createTime = Date.now() + 3000
+      this.rightLoading = true
+      let resData = await getListByids(params)
+      if (resData.data.code === 200) {
+        const timed = createTime - Date.now() > 0 ? createTime - Date.now() : 0
+        setTimeout(() => {
+          // const {records, total, size, current} = resData.data.data
+          this.rightLoading = false
+          // this.rightDataList = records
+          // this.rightPages = {total, size, currentPage: current}
+          this.rightPages = {total: resData.data.data.length, currentPage: 1}
+          this.rightDataList = resData.data.data
+        }, timed)
+      }
+    },
+    async getLeftUserList(type) {
+      const {currentPage, size} = this.leftPages
+      const createTime = Date.now() + 3000
+      let params = {
+        ...this.formInline,
+        current: currentPage,
+        size,
+        labels: this.rowData.talentsNames.join(','),
+        talentsGroupId: this.rowData.talentsGroupId
+      }
+      console.log('params', params)
+      // params.labels = '未分组'
+      this.leftLoading = true
+      let resData = await getListAllByPolicy(params)
+      if (resData.data.code === 200) {
+        const timed = createTime - Date.now() > 0 ? createTime - Date.now() : 0
+        setTimeout(() => {
+          const {records, total, size, current} = resData.data.data
+          this.leftUserDataList = records
+          this.leftPages = {total, size, currentPage: current}
+          console.log('leftpages:', this.leftPages)
+          this.leftLoading = false
+        }, timed)
+
+      }
+    },
+    async getLeftSignGroupList() {
+      const arr = this.rowData.talentsNames.map((v) => ({groupName: v, value: v}))
+      this.leftServeOptions = [{groupName: '全部'}, ...arr]
+      // let params = { labels: this.rowData.talentsNames.join(',') }
+      // params.labels = '未分组'
+      // let resData = await getListAllByPolicy(params)
+      // if ( resData.data.code === 200 ) {
+      //   this.leftServeOptions = [{groupName: '全部', value: ''}, ...resData.data.data]
+      // }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.content {
+  display: grid;
+  grid-template-columns: calc(50% - 40px) 80px  calc(50% - 80px);
+  grid-gap: 20px;
+
+  .content-left {
+  }
+
+  .content-center {
+    width: 100%;
+    height: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex-direction: column;
+  }
+
+  .content-right {
+
+    //修改动画的大小  给文字加粗效果
+    .right-search {
+      width: 100%;
+    }
+
+  }
+
+  .leftInput {
+    width: 500px;
+
+    .selectWidth {
+      width: 160px !important;
+    }
+
+    .el-input__inner {
+      width: 300px;
+    }
+
+    .input-search {
+      margin-right: -15px;
+      margin-bottom: -10px;
+    }
+  }
+
+}
+
+/deep/ .el-loading-spinner {
+  font-size: 80px;
+  font-weight: bold;
+}
+
+/deep/ .el-loading-spinner .circular {
+  width: 80px;
+  height: 80px;
+}
+
+.content-footer {
+  float: right;
+}
+
+.relative {
+  position: relative;
+}
+</style>
diff --git a/src/views/tenant/main/serve/Dialog/transferGroups.vue b/src/views/tenant/main/serveCopy/Dialog/transferGroups.vue
similarity index 100%
rename from src/views/tenant/main/serve/Dialog/transferGroups.vue
rename to src/views/tenant/main/serveCopy/Dialog/transferGroups.vue
diff --git a/src/views/tenant/main/serveCopy/index.vue b/src/views/tenant/main/serveCopy/index.vue
new file mode 100644
index 0000000..c597018
--- /dev/null
+++ b/src/views/tenant/main/serveCopy/index.vue
@@ -0,0 +1,1752 @@
+<template>
+  <div>
+    <el-row>
+      <el-col :span="5">
+        <basic-container>
+          <p>服务分组管理</p>
+          <div class="box" :style="{ height: leftHeight }">
+            <el-scrollbar style="height: 100%">
+              <el-tree ref="tree" node-key="id" highlight-current :expand-on-click-node="false" @node-click="nodeClick"
+                       :data="treeData" :props="props">
+              <span class="custom-tree-node" slot-scope="{ node, data }" style="width: 80%">
+                <span style="
+                    flex-basis: 80%;
+                    overflow: hidden;
+                    white-space: nowrap;
+                    text-overflow: ellipsis;
+                    flex-shrink: 1;
+                  ">
+                  {{ node.label }}
+                  （{{ data.sumNum }}个）
+                </span>
+                <span v-show="data.id && data.id !== '0'" style="flex-basis: 20%">
+                  <el-button type="text" icon="el-icon-edit" size="mini"
+                             v-if="vaildData(permission.tenant_main_serve_index_groupedit, false)"
+                             @click="() => updateGroups('edit', data)">
+                  </el-button>
+                  <el-button icon="el-icon-delete" type="text" size="mini"
+                             v-if="vaildData(permission.tenant_main_serve_index_groupdel, false)"
+                             @click="() => removeGroups(data)">
+                  </el-button>
+                </span>
+              </span>
+              </el-tree>
+              <div class="footer" style="padding-left: 6px">
+                <el-button type="text" icon="el-icon-plus"
+                           v-if="vaildData(permission.tenant_main_serve_index_groupadd, false)"
+                           @click="updateGroups('add')">新建分组
+                </el-button>
+              </div>
+            </el-scrollbar>
+          </div>
+        </basic-container>
+      </el-col>
+      <el-col :span="19">
+        <basic-container>
+          <!--搜索栏-->
+          <el-form size="small" label-position="right" :inline="true" style="padding-left: 10px; padding-right: 10px">
+            <el-row :span="24">
+              <el-form-item label="机构名称:">
+                <el-input v-model="query.companyName" placeholder="机构名称" clearable></el-input>
+              </el-form-item>
+              <el-form-item label="服务名称:">
+                <el-input v-model="query.name" placeholder="服务名称" clearable></el-input>
+              </el-form-item>
+
+              <div class="searchBtn">
+                <el-button type="primary" size="small" icon="el-icon-search" @click="searchChange1">搜 索</el-button>
+                <el-button size="small" icon="el-icon-delete" @click="searchReset1">清 空</el-button>
+              </div>
+            </el-row>
+          </el-form>
+          <!--/搜索栏-->
+          <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" v-model="obj"
+                     :permission="permissionList" :before-open="beforeOpen" @row-del="rowDel" @row-update="rowUpdate"
+                     @row-save="rowSave" @search-change="searchChange" @search-reset="searchReset"
+                     @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
+                     @refresh-change="refreshChange" class="customPage">
+            <!--自定义列-->
+            <template slot="worktypes" slot-scope="{ row }">
+              <el-tooltip effect="dark" :content="row.worktypes" placement="top">
+                <div slot="content">
+                  <div v-for="(item, index) in clipStr(row.worktypes)" :key="index">
+                    <div>{{ item }}</div>
+                  </div>
+                </div>
+                <div>{{ row.worktypes | ellipsis }}</div>
+              </el-tooltip>
+            </template>
+            <template slot="status" slot-scope="{ row }">
+              <div>
+              <span v-if="row.status == 1" style="color: green">
+                <b>{{ statusArr[row.status] }}</b>
+              </span>
+                <span v-if="row.status == 0" style="color: red">
+                <b>{{ statusArr[row.status] }}</b>
+              </span>
+              </div>
+            </template>
+            <template slot="resume" slot-scope="{ row }">
+              <div>
+                <el-button type="text" size="mini" @click="$refs.resume.openDialog(row)"
+                           v-if="row.userId && row.userId !== '0'">查看简历
+                </el-button>
+                <div v-else>暂无简历</div>
+              </div>
+            </template>
+            <template slot="serveLabels" slot-scope="{ row }">
+              <el-tooltip effect="dark" placement="top">
+                <div slot="content">
+                  <div v-for="(item, index) in clipStr(row.serveLabels)" :key="index">
+                    <div>{{ item }}</div>
+                  </div>
+                </div>
+                <span>{{
+                    row.serveLabels.length > 20 ? `${row.serveLabels.substring(0, 20)}...` : row.serveLabels
+                  }}</span>
+              </el-tooltip>
+            </template>
+            <!--/自定义列-->
+            <template slot="serveLabelsForm">
+              <tag-select v-model="selectLabelNameTypes" :prop="{ label: 'name', value: 'name' }" :data="worktypeData">
+              </tag-select>
+            </template>
+            <!--自定义按钮-->
+            <template slot="menuLeft">
+              <el-button type="primary" size="small" icon="el-icon-delete"
+                         @click="() => { $refs.crud.rowAdd(); selectPolicyTree = []}"
+                         v-if="vaildData(permission.tenant_main_serve_index_add, false)">
+                新增
+              </el-button>
+              <el-button type="danger" size="small" icon="el-icon-delete" @click="handleDelete"
+                         :disabled="!selectionList.length" plain
+                         v-show="vaildData(permission.tenant_talents_groupdelete, false)">
+                删除
+              </el-button>
+            </template>
+            <template slot="name" slot-scope="{row}">
+              <span>{{ row.name }}</span>
+              <!-- <span v-else>{{ row.name }}（<span style="color: red;">未实名</span>）</span> -->
+            </template>
+            <template slot="policyIdsForm" slot-scope="{row}">
+              <el-cascader
+                v-model="selectPolicyTree"
+                :options="listAllPolicyTree"
+                :props="{ expandTrigger: 'hover', multiple: true, label: 'name', value: 'value', children: 'child'}"
+                @change="handleChange"
+                filterable
+              ></el-cascader>
+            </template>
+            <!--/自定义按钮-->
+            <template slot-scope="{row,index}" slot="menu">
+              <el-button type="text"
+                         icon="el-icon-document"
+                         size="small"
+                         v-show="vaildData(permission.tenant_main_serve_index_pushserve, false)"
+                         @click="selectPushService(row)"
+              >推送服务
+              </el-button>
+              <el-button type="text"
+                         icon="el-icon-document"
+                         size="small"
+                         @click="showKeyAudience(row)"
+              >服务详情
+              </el-button>
+              <el-button type="text"
+                         v-if="row.status == 0"
+                         icon="el-icon-video-play"
+                         size="small"
+                         v-show="vaildData(permission.tenant_main_serve_index_off, false)"
+                         @click="playServe(row)"
+              >启用
+              </el-button>
+              <el-button type="text"
+                         v-if="row.status == 1"
+                         icon="el-icon-video-pause"
+                         size="small"
+                         v-show="vaildData(permission.tenant_main_serve_index_off, false)"
+                         @click="pauseServe(row)"
+              >关闭
+              </el-button>
+            </template>
+            <template slot="talentsNamesForm" slot-scope="{row}">
+              <el-button type="text"
+                         v-if="row.status == 1"
+                         icon="el-icon-video-pause"
+                         size="small"
+                         @click="pauseServe(row)"
+              >关闭
+              </el-button>
+            </template>
+            <!--/父子表-->
+          </avue-crud>
+
+          <!--批量导入-->
+          <el-dialog title="导入" append-to-body :visible.sync="excelBox" :close-on-click-modal="false" width="555px">
+            <avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter"
+                       :upload-before="beforeAvatarUpload" :upload-error="uploadError">
+              <template slot="excelTemplate">
+                <el-button type="primary" @click="handleTemplate()" :loading="templateLoading">
+                  点击下载
+                  <i class="el-icon-download el-icon--right"></i>
+                </el-button>
+              </template>
+            </avue-form>
+          </el-dialog>
+          <!--/批量导入-->
+          <!--新建 编辑分组dialog-->
+          <add-groups ref="addGroups" @refresh="refresh" :treeData="treeData"></add-groups>
+          <!--/新建 编辑分组dialog-->
+          <!--转移分组dialog-->
+          <transfer-groups ref="transferGroups" @refresh="refresh" :ids="ids"></transfer-groups>
+          <!--/转移分组dialog-->
+          <resume ref="resume" v-show="false"></resume>
+        </basic-container>
+        <ied ref="ied"></ied>
+      </el-col>
+
+    </el-row>
+    <!-- <serveCopy-detail ref="copy" @back="backIndex" v-show="false"></serveCopy-detail> -->
+    <el-drawer
+      size="85%"
+      append-to-body
+      title="服务详情"
+      :visible.sync="drawer"
+      :direction="direction"
+      :before-close="handleClose">
+      <avue-crud
+        :data="infoData"
+        :option="infoOption"
+        :search.sync="search"
+        :page.sync="infoPage"
+        @search-change="serveSearchChange"
+        @search-reset="serveResetChange"
+        @size-change="infoSizeChange"
+        @current-change="infoCurrentChange"
+      >
+        <template slot-scope="{row,index}" slot="menu">
+          <el-button type="text"
+                     icon="el-icon-document"
+                     size="small"
+                     @click="matchWorkStation(row)"
+          >匹配任务/岗位
+          </el-button>
+          <el-button type="text"
+                     icon="el-icon-document"
+                     size="small"
+                     @click="matchPolicy(row)"
+          >匹配政策
+          </el-button>
+          <el-button type="text"
+                     icon="el-icon-document"
+                     size="small"
+                     @click="serveLog(row)"
+          >服务日志
+          </el-button>
+        </template>
+      </avue-crud>
+      <el-drawer
+        title="匹配任务/岗位"
+        size="80%"
+        :append-to-body="true"
+        :before-close="handleCloseWork"
+        :visible.sync="innerDrawer1">
+        <avue-crud
+          :data="workData"
+          :option="workOption"
+          :page.sync="workPage"
+          @size-change="workSizeChange"
+          @current-change="workCurrentChange"
+        >
+          <template slot="missionDesc" slot-scope="{ row }">
+            <TextTooltip :content="row.missionDesc"></TextTooltip>
+          </template>
+          <template slot-scope="{row,index}" slot="menu">
+            <el-button type="text"
+                       icon="el-icon-document"
+                       size="small"
+                       @click="toWorkMissionDetail(row)"
+            >查看详情
+            </el-button>
+          </template>
+        </avue-crud>
+      </el-drawer>
+      <el-drawer
+        title="匹配政策"
+        size="80%"
+        :append-to-body="true"
+        :before-close="handleClosePolicy"
+        :visible.sync="innerDrawer2">
+        <avue-crud
+          :data="policyData"
+          :option="policyOption"
+          :page.sync="policyPage"
+          @size-change="policySizeChange"
+          @current-change="policyCurrentChange"
+        >
+          <template slot="policyContent" slot-scope="{ row }">
+            <el-tooltip class="item" effect="dark" placement="top-start">
+              <div slot="content">
+                <div v-for="(item, index) in clipStr(row.policyContent)" :key="index">
+                  <div>{{ item }}</div>
+                </div>
+              </div>
+              <span>{{ row.policyContent.length > 50 ? row.policyContent.substring(0, 50) : row.policyContent }}</span>
+            </el-tooltip>
+          </template>
+          <template slot="labelName" slot-scope="{ row }">
+            <el-tooltip class="item" effect="dark" placement="top-start">
+              <div slot="content">
+                <div v-for="(item, index) in clipStr(row.labelName)" :key="index">
+                  <div>{{ item }}</div>
+                </div>
+              </div>
+              <span>{{ row.labelName.length > 50 ? row.labelName.substring(0, 50) : row.labelName }}</span>
+            </el-tooltip>
+          </template>
+          <template slot="labelNameForm" slot-scope="{row}">
+            <div>
+              <el-tag style="margin: 4px 10px" v-for="(item, index) in row.labelName.split(',')" :key="index">{{
+                  item
+                }}
+              </el-tag>
+            </div>
+          </template>
+
+          <template slot="guidelineContentForm" slot-scope="{row}">
+            <div>
+              <Tinymce v-model="row.guidelineContent" :visibleToolbar="false" :visibleMenubar="false"></Tinymce>
+            </div>
+          </template>
+          <template slot="policyContentForm" slot-scope="{row}">
+            <div>
+              <Tinymce v-model="row.policyContent" :visibleToolbar="false" :visibleMenubar="false"></Tinymce>
+            </div>
+          </template>
+
+        </avue-crud>
+      </el-drawer>
+      <el-drawer
+        title="服务日志"
+        size="80%"
+        :append-to-body="true"
+        :before-close="handleCloseLog"
+        :visible.sync="innerDrawer3">
+        <!-- <div>
+          <span>姓名：</span>
+          <span>身份证号：</span>
+        </div> -->
+        <avue-crud
+          :data="logData"
+          :option="logOption"
+          @row-save="saveLog"
+          @row-update="saveUpdateLog"
+          @row-del="removeLog"
+          :page.sync="logPage"
+          @size-change="logSizeChange"
+          @current-change="logCurrentChange"
+        >
+          <!-- <template slot="menuLeft">
+            <el-button @click="addNewLog" icon="el-icon-plus" type="primary" size="mini">添加</el-button>
+          </template>
+          <template slot="menu" slot-scope="{row}">
+            <el-button type="text" @click="editLogInfo(row.id)" icon="el-icon-edit" size="mini">修改</el-button>
+            <el-button type="text" @click="editLogInfo(row.id)" icon="el-icon-edit" size="mini">查看附件</el-button>
+          </template> -->
+        </avue-crud>
+      </el-drawer>
+    </el-drawer>
+    <mission-view :visible.sync="viewDrawer" :model="view"></mission-view>
+    <work-view :visible.sync="workViewDrawer" :model="workViewModel"></work-view>
+    <PushService
+      :visible.sync="PushServiceVisible"
+      :rowData="selectPushServiceData"
+    ></PushService>
+  </div>
+</template>
+
+<script>
+import {
+  getList,
+  remove,
+  update,
+  add,
+  detail,
+  getDept,
+  removeDept,
+  upload,
+  getServeListTalents,
+  getMatchWorkStation,
+  getMatchPolicy,
+  getMatchServeList,
+  getListAllPolicy,
+  getListAllTalents,
+  addServeLog,
+  updateServeLog,
+  removeServeLog
+} from "@/api/tenant/serve";
+import {detail as missionDetail} from "@/api/tenant/mission";
+import {detail as workDetail} from "@/api/tenant/postzp";
+import {getLabelList, getWorkTypes} from "@/api/tenant/common";
+import {mapGetters} from "vuex";
+import addGroups from "./Dialog/addGroups";
+import transferGroups from "./Dialog/transferGroups";
+import Resume from "@/components/resume/index";
+import {check18IdCardNo, isvalidatemobile, isExcel} from "@/util/validate";
+import {getTemplate} from "@/api/resource/template";
+import ied from "@/views/util/import-error-dialog";
+import {excelAccept} from "@/common/accept";
+import missionView from "../../mission/Table/missionView.vue";
+import workView from "../../works/Table/missionView.vue"
+import {serviceType} from "@/common/dic";
+import Tinymce from "@/components/Tinymce";
+import {deepClone} from "@/util/util";
+import PushService from "@/views/tenant/main/serveCopy/Dialog/pushService.vue";
+import TextTooltip from "@/components/text-tooltip/index.vue";
+
+const page = {
+  pageSize: 10,
+  currentPage: 1,
+  total: 0,
+}
+export default {
+  filters: {
+    ellipsis(value) {
+      if (!value) return "";
+      if (value.length > 15) {
+        return value.slice(0, 14) + "...";
+      }
+      return value;
+    },
+  },
+  name: "tenant_talents",
+  data() {
+    return {
+      search: {
+        companyName: '',
+        name: ''
+      },
+      PushServiceVisible: false,
+      selectPushServiceData: null,
+      viewDrawer: false,
+      workViewDrawer: false,
+      view: {},
+      workViewModel: {},
+      statusArr: {
+        0: "未启用",
+        1: "服务中",
+        2: "已完成",
+        3: "已关闭",
+      },
+      direction: 'rtl',
+      drawer: false,
+      innerDrawer1: false,
+      innerDrawer2: false,
+      innerDrawer3: false,
+      activeNames: "1",
+      isIndeterminate: false,
+      checkAll: false,
+      checked: false,
+      selectionList: [],
+      loading: true,
+      templateLoading: false,
+      query: {},
+      props: {
+        label: "groupName",
+        id: "id",
+      },
+      personTotal: 0,
+      treeData: [],
+      tenantId: "",
+      page: Object.assign({}, page),
+      tempWorkType: [],
+      worktypeDic: {},
+      arr: [],//////
+      excelOption: {
+        submitBtn: false,
+        emptyBtn: false,
+        column: [
+          {
+            label: "文件上传",
+            prop: "excelFile",
+            type: "upload",
+            drag: true,
+            loadText: "文件上传中，请稍等",
+            span: 24,
+            propsHttp: {
+              res: "data",
+            },
+            tip: "请上传 .xls,.xlsx 标准格式文件",
+            accept: excelAccept,
+            showFileList: false,
+            action: upload(),
+          },
+          {
+            label: "模板下载",
+            prop: "excelTemplate",
+            formslot: true,
+            span: 24,
+          },
+        ],
+      },
+      excelBox: false,
+      data: [],
+      visibleAudience: false,
+      selectInfo: null,
+      infoData: [],
+      workData: [],
+      policyData: [],
+      logData: [],
+      infoPage: Object.assign({}, page),
+      workPage: Object.assign({}, page),
+      policyPage: Object.assign({}, page),
+      logPage: Object.assign({}, page),
+      obj: {},
+      excelForm: {isCovered: 1},
+      listAllPolicyTree: [],
+      selectPolicyTree: [],
+      talentsList: [],
+      selectUserServeLog: null,
+    };
+  },
+  components: {addGroups, transferGroups, Resume, ied, missionView, workView, Tinymce, PushService, TextTooltip},
+  watch: {},
+  computed: {
+    ...mapGetters(["permission", "userInfo"]),
+    permissionList() {
+      return {
+        addBtn: this.vaildData(this.permission.tenant_main_serve_index_add, false),
+        viewBtn: true,
+        delBtn: this.vaildData(this.permission.tenant_main_serve_index_del, false),
+        editBtn: this.vaildData(this.permission.tenant_main_serve_index_edit, false),
+      };
+    },
+    ids() {
+      let ids = [];
+      this.selectionList.forEach((ele) => {
+        ids.push(ele.id);
+      });
+      return ids.join(",");
+    },
+    leftHeight: function () {
+      //获取高度值
+      if (document.getElementsByClassName("avue-crud__pagination")[0]) {
+        let pageHeight = document.getElementsByClassName(
+          "avue-crud__pagination"
+        )[0].offsetTop;
+        return pageHeight - 105 + "px";
+      } else {
+        return 725 + "px";
+      }
+    },
+    option() {
+      const self = this;
+      const IdCardNo = (rule, value, callback) => {
+        if (check18IdCardNo(value)) {
+          callback();
+        } else {
+          callback(new Error("身份证格式不正确"));
+        }
+      };
+      const validateTel = (rule, value, callback) => {
+        if (isvalidatemobile(value)[0]) {
+          callback(new Error(isvalidatemobile(value)[1]));
+        } else {
+          callback();
+        }
+      };
+      console.log(self.talentsList)
+      return {
+        height: "auto",
+        dialogWidth: "60%",
+        calcHeight: 180,
+        align: "center",
+        menuAlign: "center",
+        tip: false,
+        columnBtn: false,
+        searchBtn: true,
+        searchShow: true,
+        addBtn: false,
+        viewBtn: true,
+        searchMenuSpan: 6,
+        border: true,
+        index: false,
+        indexLabel: "序号",
+        selection: true,
+        dialogType: "drawer",
+        dialogClickModal: false,
+        labelWidth: 120,
+        column: [
+          {
+            label: "机构名称",
+            prop: "companyName",
+            addDisplay: false,
+          },
+
+          {
+            label: "服务名称",
+            prop: "name",
+            // search: true,
+            span: 24,
+            rules: [
+              {
+                required: true,
+                whitespace: true,
+                message: "请输入姓名",
+                trigger: "blur",
+              },
+            ],
+            slot: true
+          },
+          {
+            label: "服务分组",
+            prop: "groupId",
+            type: "tree",
+            span: 24,
+            display: true,
+            dicData: self.treeData,
+            hide: true,
+            props: {
+              label: "groupName",
+              value: "id",
+            },
+            rules: [
+              {
+                required: true,
+                message: "请选择分组",
+                trigger: "change",
+              },
+            ],
+            placeholder: "请选择 分组",
+          },
+          {
+            label: "政策指南",
+            prop: "policyIds",
+            // search: true,
+            span: 24,
+            hide: true,
+            // display: false,
+            formslot: true,
+          },
+          {
+            label: "用户类型",
+            prop: "userId",
+            type: "select",
+            dicData: [
+              {
+                value: "0",
+                label: "未注册用户",
+              },
+              {
+                value: "1",
+                label: "已注册用户",
+              },
+            ],
+            display: false,
+            hide: true,
+            // search: true
+          },
+          {
+            label: "服务场景",
+            prop: "serveLabels",
+            rules: [
+              {
+                required: true,
+                message: "请选择标签",
+                trigger: ["blur"],
+              },
+            ],
+            slot: true,
+            formslot: true,
+          },
+          {
+            label: "重点人群",
+            prop: "talentsGroupId",
+            type: "select",
+            multiple: true,
+            hide: true,
+            display: true,
+            dicData: self.talentsList,
+            props: {
+              label: "groupName",
+              value: "id"
+            },
+            span: 24,
+          },
+          {
+            label: "服务状态",
+            prop: "status",
+            display: false,
+            span: 24,
+            slot: true,
+          },
+          {
+            label: "备注",
+            prop: "remarks",
+            type: "textarea",
+            slot: true,
+            hide: true,
+            span: 24,
+            maxlength: 100,
+            showWordLimit: true,
+          },
+        ],
+      };
+    },
+    workOption() {
+      return {
+        editBtn: false,
+        delBtn: false,
+        addBtn: false,
+        border: true,
+        index: true,
+        indexLabel: "序号",
+        refreshBtn: false,
+        height: '100',
+        column: [{
+          label: "名称",
+          prop: "missionTitle",
+        }, {
+          label: "描述",
+          prop: "missionDesc",
+          slot: true
+        }]
+      }
+    },
+    policyOption() {
+      return {
+        editBtn: false,
+        delBtn: false,
+        addBtn: false,
+        border: true,
+        index: true,
+        indexLabel: "序号",
+        refreshBtn: false,
+        height: '100',
+        viewBtn: true,
+        dialogType: "drawer",
+        column: [{
+          label: '政策名称',
+          prop: 'name'
+        },
+          {
+            label: "政策级别",
+            prop: "level",
+            span: 12,
+            hide: true,
+          },
+          {
+            label: "政策文号",
+            prop: "number",
+            span: 12,
+            hide: true,
+          },
+          {
+            label: "发文机构",
+            prop: "issuingAuthority",
+            span: 12,
+            hide: true,
+          },
+          {
+            label: "分组",
+            prop: "groupId",
+            type: "tree",
+            hide: true,
+            span: 12,
+            display: true,
+            placeholder: "请选择 分组",
+          },
+          {
+            label: "有效性",
+            prop: "status",
+            type: "tree",
+            span: 12,
+            hide: true,
+            display: true,
+            dicData: [{name: "有效", value: 1}, {name: "无效", value: 0}],
+            props: {
+              label: "name",
+              value: "value",
+            },
+          },
+          {
+            label: "服务类型",
+            prop: "stype",
+            type: "tree",
+            span: 12,
+            display: true,
+            hide: true,
+            dicData: serviceType,
+            props: {
+              label: "label",
+              value: "value",
+            },
+            rules: [
+              {
+                required: true,
+                message: "请选择服务类型",
+                trigger: "change",
+              },
+            ],
+            placeholder: "请选择 服务类型",
+          },
+          {
+            label: "发文字号",
+            prop: "issuingNumber",
+            hide: true,
+            span: 12,
+            // row: true,
+            maxlength: 50,
+            showWordLimit: true,
+          },
+          {
+            label: "类别",
+            prop: "category",
+            span: 12,
+            hide: true,
+            maxlength: 50,
+            showWordLimit: true,
+          },
+          {
+            label: "标签",
+            prop: "labelName",
+            hide: false,
+            formslot: true,
+            span: 24,
+          },
+          {
+            label: "政策文件名",
+            prop: "policyFileName",
+            hide: true,
+            span: 24,
+          },
+          {
+            label: '政策内容',
+            prop: 'policyContent',
+            slot: true,
+            hide: true,
+            formslot: true,
+            span: 24,
+          },
+          {
+            label: "指南文件名",
+            prop: "guidelineFileName",
+            hide: true,
+            span: 24,
+            maxlength: 50,
+            showWordLimit: true,
+          },
+          {
+            label: "指南内容",
+            prop: "guidelineContent",
+            hide: true,
+            formslot: true,
+            span: 24,
+          },
+          {
+            label: "备注",
+            prop: "remarks",
+            type: "textarea",
+            hide: true,
+            span: 24,
+            maxlength: 100,
+            showWordLimit: true,
+          },
+        ]
+      }
+    },
+    logOption() {
+      return {
+        editBtn: true,
+        delBtn: true,
+        addBtn: true,
+        viewBtn: true,
+        border: true,
+        index: true,
+        indexLabel: "序号",
+        refreshBtn: false,
+        dialogType: "drawer",
+        height: '100',
+        column: [{
+          label: '服务时间',
+          prop: 'createTime',
+          type: 'date',
+          format: "yyyy-MM-dd",
+          valueFormat: "yyyy-MM-dd HH:mm:ss",
+        }, {
+          label: '服务发起人',
+          prop: 'fromName',
+          display: false,
+        }, {
+          label: '服务对象',
+          prop: 'toName',
+          display: false,
+        }, {
+          label: '服务主题',
+          prop: 'serveTheme'
+        }, {
+          label: '服务内容',
+          span: 24,
+          prop: 'serveContent'
+        }, {
+          label: '备注说明',
+          span: 24,
+          type: 'textarea',
+          prop: 'bak1'
+        }]
+      }
+    },
+    infoOption() {
+      return {
+        dialogWidth: "50%",
+        dialogType: "drawer",
+        dialogClickModal: false,
+        editBtn: false,
+        delBtn: false,
+        addBtn: false,
+        viewBtn: true,
+        border: true,
+        refreshBtn: false,
+        searchBtn: true,
+        searchShow: true,
+        searchMenuSpan: 6,
+        height: '100',
+        column: [
+          {
+            label: "姓名",
+            prop: "name",
+            search: true
+          },
+          {
+            label: "身份证",
+            prop: "idNumber",
+            search: true
+          },
+          {
+            label: "手机号",
+            prop: "telphone",
+          },
+          // {
+          //   label: "用户类型",
+          //   prop: "userId",
+          // },
+          {
+            label: "身份标签",
+            prop: "labelsBase",
+          },
+        ]
+      }
+    },
+    selectLabelNameTypes: {
+      get() {
+        if (!this.obj.serveLabels) {
+          return [];
+        }
+        const result = [];
+        const wt = this.obj.serveLabels ? this.obj.serveLabels.split(",") : [];
+        wt.forEach((item) => {
+          result.push({name: item});
+        });
+        return result;
+      },
+      set(val) {
+        const arr = [];
+        val.forEach((item) => {
+          arr.push(item.name);
+        });
+        this.obj.serveLabels = arr.join(",");
+      },
+    },
+    worktypeData() {
+      let rel = [];
+      for (let j = 0; j < this.arr.length; j++) {
+        const key = this.arr[j];
+        if (this.worktypeDic.hasOwnProperty(key)) {
+          rel.push({name: key})
+        }
+      }
+      for (let i = 0; i < this.tempWorkType.length; i++) {
+        const key = this.tempWorkType[i];
+        if (key && !this.worktypeDic.hasOwnProperty(key)) {
+          rel.push({name: key});
+        }
+      }
+      return rel;
+    },
+  },
+  created() {
+    this.initDept();
+    // this.getWorkTypes();
+    this.getLabelList();
+    this.getListAllPolicyTree()
+    this.ListAllTalents()
+  },
+  methods: {
+    async saveLog(row, index, done, loading) {
+      let params = {
+        ...row,
+        serveId: this.selectInfo.id,
+        serveUserId: this.selectUserServeLog.serveUserId,
+        talentsId: this.selectUserServeLog.id,
+        idNumber: this.selectUserServeLog.idNumber,
+        toName: this.selectUserServeLog.name,
+        fromName: this.userInfo.real_name
+      }
+      let resData = await addServeLog(params)
+      done()
+      if (resData.data.code === 200) {
+        this.$message({
+          type: "success",
+          message: "添加成功!",
+        });
+        this.serveLog(this.selectUserServeLog)
+      }
+    },
+    async saveUpdateLog(row, index, done, loading) {
+      let params = {
+        id: row.id,
+        createTime: row.createTime,
+        fromName: row.fromName,
+        toName: row.toName,
+        serveTheme: row.serveTheme,
+        serveContent: row.serveContent,
+        bak1: row.bak1,
+      }
+      let resData = await updateServeLog(params)
+      done()
+      if (resData.data.code === 200) {
+        this.$message({
+          type: "success",
+          message: "修改成功!",
+        });
+        this.serveLog(this.selectUserServeLog)
+      }
+    },
+    removeLog(row, index, done, loading) {
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          return removeServeLog({ids: row.id});
+        })
+        .then(() => {
+          this.serveLog(this.selectUserServeLog)
+          this.$message({
+            type: "success",
+            message: "操作成功!",
+          });
+        });
+    },
+    workSizeChange() {
+    },
+    workCurrentChange() {
+    },
+    logSizeChange(pageSize) {
+      this.logPage.pageSize = pageSize;
+      this.serveLog(this.selectUserServeLog)
+    },
+    logCurrentChange(currentPage) {
+      this.logPage.currentPage = currentPage;
+      this.serveLog(this.selectUserServeLog)
+    },
+    async ListAllTalents() {
+      let resData = await getListAllTalents()
+      if (resData.data.code === 200) {
+        this.talentsList = resData.data.data
+      }
+    },
+    selectPushService(row) {
+      console.log('点击')
+      detail(row.id).then((res) => {
+        if (res.data.code === 200) {
+          this.selectPushServiceData = res.data.data
+          this.PushServiceVisible = true
+        }
+      })
+      // this.selectPushServiceData = deepClone(row)
+      // this.PushServiceVisible = true
+    },
+    handleChange(item) {
+      console.log(item)
+    },
+    async getListAllPolicyTree() {
+      let resData = await getListAllPolicy({})
+      if (resData.data.code === 200) {
+        this.listAllPolicyTree = resData.data.data
+      }
+    },
+    toPolicyDetail(row) {
+      console.log(row)
+      console.log()
+    },
+    clipStr(str) {
+      const clip = []
+      if (str && str.length > 50) {
+        for (let i = 0; i < Math.ceil(str.length / 50); i++) {
+          clip.push(str.slice(i * 50, i * 50 + 50))
+        }
+        return clip
+      }
+      return [str]
+    },
+    getLabelList() {
+      getLabelList().then((res) => {
+        const arr = res.data.data.flatMap(obj => obj.child.map(item => item.concatName));
+        this.arr = arr.map(concatName => {
+          this.worktypeDic[concatName] = 1;
+          return concatName;
+        });
+      });
+    },
+    showKeyAudience(row) {
+      this.selectInfo = row
+      this.getKeyAudience({
+        id: row.id
+      })
+      this.drawer = true;
+    },
+    getKeyAudience(params) {
+      const _this = this
+      return getServeListTalents(params).then((res) => {
+        if (res.data.code === 200) {
+          const {records, current, size, total} = res.data.data
+          _this.infoData = records
+          _this.visibleAudience = true
+          _this.infoPage = {
+            pageSize: size,
+            currentPage: current,
+            total: total,
+          }
+        }
+      })
+    },
+    infoSizeChange(pageSize) {
+      const {currentPage, total} = this.infoPage
+      this.getKeyAudience({
+        pageSize: pageSize,
+        current: currentPage,
+        total: total,
+        id: this.selectInfo.id
+      })
+    },
+    infoCurrentChange(currentPage) {
+      const {pageSize, total} = this.infoPage
+      this.getKeyAudience({
+        pageSize: pageSize,
+        current: currentPage,
+        total: total,
+        id: this.selectInfo.id
+      })
+    },
+    infoRefreshChange() {
+      const {currentPage, pageSize, total} = this.infoPage
+      this.getKeyAudience({
+        pageSize: pageSize,
+        current: currentPage,
+        total: total,
+        id: this.selectInfo.id
+      })
+    },
+    getWorkTypes() {
+
+      getWorkTypes(1).then((res) => {
+        for (let i = 0; i < res.data.data.length; i++) {
+          const element = res.data.data[i];
+          this.worktypeDic[element.name] = 1;
+          this.arr.push(element.name)
+        }
+      });
+    },
+    /*加载分组*/
+    initDept(groupId) {
+      getDept().then((res) => {
+        const data = res.data.data.list;
+        this.treeData = data;
+        let treeDataOne = {
+          companyId: "",
+          createTime: "",
+          groupName: "全部",
+          id: "",
+          remarks: "",
+          sort: '',
+          sumNum: res.data.data.sum,
+          type: '',
+        };
+        this.treeData.unshift(treeDataOne);
+        const column = this.findObject(this.option.column, "groupId");
+        column.dicData = this.treeData;
+        if (groupId) {
+          this.$nextTick(function () {
+            this.$refs.tree.setCurrentKey(groupId);
+          }); //默认高亮
+          this.nodeClick({id: groupId});
+        } else {
+          if (this.treeData.length) {
+            this.$nextTick(function () {
+              this.$refs.tree.setCurrentKey(this.treeData[0].id);
+            }); //默认高亮第一个
+            this.nodeClick({id: this.treeData[0].id});
+          }
+        }
+        this.personTotal = res.data.data.sum;
+        this.loading = false;
+      });
+    },
+    /*新建 编辑分组*/
+    updateGroups(type, data) {
+      this.$refs.addGroups.openDialog(type, data);
+    },
+    /*删除分组*/
+    removeGroups(data) {
+      //检验该分组是否存在人员,存在提示无法删除，不存在泽提示确定要删除此分组吗
+      const h = this.$createElement;
+      this.$confirm(
+        h("div", null, [
+          h("p", {style: "font-size: 16px"}, "您确定要删除此分组吗? "),
+          h("p", {style: "color: red"}, "一旦删除则无法找回"),
+        ]),
+        {
+          type: "warning",
+          showClose: false,
+          showCancelButton: true,
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          beforeClose: (action, instance, done) => {
+            if (action === "confirm") {
+              instance.confirmButtonLoading = true;
+              instance.cancelButtonLoading = true;
+              instance.closeOnPressEscape = false;
+              instance.closeOnClickModal = false;
+              setTimeout(() => {
+                done();
+                setTimeout(() => {
+                  instance.confirmButtonLoading = false;
+                  instance.cancelButtonLoading = false;
+                }, 300);
+              }, 1000);
+            } else {
+              done();
+            }
+          },
+        }
+      )
+        .then(() => {
+          removeDept(data.id).then(
+            () => {
+              this.$message({
+                type: "success",
+                message: "操作成功!",
+              });
+              this.refresh("del");
+            },
+            (error) => {
+              window.console.log(error);
+            }
+          );
+        })
+        .catch(() => {
+        });
+    },
+    /*批量转移分组 */
+    handleTransfer() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning("请选择至少一条数据");
+        return;
+      }
+      this.$refs.transferGroups.openDialog();
+    },
+    /*点击分组加载相应人才列表*/
+    nodeClick(data) {
+      this.tenantId = data.id ? data.id : "";
+      this.page.currentPage = 1;
+      this.onLoad(this.page, this.query);
+    },
+    /*新增 编辑 转移  删除分组 更新人才后*/
+    refresh(type) {
+      this.page.currentPage = 1;
+      this.query = {};
+      if (type === "del") {
+        //删除分组后重新选中分组为未分组
+        this.initDept();
+        this.onLoad(this.page, this.query);
+      } else {
+        this.initDept(this.tenantId);
+        this.onLoad(this.page, this.query);
+      }
+    },
+    /*获取人才详情 */
+    beforeOpen(done, type) {
+      const self = this
+      if (["edit", "view", "add"].includes(type)) {
+        if (type === "edit" || type === "view") {
+          setTimeout(() => {
+            detail(this.obj.id).then(
+              (res) => {
+                this.obj = res.data.data;
+                this.tempWorkType = this.obj.serveLabels.split(",");
+                const policyIds = self.treeIteration(this.listAllPolicyTree, res.data.data.policyIds.split(','))
+                self.selectPolicyTree = policyIds
+                done();
+              },
+              (error) => {
+                window.console.log(error);
+              }
+            );
+          }, 0);
+        } else {
+          this.tempWorkType = [];
+          done();
+        }
+      }
+    },
+    treeIteration(tree, ids) {
+      if (!(tree.length && ids.length)) return;
+      let arr = []
+      tree.forEach((treeItem) => {
+        treeItem.child.forEach((item) => {
+          if (ids.some((id) => item.value === id)) {
+            arr.push([treeItem.value, item.value])
+          }
+        })
+      })
+      return arr;
+    },
+    /*新增人才*/
+    rowSave(row, done) {
+      let params = {
+        groupId: row.groupId,
+        name: row.name,
+        serveLabels: row.serveLabels,
+        remarks: row.remarks,
+        policyIds: this.selectPolicyTree.map((item) => item[1]).join(','),
+        talentsGroupId: row.talentsGroupId.join(',')
+      }
+      add(params).then(
+        () => {
+          this.$message({
+            type: "success",
+            message: "操作成功!",
+          });
+          done();
+          this.selectPolicyTree = []
+          this.refresh();
+        },
+        (error) => {
+          this.selectPolicyTree = []
+          window.console.log(error);
+          done();
+        }
+      );
+    },
+    /*编辑人才*/
+    rowUpdate(row, index, done) {
+
+      console.log(row)
+      update({
+        id: row.id,
+        groupId: row.groupId,
+        name: row.name,
+        serveLabels: row.serveLabels,
+        remarks: row.remarks,
+        policyIds: this.selectPolicyTree.map((item) => item[1]).join(','),
+        talentsGroupId: Array.isArray(row.talentsGroupId) ? row.talentsGroupId.join(',') : row.talentsGroupId
+      }).then(
+        () => {
+          done();
+          this.$message({
+            type: "success",
+            message: "操作成功!",
+          });
+          this.refresh();
+        },
+        (error) => {
+          window.console.log(error);
+          done();
+        }
+      );
+    },
+    /*删除人才 */
+    rowDel(row) {
+      const h = this.$createElement;
+      this.$confirm(
+        h("div", null, [
+          h("p", {style: "font-size: 16px"}, "您确定要删除此人才吗? "),
+          h("p", {style: "color: red"}, "一旦删除则无法找回"),
+        ]),
+        {
+          type: "warning",
+          showClose: false,
+          showCancelButton: true,
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          beforeClose: (action, instance, done) => {
+            if (action === "confirm") {
+              instance.confirmButtonLoading = true;
+              instance.cancelButtonLoading = true;
+              instance.closeOnPressEscape = false;
+              instance.closeOnClickModal = false;
+              setTimeout(() => {
+                done();
+                setTimeout(() => {
+                  instance.confirmButtonLoading = false;
+                  instance.cancelButtonLoading = false;
+                }, 300);
+              }, 1000);
+            } else {
+              done();
+            }
+          },
+        }
+      )
+        .then(() => {
+          remove(row.id).then(
+            () => {
+              this.$message({
+                type: "success",
+                message: "操作成功!",
+              });
+              this.refresh();
+            },
+            (error) => {
+              window.console.log(error);
+            }
+          );
+        })
+        .catch(() => {
+        });
+    },
+    /*批量删除人才*/
+    handleDelete() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning("请选择至少一条数据");
+        return;
+      }
+      const h = this.$createElement;
+      this.$confirm(
+        h("div", null, [
+          h("p", {style: "font-size: 16px"}, "您确定要批量删除选中人才吗? "),
+        ]),
+        {
+          type: "warning",
+          showClose: false,
+          showCancelButton: true,
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          beforeClose: (action, instance, done) => {
+            if (action === "confirm") {
+              instance.confirmButtonLoading = true;
+              instance.cancelButtonLoading = true;
+              instance.closeOnPressEscape = false;
+              instance.closeOnClickModal = false;
+              setTimeout(() => {
+                done();
+                setTimeout(() => {
+                  instance.confirmButtonLoading = false;
+                  instance.cancelButtonLoading = false;
+                }, 300);
+              }, 1000);
+            } else {
+              done();
+            }
+          },
+        }
+      )
+        .then(() => {
+          remove(this.ids).then(
+            () => {
+              this.$message({
+                type: "success",
+                message: "操作成功!",
+              });
+              this.onLoad(this.page);
+              this.$refs.crud.toggleSelection();
+            },
+            (error) => {
+              window.console.log(error);
+            }
+          );
+        })
+        .catch(() => {
+        });
+    },
+    /*导入人才库*/
+    beforeAvatarUpload(file, done, loading) {
+      if (!isExcel(file)) {
+        loading();
+        this.$message.error("上传人才库信息只能是 .xls,.xlsx 标准格式文件!");
+      } else {
+        done();
+      }
+    },
+    uploadAfter(res, done) {
+      if (!(res instanceof Error) && !res.data) {
+        this.excelBox = false;
+      } else if (res.data && res.data.code === 900) {
+        const arr = [];
+        const data = res.data.data;
+        data.error &&
+        data.error.errorList.forEach((item) => {
+          arr.push(`${item.name} ${item.remarks}`);
+        });
+        data.auth &&
+        data.auth.authList.forEach((item) => {
+          arr.push(`${item.name} ${item.remarks}`);
+        });
+        this.$refs.ied.show(arr);
+      }
+      this.refreshChange();
+      this.initDept(this.tenantId);
+      done();
+    },
+    uploadError(error) {
+      if (error) {
+        this.$message.error(error);
+      }
+    },
+    handleImport() {
+      this.excelBox = true;
+    },
+    /*下载人才库模板 */
+    handleTemplate() {
+      this.templateLoading = true;
+      getTemplate("trc")
+        .then((rep) => {
+          this.templateLoading = false;
+          window.open(rep.data.data);
+        })
+        .catch(() => {
+          this.templateLoading = false;
+        });
+    },
+    /*人才列表切换页码 */
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
+      this.refreshChange();
+    },
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+      this.refreshChange();
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.query);
+    },
+    /*搜索 */
+    searchReset() {
+      this.query = {};
+      this.onLoad(this.page);
+    },
+    searchChange(params, done) {
+      this.query = params;
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    serveSearchChange(params, done) {
+      console.log(params);
+      this.infoPage.currentPage = 1;
+      const {currentPage, pageSize} = this.infoPage
+      this.getKeyAudience({
+        current: currentPage,
+        pageSize,
+        id: this.selectInfo.id,
+        ...params
+      })
+      done();
+    },
+    searchReset1() {
+      this.query = {};
+      this.onLoad(this.page);
+    },
+    searchChange1() {
+      this.page.currentPage = 1;
+      this.onLoad(this.page, this.query);
+    },
+    /*人才列表多选 */
+    selectionChange(list) {
+      this.selectionList = list;
+    },
+    selectionClear() {
+      this.selectionList = [];
+      this.$refs.crud.toggleSelection();
+    },
+    /*加载人才列表 */
+    onLoad(page, params = {}) {
+      this.loading = true;
+      getList(
+        page.currentPage,
+        page.pageSize,
+        Object.assign(params, this.query),
+        this.tenantId
+      ).then((res) => {
+        const data = res.data.data;
+        this.page.total = data.total;
+        console.log(data.records)
+        this.data = data.records.map((item) => ({
+          ...item, talentsGroupId: item.talentsGroupId.split(',')
+        }));
+        this.loading = false;
+        this.selectionClear();
+      });
+    },
+    // 匹配任务和岗位
+    matchWorkStation(row) {
+      console.log('匹配任务和岗位')
+      getMatchWorkStation({
+        serveUserId: row.serveUserId,
+        serveId: this.selectInfo.id,
+        companyId: this.selectInfo.companyId
+      }).then(res => {
+        const {records, current, size, total} = res.data.data
+        this.innerDrawer1 = true
+        this.workData = records
+        this.workPage = {
+          pageSize: size,
+          currentPage: current,
+          total: total,
+        }
+      })
+    },
+    // 匹配政策
+    matchPolicy(row) {
+      console.log('匹配政策')
+      getMatchPolicy({id: row.id, serveId: this.selectInfo.id, serveUserId: row.serveUserId}).then(res => {
+        let _this = this;
+        const {records, current, size, total} = res.data.data
+        _this.policyData = records
+        _this.innerDrawer2 = true
+        _this.policyPage = {
+          pageSize: size,
+          currentPage: current,
+          total: total,
+        }
+      })
+    },
+    // 服务日志
+    serveLog(row) {
+      console.log('服务日志', row)
+      this.selectUserServeLog = row
+      getMatchServeList({
+        id: row.id,
+        serveId: this.selectInfo.id,
+        companyId: this.selectInfo.companyId,
+        current: this.logPage.currentPage,
+        size: this.logPage.pageSize
+      }).then(res => {
+        let _this = this;
+        const {records, current, size, total} = res.data.data
+        _this.logData = records
+        _this.innerDrawer3 = true
+        _this.logPage = {
+          pageSize: size,
+          currentPage: current,
+          total: total,
+        }
+      })
+    },
+    /**/
+    handleClose() {
+      this.drawer = false;
+      this.innerDrawer3 = false
+      this.infoData = null;
+    },
+    handleCloseWork() {
+      this.innerDrawer1 = false
+    },
+    handleClosePolicy() {
+      this.innerDrawer2 = false
+    },
+    handleCloseLog() {
+      this.innerDrawer3 = false
+    },
+    /*查看*/
+    toWorkMissionDetail(row) {
+      if (row.type == 0) {
+        missionDetail(row.missionNo).then((res) => {
+          this.viewDrawer = true;
+          this.view = res;
+        });
+      } else if (row.type == 1) {
+        workDetail(row.id).then(res => {
+          this.workViewDrawer = true;
+          this.workViewModel = res;
+        })
+      }
+
+    },
+    // 启用服务
+    playServe(row) {
+      this.$confirm('是否确认启用该服务？', {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        return update({id: row.id, status: 1})
+      }).then(
+        () => {
+          this.$message({
+            type: "success",
+            message: "启用成功!",
+          });
+          this.refresh();
+        },
+        (error) => {
+          window.console.log(error);
+        })
+    },
+    pauseServe(row) {
+      this.$confirm('是否确认关闭该服务？', {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        return update({id: row.id, status: 0})
+      }).then(
+        () => {
+          this.$message({
+            type: "success",
+            message: "关闭成功!",
+          });
+          this.refresh();
+        },
+        (error) => {
+          window.console.log(error);
+        })
+    },
+    addNewLog() {
+      console.log('add log')
+      this.$router.push({name: '添加/修改日志log', params: {type: 'add', id: null}})
+    },
+    editLogInfo() {
+      console.log('edit log')
+      this.$router.push({name: '添加/修改日志log', params: {type: 'edit', id: null}})
+    }
+  },
+};
+</script>
+
+<style scoped>
+.el-tree {
+  font-size: 14px;
+}
+
+.custom-tree-node {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  font-size: 14px;
+  padding-right: 8px;
+}
+
+.el-form-item {
+  margin-bottom: 18px;
+  padding: 0 10px;
+}
+
+.searchBtn {
+  display: inline-block;
+  margin-bottom: 18px;
+}
+</style>
diff --git a/src/views/tenant/main/talents/certain/index.vue b/src/views/tenant/main/talents/certain/index.vue
index 1049b87..319c74a 100644
--- a/src/views/tenant/main/talents/certain/index.vue
+++ b/src/views/tenant/main/talents/certain/index.vue
@@ -93,6 +93,21 @@
             <span v-else>{{ row.name }}（<span style="color: red;">未实名</span>）</span> -->
 
           </template>
+          <template slot-scope="{row}" slot="menu">
+            <el-button type="text"
+                       icon="el-icon-document"
+                       size="small"
+                       @click="serveLog(row)"
+            >查看日志
+            </el-button>
+            <el-button type="text"
+                       icon="el-icon-circle-check"
+                       size="small"
+                       @click="checkUserInfo(row)"
+            >剔除
+            </el-button>
+          </template>
+
           <!--/自定义按钮-->
           <template slot="menuRight">
             <el-button
@@ -106,6 +121,37 @@
           </template>
         </avue-crud>
 
+        <el-drawer
+          title="服务日志"
+          size="80%"
+          :append-to-body="true"
+          :before-close="handleCloseLog"
+          :visible.sync="innerDrawerLog">
+          <!-- <div>
+            <span>姓名：</span>
+            <span>身份证号：</span>
+          </div> -->
+          <avue-crud
+            :data="logDataSource"
+            :option="logOption"
+            :page.sync="logPage"
+            :table-loading="loadingLog"
+            @row-save="saveLog"
+            @row-update="saveUpdateLog"
+            @row-del="removeLog"
+            @size-change="logSizeChange"
+            @current-change="logCurrentChange"
+          >
+            <!-- <template slot="menuLeft">
+              <el-button @click="addNewLog" icon="el-icon-plus" type="primary" size="mini">添加</el-button>
+            </template>
+            <template slot="menu" slot-scope="{row}">
+              <el-button type="text" @click="editLogInfo(row.id)" icon="el-icon-edit" size="mini">修改</el-button>
+              <el-button type="text" @click="editLogInfo(row.id)" icon="el-icon-edit" size="mini">查看附件</el-button>
+            </template> -->
+          </avue-crud>
+        </el-drawer>
+
         <!--批量导入-->
         <el-dialog title="导入" append-to-body :visible.sync="excelBox" :close-on-click-modal="false" width="555px">
           <avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter"
@@ -125,6 +171,28 @@
         <transfer-groups ref="transferGroups" @refresh="refresh" :ids="ids"></transfer-groups>
         <!--/转移分组dialog-->
         <resume ref="resume" v-show="false"></resume>
+
+        <PromptDialog
+          :visible="dialogFlag"
+          title="剔除"
+          :back-btn-hide="false"
+          submit-text="确 认"
+          sub-title="请核对人员信息后再进行审核通过，剔除该用户将从人群中删除，在人员服务日志中可见"
+          :tips="[
+            '人员信息描述不清晰或过于简单；',
+            '人员信息存在违法违规行为；',
+            '人员信息的薪资、福利等待遇不符合市场标准；',
+          ]"
+          @onClose="dialogFlag = false; backInput = ''"
+          @onConfirm="diaLogConfirm"
+        >
+          <template v-slot:header>
+            <div class="input_box" style="margin-top: 20px">
+              <el-input type="textarea" v-model="backInput" placeholder="请输入备注"></el-input>
+            </div>
+          </template>
+        </PromptDialog>
+
       </basic-container>
       <ied ref="ied"></ied>
     </el-col>
@@ -140,7 +208,9 @@ import {
   detail,
   getDept,
   removeDept,
-  upload, getDeptMyTree,
+  upload,
+  getDeptMyTree,
+  talentsEliminate
 } from "@/api/tenant/talents";
 import {getWorkTypes, getLabelList} from "@/api/tenant/common";
 import {mapGetters} from "vuex";
@@ -152,7 +222,14 @@ import {getTemplate, getTemplateRecommendExportList} from "@/api/resource/templa
 import ied from "@/views/util/import-error-dialog";
 import {excelAccept} from "@/common/accept";
 import TextTooltip from '@/components/text-tooltip'
+import {addServeLog, getMainServeUserLog, removeServeLog, updateServeLog} from "@/api/tenant/serve";
+import PromptDialog from "@/components/promptDialog/index.vue";
 
+let page = {
+  pageSize: 10,
+  currentPage: 1,
+  total: 0,
+}
 export default {
   filters: {
     ellipsis(value) {
@@ -166,6 +243,8 @@ export default {
   name: "tenant_talents",
   data() {
     return {
+      dialogFlag: false,
+      dialogInfo: null,
       downloadButton: false,
       activeNames: "1",
       isIndeterminate: false,
@@ -196,9 +275,15 @@ export default {
       obj: {},
       depTree: [],
       excelForm: {isCovered: 1},
+      logPage: Object.assign({}, page),
+      logDataSource: [],
+      loadingLog: false,
+      innerDrawerLog: false,
+      selectUserServeLog: null,
+      backInput: ''
     };
   },
-  components: {addGroups, transferGroups, Resume, ied, TextTooltip},
+  components: {addGroups, transferGroups, Resume, ied, TextTooltip, PromptDialog},
   watch: {},
   computed: {
     ...mapGetters(["permission"]),
@@ -256,6 +341,7 @@ export default {
         searchShow: true,
         viewBtn: true,
         searchMenuSpan: 6,
+        menuWidth: 170,
         border: true,
         index: false,
         indexLabel: "序号",
@@ -549,6 +635,45 @@ export default {
       }
       return rel;
     },
+    logOption() {
+      return {
+        editBtn: true,
+        delBtn: true,
+        addBtn: true,
+        viewBtn: true,
+        border: true,
+        index: true,
+        indexLabel: "序号",
+        refreshBtn: false,
+        dialogType: "drawer",
+        addBtnText: "新增日志",
+        height: '100',
+        column: [{
+          label: '服务时间',
+          prop: 'createTime',
+          type: 'date',
+          format: "yyyy-MM-dd",
+          valueFormat: "yyyy-MM-dd HH:mm:ss",
+        }, {
+          label: '服务发起人',
+          prop: 'fromName',
+          display: false,
+        }, {
+          label: '服务对象',
+          prop: 'toName',
+          display: false,
+        }, {
+          label: '服务主题',
+          prop: 'serveTheme'
+        }, {
+          label: '服务内容',
+          prop: 'serveContent'
+        }, {
+          label: '备注说明',
+          prop: 'bak1'
+        }]
+      }
+    }
   },
   created() {
     this.initDept();
@@ -557,6 +682,33 @@ export default {
     this.getDept()
   },
   methods: {
+    checkUserInfo(row) {
+      this.dialogInfo = row
+      this.dialogFlag = true
+    },
+    diaLogConfirm() {
+      if (!this.backInput) {
+        return this.$message.info('请输入剔除备注');
+      }
+      const params = {
+        idNumber: this.dialogInfo.idNumber,
+        content: this.backInput,
+        name: this.dialogInfo.name,
+      }
+      this.$confirm("确定将选择数据剔除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return talentsEliminate(params);
+        })
+        .then(() => {
+          this.onLoad(this.page, this.query);
+          this.dialogFlag = false
+          this.$message.success('操作成功');
+        });
+    },
     handleExport() {
       this.downloadButton = true
       // 0 潜在 1 已认定
@@ -1035,6 +1187,95 @@ export default {
         this.selectionClear();
       });
     },
+    async saveLog(row, index, done, loading) {
+      let params = {
+        ...row,
+        serveId: this.selectUserServeLog.serveId,
+        serveUserId: this.selectUserServeLog.serveUserId,
+        talentsId: this.selectUserServeLog.id,
+        idNumber: this.selectUserServeLog.idNumber,
+        toName: this.selectUserServeLog.name,
+        fromName: this.userInfo.real_name
+      }
+      console.log(params)
+      let resData = await addServeLog(params)
+      done()
+      if (resData.data.code === 200) {
+        this.$message({
+          type: "success",
+          message: "添加成功!",
+        });
+        this.serveLog(this.selectUserServeLog)
+      }
+    },
+    async saveUpdateLog(row, index, done, loading) {
+      let params = {
+        id: row.id,
+        createTime: row.createTime,
+        fromName: row.fromName,
+        toName: row.toName,
+        serveTheme: row.serveTheme,
+        serveContent: row.serveContent,
+        bak1: row.bak1,
+      }
+      let resData = await updateServeLog(params)
+      done()
+      if (resData.data.code === 200) {
+        this.$message({
+          type: "success",
+          message: "修改成功!",
+        });
+        this.serveLog(this.selectUserServeLog)
+      }
+    },
+    removeLog(row, index, done, loading) {
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          return removeServeLog({ids: row.id});
+        })
+        .then(() => {
+          this.serveLog(this.selectUserServeLog)
+          this.$message({
+            type: "success",
+            message: "操作成功!",
+          });
+        });
+    },
+    handleCloseLog() {
+      this.innerDrawerLog = false
+    },
+    logSizeChange(pageSize) {
+      this.logPage.pageSize = pageSize;
+      this.serveLog(this.selectUserServeLog)
+    },
+    logCurrentChange(currentPage) {
+      this.logPage.currentPage = currentPage;
+      this.serveLog(this.selectUserServeLog)
+    },
+    serveLog(row) {
+      console.log('服务日志', row)
+      this.selectUserServeLog = row
+      this.loadingLog = true
+      getMainServeUserLog({
+        idNumber: row.idNumber,
+        current: this.logPage.currentPage,
+        size: this.logPage.pageSize
+      }).then(res => {
+        this.loadingLog = false
+        const {records, current, size, total} = res.data.data
+        this.logDataSource = records
+        this.innerDrawerLog = true
+        this.logPage = {
+          pageSize: size,
+          currentPage: current,
+          total: total,
+        }
+      })
+    },
   },
 };
 </script>
diff --git a/src/views/tenant/main/talents/latent/index.vue b/src/views/tenant/main/talents/latent/index.vue
index bda6ce7..dfd9b2d 100644
--- a/src/views/tenant/main/talents/latent/index.vue
+++ b/src/views/tenant/main/talents/latent/index.vue
@@ -101,8 +101,7 @@
               :disabled="downloadButton"
               @click="handleExport"
             >导出
-            </el-button
-            >
+            </el-button>
           </template>
           <template slot-scope="{row}" slot="menu">
             <el-button type="text"
@@ -111,6 +110,12 @@
                        @click="serveLog(row)"
             >查看日志
             </el-button>
+            <el-button type="text"
+                       icon="el-icon-circle-check"
+                       size="small"
+                       @click="checkUserInfo(row)"
+            >审核
+            </el-button>
           </template>
         </avue-crud>
 
@@ -141,6 +146,7 @@
             :data="logDataSource"
             :option="logOption"
             :page.sync="logPage"
+            :table-loading="loadingLog"
             @row-save="saveLog"
             @row-update="saveUpdateLog"
             @row-del="removeLog"
@@ -163,6 +169,36 @@
         <transfer-groups ref="transferGroups" @refresh="refresh" :ids="ids"></transfer-groups>
         <!--/转移分组dialog-->
         <resume ref="resume" v-show="false"></resume>
+
+        <PromptDialog
+          :visible="dialogFlag"
+          title="审核"
+          :back-btn-status="1"
+          submit-text="确 定"
+          sub-title="请核对人员信息后再进行审核通过，通过将在已认定人群可见，驳回该用户将从人群中删除，在人员服务日志中可见"
+          :tips="[
+            '人员信息描述不清晰或过于简单；',
+            '人员信息存在违法违规行为；',
+            '人员信息的薪资、福利等待遇不符合市场标准；',
+          ]"
+          @onClose="dialogFlag = false; GroupValue = ''"
+          @onCancel="diaLogCancel"
+          @onConfirm="diaLogConfirm"
+        >
+          <template v-slot:header>
+            <div class="input_box" style="margin-top: 20px">
+              <el-select style="width: 100%" clearable v-model="GroupValue" placeholder="请选择分组 (驳回不用选择此项)">
+                <el-option
+                  v-for="item in selecTreeData"
+                  :key="item.id"
+                  :label="item.groupName"
+                  :value="item.id">
+                </el-option>
+              </el-select>
+            </div>
+          </template>
+        </PromptDialog>
+
       </basic-container>
       <ied ref="ied"></ied>
     </el-col>
@@ -179,7 +215,8 @@ import {
   getDept,
   removeDept,
   upload,
-  getDeptMyTree
+  getDeptMyTree,
+  talentsApproval, talentsEliminate
 } from "@/api/tenant/talents";
 import {getWorkTypes, getLabelList} from "@/api/tenant/common";
 import {mapGetters} from "vuex";
@@ -193,6 +230,7 @@ import {excelAccept} from "@/common/accept";
 import TextTooltip from '@/components/text-tooltip'
 import {exportList} from "@/api/workstation/post";
 import {addServeLog, getMainServeUserLog, removeServeLog, updateServeLog} from "@/api/tenant/serve";
+import PromptDialog from "@/components/promptDialog/index.vue";
 
 let page = {
   pageSize: 10,
@@ -212,6 +250,8 @@ export default {
   name: "tenant_talents",
   data() {
     return {
+      dialogFlag: false,
+      dialogInfo: null,
       downloadButton: false,
       activeNames: "1",
       isIndeterminate: false,
@@ -231,6 +271,7 @@ export default {
       page: Object.assign({}, page),
       logPage: Object.assign({}, page),
       logDataSource: [],
+      loadingLog: false,
       innerDrawerLog: false,
       selectUserServeLog: null,
       tempWorkType: [],
@@ -242,9 +283,11 @@ export default {
       data: [],
       obj: {},
       excelForm: {isCovered: 1},
+      selecTreeData: [],
+      GroupValue: ''
     };
   },
-  components: {addGroups, transferGroups, Resume, ied, TextTooltip},
+  components: {addGroups, transferGroups, Resume, ied, TextTooltip, PromptDialog},
   watch: {},
   computed: {
     ...mapGetters(["permission", "userInfo"]),
@@ -301,6 +344,7 @@ export default {
         searchBtn: true,
         searchShow: true,
         viewBtn: true,
+        menuWidth: 170,
         searchMenuSpan: 6,
         border: true,
         index: false,
@@ -655,11 +699,72 @@ export default {
   },
   created() {
     this.initDept();
+    this.groupTypeDept()
     // this.getWorkTypes();
     this.getLabelList();
     this.getDept()
   },
   methods: {
+    groupTypeDept() {
+      getDept({groupType: 1}).then((res) => {
+        this.selecTreeData = res.data.data.list;
+      });
+    },
+    checkUserInfo(row) {
+      this.dialogInfo = row
+      this.dialogFlag = true
+    },
+    diaLogCancel(value) {
+      if (value) {
+        let params = {
+          idNumber: this.dialogInfo.idNumber,
+          id: this.dialogInfo.id,
+          approvalStatus: 1,
+          content: value,
+        }
+        this.$confirm("确定将选择数据驳回?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return talentsApproval(params);
+          })
+          .then(() => {
+            this.onLoad(this.page, this.query);
+            this.dialogFlag = false
+            this.$message.success('操作成功');
+          });
+      } else {
+        this.$message.error("请填写驳回原因");
+      }
+    },
+    diaLogConfirm(value) {
+      if (this.GroupValue) {
+        let params = {
+          idNumber: this.dialogInfo.idNumber,
+          id: this.dialogInfo.id,
+          approvalStatus: 0,
+          content: value,
+          groupId: this.GroupValue
+        }
+        this.$confirm("确定通过?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return talentsApproval(params);
+          })
+          .then(() => {
+            this.onLoad(this.page, this.query);
+            this.dialogFlag = false
+            this.$message.success('操作成功');
+          });
+      } else {
+        this.$message.error("请选择分组");
+      }
+    },
     handleExport() {
       this.downloadButton = true
       // 0 潜在 1 已认定
@@ -1186,17 +1291,17 @@ export default {
     serveLog(row) {
       console.log('服务日志', row)
       this.selectUserServeLog = row
+      this.loadingLog = true
       getMainServeUserLog({
-        idNumber: row.id,
+        idNumber: row.idNumber,
         current: this.logPage.currentPage,
         size: this.logPage.pageSize
       }).then(res => {
-        let _this = this;
+        this.loadingLog = false
         const {records, current, size, total} = res.data.data
-        console.log(records, total)
-        _this.logDataSource = records
-        _this.innerDrawerLog = true
-        _this.logPage = {
+        this.logDataSource = records
+        this.innerDrawerLog = true
+        this.logPage = {
           pageSize: size,
           currentPage: current,
           total: total,
diff --git a/src/views/tenant/main/talents/personnelserve/index.vue b/src/views/tenant/main/talents/personnelserve/index.vue
index 3fe762c..d1ccc1a 100644
--- a/src/views/tenant/main/talents/personnelserve/index.vue
+++ b/src/views/tenant/main/talents/personnelserve/index.vue
@@ -15,14 +15,77 @@
         @size-change="sizeChange"
         class="customPage"
       >
+        <!--自定义列-->
+        <template slot="labelsBase" slot-scope="{ row }">
+          <el-tooltip effect="dark" placement="top">
+            <div slot="content" v-for="(item,index) in row.labelsBaseArr" :key="index">{{ item }}<br/></div>
+            <div>{{ row.labelsBase | ellipsis }}</div>
+          </el-tooltip>
+        </template>
+
+        <template slot-scope="{row}" slot="menu">
+          <el-button type="text"
+                     icon="el-icon-document"
+                     size="small"
+                     @click="serveLog(row)"
+          >查看日志
+          </el-button>
+          <el-button type="text"
+                     icon="el-icon-document"
+                     size="small"
+                     @click="addServeLog(row)"
+          >新增日志
+          </el-button>
+        </template>
       </avue-crud>
     </basic-container>
+    <el-drawer
+      title="服务日志"
+      size="80%"
+      :append-to-body="true"
+      :before-close="handleCloseLog"
+      :visible.sync="innerDrawerLog">
+      <!-- <div>
+        <span>姓名：</span>
+        <span>身份证号：</span>
+      </div> -->
+      <avue-crud
+        :data="logDataSource"
+        :option="logOption"
+        :page.sync="logPage"
+        :table-loading="loadingLog"
+        @row-save="saveLog"
+        @row-update="saveUpdateLog"
+        @row-del="removeLog"
+        @size-change="logSizeChange"
+        @current-change="logCurrentChange"
+      >
+        <!-- <template slot="menuLeft">
+          <el-button @click="addNewLog" icon="el-icon-plus" type="primary" size="mini">添加</el-button>
+        </template>
+        <template slot="menu" slot-scope="{row}">
+          <el-button type="text" @click="editLogInfo(row.id)" icon="el-icon-edit" size="mini">修改</el-button>
+          <el-button type="text" @click="editLogInfo(row.id)" icon="el-icon-edit" size="mini">查看附件</el-button>
+        </template> -->
+      </avue-crud>
+    </el-drawer>
+    <el-drawer
+      title="新增"
+      size="60%"
+      :append-to-body="true"
+      :before-close="() => innerDrawerAddLog = false"
+      :visible.sync="innerDrawerAddLog">
+      <avue-form ref="form" :option="logOption" v-model="logValues" @submit="handleSubmitLog"/>
+    </el-drawer>
   </el-row>
 </template>
 
 <script>
 import {mapGetters} from "vuex";
 import {getList} from "@/api/tenant/personnelserve";
+import {isvalidatemobile} from "@/util/validate";
+import {getDept, getDeptMyTree} from "@/api/tenant/talents";
+import {addServeLog, getMainServeUserLog, removeServeLog, updateServeLog} from "@/api/tenant/serve";
 
 const page = {
   pageSize: 10,
@@ -36,6 +99,7 @@ const baseOptions = {
   editBtn: false,
   delBtn: false,
   height: "auto",
+  menuWidth: 130,
   reserveSelection: false,
   border: true,
   columnBtn: false,
@@ -48,16 +112,33 @@ const baseOptions = {
   searchLabelWidth: 60,
 }
 export default {
+  filters: {
+    ellipsis(value) {
+      if (!value) return "";
+      if (value.length > 15) {
+        return value.slice(0, 14) + "...";
+      }
+      return value;
+    },
+  },
   data() {
     return {
       loading: false,
       dataSource: [],
       crudValues: {},
-      page: Object.assign({}, page)
+      depTree: [],
+      page: Object.assign({}, page),
+      treeData: [],
+      logPage: Object.assign({}, page),
+      logDataSource: [],
+      loadingLog: false,
+      innerDrawerLog: false,
+      innerDrawerAddLog: false,
+      logValues: {}
     }
   },
   computed: {
-    ...mapGetters(["permission"]),
+    ...mapGetters(["permission", "userInfo"]),
     permissionList() {
       return {
         addBtn: this.vaildData(this.permission.tenant_main_talents_latent_index_add, false),
@@ -67,30 +148,308 @@ export default {
       };
     },
     option() {
+      const self = this;
+      const IdCardNo = (rule, value, callback) => {
+        // if (check18IdCardNo(value)) {
+        callback();
+        // } else {
+        //   callback(new Error("身份证格式不正确"));
+        // }
+      };
+      const validateTel = (rule, value, callback) => {
+        if (isvalidatemobile(value)[0]) {
+          callback(new Error(isvalidatemobile(value)[1]));
+        } else {
+          callback();
+        }
+      };
       return {
         ...baseOptions,
         column: [
+          {
+            label: "所属机构",
+            prop: "createDept",
+            type: "tree",
+            multiple: false,
+            dicData: this.depTree,
+            props: {
+              label: "title",
+              value: 'value'
+            },
+            checkStrictly: true,
+            span: 24,
+            search: true,
+            searchLabelWidth: 80,
+            change: this.deptChange
+          },
           {
             label: "姓名",
             prop: "name",
+            // search: true,
+            span: 24,
+            rules: [
+              {
+                required: true,
+                whitespace: true,
+                message: "请输入姓名",
+                trigger: "blur",
+              },
+            ],
             search: true,
-            searchSpan: 6,
+          },
+          {
+            label: "姓别",
+            prop: "aac004",
+            type: 'select',
+            dicUrl: "/api/jobslink-api/system/dict-biz/tadict?code=AAC004",
+            props: {
+              label: "dictValue",
+              value: "dictKey",
+            },
+            rules: [
+              {
+                required: true,
+                message: "请输入性别",
+                trigger: "blur",
+              },
+            ],
+            span: 24,
           },
           {
             label: "身份证",
             prop: "idNumber",
+            // hide: true,
+            span: 24,
+            rules: [
+              {required: true, message: "请输入身份证号", trigger: "blur"},
+              {trigger: "blur", validator: IdCardNo},
+            ],
             search: true,
-            searchSpan: 6,
           },
           {
             label: "手机号",
-            prop: "phone",
+            prop: "telphone",
+            span: 24,
+            hide: false,
+            rules: [
+              {
+                required: true,
+                validator: validateTel,
+                trigger: "blur",
+              },
+            ],
           },
-        ]
+          {
+            label: "民族",
+            prop: "aac005",
+            type: 'select',
+            dicUrl: "/api/jobslink-api/system/dict-biz/tadict?code=AAC005",
+            props: {
+              label: "dictValue",
+              value: "dictKey",
+            },
+            rules: [
+              {
+                required: true,
+                message: "请输入民族",
+                trigger: "blur",
+              },
+            ],
+            span: 24,
+          },
+          {
+            label: "户口性质",
+            prop: "aac009",
+            type: 'select',
+            dicUrl: "/api/jobslink-api/system/dict-biz/tadict?code=AAC009",
+            props: {
+              label: "dictValue",
+              value: "dictKey",
+            },
+            rules: [
+              {
+                required: true,
+                message: "请输入户口性质",
+                trigger: "blur",
+              },
+            ],
+            span: 24,
+          },
+          {
+            label: "户口所在地",
+            prop: "aac010",
+            // hide: true,
+            span: 24,
+            rules: [
+              {required: true, message: "请输入口所在地", trigger: "blur"},
+            ],
+          },
+          {
+            label: "文化程度",
+            prop: "aac011",
+            type: 'select',
+            dicUrl: "/api/jobslink-api/system/dict-biz/tadict?code=AAC011",
+            props: {
+              label: "dictValue",
+              value: "dictKey",
+            },
+            rules: [
+              {
+                required: true,
+                message: "请输入文化程度",
+                trigger: "blur",
+              },
+            ],
+            span: 24,
+          },
+          {
+            label: "经办时间",
+            prop: "aae036",
+            display: false,
+            span: 24,
+            rules: [
+              {required: true, message: "请输入经办时间", trigger: "blur"},
+            ],
+          },
+          {
+            label: "用户类型",
+            prop: "userId",
+            type: "select",
+            dicData: [
+              {
+                value: "0",
+                label: "未注册用户",
+              },
+              {
+                value: "1",
+                label: "已注册用户",
+              },
+            ],
+            display: false,
+            hide: true,
+            // search: true
+          },
+          {
+            label: "分组",
+            prop: "groupId",
+            type: "tree",
+            span: 24,
+            display: true,
+            dicData: self.treeData,
+            props: {
+              label: "groupName",
+              value: "id",
+            },
+            rules: [
+              {
+                required: true,
+                message: "请选择分组",
+                trigger: "change",
+              },
+            ],
+            placeholder: "请选择 分组",
+          },
+          {
+            label: "标签名称",
+            prop: "labelsBase",
+            rules: [
+              {
+                required: true,
+                message: "请选择标签名称",
+                trigger: ["blur"],
+              },
+            ],
+            slot: true,
+            formslot: true,
+            span: 24,
+          },
+
+          {
+            label: "备注",
+            prop: "remarks",
+            type: "textarea",
+            slot: true,
+            hide: true,
+            span: 24,
+            maxlength: 100,
+            showWordLimit: true,
+          },
+        ],
+      }
+    },
+    logOption() {
+      return {
+        editBtn: true,
+        delBtn: true,
+        addBtn: true,
+        viewBtn: true,
+        border: true,
+        index: true,
+        indexLabel: "序号",
+        refreshBtn: false,
+        dialogType: "drawer",
+        addBtnText: "新增日志",
+        height: '100',
+        column: [{
+          label: '服务时间',
+          prop: 'createTime',
+          type: 'date',
+          format: "yyyy-MM-dd",
+          valueFormat: "yyyy-MM-dd HH:mm:ss",
+        }, {
+          label: '服务发起人',
+          prop: 'fromName',
+          display: false,
+        }, {
+          label: '服务对象',
+          prop: 'toName',
+          display: false,
+        }, {
+          label: '服务主题',
+          prop: 'serveTheme'
+        }, {
+          label: '服务内容',
+          prop: 'serveContent'
+        }, {
+          label: '备注说明',
+          prop: 'bak1'
+        }]
       }
     }
   },
+  created() {
+    this.getDept()
+    this.initDept()
+    this.onLoad(this.page, this.query)
+  },
   methods: {
+    async getDept() {
+      let params = {
+        tenantId: '000000'
+      }
+      let resData = await getDeptMyTree(params)
+      if (resData.data.code === 200) {
+        this.depTree = resData.data.data
+      }
+    },
+    initDept(groupId) {
+      getDept({groupType: 0}).then((res) => {
+        const data = res.data.data.list;
+        this.treeData = data;
+        let treeDataOne = {
+          companyId: "",
+          createTime: "",
+          groupName: "全部",
+          id: "",
+          remarks: "",
+          sort: '',
+          sumNum: res.data.data.sum,
+          type: '',
+        };
+        this.treeData.unshift(treeDataOne);
+        this.loading = false;
+      });
+    },
     searchChange(params, done) {
       this.query = params;
       this.page.currentPage = 1;
@@ -109,24 +468,139 @@ export default {
       this.page.pageSize = pageSize;
       this.onLoad(this.page, this.query);
     },
+    logSizeChange(pageSize) {
+      this.logPage.pageSize = pageSize;
+      this.serveLog(this.selectUserServeLog);
+    },
+    logCurrentChange(currentPage) {
+      this.logPage.currentPage = currentPage;
+      this.serveLog(this.selectUserServeLog);
+    },
     onLoad(page, params = {}) {
       const {releaseTimeRange} = params;
-      let values = {
-        ...params,
+      let paramsed = {
+        currentPage: page.currentPage,
+        pageSize: page.pageSize,
+        ...this.query
       };
       this.loading = true;
-      getList(
-        page.currentPage,
-        page.pageSize,
-        Object.assign(values, this.query)
-      ).then((res) => {
-        const {total, records, page} = res.data.data
-        this.page.total = total;
-        // this.page.currentPage = page
+      getList(paramsed).then((res) => {
+        const {total, size, current, records, page} = res.data.data
         this.dataSource = records;
         this.loading = false;
+        this.page = {
+          pageSize: size,
+          currentPage: current,
+          total: total,
+        }
       });
     },
+    serveLog(row) {
+      console.log('服务日志', row)
+      this.selectUserServeLog = row
+      this.loadingLog = true
+      getMainServeUserLog({
+        idNumber: row.idNumber,
+        current: this.logPage.currentPage,
+        size: this.logPage.pageSize
+      }).then(res => {
+        this.loadingLog = false
+        const {records, current, size, total} = res.data.data
+        this.logDataSource = records
+        this.innerDrawerLog = true
+        this.logPage = {
+          pageSize: size,
+          currentPage: current,
+          total: total,
+        }
+      })
+    },
+    addServeLog(row) {
+      this.selectUserServeLog = row
+      this.innerDrawerAddLog = true
+    },
+    async handleSubmitLog(row, done) {
+      let params = {
+        ...row,
+        serveId: this.selectUserServeLog.serveId,
+        serveUserId: this.selectUserServeLog.serveUserId,
+        talentsId: this.selectUserServeLog.id,
+        idNumber: this.selectUserServeLog.idNumber,
+        toName: this.selectUserServeLog.name,
+        fromName: this.userInfo.real_name
+      }
+      console.log(params)
+      let resData = await addServeLog(params)
+      done()
+      if (resData.data.code === 200) {
+        this.$message({
+          type: "success",
+          message: "添加成功!",
+        });
+        this.innerDrawerAddLog = false
+      }
+    },
+    async saveLog(row, index, done, loading) {
+      let params = {
+        ...row,
+        serveId: this.selectUserServeLog.serveId,
+        serveUserId: this.selectUserServeLog.serveUserId,
+        talentsId: this.selectUserServeLog.id,
+        idNumber: this.selectUserServeLog.idNumber,
+        toName: this.selectUserServeLog.name,
+        fromName: this.userInfo.real_name
+      }
+      console.log(params)
+      let resData = await addServeLog(params)
+      done()
+      if (resData.data.code === 200) {
+        this.$message({
+          type: "success",
+          message: "添加成功!",
+        });
+        this.serveLog(this.selectUserServeLog)
+      }
+    },
+    async saveUpdateLog(row, index, done, loading) {
+      let params = {
+        id: row.id,
+        createTime: row.createTime,
+        fromName: row.fromName,
+        toName: row.toName,
+        serveTheme: row.serveTheme,
+        serveContent: row.serveContent,
+        bak1: row.bak1,
+      }
+      let resData = await updateServeLog(params)
+      done()
+      if (resData.data.code === 200) {
+        this.$message({
+          type: "success",
+          message: "修改成功!",
+        });
+        this.serveLog(this.selectUserServeLog)
+      }
+    },
+    removeLog(row, index, done, loading) {
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          return removeServeLog({ids: row.id});
+        })
+        .then(() => {
+          this.serveLog(this.selectUserServeLog)
+          this.$message({
+            type: "success",
+            message: "操作成功!",
+          });
+        });
+    },
+    handleCloseLog() {
+      this.innerDrawerLog = false
+    },
   }
 }
 
diff --git a/vue.config.js b/vue.config.js
index 74507a2..fe2292a 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -24,7 +24,7 @@ module.exports = {
     port: 1888,
     proxy: {
       "/api": {
-        target: 'http://10.165.0.173:8000',
+        target: 'http://192.168.1.105:8000',
         ws: true,
         changeOrigin: true,
         pathRewrite: {