From ca1f42083d23d5cfec41bb5c856e0de84419b714 Mon Sep 17 00:00:00 2001
From: dengxin <2390584170@qq.com>
Date: Mon, 19 Feb 2024 16:17:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=87=8D=E7=82=B9=E4=BA=BA?=
 =?UTF-8?q?=E7=BE=A4=E6=9C=8D=E5=8A=A1-=E5=9F=BA=E7=A1=80=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E5=BA=93=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/tenant/policy.js                      |  106 ++
 src/common/dic.js                             |  312 ++--
 .../tenant/main/policy/Dialog/addGroups.vue   |    2 +-
 .../main/policy/Dialog/transferGroups.vue     |    4 +-
 src/views/tenant/main/policy/index.vue        | 1516 +++++++++--------
 .../tenant/mission/Table/ExpiredMission.vue   |  170 +-
 .../tenant/mission/Table/FinishedMission.vue  |  121 +-
 .../tenant/mission/Table/OngoingMission.vue   |   87 +-
 vue.config.js                                 |    4 +-
 9 files changed, 1318 insertions(+), 1004 deletions(-)
 create mode 100644 src/api/tenant/policy.js

diff --git a/src/api/tenant/policy.js b/src/api/tenant/policy.js
new file mode 100644
index 0000000..b34017d
--- /dev/null
+++ b/src/api/tenant/policy.js
@@ -0,0 +1,106 @@
+import request from '@/router/axios';
+/*获取人才列表*/
+export const getList =
+    (current, size, params, groupId) => {
+      return request({
+        url: '/api/jobslink-api/label/list',
+        method: 'get',
+        params: {...params, current, size, groupId}
+      })
+    }
+
+/*新增人才*/
+export const add =
+    (row) => {
+      return request(
+          {url: '/api/jobslink-api/label/save', method: 'post', data: row})
+    }
+
+/*编辑人才*/
+export const update =
+    (row) => {
+      return request({
+        url: '/api/jobslink-api/label/tenant/update',
+        method: 'post',
+        data: row
+      })
+    }
+
+/*删除人才*/
+export const remove =
+    (ids) => {
+      return request({
+        url: '/api/jobslink-api/label/remove',
+        method: 'post',
+        params: {ids}
+      })
+    }
+
+/*人才详情*/
+export const detail =
+    (id) => {
+      return request({
+        url: '/api/jobslink-api/label/detail',
+        method: 'get',
+        params: {id}
+      })
+    }
+
+
+/*获取分组*/
+export const getDept =
+    () => {
+      return request({
+        url: '/api/jobslink-api/label/group/listAll',
+        method: 'get',
+        params: {}
+      })
+    }
+
+/*新建分组*/
+export const addDept =
+    (row) => {
+      return request({
+        url: '/api/jobslink-api/label/group/save',
+        method: 'post',
+        data: row
+      })
+    }
+
+
+/*编辑分组*/
+export const updateDept =
+    (row) => {
+      return request({
+        url: '/api/jobslink-api/label/group/update',
+        method: 'post',
+        data: row
+      })
+    }
+
+
+/*删除分组*/
+export const removeDept =
+    (ids) => {
+      return request({
+        url: '/api/jobslink-api/label/group/remove',
+        method: 'post',
+        params: {ids}
+      })
+    }
+
+
+/*转移分组*/
+export const transferDept =
+    (groupIds, ids) => {
+      return request({
+        url: '/api/jobslink-api/label/updateAllGroup',
+        method: 'post',
+        params: {groupIds, ids}
+      })
+    }
+
+/*导入人才库*/
+export const upload = () => {
+  return `/api/jobslink-api/label/tenant/import-label?isCovered=1`
+}
diff --git a/src/common/dic.js b/src/common/dic.js
index 862b60a..724accf 100644
--- a/src/common/dic.js
+++ b/src/common/dic.js
@@ -1,126 +1,148 @@
-
 export const wagesStatus = [
-  {value: 0,label: '未支付'},
-  {value: 1,label: '已支付'},
-  {value: 2,label: '已取消'},
-  {value: 3,label: '已过期'},
-  {value: 9,label: '异常'},
+  { value: 0, label: "未支付" },
+  { value: 1, label: "已支付" },
+  { value: 2, label: "已取消" },
+  { value: 3, label: "已过期" },
+  { value: 9, label: "异常" },
 ];
 export const orderGoodStatus = [
-  {value: 0,label: '未支付'},
-  {value: 1,label: '已支付'}
+  { value: 0, label: "未支付" },
+  { value: 1, label: "已支付" },
 ];
 export const insuranceStatus = [
-  {value: 1,label: '生效中'},
-  {value: 2,label: '即将失效'},
-  {value: 3,label: '已失效'},
-  {value: 0,label: '未生效'},
+  { value: 1, label: "生效中" },
+  { value: 2, label: "即将失效" },
+  { value: 3, label: "已失效" },
+  { value: 0, label: "未生效" },
 ];
 
 export const orderGoods = [
-  {value: 1,label: '服务费订单'},
-  {value: 0,label: '工资订单'}
+  { value: 1, label: "服务费订单" },
+  { value: 0, label: "工资订单" },
 ];
 
 export const timeStatus = [
-  {value: 0,label: '开始时间'},
-  {value: 1,label: '结束时间'},
-  {value: 2,label: '截止时间'},
+  { value: 0, label: "开始时间" },
+  { value: 1, label: "结束时间" },
+  { value: 2, label: "截止时间" },
 ];
 export const jobStatus = [
-  {value: '',label: '全部'},
-  {value: 1,label: '招聘中'},
-  {value: 2,label: '任务中'},
-  {value: 3,label: '已完成'},
-  {value: 4,label: '已失效'},
-  {value: 9,label: '审核未通过'}
+  { value: "", label: "全部" },
+  { value: 1, label: "招聘中" },
+  { value: 2, label: "任务中" },
+  { value: 3, label: "已完成" },
+  { value: 4, label: "已失效" },
+  { value: 9, label: "审核未通过" },
 ];
 export const bondState = [
-  {value: '',label: '全部'},
-  {value: 0,label: '已缴'},
-  {value: 2,label: '免缴'},
-  {value: 1,label: '未缴'}
+  { value: "", label: "全部" },
+  { value: 0, label: "已缴" },
+  { value: 2, label: "免缴" },
+  { value: 1, label: "未缴" },
 ];
 export const enableState = [
-  {value: '',label: '全部'},
-  {value: 1,label: '启用'},
-  {value: 0,label: '停用'}
+  { value: "", label: "全部" },
+  { value: 1, label: "启用" },
+  { value: 0, label: "停用" },
 ];
 export const payState = [
-  {value: '', label: '全部'}, {value: 0, label: '未支付'},
-  {value: 1, label: '已支付'}
+  { value: "", label: "全部" },
+  { value: 0, label: "未支付" },
+  { value: 1, label: "已支付" },
 ];
 export const taskState = [
-  {value: 1, label: '任务汇总'}, {value: 2, label: '任务明细'}
+  { value: 1, label: "任务汇总" },
+  { value: 2, label: "任务明细" },
 ];
 export const postState = [
-  {value: 1, label: '岗位汇总'}, {value: 2, label: '岗位明细'}
+  { value: 1, label: "岗位汇总" },
+  { value: 2, label: "岗位明细" },
 ];
 export const enterpriseState = [
-  {value: 1, label: '审核中企业'}, {value: 2, label: '合作中企业'},
-  {value: 3, label: '终止合作企业'}
+  { value: 1, label: "审核中企业" },
+  { value: 2, label: "合作中企业" },
+  { value: 3, label: "终止合作企业" },
 ];
 export const companyMissionState = [
-  {value: 1, label: '招聘中'}, {value: 2, label: '任务中'},
-  {value: 3, label: '已完成'}, {value: 4, label: '已失效'}
+  { value: 1, label: "招聘中" },
+  { value: 2, label: "任务中" },
+  { value: 3, label: "已完成" },
+  { value: 4, label: "已失效" },
 ];
 export const companyPostState = [
-  {value: 1, label: '在招'}, {value: 2, label: '已招'},
-  {value: 3, label: '过期'}, {value: 4, label: '未正式发布'}
+  { value: 1, label: "在招" },
+  { value: 2, label: "已招" },
+  { value: 3, label: "过期" },
+  { value: 4, label: "未正式发布" },
 ];
 //电子签章管理
 export const esignatureState = [
-  {value: 0, label: '待签发'}, {value: 1, label: '签发成功'},{value: 2, label: '签发失败'}
+  { value: 0, label: "待签发" },
+  { value: 1, label: "签发成功" },
+  { value: 2, label: "签发失败" },
 ];
 
 //线上代发工资状态
 export const onLinePayState = [
-  {value: 'wait', label: '待确定'}, {value: 'ing', label: '发放中'},
-  {value: 'moreThan', label: '超三倍工资'},
-  {value: 'success', label: '发放成功'}, {value: 'fail', label: '发放失败'},
-  {value: 'pause', label: '暂不发放'}, {value: 'all', label: '发放历史'}
+  { value: "wait", label: "待确定" },
+  { value: "ing", label: "发放中" },
+  { value: "moreThan", label: "超三倍工资" },
+  { value: "success", label: "发放成功" },
+  { value: "fail", label: "发放失败" },
+  { value: "pause", label: "暂不发放" },
+  { value: "all", label: "发放历史" },
 ];
 //个税校准管理状态
 export const incomeTaxState = [
-  {value: 1, label: '待校准'}, {value: 2, label: '待确定'},
-  {value: 3, label: '补发中'}, {value: 4, label: '补发成功'},
-  {value: 5, label: '补发失败'}, {value: 6, label: '无需补发'}
+  { value: 1, label: "待校准" },
+  { value: 2, label: "待确定" },
+  { value: 3, label: "补发中" },
+  { value: 4, label: "补发成功" },
+  { value: 5, label: "补发失败" },
+  { value: 6, label: "无需补发" },
 ];
 //线下代发工资状态
 export const offLinePayState = [
-  {value: 'wait', label: '待发放'}, {value: 'success', label: '发放成功'},
-  {value: 'all', label: '发放历史'}
+  { value: "wait", label: "待发放" },
+  { value: "success", label: "发放成功" },
+  { value: "all", label: "发放历史" },
 ];
 //线上代发发放渠道
 export const payType = [
-  {value: 0, label: '银联线上'}, {value: 1, label: '其他发放'},
+  { value: 0, label: "银联线上" },
+  { value: 1, label: "其他发放" },
 ];
 //个税校准管理状态
 export const examineListState = [
   {
     value: 3,
-    label: '待完善'
-  }, {
+    label: "待完善",
+  },
+  {
     value: 4,
-    label: '待审核'
-  }, {
+    label: "待审核",
+  },
+  {
     value: 0,
-    label: '审核通过'
-  }, {
+    label: "审核通过",
+  },
+  {
     value: 1,
-    label: '审核不通过'
-  }, {
+    label: "审核不通过",
+  },
+  {
     value: 5,
-    label: '暂不处理'
-  }, {
+    label: "暂不处理",
+  },
+  {
     value: 9,
-    label: '终止合作'
-  }
+    label: "终止合作",
+  },
 ];
 export const missionState = [
   ...companyMissionState,
   {
-    label: '审核未通过',
+    label: "审核未通过",
     value: 9,
   },
 ];
