Merge remote-tracking branch 'origin/master'

yz

2021-03-05 ded74de21871a897e6a9f8f71b6225a70eec868e

 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>
@@ -573,7 +579,7 @@
        this.headerHeight = '20px'
        this.advancedQueryShow = false
      } else {
        this.headerHeight = '360px'
        this.headerHeight = 'auto'
        this.advancedQueryShow = true
      }
    },
@@ -639,6 +645,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{
@@ -662,11 +687,6 @@
}
.fj-table thead {
    color: #000;
}
.td {
   background-color: #dddcdc !important;
   width: 160px;
   text-align: center;
}
.td-group {
   padding-left: 20px;
@@ -698,10 +718,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 {
@@ -711,13 +731,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 {
@@ -733,4 +746,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>