Merge branch 'amend_xia'

src/App.vue

@@ -59,7 +59,7 @@
           size="small"
         >
         </el-input>
-
+        <!-- 树 -->
         <el-tree
           class="filter-tree"
           :data="data"
@@ -96,6 +96,7 @@
             active-text-color="#5688f3"
             style="text-align: center"
           >
+          <!-- 头部菜单 -->
             <el-submenu index="1">
               <template slot="title">
                 <i class="el-icon-bank-card"></i>
@@ -113,8 +114,8 @@
 
             <el-submenu index="2">
               <template slot="title">招聘管理</template>
-              <el-menu-item index="2-1">招聘计划管理</el-menu-item>
-              <el-menu-item index="2-2">招聘人员管理</el-menu-item>
+              <el-menu-item index="2-1" ><div @click="$router.push('/recruitmentPlan')" target="_blank" style="text-decoration: none;border-bottom:none;color: rgb(50, 50, 50);">招聘计划管理</div></el-menu-item>
+              <el-menu-item index="2-2"><div @click="$router.push('/RecruitmentPeople')" target="_blank" style="text-decoration: none;border-bottom:none;color: rgb(50, 50, 50);">招聘人员管理</div></el-menu-item>
             </el-submenu>
 
             <el-submenu index="3">
@@ -181,7 +182,14 @@
               <el-menu-item index="10-3">代码生成</el-menu-item>
               <el-menu-item index="10-4">系统接口</el-menu-item>
             </el-submenu>
-
+              <img src="../src/assets/imgs/profile.jpg"
+              style="float: left;
+              width: 27px;
+              height: 27px;
+              border-radius: 50%;
+              margin-right: 2px;
+              margin-top: 10px;"
+              />
             <el-submenu index="11">
               <template slot="title">管理员</template>
               <el-menu-item index="11-1">个人中心</el-menu-item>
@@ -205,6 +213,7 @@
                 </div>
               </div>
             </el-submenu>
+          <!-- 头部菜单 -->
           </el-menu>
         </el-header>
         <el-main style="background: #ebeffa">