@@ -129,189 +151,199 @@ export const missionState = [
 export const insureState = [
   {
     value: 0,
-    label: '未生效',
+    label: "未生效",
   },
   {
     value: 1,
-    label: '生效中',
+    label: "生效中",
   },
   {
     value: 2,
-    label: '即将失效',
+    label: "即将失效",
   },
   {
     value: 3,
-    label: '已失效',
+    label: "已失效",
   },
   {
     value: 4,
-    label: '已生效',
+    label: "已生效",
   },
   {
     value: 5,
-    label: '已过期',
+    label: "已过期",
   },
   {
     value: 6,
-    label: '已失效',
+    label: "已失效",
   },
 ];
 
 export const wageUnitCategoryState = [
-  {value: 0, label: '元/人·次', disable: true},
-  {value: 1, label: '元/人·时', disable: false},
-  {value: 2, label: '元/人·天', disable: false},
-  {value: 3, label: '元/人·周', disable: true},
-  {value: 4, label: '元/人·月', disable: true},
-  {value: 5, label: '元/人·个', disable: true},
-  {value: 6, label: '元/人·件', disable: true},
+  { value: 0, label: "元/人·次", disable: true },
+  { value: 1, label: "元/人·时", disable: false },
+  { value: 2, label: "元/人·天", disable: false },
+  { value: 3, label: "元/人·周", disable: true },
+  { value: 4, label: "元/人·月", disable: true },
+  { value: 5, label: "元/人·个", disable: true },
+  { value: 6, label: "元/人·件", disable: true },
 ];
 
 export const wageOptionsMonth = [
-  
   {
-    value: '2000元（含）以下/月',
-    label: '2000元（含）以下/月',
+    value: "2000元（含）以下/月",
+    label: "2000元（含）以下/月",
   },
   {
-    value: '2000-5000元（含）/月',
-    label: '2000-5000元（含）/月',
+    value: "2000-5000元（含）/月",
+    label: "2000-5000元（含）/月",
   },
   {
-    value: '5000-8000元（含）/月',
-    label: '5000-8000元（含）/月',
+    value: "5000-8000元（含）/月",
+    label: "5000-8000元（含）/月",
   },
   {
-    value: '8000-10000元（含）/月',
-    label: '8000-10000元（含）/月',
+    value: "8000-10000元（含）/月",
+    label: "8000-10000元（含）/月",
   },
   {
-    value: '10000-15000元（含）/月',
-    label: '10000-15000元（含）/月',
+    value: "10000-15000元（含）/月",
+    label: "10000-15000元（含）/月",
   },
   {
-    value: '15000-20000元（含）/月',
-    label: '15000-20000元（含）/月',
+    value: "15000-20000元（含）/月",
+    label: "15000-20000元（含）/月",
   },
   {
-    value: '20000-25000元（含）/月',
-    label: '20000-25000元（含）/月',
+    value: "20000-25000元（含）/月",
+    label: "20000-25000元（含）/月",
   },
   {
-    value: '25000-30000元（含）/月',
-    label: '25000-30000元（含）/月',
+    value: "25000-30000元（含）/月",
+    label: "25000-30000元（含）/月",
   },
   {
-    value: '30000元以上/月',
-    label: '30000元以上/月',
+    value: "30000元以上/月",
+    label: "30000元以上/月",
   },
   {
-    value: '面议、暂无要求',
-    label: '面议、暂无要求',
-  }
-]
+    value: "面议、暂无要求",
+    label: "面议、暂无要求",
+  },
+];
 
 export const wageOptionsWithNoMonth = [
   {
-    value: '10-15元/小时',
-    label: '10-15元/小时',
+    value: "10-15元/小时",
+    label: "10-15元/小时",
   },
   {
-    value: '16-20元/小时',
-    label: '16-20元/小时',
+    value: "16-20元/小时",
+    label: "16-20元/小时",
   },
   {
-    value: '21-25元/小时',
-    label: '21-25元/小时',
+    value: "21-25元/小时",
+    label: "21-25元/小时",
   },
   {
-    value: '26-30元/小时',
-    label: '26-30元/小时',
+    value: "26-30元/小时",
+    label: "26-30元/小时",
   },
   {
-    value: '30元/小时以上',
-    label: '30元/小时以上',
+    value: "30元/小时以上",
+    label: "30元/小时以上",
   },
   {
-    value: '100-150元/天',
-    label: '100-150元/天',
+    value: "100-150元/天",
+    label: "100-150元/天",
   },
   {
-    value: '151-200元/天',
-    label: '151-200元/天',
+    value: "151-200元/天",
+    label: "151-200元/天",
   },
   {
-    value: '201-250元/天',
-    label: '201-250元/天',
+    value: "201-250元/天",
+    label: "201-250元/天",
   },
   {
-    value: '251-300元/天',
-    label: '251-300元/天',
+    value: "251-300元/天",
+    label: "251-300元/天",
   },
   {
-    value: '300元/天以上',
-    label: '300元/天以上',
+    value: "300元/天以上",
+    label: "300元/天以上",
   },
   {
-    value: '30000元以上/月',
-    label: '30000元以上/月',
+    value: "30000元以上/月",
+    label: "30000元以上/月",
   },
   {
-    value: '面议、暂无要求',
-    label: '面议、暂无要求',
-  }
-]
+    value: "面议、暂无要求",
+    label: "面议、暂无要求",
+  },
+];
 
 export const educationState = [
   {
-    label: '不限',
+    label: "不限",
     value: 8,
   },
   {
-    label: '初中及以下',
+    label: "初中及以下",
     value: 7,
   },
   {
-    label: '中专/中技',
+    label: "中专/中技",
     value: 6,
   },
   {
-    label: '高中',
+    label: "高中",
     value: 5,
   },
   {
-    label: '大专',
+    label: "大专",
     value: 4,
   },
   {
-    label: '本科',
+    label: "本科",
     value: 3,
   },
   {
-    label: '硕士',
+    label: "硕士",
     value: 2,
   },
   {
-    label: '博士',
+    label: "博士",
     value: 1,
   },
   {
-    label: 'MBA/EMBA',
+    label: "MBA/EMBA",
     value: 0,
-  }
+  },
 ];
 
 export const genderState = [
   {
-    label: '不限男女',
+    label: "不限男女",
     value: 0,
   },
   {
-    label: '男',
+    label: "男",
     value: 1,
   },
   {
-    label: '女',
+    label: "女",
     value: 2,
   },
 ];
