楚江漓i
2021-03-05 fb4cc8f8c3a452e00427c69d85eb279891ae2f3f
登录页,档案页,员工附件,员工智搜样式修改
6个文件已修改
9958 ■■■■ 已修改文件
src/views/login/login.scss 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/user/archivesChange.vue 4443 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/user/archivesEdit.vue 5271 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/user/outemployess.vue 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/user/search.vue 93 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/yunpan/fujian.vue 134 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/login/login.scss
@@ -54,6 +54,7 @@
  }
  i.el-input__icon {
    line-height: 8vh;
    width: 1.3vw;
    font-size: 2.65vh;
    margin-left: 1.3vw;
src/views/user/archivesChange.vue
Diff too large
src/views/user/archivesEdit.vue
Diff too large
src/views/user/outemployess.vue
@@ -174,7 +174,7 @@
          </form>
        </div>
      </el-header>
      <el-main style="height: 85%;">
      <el-main style="height: 85vh;">
        <el-row style="margin: 10px 0 10px 0;">
          <el-col :span="24">
            <el-button type="primary" @click="delEmp">删除员工</el-button>
@@ -182,7 +182,13 @@
            <el-button type="danger" class="hr-but-all" @click="doDcbb">导出报表</el-button>
          </el-col>
        </el-row>
        <el-table ref="multipleTable" :data="tableData" style="width: 100%;">
        <el-table
          ref="multipleTable"
          :data="tableData"
          stripe
          :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
          style="width: 100%;"
        >
          <el-table-column type="selection" width="55" />
          <el-table-column label="操作" width="120">
            <template slot-scope="scope">
@@ -1045,7 +1051,6 @@
  },
  methods: {
    educationFormat(row, column) {
      debugger
      return this.selectDictLabel(this.educationOptions, row.education)
    },
    sexFormat(row, column) {
@@ -1418,6 +1423,8 @@
  color: #D9001B;
}
</style>
<style>
.search-btn {
  display: inline-block;
  width: 3.64vw;
@@ -1445,4 +1452,7 @@
  cursor: pointer;
  vertical-align: middle;
}
.el-dialog.is-fullscreen {
  overflow: hidden;
}
</style>
src/views/user/search.vue
@@ -1,8 +1,8 @@
<template>
  <div>
    <el-container>
      <el-aside width="200px">
        <el-timeline>
      <el-aside width="175px">
        <el-timeline style="padding-left: 15px">
          <el-timeline-item @click.native="isShow(showArr[0].show, 0)">
            <span :class="thisShowIndex===0?'selectedTimeline':''">基本信息</span>
          </el-timeline-item>
@@ -60,8 +60,8 @@
            </el-col>
            <el-col :span="7">
              <el-input v-model="queryParams.vague" placeholder="请输入内容" style="width:200px" />
              <el-button type="primary" @click="vagueSearch">查询</el-button>
              <el-button type="danger" @click="advancedQueryShowMethods">高级查询</el-button>
              <span class="search-btn" @click="vagueSearch">查询</span>
              <span class="sup-search-btn" @click="advancedQueryShowMethods">高级查询</span>
            </el-col>
          </el-row>
          <div v-show="advancedQueryShow">
@@ -219,25 +219,31 @@
            <el-col :span="21">
              已为您搜索出<span style="color:red">{{ total }}</span>条符合条件的记录
            </el-col>
            <el-col :span="3">
            <el-col :span="3" style="text-align: right;padding-right: 10px">
              <el-button size="mini" class="hr-but" type="success" @click.native="exportExcel">
                {{ $t('table.export') }}
              </el-button>
            </el-col>
          </el-row>
          <el-table ref="empBaseInfoTable" :data="basicInformationData" style="width: 100%;height: 70%;">
            <el-table-column type="index" label="序号" width="50" align="center" />
            <el-table-column prop="empNumb" label="员工编号" />
            <el-table-column prop="deptName" label="护卫点" />
            <el-table-column prop="jobName" label="岗位" />
            <el-table-column prop="empName" label="姓名" />
            <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
            <el-table-column prop="sex" label="性别" width="50" :formatter="sexFormat" />
            <el-table-column prop="age" label="年龄" width="50" />
            <el-table-column prop="education" label="学历" :formatter="educationFormat" />
            <el-table-column prop="nativePlace" label="籍贯" :formatter="nativePlaceFormat" />
            <el-table-column prop="telePhone" label="电话" />
            <el-table-column prop="empStatus" label="员工状态">
          <el-table
            ref="empBaseInfoTable"
            :data="basicInformationData"
            stripe
            :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
            style="width: 100%;height: 100%;"
          >
            <el-table-column show-overflow-tooltip type="index" label="序号" width="50" align="center" />
            <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" />
            <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" />
            <el-table-column show-overflow-tooltip prop="jobName" label="岗位" />
            <el-table-column show-overflow-tooltip prop="empName" label="姓名" />
            <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="180" />
            <el-table-column show-overflow-tooltip prop="sex" label="性别" width="50" :formatter="sexFormat" />
            <el-table-column show-overflow-tooltip prop="age" label="年龄" width="50" />
            <el-table-column show-overflow-tooltip prop="education" label="学历" :formatter="educationFormat" />
            <el-table-column show-overflow-tooltip prop="nativePlace" label="籍贯" :formatter="nativePlaceFormat" />
            <el-table-column show-overflow-tooltip prop="telePhone" label="电话" />
            <el-table-column show-overflow-tooltip prop="empStatus" label="员工状态">
              <template slot-scope="{row}">
                {{ transEmpStatus(row.empStatus) }}
              </template>
@@ -2522,7 +2528,7 @@
  font-size: 15px;
}
  .el-container {
    height: 100%;
    height: 86.7vh;
    background-color: white;
    .el-aside {
@@ -2544,14 +2550,16 @@
  }
 .searchTable {
    margin-top: 10px;
    border-collapse: collapse;
    width: 100%;
  margin-bottom: 15px;
   margin-top: 10px;
   border-collapse: collapse;
   width: 100%;
   tr {
     border-bottom: 1px dashed #d9dadb;
   }
  .td {
    background-color: #dddcdc !important;
    width: 160px;
    text-align: center;
    width: 90px;
    text-align: right;
  }
  .td-group {
    padding-left: 20px;
@@ -2560,16 +2568,13 @@
  .searchTable td,
  .searchTable th {
    border: 1px solid #b0b0b0;
    color: #000;
    height: 40px;
    height: 50px;
    background-color: #fff;
  }
  .searchTable tr td:first-child {
    background-color: #dddcdc !important;
    width: 160px;
    text-align: center;
  }
  .button-from {
@@ -2616,4 +2621,32 @@
  .el-date-editor.el-input__inner {
    width: 100%;
  }
.search-btn {
  display: inline-block;
  width: 3.64vw;
  height: 3.2vh;
  line-height: 3.2vh;
  text-align: center;
  background-color: #a00515;
  color: #fff;
  margin-left: 1vw;
  box-sizing: border-box;
  cursor: pointer;
  vertical-align: middle;
}
.sup-search-btn {
  display: inline-block;
  width: 5.2vw;
  height: 3.2vh;
  line-height: 3.2vh;
  text-align: center;
  margin-left: 1vw;
  color: #a00515;
  border: 1px solid #a00515;
  box-sizing: border-box;
  cursor: pointer;
  vertical-align: middle;
}
</style>
src/views/yunpan/fujian.vue
@@ -1,5 +1,5 @@
<template>
  <div>
  <div style="background-color: #fff;height: 100%;">
    <el-container>
      <el-header :height="headerHeight">
        <el-row class="search-title">
@@ -8,13 +8,8 @@
          </el-col>
          <el-col :span="8" class="search">
            <el-input v-model="basic" class="input-empName" maxlength="18" size="medium" style="width:220px" />
            <el-button type="primary" size="mini" @click="findEmpAccessory()">查询</el-button>
            <el-button
              type="danger"
              size="mini"
              class="hr-but-all"
              @click="advancedQueryShowMethods"
            >高级查询</el-button>
            <span class="search-btn" @click="findEmpAccessory">查询</span>
            <span class="sup-search-btn" @click="advancedQueryShowMethods">高级查询</span>
          </el-col>
        </el-row>
        <el-form v-show="advancedQueryShow" ref="queryform" :model="queryform">
@@ -52,9 +47,9 @@
          </el-row>
          <el-row>
            <el-col :span="24">
              <table id="searchTable">
              <table id="searchTable" class="searchTable">
                <tr>
                  <td class="td">性别</td>
                  <td class="td">性别:</td>
                  <td class="td-group">
                    <el-checkbox-group v-model="queryform.sex" class="fj-checkbox">
                      <el-checkbox label="" @change="selectAllSex">全部</el-checkbox>
@@ -64,7 +59,7 @@
                  </td>
                </tr>
                <tr>
                  <td class="td">最高学历</td>
                  <td class="td">最高学历:</td>
                  <td class="td-group">
                    <el-checkbox-group v-model="queryform.education" class="fj-checkbox">
                      <el-checkbox label="" @change="selectAllEducation">全部</el-checkbox>
@@ -82,7 +77,7 @@
                  </td>
                </tr>
                <tr>
                  <td class="td">政治面貌</td>
                  <td class="td">政治面貌:</td>
                  <td class="td-group">
                    <el-checkbox-group v-model="queryform.politics" class="fj-checkbox">
                      <el-checkbox label="" @change="selectAllPolitics">全部</el-checkbox>
@@ -103,7 +98,7 @@
                  </td>
                </tr>
                <tr>
                  <td class="td">年龄</td>
                  <td class="td">年龄:</td>
                  <td class="td-group">
                    <el-checkbox-group v-model="queryform.age" class="fj-checkbox">
                      <el-checkbox label="" @change="selectAllage">全部</el-checkbox>
@@ -117,7 +112,7 @@
                  </td>
                </tr>
                <tr>
                  <td class="td">档案情况</td>
                  <td class="td">档案情况:</td>
                  <td class="td-group">
                    <el-checkbox-group v-model="queryform.archivesStatus" class="fj-checkbox">
                      <el-checkbox label="" @change="selectAllArchivesStatus">全部</el-checkbox>
@@ -127,7 +122,7 @@
                  </td>
                </tr>
                <tr>
                  <td class="td">保险类型</td>
                  <td class="td">保险类型:</td>
                  <td class="td-group">
                    <el-checkbox-group v-model="queryform.insuranceType" class="fj-checkbox">
                      <el-checkbox label="" @change="selectAllInsuranceType">全部</el-checkbox>
@@ -155,11 +150,11 @@
          </el-row>
        </el-form>
      </el-header>
      <el-main>
      <el-main style="height: 85vh;">
        <el-row style="margin-bottom: 10px;height: 40px;">
          <el-col :span="24">
            <el-button class="hr-but-all" type="danger" @click="dialogFormVisible = true">新建标签</el-button>
            <el-button class="hr-but" type="danger" @click="deldialogFormVisible = true">删除标签</el-button>
            <el-button type="primary" @click="deldialogFormVisible = true">删除标签</el-button>
            <el-button class="hr-but-all" type="danger" @click="downloaddialogFormVisible = true">下载附件</el-button>
            <el-dialog
              title="新建标签"
@@ -274,28 +269,39 @@
            已为您搜索出<span style="color:red">{{ total }}</span>条符合条件的记录
          </el-col>
        </el-row>
        <el-table ref="empAccessoryTable" :data="tableData" class="fj-table" style="width: 100%;color: #000;">
        <el-table
          ref="empAccessoryTable"
          :data="tableData"
          stripe
          :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
          style="width: 100%;color: #000;"
        >
          <el-table-column
            type="selection"
            width="55"
          />
          <el-table-column label="操作" width="120">
          <el-table-column label="操作" width="80">
            <template slot-scope="scope">
              <el-button
                type="text"
                size="small"
              <!--              <el-button-->
              <!--                type="text"-->
              <!--                size="small"-->
              <!--                @click.native.prevent="dialogShow(scope.$index, scope.row)"-->
              <!--              >-->
              <!--                上传-->
              <!--              </el-button>-->
              <span
                style="color: #a00515;display: inline-block;width: 50%;cursor: pointer"
                @click.native.prevent="dialogShow(scope.$index, scope.row)"
              >
                上传
              </el-button>
              >上传</span>
            </template>
          </el-table-column>
          <el-table-column prop="empName" label="姓名" width="100px" />
          <el-table-column prop="certificateNumb" label="身份证号" width="200px" />
          <el-table-column prop="deptName" label="护卫点(部门)" width="200px" />
          <el-table-column prop="jobName" label="岗位" />
          <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80px" />
          <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号" width="120px" />
          <el-table-column show-overflow-tooltip prop="deptName" label="护卫点(部门)" width="120px" />
          <el-table-column show-overflow-tooltip prop="jobName" label="岗位" />
          <template v-for="(col) in labelData">
            <el-table-column :key="col.labelid" :prop="col.labelcode" :label="col.labelname">
            <el-table-column :key="col.labelid" show-overflow-tooltip :prop="col.labelcode" :label="col.labelname">
              <template slot-scope="scope">
                <el-link type="primary"> {{ scope.row[col.labelcode] }}</el-link>
              </template>
@@ -570,7 +576,7 @@
        this.headerHeight = '20px'
        this.advancedQueryShow = false
      } else {
        this.headerHeight = '360px'
        this.headerHeight = 'auto'
        this.advancedQueryShow = true
      }
    },
@@ -636,6 +642,25 @@
.el-input-number {
    width: 100%;
}
.searchTable {
  margin-top: 10px;
  border-collapse: collapse;
  width: 100%;
  tr {
    border-bottom: 1px dashed #d9dadb;
  }
  .td {
    width: 90px;
    text-align: right;
  }
  .td-group {
    padding-left: 20px;
  }
}
</style>
<style lang="scss">
.fj-checkbox{
@@ -659,11 +684,6 @@
}
.fj-table thead {
    color: #000;
}
.td {
    background-color: #dddcdc !important;
    width: 160px;
    text-align: center;
}
.td-group {
    padding-left: 20px;
@@ -695,10 +715,10 @@
#searchTable td,
#searchTable th {
    border: 1px solid #b0b0b0;
    color: #000;
    height: 40px;
    background-color: #fff;
  border: 0;
  color: #000;
  height: 50px;
  background-color: #fff;
}
#ygxq table {
@@ -708,13 +728,6 @@
    text-align: center;
    width: 100%;
    margin-top: 20px;
}
#ygxq table td,
#ygxq table th {
    border: 1px solid #eae9e9;
    color: #666;
    height: 30px;
}
#ygxq table thead th {
@@ -730,4 +743,31 @@
    background: #f5fafa;
}
.search-btn {
  display: inline-block;
  width: 3.64vw;
  height: 3.2vh;
  line-height: 3.2vh;
  text-align: center;
  background-color: #a00515;
  color: #fff;
  margin-left: 1vw;
  box-sizing: border-box;
  cursor: pointer;
  vertical-align: middle;
}
.sup-search-btn {
  display: inline-block;
  width: 5.2vw;
  height: 3.2vh;
  line-height: 3.2vh;
  text-align: center;
  margin-left: 1vw;
  color: #a00515;
  border: 1px solid #a00515;
  box-sizing: border-box;
  cursor: pointer;
  vertical-align: middle;
}
</style>