@@ -240,19 +249,43 @@ export default {
       data: [
         {
           id: 1,
-          label: "一级 1",
+          label: "安徽省",
           children: [
             {
               id: 4,
-              label: "二级 1-1",
+              label: "安徽省直",
               children: [
                 {
                   id: 9,
-                  label: "三级 1-1-1",
+                  label: "演示主管部门一",
+                  children: [
+                {
+                  id: 11,
+                  label: "演示事业单位一",
+                },
+                {
+                  id: 12,
+                  label: "演示事业单位二",
+                },
+              ],
                 },
                 {
                   id: 10,
-                  label: "三级 1-1-2",
+                  label: "演示主管部门二",
+                  children: [
+                {
+                  id: 13,
+                  label: "演示事业单位三",
+                },
+                {
+                  id: 14,
+                  label: "演示事业单位四",
+                },
+                {
+                  id: 15,
+                  label: "演示事业单位五",
+                },
+              ],
                 },
               ],
             },

src/router/index.js

@@ -43,10 +43,30 @@ const routes = [
     },
     component: () => import('@/views/user/personalCenter/personalCenter.vue')
   },
+  {
+    path: '/recruitmentPlan',
+    name: 'recruitmentPlan',
+    meta:{
+      inStructure:true
+    },
+    component: () => import('@/views/recruitmentManagement/recruitmentPlan/RecruitmentPeople.vue')
+  },
+  {
+    path: '/RecruitmentPeople',
+    name: 'RecruitmentPeople',
+    meta:{
+      inStructure:true
+    },
+    component: () => import('@/views/recruitmentManagement/recruitmentPlan/RecruitmentPeople.vue')
+  },
 ]
 
 const router = new VueRouter({
   routes
 })
-
+// 解决报错
+const originalPush = VueRouter.prototype.push
+VueRouter.prototype.push = function push(location) {
+  return originalPush.call(this, location).catch(err => err)
+}
 export default router

src/views/index/index.vue

@@ -26,6 +26,7 @@
         />
       </div>
       <div class="todayDate">{{ todayDate }}</div>
+      <div class="wait">待办</div>
     </div>
     <div class="con" style="padding: 0 15px">
       <div class="conTop">
@@ -351,4 +352,23 @@ export default {
 .conBottom .conBottomImg.conBottomImg4:hover {
   content: url("../../assets/imgs/jygl2.png");
 }
+.wait {
+   font-size: 13px;
+    margin-left: 5px;
+    color: #e9686b;
+    display: inline-block;
+    position: relative;
+    bottom: 60px;
+    right: 40px;
+    float: right;
+    height: 64px;
+    text-align: center;
+    width: 64px;
+    line-height: 64px;
+    background: #ffefef;
+    border-radius: 5px;
+    border: 1px solid #ffc4c4;
+    font-weight: bold;
+    cursor: pointer;
+}
 </style>

src/views/recruitmentManagement/recruitmentPlan/RecruitmentPeople.vue

@@ -0,0 +1,224 @@
+<!-- 招聘人员管理 -->
+<template>
+    <div class="recruitmentPlanBox">
+    <div class="header">
+      <plan-header :Type ="2"></plan-header>
+    </div>
+    <div class="content">
+      <div class="con">
+        <el-button type="primary" icon="el-icon-plus" style="margin-left: 30px;">添加</el-button>
+        <el-button icon="el-icon-edit-outline">修改</el-button>
+        <el-button icon="el-icon-close">删除</el-button>
+      </div>
+      <!-- 右侧栏 -->
+      <div class="con cons">
+        <div class="b_r b_ro">
+          <i class="el-icon-search" title="搜索"></i>
+        </div>
+        <div class="b_r">
+          <i class="el-icon-refresh" title="刷新"></i>
+        </div>
+        <div class="b_r">
+          <i class="el-icon-notebook-2" title="切换"></i>
+        </div>
+        <div class="b_r b_rf">
+          <i class="el-icon-s-grid" title="列"></i>
+          <i class="el-icon-caret-bottom" title="列"></i>
+        </div>
+        <plan-con></plan-con>
+      </div>
+    </div>
+      <!-- 右侧栏 -->
+    <!-- 多选表格 -->
+    <el-table ref="multipleTable" :data="tableData" tooltip-effect="dark" style="width: 100%"
+      @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55">
+      </el-table-column>
+      <el-table-column label="序号" width="120">
+        <template slot-scope="scope">{{ scope.row.date }}</template>
+      </el-table-column>
+      <el-table-column prop="name" label="招聘单位" width="120">
+      </el-table-column>
+      <el-table-column prop="type" label="招聘类型" width="120">
+      </el-table-column>
+      <el-table-column prop="year" label="招聘计划年份" width="120">
+      </el-table-column>
+      <el-table-column prop="number" label="拟聘人数" width="120">
+      </el-table-column>
+      <el-table-column prop="num" label="已聘人数" width="120">
+      </el-table-column>
+      <el-table-column label="备注" width="120">
+      </el-table-column>
+      <el-table-column prop="person" label="创建人" width="120">
+      </el-table-column>
+      <el-table-column label="创建时间" width="120">
+      </el-table-column>
+      <el-table-column label="修改人" width="120">
+      </el-table-column>
+      <el-table-column prop="address" label="修改时间" show-overflow-tooltip>
+      </el-table-column>
+    </el-table>
+    <!-- 多选表格 -->
+  </div>
+</template>
+
+<script>
+import planHeader from "./components/planHeader.vue";
+import planCon from "./components/planCon.vue";
+export default {
+  data() {
+    return {
+      tableData: [{
+        date: '1',
+        name: '安徽省直',
+        type: '统一招聘',
+        number: '5',
+        num: '0',
+        person: '张三',
+        year: '2022',
+        address: '上海市普陀区金沙江路 1518 弄'
+      }, {
+        date: '2016-05-02',
+        name: '王小虎',
+        address: '上海市普陀区金沙江路 1518 弄'
+      }, {
+        date: '2016-05-04',
+        name: '王小虎',
+        address: '上海市普陀区金沙江路 1518 弄'
+      }, {
+        date: '2016-05-01',
+        name: '王小虎',
+        address: '上海市普陀区金沙江路 1518 弄'
+      }, {
+        date: '2016-05-08',
+        name: '王小虎',
+        address: '上海市普陀区金沙江路 1518 弄'
+      }, {
+        date: '2016-05-06',
+        name: '王小虎',
+        address: '上海市普陀区金沙江路 1518 弄'
+      }, {
+        date: '2016-05-07',
+        name: '王小虎',
+        address: '上海市普陀区金沙江路 1518 弄'
+      }],
+      multipleSelection: []
+    }
+  },
+  methods: {
+    toggleSelection(rows) {
+      if (rows) {
+        rows.forEach(row => {
+          this.$refs.multipleTable.toggleRowSelection(row);
+        });
+      } else {
+        this.$refs.multipleTable.clearSelection();
+      }
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    }
+  },
+  name: "recruitmentPlan",
+  components: {
+    planHeader,
+    planCon,
+  },
+
+};
+</script>
+
+<style scoped>
+.recruitmentPlanBox {
+  height: 100%;
+}
+
+.recruitmentPlanBox .header {
+  background: #fff;
+  border-radius: 10px 10px 0 0;
+  box-shadow: 1px 1px 3px rgb(0 0 0 / 20%);
+}
+
+.recruitmentPlanBox .con {
+  background: #fff;
+  border-radius: 0 0 10px 10px;
+  height: calc(100% - 90px);
+  padding-top: 20px;
+  margin-right: 20px;
+}
+
+.content {
+  display: flex;
+  justify-content: space-between;
+  background: #fff;
+}
+
+.cons {
+  display: flex;
+}
+
+.b_r {
+  border: 1px solid #DCDCDC;
+  border-right: none;
+  color: #000;
+  font-size: 24px;
+  cursor: pointer;
+}
+
+.b_ro {
+  border-radius: 5px 0 0 5px;
+}
+
+.b_rf {
+  display: flex;
+  border-right: 1px solid #DCDCDC;
+  border-radius: 0 5px 5px 0;
+  align-items: center;
+}
+
+.b_r:hover {
+  color: #ffffff;
+  background-color: #CFCFCF;
+}
+
+.b_rf:hover {
+  color: #ffffff;
+  background-color: #CFCFCF;
+}
+
+.el-icon-caret-bottom {
+  font-size: 16px;
+}
+
+.el-icon-search {
+  padding: 10px 10px 10px 10px;
+  font-size: 16px;
+  font-weight: 600;
+}
+
+.el-icon-refresh {
+  padding: 10px 10px 10px 10px;
+  font-size: 16px;
+  font-weight: 600;
+}
+
+.el-icon-notebook-2 {
+  padding: 10px 10px 10px 10px;
+  font-size: 16px;
+  font-weight: 600;
+}
+
+.el-icon-s-grid {
+  padding: 10px 0px 10px 10px;
+  font-size: 16px;
+  font-weight: 500;
+}
+
+.el-icon-caret-bottom {
+  padding: 10px 10px 10px 0;
+  font-size: 10px;
+  font-weight: 500;
+}
+</style>
+   </div>
+</template>

src/views/recruitmentManagement/recruitmentPlan/components/planHeader.vue

@@ -6,16 +6,20 @@
       class="demo-form-inline"
       ref="planHeaderForm"
     >
-      <el-form-item label="招聘单位:" prop="unit">
-        <el-input v-model="planHeaderForm.unit" size="small"></el-input>
+      <el-form-item label="招聘单位:" prop="unit" style="margin-left: 20px;">
+        <el-input v-model="planHeaderForm.unit"></el-input>
       </el-form-item>
-
-      <el-form-item label="招聘单位:" prop="years">
+      <el-form-item v-if="Type==2" label="姓名:" prop="name" style="margin-left: 20px;">
+        <el-input v-model="planHeaderForm.name"></el-input>
+      </el-form-item>
+      <el-form-item v-if="Type==2" label="身份证号:" prop="cardId" style="margin-left: 20px;">
+        <el-input v-model="planHeaderForm.cardId"></el-input>
+      </el-form-item>
+      <el-form-item label="年份:" prop="years">
         <el-date-picker
           v-model="planHeaderForm.years"
           type="year"
           placeholder="年份"
-          size="small"
         >
         </el-date-picker>
       </el-form-item>
@@ -23,15 +27,11 @@
       <el-form-item>
         <el-button
           type="primary"
-          round
           icon="el-icon-search"
           @click="onSearch"
-          size="small"
           >搜索</el-button
         >
         <el-button
-          round
-          size="small"
           icon="el-icon-refresh"
           @click="resetForm('planHeaderForm')"
           >重置</el-button
@@ -44,17 +44,24 @@
 <script>
 export default {
   name: "planHeader",
+  props:{
+    Type: {
+      type: Number,
+      default: 1,
+    },
+  },
   data() {
     return {
       planHeaderForm: {
         unit: "",
         years: "",
+        cardId:'',
       },
     };
   },
   methods: {
     onSearch() {
-      console.log("onSearch!");
+      // console.log("onSearch!");
     },
     resetForm(formName) {
       this.$refs[formName].resetFields();

src/views/recruitmentManagement/recruitmentPlan/recruitmentPlan.vue

@@ -1,15 +1,123 @@
+<!-- 招聘计划管理 -->
 <template>
   <div class="recruitmentPlanBox">
     <div class="header">
       <plan-header></plan-header>
     </div>
-    <div class="con">
-      <el-button type="primary" size="small" icon="el-icon-plus">添加</el-button>
-      <el-button size="small" icon="el-icon-edit-outline">修改</el-button>
-      <el-button size="small" icon="el-icon-close">删除</el-button>
-      <el-button size="small" icon="el-icon-download">合并查看</el-button>
-      <plan-con></plan-con>
+    <div class="content">
+      <div class="con">
+        <el-button type="primary" icon="el-icon-plus" style="margin-left: 30px;">添加</el-button>
+        <el-button icon="el-icon-edit-outline">修改</el-button>
+        <el-button icon="el-icon-close">删除</el-button>
+        <el-button icon="el-icon-download">合并查看</el-button>
+      </div>
+      <!-- 右侧栏 -->
+      <div class="con cons">
+        <div class="b_r b_ro">
+          <i class="el-icon-search" title="搜索"></i>
+        </div>
+        <div class="b_r">
+          <i class="el-icon-refresh" title="刷新"></i>
+        </div>
+        <div class="b_r">
+          <i class="el-icon-notebook-2" title="切换"></i>
+        </div>
+        <div class="b_r ">
+          <el-dropdown :hide-on-click="false">
+            <div class=" b_rf">
+              <i class="el-icon-s-grid" title="列"></i>
+              <i class="el-icon-caret-bottom" title="列"></i>
+            </div>
+      <!-- 右侧栏 -->
+      <!-- 下拉菜单 -->
+            <el-dropdown-menu slot="dropdown" style="height: 320px;overflow-y: scroll;">
+              <el-dropdown-item>
+                <el-checkbox v-model="showColumn.inviteid">招聘计划id</el-checkbox>
+              </el-dropdown-item>
+              <el-dropdown-item>
+                <el-checkbox v-model="showColumn.serial">序号</el-checkbox>
+              </el-dropdown-item>
+              <el-dropdown-item>
+                <el-checkbox v-model="showColumn.organid">机构id</el-checkbox>
+              </el-dropdown-item>
+              <el-dropdown-item>
+                <el-checkbox v-model="showColumn.want">招聘单位</el-checkbox>
+              </el-dropdown-item>
+              <el-dropdown-item>
+                <el-checkbox v-model="showColumn.wanttype">招聘类型</el-checkbox>
+              </el-dropdown-item>
+              <el-dropdown-item>
+                <el-checkbox v-model="showColumn.wantyear">招聘计划年份</el-checkbox>
+              </el-dropdown-item>
+              <el-dropdown-item>
+                <el-checkbox v-model="showColumn.planwant">拟聘人数</el-checkbox>
+              </el-dropdown-item>
+              <el-dropdown-item>
+                <el-checkbox v-model="showColumn.wantnumber">已聘人数</el-checkbox>
+              </el-dropdown-item>
+              <el-dropdown-item>
+                <el-checkbox v-model="showColumn.remark">备注</el-checkbox>
+              </el-dropdown-item>
+              <el-dropdown-item>
+                <el-checkbox v-model="showColumn.creator">创建人</el-checkbox>
+              </el-dropdown-item>
+              <el-dropdown-item>
+                <el-checkbox v-model="showColumn.creationtime">创建时间</el-checkbox>
+              </el-dropdown-item>
+              <el-dropdown-item>
+                <el-checkbox v-model="showColumn.modifier">修改人</el-checkbox>
+              </el-dropdown-item>
+              <el-dropdown-item>
+                <el-checkbox v-model="showColumn.modifiertime">修改时间</el-checkbox>
+              </el-dropdown-item>
+              <el-dropdown-item>
+                <el-checkbox v-model="showColumn.accessory">附件</el-checkbox>
+              </el-dropdown-item>
+            </el-dropdown-menu>
+            <!-- 下拉菜单 -->
+          </el-dropdown>
+        </div>
+        <plan-con></plan-con>
+      </div>
     </div>
+    <!-- 展示列表 -->
+    <el-table ref="multipleTable" :data="tableData" tooltip-effect="dark" style="width: 100%"
+      @selection-change="handleSelectionChange">
+      <el-table-column type="selection">
+      </el-table-column>
+      <el-table-column label="招聘计划id" v-if="showColumn.inviteid">
+        <template slot-scope="scope">{{ scope.row.date }}</template>
+      </el-table-column>
+      <el-table-column label="序号" v-if="showColumn.serial">
+        <template slot-scope="scope">{{ scope.row.date }}</template>
+      </el-table-column>
+      <el-table-column label="机构id" v-if="showColumn.organid">
+        <template slot-scope="scope">{{ scope.row.date }}</template>
+      </el-table-column>
+      <el-table-column prop="name" label="招聘单位" v-if="showColumn.want">
+      </el-table-column>
+      <el-table-column prop="type" label="招聘类型" v-if="showColumn.wanttype">
+      </el-table-column>
+      <el-table-column prop="year" label="招聘计划年份" v-if="showColumn.wantyear">
+      </el-table-column>
+      <el-table-column prop="number" label="拟聘人数" v-if="showColumn.planwant">
+      </el-table-column>
+      <el-table-column prop="num" label="已聘人数" v-if="showColumn.wantnumber">
+      </el-table-column>
+      <el-table-column label="备注" v-if="showColumn.remark">
+      </el-table-column>
+      <el-table-column prop="person" label="创建人" v-if="showColumn.creator">
+      </el-table-column>
+      <el-table-column label="创建时间" v-if="showColumn.creationtime">
+      </el-table-column>
+      <el-table-column label="修改人" v-if="showColumn.modifier">
+      </el-table-column>
+      <el-table-column prop="address" label="修改时间" show-overflow-tooltip v-if="showColumn.modifiertime">
+      </el-table-column>
+      <el-table-column prop="address" label="附件" show-overflow-tooltip v-if="showColumn.accessory">
+      </el-table-column>
+    </el-table>
+    <!-- 展示列表 -->
   </div>
 </template>
 
@@ -17,28 +125,225 @@
 import planHeader from "./components/planHeader.vue";
 import planCon from "./components/planCon.vue";
 export default {
+  data() {
+    return {
+      visible: false,
+      checkList: ['选中且禁用', '复选框 A'],
+      tableData: [{
+        date: '1',
+        name: '安徽省直',
+        type: '统一招聘',
+        number: '5',
+        num: '0',
+        person: '张三',
+        year: '2022',
+        address: '上海市普陀区金沙江路 1518 弄'
+      }, {
+        date: '2016-05-02',
+        name: '王小虎',
+        address: '上海市普陀区金沙江路 1518 弄'
+      }, {
+        date: '2016-05-04',
+        name: '王小虎',
+        address: '上海市普陀区金沙江路 1518 弄'
+      }, {
+        date: '2016-05-01',
+        name: '王小虎',
+        address: '上海市普陀区金沙江路 1518 弄'
+      }, {
+        date: '2016-05-08',
+        name: '王小虎',
+        address: '上海市普陀区金沙江路 1518 弄'
+      }, {
+        date: '2016-05-06',
+        name: '王小虎',
+        address: '上海市普陀区金沙江路 1518 弄'
+      }, {
+        date: '2016-05-07',
+        name: '王小虎',
+        address: '上海市普陀区金沙江路 1518 弄'
+      }],
+      multipleSelection: [],
+      showColumn: {
+        inviteid: false,
+        serial: true,
+        organid: true,
+        want: true,
+        wanttype: true,
+        wantyear: true,
+        planwant: true,
+        wantnumber: true,
+        hired: true,
+        remark: true,
+        creator: true,
+        creationtime: true,
+        modifier: true,
+        modifiertime: true,
+        accessory: true,
+      },
+
+    }
+  },
+  mounted() {
+    // 发请求得到showColumnInitData的列的名字
+    if (localStorage.getItem("columnSet")) {
+      this.showColumn = JSON.parse(localStorage.getItem("columnSet"))
+    } else {
+      this.showColumn = {
+        inviteid: false,
+        serial: true,
+        organid: true,
+        want: true,
+        wanttype: true,
+        wantyear: true,
+        planwant: true,
+        wantnumber: true,
+        hired: true,
+        remark: true,
+        creator: true,
+        creationtime: true,
+        modifier: true,
+        modifiertime: true,
+        accessory: true,
+      };
+    }
+  },
+  methods: {
+    toggleSelection(rows) {
+      if (rows) {
+        rows.forEach(row => {
+          this.$refs.multipleTable.toggleRowSelection(row);
+        });
+      } else {
+        this.$refs.multipleTable.clearSelection();
+      }
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    handleClick(row) {
+      console.log(row);
+    },
+    saveColumn() {
+      localStorage.setItem("columnSet", JSON.stringify(this.showColumn))
+      this.visible = false;
+    },
+
+  },
   name: "recruitmentPlan",
   components: {
     planHeader,
     planCon,
   },
+
 };
+
 </script>
 
 <style scoped>
 .recruitmentPlanBox {
   height: 100%;
 }
+
 .recruitmentPlanBox .header {
   background: #ffffff;
-  border-radius: 10px;
+  border-radius: 10px 10px 0 0;
   box-shadow: 1px 1px 3px rgb(0 0 0 / 20%);
 }
+
 .recruitmentPlanBox .con {
-  margin-top: 15px;
   background: #ffffff;
-  border-radius: 10px;
+  border-radius: 0 0 10px 10px;
   height: calc(100% - 90px);
+  padding-top: 20px;
+  margin-right: 20px;
 }
 
+.content {
+  display: flex;
+  justify-content: space-between;
+  background: #ffffff;
+}
+
+.cons {
+  display: flex;
+}
+
+.b_r {
+  border: 1px solid #DCDCDC;
+  border-right: none;
+  color: #000;
+  font-size: 24px;
+  cursor: pointer;
+}
+
+.b_ro {
+  border-radius: 5px 0 0 5px;
+}
+
+.b_rf {
+  display: flex;
+  border-right: 1px solid #DCDCDC;
+  border-radius: 0 5px 5px 0;
+  align-items: center;
+}
+
+.b_r:hover {
+  color: #ffffff;
+  background-color: #999;
+}
+
+.b_rf:hover {
+  color: #ffffff;
+  background-color: #999;
+}
+
+.el-icon-caret-bottom {
+  font-size: 16px;
+}
+
+.el-icon-search {
+  padding: 10px 10px 10px 10px;
+  font-size: 16px;
+  font-weight: 600;
+}
+
+.el-icon-refresh {
+  padding: 10px 10px 10px 10px;
+  font-size: 16px;
+  font-weight: 600;
+}
+
+.el-icon-notebook-2 {
+  padding: 10px 10px 10px 10px;
+  font-size: 16px;
+  font-weight: 600;
+}
+
+.el-icon-s-grid {
+  padding: 10px 0px 10px 10px;
+  font-size: 16px;
+  font-weight: 500;
+}
+
+.el-icon-caret-bottom {
+  padding: 10px 10px 10px 0;
+  font-size: 10px;
+  font-weight: 500;
+}
+
+.fade-enter-active,
+.fade-leave-active {
+  transition: opacity 0.3s;
+}
+
+.fade-enter,
+.fade-leave-to {
+  opacity: 0;
+}
+
+.chenkbox {
+  display: flex;
+  flex-direction: column;
+}
 </style>