+// 服务类型
+export const serviceType = [
+  {
+    label: "政策标签",
+    value: 0,
+  },
+  {
+    label: "个人标签",
+    value: 1,
+  },
+];
diff --git a/src/views/tenant/main/policy/Dialog/addGroups.vue b/src/views/tenant/main/policy/Dialog/addGroups.vue
index 4598053..47a4b12 100644
--- a/src/views/tenant/main/policy/Dialog/addGroups.vue
+++ b/src/views/tenant/main/policy/Dialog/addGroups.vue
@@ -35,7 +35,7 @@
 </template>
 
 <script>
-import { addDept, updateDept } from "@/api/tenant/talents";
+import { addDept, updateDept } from "@/api/tenant/policy";
 export default {
   data() {
     return {
diff --git a/src/views/tenant/main/policy/Dialog/transferGroups.vue b/src/views/tenant/main/policy/Dialog/transferGroups.vue
index 0b60c78..47df935 100644
--- a/src/views/tenant/main/policy/Dialog/transferGroups.vue
+++ b/src/views/tenant/main/policy/Dialog/transferGroups.vue
@@ -19,7 +19,7 @@
 </template>
 
 <script>
-import { transferDept } from "@/api/tenant/talents";
+import { transferDept } from "@/api/tenant/policy";
 export default {
   props: {
     ids: String,
@@ -42,7 +42,7 @@ export default {
             type: "tree",
             span: 24,
             display: true,
-            dicUrl: `/api/jobslink-api/tenant/talents/group/listAll`,
+            dicUrl: `/api/jobslink-api/label/group/listAll`,
             dicMethod: "get",
             dicFormatter: (res) => {
               return res.data.list; //返回字典的层级结构
diff --git a/src/views/tenant/main/policy/index.vue b/src/views/tenant/main/policy/index.vue
index 85f8bf8..f2dca20 100644
--- a/src/views/tenant/main/policy/index.vue
+++ b/src/views/tenant/main/policy/index.vue
@@ -35,7 +35,8 @@
             </el-tree>
             <div class="footer" style="padding-left: 6px">
               <el-button type="text" icon="el-icon-plus" @click="updateGroups('add')"
-                v-show="vaildData(permission.tenant_wage_payroll_view, false)">新建分组</el-button>
+                v-show="vaildData(permission.tenant_wage_payroll_view, false)">
+                新建分组</el-button>
             </div>
           </el-scrollbar>
         </div>
@@ -54,12 +55,18 @@
             <el-form-item label="姓名:">
               <el-input v-model="query.name" placeholder="姓名" clearable></el-input>
             </el-form-item>
-            <el-form-item label="工种:">
+            <el-form-item label="服务类型:">
+              <el-select v-model="query.stype" placeholder="服务类型" style="width: 100%" filterable clearable>
+                <el-option v-for="(item, key, index) in serviceType" :key="index" :label="item.label"
+                  :value="item.value"></el-option>
+              </el-select>
+            </el-form-item>
+            <!-- <el-form-item label="工种:">
               <el-select v-model="query.worktypes" placeholder="工种" style="width: 100%" filterable clearable>
                 <el-option v-for="(item, key, index) in worktypeData" :key="index" :label="item.name"
                   :value="item.name"></el-option>
               </el-select>
-            </el-form-item>
+            </el-form-item> -->
 
             <div class="searchBtn">
               <el-button type="primary" size="small" icon="el-icon-search" @click="searchChange1">搜 索</el-button>
@@ -102,8 +109,8 @@
               删除</el-button>
           </template>
           <template slot="name" slot-scope="{row}">
-            <span v-if="row.status==1">{{row.name}}</span>
-            <span v-else>{{row.name}}（<span style="color: red;">未实名</span>）</span>
+            <span v-if="row.status == 1">{{ row.name }}</span>
+            <span v-else>{{ row.name }}（<span style="color: red;">未实名</span>）</span>
 
           </template>
           <!--/自定义按钮-->
@@ -136,773 +143,800 @@
 </template>
 
 <script>
-  import {
-    getList,
-    remove,
-    update,
-    add,
-    detail,
-    getDept,
-    removeDept,
-    upload,
-  } from "@/api/tenant/talents";
-  import { 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 {
+  getList,
+  remove,
+  update,
+  add,
+  detail,
+  getDept,
+  removeDept,
+  upload,
+} from "@/api/tenant/policy";
+import { 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 { serviceType } from "@/common/dic";
 
-  export default {
-    filters: {
-      ellipsis(value) {
-        if (!value) return "";
-        if (value.length > 15) {
-          return value.slice(0, 14) + "...";
-        }
-        return value;
-      },
+export default {
+  filters: {
+    ellipsis(value) {
+      if (!value) return "";
+      if (value.length > 15) {
+        return value.slice(0, 14) + "...";
+      }
+      return value;
     },
-    name: "tenant_talents",
-    data() {
+  },
+  name: "tenant_talents",
+  data() {
+    return {
+      activeNames: "1",
+      isIndeterminate: false,
+      checkAll: false,
+      checked: false,
+      selectionList: [],
+      loading: true,
+      templateLoading: false,
+      query: {},
+      props: {
+        label: "groupName",
+        id: "id",
+      },
+      personTotal: 0,
+      treeData: [],
+      tenantId: "",
+      page: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0,
+      },
+      tempWorkType: [],
+      serviceType: serviceType,
+      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: [],
+      obj: {},
+      excelForm: { isCovered: 1 },
+    };
+  },
+  components: { addGroups, transferGroups, Resume, ied },
+  watch: {},
+  computed: {
+    ...mapGetters(["permission"]),
+    permissionList() {
       return {
-        activeNames: "1",
-        isIndeterminate: false,
-        checkAll: false,
-        checked: false,
-        selectionList: [],
-        loading: true,
-        templateLoading: false,
-        query: {},
-        props: {
-          label: "groupName",
-          id: "id",
-        },
-        personTotal: 0,
-        treeData: [],
-        tenantId: "",
-        page: {
-          pageSize: 10,
-          currentPage: 1,
-          total: 0,
-        },
-        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: [],
-        obj: {},
-        excelForm: { isCovered: 1 },
+        addBtn: this.vaildData(this.permission.tenant_talents_groupadd, false),
+        viewBtn: false,
+        delBtn: this.vaildData(
+          this.permission.tenant_talents_groupdelete,
+          false
+        ),
+        editBtn: this.vaildData(
+          this.permission.tenant_talents_groupedit,
+          false
+        ),
       };
     },
-    components: { addGroups, transferGroups, Resume, ied },
-    watch: {},
-    computed: {
-      ...mapGetters(["permission"]),
-      permissionList() {
-        return {
-          addBtn: this.vaildData(this.permission.tenant_talents_groupadd, false),
-          viewBtn: false,
-          delBtn: this.vaildData(
-            this.permission.tenant_talents_groupdelete,
-            false
-          ),
-          editBtn: this.vaildData(
-            this.permission.tenant_talents_groupedit,
-            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";
+    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 {
-          return 725 + "px";
+          callback(new Error("身份证格式不正确"));
         }
-      },
-      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 {
-          height: "auto",
-          dialogWidth: "30%",
-          calcHeight: 180,
-          align: "center",
-          menuAlign: "center",
-          tip: false,
-          columnBtn: false,
-          searchBtn: true,
-          searchShow: true,
-          searchMenuSpan: 6,
-          border: true,
-          index: true,
-          indexLabel: "序号",
-          selection: true,
-          dialogType: "dialog",
-          dialogClickModal: false,
-          column: [
-            {
-              label: "姓名",
-              prop: "name",
-              // search: true,
-              span: 24,
-              rules: [
-                {
-                  required: true,
-                  whitespace: true,
-                  message: "请输入姓名",
-                  trigger: "blur",
-                },
-              ],
-              slot:true
-            },
-            {
-              label: "身份证",
-              prop: "idNumber",
-              hide: true,
-              span: 24,
-              rules: [
-                { required: true, message: "请输入身份证号", trigger: "blur" },
-                { trigger: "blur", validator: IdCardNo },
-              ],
-            },
-            {
-              label: "手机号",
-              prop: "telphone",
-              span: 24,
-              hide: true,
-              rules: [
-                {
-                  required: true,
-                  validator: validateTel,
-                  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",
+      };
+      const validateTel = (rule, value, callback) => {
+        if (isvalidatemobile(value)[0]) {
+          callback(new Error(isvalidatemobile(value)[1]));
+        } else {
+          callback();
+        }
+      };
+      return {
+        height: "auto",
+        dialogWidth: "30%",
+        calcHeight: 180,
+        align: "center",
+        menuAlign: "center",
+        tip: false,
+        columnBtn: false,
+        searchBtn: true,
+        searchShow: true,
+        searchMenuSpan: 6,
+        border: true,
+        index: true,
+        indexLabel: "序号",
+        selection: true,
+        dialogType: "dialog",
+        dialogClickModal: false,
+        column: [
+          {
+            label: "姓名",
+            prop: "name",
+            // search: true,
+            span: 24,
+            rules: [
+              {
+                required: true,
+                whitespace: true,
+                message: "请输入姓名",
+                trigger: "blur",
               },
-              rules: [
-                {
-                  required: true,
-                  message: "请选择分组",
-                  trigger: "change",
-                },
-              ],
-              placeholder: "请选择 分组",
+            ],
+            slot: true
+          },
+          // {
+          //   label: "身份证",
+          //   prop: "idNumber",
+          //   hide: true,
+          //   span: 24,
+          //   rules: [
+          //     { required: true, message: "请输入身份证号", trigger: "blur" },
+          //     { trigger: "blur", validator: IdCardNo },
+          //   ],
+          // },
+          // {
+          //   label: "手机号",
+          //   prop: "telphone",
+          //   span: 24,
+          //   hide: true,
+          //   rules: [
+          //     {
+          //       required: true,
+          //       validator: validateTel,
+          //       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",
             },
-            {
-              label: "工种",
-              prop: "worktypes",
-              rules: [
-                {
-                  required: true,
-                  message: "请选择工种",
-                  trigger: ["blur"],
-                },
-              ],
-              slot: true,
-              formslot: true,
-              span: 24,
+            rules: [
+              {
+                required: true,
+                message: "请选择分组",
+                trigger: "change",
+              },
+            ],
+            placeholder: "请选择 分组",
+          },
+          {
+            label: "服务类型",
+            prop: "stype",
+            type: "tree",
+            span: 24,
+            display: true,
+            dicData: serviceType,
+            props: {
+              label: "label",
+              value: "value",
             },
-            // {
-            //   label: "简历",
-            //   prop: "resume",
-            //   slot: true,
-            //   display: false
-            // },
-            {
-              label: "备注",
-              prop: "remarks",
-              type: "textarea",
-              slot: true,
-              hide: true,
-              span: 24,
-              maxlength: 100,
-              showWordLimit: true,
-            },
-          ],
-        };
-      },
-      selectedWorkTypes: {
-        get() {
-          if (!this.obj.worktypes) {
-            return [];
-          }
-          const result = [];
-          const wt = this.obj.worktypes.split(",");
-          wt.forEach((item) => {
-            result.push({ name: item });
-          });
-          return result;
-        },
-        set(val) {
-          const arr = [];
-          val.forEach((item) => {
-            arr.push(item.name);
-          });
-          this.obj.worktypes = 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 (const key in this.worktypeDic) {
-          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;
-      },
+            rules: [
+              {
+                required: true,
+                message: "请选择服务类型",
+                trigger: "change",
+              },
+            ],
+            placeholder: "请选择 服务类型",
+          },
+          // {
+          //   label: "工种",
+          //   prop: "worktypes",
+          //   rules: [
+          //     {
+          //       required: true,
+          //       message: "请选择工种",
+          //       trigger: ["blur"],
+          //     },
+          //   ],
+          //   slot: true,
+          //   formslot: true,
+          //   span: 24,
+          // },
+          // {
+          //   label: "简历",
+          //   prop: "resume",
+          //   slot: true,
+          //   display: false
+          // },
+          {
+            label: "备注",
+            prop: "remarks",
+            type: "textarea",
+            slot: true,
+            hide: true,
+            span: 24,
+            maxlength: 100,
+            showWordLimit: true,
+          },
+        ],
+      };
     },
-    created() {
-      this.initDept();
-      this.getWorkTypes();
-    },
-    methods: {
-      getWorkTypes() {
-
-        getWorkTypes().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)
-
-          }
+    selectedWorkTypes: {
+      get() {
+        if (!this.obj.worktypes) {
+          return [];
+        }
+        const result = [];
+        const wt = this.obj.worktypes.split(",");
+        wt.forEach((item) => {
+          result.push({ name: item });
         });
+        return result;
       },
-      /*加载分组*/
-      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) {
+      set(val) {
+        const arr = [];
+        val.forEach((item) => {
+          arr.push(item.name);
+        });
+        this.obj.worktypes = 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 (const key in this.worktypeDic) {
+         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();
+    console.log(this.permission,'========================');
+  },
+  methods: {
+    getWorkTypes() {
+
+      getWorkTypes().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(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.$refs.tree.setCurrentKey(this.treeData[0].id);
+            }); //默认高亮第一个
+            this.nodeClick({ id: this.treeData[0].id });
+          }
+        }
+        this.personTotal = res.data.data.sum;
+        // this.onLoad();
+        //this.treeData.push(treeDataOne);
+        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();
             }
-          }
-          this.personTotal = res.data.data.sum;
-          // this.onLoad();
-          //this.treeData.push(treeDataOne);
-          this.loading = false;
+          },
+        }
+      )
+        .then(() => {
+          removeDept(data.id).then(
+            () => {
+              this.$message({
+                type: "success",
+                message: "操作成功!",
+              });
+              this.refresh("del");
+            },
+            (error) => {
+              window.console.log(error);
+            }
+          );
+        })
+        .catch(() => {
+          // this.$message({
+          //   type: 'info',
+          //   message: '已取消'
+          // });
         });
-      },
-      /*新建 编辑分组*/
-      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(() => {
-            // this.$message({
-            //   type: 'info',
-            //   message: '已取消'
-            // });
-          });
-      },
-      /*批量转移分组 */
-      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);
-        // if (this.tenantId !== data.id) {
+    },
+    /*批量转移分组 */
+    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);
+      // if (this.tenantId !== data.id) {
 
-        // } else {
-        //   return;
-        // }
-      },
-      /*新增 编辑 转移  删除分组 更新人才后*/
-      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) {
-        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.worktypes.split(",");
-                  done();
-                },
-                (error) => {
-                  window.console.log(error);
-                }
-              );
-            }, 0);
-          } else {
-            this.tempWorkType = [];
-            done();
-          }
-        }
-      },
-      /*新增人才*/
-      rowSave(row, done) {
-        add({
-          groupId: row.groupId,
-          name: row.name,
-          idNumber: row.idNumber,
-          telphone: row.telphone,
-          worktypes: row.worktypes,
-          remarks: row.remarks,
-        }).then(
-          () => {
-            this.$message({
-              type: "success",
-              message: "操作成功!",
-            });
-            done();
-            this.refresh();
-          },
-          (error) => {
-            window.console.log(error);
-            done();
-          }
-        );
-      },
-      /*编辑人才*/
-      rowUpdate(row, index, done) {
-        update({
-          id: row.id,
-          groupId: row.groupId,
-          name: row.name,
-          idNumber: row.idNumber,
-          telphone: row.telphone,
-          worktypes: row.worktypes,
-          remarks: row.remarks,
-        }).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 {
+      // } else {
+      //   return;
+      // }
+    },
+    /*新增 编辑 转移  删除分组 更新人才后*/
+    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) {
+      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.worktypes.split(",");
                 done();
-              }
-            },
-          }
-        )
-          .then(() => {
-            remove(row.id).then(
-              () => {
-                this.$message({
-                  type: "success",
-                  message: "操作成功!",
-                });
-                this.refresh();
               },
               (error) => {
                 window.console.log(error);
               }
             );
-          })
-          .catch(() => {
-            // this.$message({
-            //   type: 'info',
-            //   message: '已取消'
-            // });
-          });
-      },
-      /*批量删除人才*/
-      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(() => {
-            // this.$message({
-            //   type: 'info',
-            //   message: '已取消'
-            // });
-          });
-      },
-      /*导入人才库*/
-      beforeAvatarUpload(file, done, loading) {
-        if (!isExcel(file)) {
-          loading();
-          this.$message.error("上传人才库信息只能是 .xls,.xlsx 标准格式文件!");
+          }, 0);
         } else {
+          this.tempWorkType = [];
           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();
-      },
-      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;
-          this.data = data.records;
-          this.loading = false;
-          this.selectionClear();
-        });
-      },
+      }
     },
-  };
+    /*新增人才*/
+    rowSave(row, done) {
+      add({
+        groupId: row.groupId,
+        name: row.name,
+        idNumber: row.idNumber,
+        telphone: row.telphone,
+        worktypes: row.worktypes,
+        remarks: row.remarks,
+        stype: row.stype,
+      }).then(
+        () => {
+          this.$message({
+            type: "success",
+            message: "操作成功!",
+          });
+          done();
+          this.refresh();
+        },
+        (error) => {
+          window.console.log(error);
+          done();
+        }
+      );
+    },
+    /*编辑人才*/
+    rowUpdate(row, index, done) {
+      update({
+        id: row.id,
+        groupId: row.groupId,
+        name: row.name,
+        idNumber: row.idNumber,
+        telphone: row.telphone,
+        worktypes: row.worktypes,
+        remarks: row.remarks,
+      }).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(() => {
+          // this.$message({
+          //   type: 'info',
+          //   message: '已取消'
+          // });
+        });
+    },
+    /*批量删除人才*/
+    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(() => {
+          // this.$message({
+          //   type: 'info',
+          //   message: '已取消'
+          // });
+        });
+    },
+    /*导入人才库*/
+    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();
+    },
+    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;
+      console.log(this.query, '999999999999')
+      getList(
+        page.currentPage,
+        page.pageSize,
+
+
+        Object.assign(params, this.query),
+        this.tenantId
+      ).then((res) => {
+        const data = res.data.data;
+        this.page.total = data.total;
+        this.data = data.records;
+        this.loading = false;
+        this.selectionClear();
+      });
+    },
+  },
+};
 </script>
 
 <style scoped>
-  .el-tree {
-    font-size: 14px;
-  }
+.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;
-  }
+.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;
-  }
+.el-form-item {
+  margin-bottom: 18px;
+  padding: 0 10px;
+}
 
-  .searchBtn {
-    display: inline-block;
-    margin-bottom: 18px;
-  }
+.searchBtn {
+  display: inline-block;
+  margin-bottom: 18px;
+}
 </style>
diff --git a/src/views/tenant/mission/Table/ExpiredMission.vue b/src/views/tenant/mission/Table/ExpiredMission.vue
index 81f40cf..d857b81 100644
--- a/src/views/tenant/mission/Table/ExpiredMission.vue
+++ b/src/views/tenant/mission/Table/ExpiredMission.vue
@@ -1,21 +1,8 @@
 <template>
   <div>
-    <avue-crud
-      :option="option"
-      :table-loading="loading"
-      :data="data"
-      ref="crud"
-      v-model="obj"
-      @row-del="rowDel"
-      @row-update="rowUpdate"
-      @row-save="rowSave"
-      :before-open="beforeOpen"
-      :page.sync="page"
-      @current-change="currentChange"
-      @size-change="sizeChange"
-      @refresh-change="refreshChange"
-      @on-load="onLoad"
-    >
+    <avue-crud :option="option" :table-loading="loading" :data="data" ref="crud" v-model="obj" @row-del="rowDel"
+      @row-update="rowUpdate" @row-save="rowSave" :before-open="beforeOpen" :page.sync="page"
+      @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
       <!--自定义列-->
       <template slot="missionTitle" slot-scope="{ row }">
         <el-tooltip effect="dark" :content="row.missionTitle" placement="top">
@@ -26,11 +13,11 @@
       </template>
       <!-- 开始日期 -->
       <template slot="stime" slot-scope="{row}">
-        <span>{{format(row.stime)}}</span>
+        <span>{{ format(row.stime) }}</span>
       </template>
       <!-- 完成日期 -->
       <template slot="etime" slot-scope="{row}">
-        <span>{{format(row.etime)}}</span>
+        <span>{{ format(row.etime) }}</span>
       </template>
       <template slot="signUpCount" slot-scope="{ row }">
         <div style="color: #409eff">
@@ -56,32 +43,16 @@
           @click="rowView(row);"
           v-show="vaildData(permission.tenant_mission_view,false)"
         >查看</el-button>-->
-        <el-button
-          icon="el-icon-check"
-          :size="size"
-          :type="type"
-          @click="rowCopy(row, 'copy')"
-          v-show="vaildData(permission.tenant_mission_add, false)"
-        >复制</el-button>
-        <el-button
-          icon="el-icon-delete"
-          :size="size"
-          :type="type"
-          @click="$refs.crud.rowDel(row)"
-          v-show="vaildData(permission.tenant_mission_delete, false)"
-        >删除</el-button>
+        <el-button icon="el-icon-check" :size="size" :type="type" @click="rowCopy(row, 'copy')"
+          v-show="vaildData(permission.tenant_mission_add, false)">复制</el-button>
+        <el-button icon="el-icon-delete" :size="size" :type="type" @click="$refs.crud.rowDel(row)"
+          v-show="vaildData(permission.tenant_mission_delete, false)">删除</el-button>
       </div>
       <!--/自定义操作栏-->
       <!--自定义按钮-->
       <template slot="menuLeft">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-plus"
-          size="small"
-          @click="rowCopy('', 'add')"
-          v-show="vaildData(permission.tenant_mission_add, false)"
-        >发布任务</el-button>
+        <el-button type="warning" plain icon="el-icon-plus" size="small" @click="rowCopy('', 'add')"
+          v-show="vaildData(permission.tenant_mission_add, false)">发布任务</el-button>
       </template>
       <!--/自定义按钮-->
     </avue-crud>
@@ -105,7 +76,7 @@ import saveButton from "./saveButton";
 export default {
   comments: {},
   filters: {
-    ellipsis (value) {
+    ellipsis(value) {
       if (!value) return "";
       if (value.length > 15) {
         return value.slice(0, 14) + "...";
@@ -113,7 +84,7 @@ export default {
       return value;
     },
   },
-  data () {
+  data() {
     return {
       viewDrawer: false,
       view: {},
@@ -168,10 +139,10 @@ export default {
     missionView,
     saveButton,
   },
-  created () { },
+  created() { },
   computed: {
     ...mapGetters(["permission"]),
-    option () {
+    option() {
       return {
         height: "auto",
         calcHeight: 40,
@@ -193,12 +164,63 @@ export default {
         dialogType: "drawer",
         dialogWidth: "60%",
         dialogClickModal: false,
+        // column: [
+        //   {
+        //     label: "任务名称",
+        //     prop: "missionTitle",
+        //     slot: true,
+        //     display: false,
+        //   },
+        //   {
+        //     label: "任务编码",
+        //     prop: "missionNo",
+        //     display: false,
+        //   },
+        //   {
+        //     label: "开始时间",
+        //     prop: "stime",
+        //     display: false,
+        //     width: 130,
+        //     slot:true
+        //   },
+        //   {
+        //     label: "完成时间",
+        //     prop: "etime",
+        //     display: false,
+        //     width: 130,
+        //     slot:true
+        //   },
+        //   // {
+        //   //   label: "任务时间",
+        //   //   prop: "missionDate",
+        //   //   slot: true,
+        //   //   display: false,
+        //   //   width: 200,
+        //   // },
+        //   {
+        //     label: "申请人数",
+        //     prop: "signUpCount",
+        //     slot: true,
+        //     display: false,
+        //   },
+        //   {
+        //     label: "录用人数",
+        //     prop: "takeOnCount",
+        //     slot: true,
+        //     display: false,
+        //   },
+        //   {
+        //     label: "备注",
+        //     prop: "remarks",
+        //     display: false,
+        //   },
+        // ],
         column: [
           {
             label: "任务名称",
             prop: "missionTitle",
-            slot: true,
             display: false,
+            slot: true,
           },
           {
             label: "任务编码",
@@ -206,69 +228,75 @@ export default {
             display: false,
           },
           {
-            label: "开始时间",
+            label: "报名截止日期",
+            prop: "etimePub",
+            display: false,
+            format: "yyyy-MM-dd",
+            width: 130,
+            slot: true,
+          },
+          {
+            label: "开始日期",
             prop: "stime",
             display: false,
             width: 130,
-            slot:true
+            slot: true,
           },
           {
-            label: "完成时间",
+            label: "完成日期",
             prop: "etime",
             display: false,
             width: 130,
-            slot:true
+            slot: true,
           },
-          // {
-          //   label: "任务时间",
-          //   prop: "missionDate",
-          //   slot: true,
-          //   display: false,
-          //   width: 200,
-          // },
           {
             label: "申请人数",
             prop: "signUpCount",
             slot: true,
             display: false,
+            width: 110,
           },
           {
             label: "录用人数",
             prop: "takeOnCount",
             slot: true,
             display: false,
+            width: 110,
           },
-          {
-            label: "备注",
-            prop: "remarks",
-            display: false,
-          },
+
+          // {
+          //   label: "提示",
+          //   prop: "toStart",
+          //   slot: true,
+          //   display: false,
+          //   width: 200,
+          // },
         ],
       };
     },
   },
   methods: {
-    format (date) {
+    format(date) {
       if (date) {
         return dateFormat(new Date(date), "yyyy/MM/dd");
       }
     },
     /*查看*/
-    rowView (row) {
+    rowView(row) {
       detail(row.missionNo).then((res) => {
         this.viewDrawer = true;
         this.view = res;
       });
     },
     /*打开新建 复制*/
-    rowCopy (row, type) {
+    rowCopy(row, type) {
       this.$refs.copy.onLoad(row, type);
-      this.$nextTick(()=>{
+      this.$nextTick(() => {
         this.$refs.copy.resetFields();//等弹窗里的form表单的dom渲染完在执行this.$refs.staffForm.resetFields()，去除验证
       })
     },
     /*删除任务*/
-    rowDel (row) {
+    rowDel(row) {
       const h = this.$createElement;
       this.$confirm(
         h("div", null, [
@@ -321,18 +349,18 @@ export default {
           // });
         });
     },
-    currentChange (currentPage) {
+    currentChange(currentPage) {
       this.page.currentPage = currentPage;
     },
-    sizeChange (pageSize) {
+    sizeChange(pageSize) {
       this.page.pageSize = pageSize;
     },
     /*刷新本页 带搜索参数*/
-    refreshChange () {
+    refreshChange() {
       this.onLoad(this.page, this.query);
     },
     /*加载数据*/
-    onLoad (page, params = {}) {
+    onLoad(page, params = {}) {
       this.loading = true;
       getExpiredList(
         page.currentPage,
@@ -346,7 +374,7 @@ export default {
       });
     },
     /*返回首页*/
-    backIndex () {
+    backIndex() {
       this.$emit("refresh");
     },
   },
diff --git a/src/views/tenant/mission/Table/FinishedMission.vue b/src/views/tenant/mission/Table/FinishedMission.vue
index 51d1ec6..760a6bb 100644
--- a/src/views/tenant/mission/Table/FinishedMission.vue
+++ b/src/views/tenant/mission/Table/FinishedMission.vue
@@ -191,6 +191,69 @@ export default {
         dialogWidth: "60%",
         delBtnText: "取消",
         dialogClickModal: false,
+        // column: [
+        //   {
+        //     label: "任务名称",
+        //     prop: "missionTitle",
+        //     display: false,
+        //     slot: true,
+        //   },
+        //   {
+        //     label: "任务编码",
+        //     prop: "missionNo",
+        //     display: false,
+        //   },
+        //   // {
+        //   //   label: "任务时间",
+        //   //   prop: "missionDate",
+        //   //   slot: true,
+        //   //   display: false,
+        //   //   width: 200,
+        //   // },
+        //   {
+        //     label: "开始日期",
+        //     prop: "stime",
+        //     display: false,
+        //     width: 130,
+        //     slot:true
+        //   },
+        //   {
+        //     label: "完成日期",
+        //     prop: "etime",
+        //     display: false,
+        //     width: 130,
+        //     slot:true
+        //   },
+        //   {
+        //     label: "录用人数",
+        //     prop: "takeOnCount",
+        //     slot: true,
+        //     display: false,
+        //     width: 130,
+        //   },
+        //   {
+        //     label: "已发工资人数",
+        //     prop: "payCount",
+        //     slot: true,
+        //     display: false,
+        //     width: 130,
+        //   },
+        //   {
+        //     label: "发工资截止日期",
+        //     prop: "expiryTime",
+        //     slot: true,
+        //     display: false,
+        //     width: 160,
+        //     format: "yyyy-MM-dd",
+        //   },
+        //   {
+        //     label: "提示",
+        //     prop: "toPayEnd",
+        //     slot: true,
+        //     display: false,
+        //     width: 200,
+        //   },
+        // ],
         column: [
           {
             label: "任务名称",
@@ -203,56 +266,50 @@ export default {
             prop: "missionNo",
             display: false,
           },
-          // {
-          //   label: "任务时间",
-          //   prop: "missionDate",
-          //   slot: true,
-          //   display: false,
-          //   width: 200,
-          // },
+          {
+            label: "报名截止日期",
+            prop: "etimePub",
+            display: false,
+            format: "yyyy-MM-dd",
+            width: 130,
+            slot: true,
+          },
           {
             label: "开始日期",
             prop: "stime",
             display: false,
             width: 130,
-            slot:true
+            slot: true,
           },
           {
             label: "完成日期",
             prop: "etime",
             display: false,
             width: 130,
-            slot:true
+            slot: true,
+          },
+          {
+            label: "申请人数",
+            prop: "signUpCount",
+            slot: true,
+            display: false,
+            width: 110,
           },
           {
             label: "录用人数",
             prop: "takeOnCount",
             slot: true,
             display: false,
-            width: 130,
-          },
-          {
-            label: "已发工资人数",
-            prop: "payCount",
-            slot: true,
-            display: false,
-            width: 130,
-          },
-          {
-            label: "发工资截止日期",
-            prop: "expiryTime",
-            slot: true,
-            display: false,
-            width: 160,
-            format: "yyyy-MM-dd",
-          },
-          {
-            label: "提示",
-            prop: "toPayEnd",
-            slot: true,
-            display: false,
-            width: 200,
+            width: 110,
           },
+
+          // {
+          //   label: "提示",
+          //   prop: "toStart",
+          //   slot: true,
+          //   display: false,
+          //   width: 200,
+          // },
         ],
       };
     },
diff --git a/src/views/tenant/mission/Table/OngoingMission.vue b/src/views/tenant/mission/Table/OngoingMission.vue
index 075b3a8..0720025 100644
--- a/src/views/tenant/mission/Table/OngoingMission.vue
+++ b/src/views/tenant/mission/Table/OngoingMission.vue
@@ -187,6 +187,52 @@ export default {
         dialogWidth: "60%",
         delBtnText: "取消",
         dialogClickModal: false,
+        // column: [
+        //   {
+        //     label: "任务名称",
+        //     prop: "missionTitle",
+        //     display: false,
+        //     slot: true,
+        //   },
+        //   {
+        //     label: "任务编码",
+        //     prop: "missionNo",
+        //     display: false,
+        //   },
+        //   // {
+        //   //   label: "任务时间",
+        //   //   prop: "missionDate",
+        //   //   slot: true,
+        //   //   display: false,
+        //   //   width: 200,
+        //   // },
+        //   {
+        //     label: "开始时间",
+        //     prop: "stime",
+        //     display: false,
+        //     width: 130,
+        //     slot: true,
+        //   },
+        //   {
+        //     label: "完成时间",
+        //     prop: "etime",
+        //     display: false,
+        //     width: 130,
+        //     slot: true,
+        //   },
+        //   {
+        //     label: "录用人数",
+        //     prop: "takeOnCount",
+        //     slot: true,
+        //     display: false,
+        //   },
+        //   {
+        //     label: "提示",
+        //     prop: "toEnd",
+        //     slot: true,
+        //     display: false,
+        //   },
+        // ],
         column: [
           {
             label: "任务名称",
@@ -199,39 +245,50 @@ export default {
             prop: "missionNo",
             display: false,
           },
-          // {
-          //   label: "任务时间",
-          //   prop: "missionDate",
-          //   slot: true,
-          //   display: false,
-          //   width: 200,
-          // },
           {
-            label: "开始时间",
+            label: "报名截止日期",
+            prop: "etimePub",
+            display: false,
+            format: "yyyy-MM-dd",
+            width: 130,
+            slot: true,
+          },
+          {
+            label: "开始日期",
             prop: "stime",
             display: false,
             width: 130,
             slot: true,
           },
           {
-            label: "完成时间",
+            label: "完成日期",
             prop: "etime",
             display: false,
             width: 130,
             slot: true,
           },
+          {
+            label: "申请人数",
+            prop: "signUpCount",
+            slot: true,
+            display: false,
+            width: 110,
+          },
           {
             label: "录用人数",
             prop: "takeOnCount",
             slot: true,
             display: false,
+            width: 110,
           },
-          {
-            label: "提示",
-            prop: "toEnd",
-            slot: true,
-            display: false,
-          },
+
+          // {
+          //   label: "提示",
+          //   prop: "toStart",
+          //   slot: true,
+          //   display: false,
+          //   width: 200,
+          // },
         ],
       };
     },
diff --git a/vue.config.js b/vue.config.js
index e1ef759..6ce6a2b 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -24,8 +24,8 @@ module.exports = {
     proxy: {
       "/api": {
         // target: 'http://127.0.0.1:8000', // 本地服务接口地址
-        target: "http://39.98.184.58:8000",  // 阿里云后台地址
-        // target: "http://192.168.0.106:8000",  // 本地
+        // target: "http://39.98.184.58:8000",  // 阿里云后台地址
+        target: "http://192.168.0.105:8000",  // 本地
         ws: true,
         changeOrigin: true,
         pathRewrite: {