Merge remote-tracking branch 'origin/master'

孔祥富

2021-02-27 c695c32a2bb103a4d91d0c3e40efe4410ae77759

 src/views/user/outemployess.vue

@@ -13,7 +13,7 @@
          </el-col>
        </el-row>
        <div v-show="advancedQueryShow">
          <el-row>
          <el-row style="margin-bottom: 10px;">
            <el-col :span="3">员工编号：
              <el-input v-model="queryParams.empNumb" size="small" maxlength="20" style="width:85px" />
            </el-col>
@@ -68,9 +68,9 @@
              <el-col :span="24">
                <table class="searchTable">
                  <tr>
                    <td>性别：</td>
                    <td>
                      <el-checkbox-group v-model="queryParams.sex">
                    <td class="td">性别：</td>
                    <td class="td-group">
                      <el-checkbox-group v-model="queryParams.sex" class="fj-checkbox">
                        <el-checkbox label="" @change="selectAllSex">全部</el-checkbox>
                        <el-checkbox label="1">男性</el-checkbox>
                        <el-checkbox label="2">女性</el-checkbox>
@@ -78,9 +78,9 @@
                    </td>
                  </tr>
                  <tr>
                    <td>最高学历：</td>
                    <td>
                      <el-checkbox-group v-model="queryParams.education">
                    <td class="td">最高学历：</td>
                    <td class="td-group">
                      <el-checkbox-group v-model="queryParams.education" class="fj-checkbox">
                        <el-checkbox label="" @change="selectAllEducation">全部</el-checkbox>
                        <el-checkbox label="91">无学历</el-checkbox>
                        <el-checkbox label="81">小学</el-checkbox>
@@ -96,30 +96,30 @@
                    </td>
                  </tr>
                  <tr>
                    <td>政治面貌：</td>
                    <td>
                      <el-checkbox-group v-model="queryParams.politics">
                    <td class="td">政治面貌：</td>
                    <td class="td-group">
                      <el-checkbox-group v-model="queryParams.politics" class="fj-checkbox">
                        <el-checkbox label="" @change="selectAllPolitics">全部</el-checkbox>
                        <el-checkbox label="01">中共党员</el-checkbox>
                        <el-checkbox label="02">预备党员</el-checkbox>
                        <el-checkbox label="03">共青团员</el-checkbox>
                        <el-checkbox label="04">民革会员</el-checkbox>
                        <el-checkbox label="05">民盟盟员</el-checkbox>
                        <el-checkbox label="06">民建会员</el-checkbox>
                        <el-checkbox label="07">民进会员</el-checkbox>
                        <el-checkbox label="08">农工党员</el-checkbox>
                        <el-checkbox label="09">致公党员</el-checkbox>
                        <el-checkbox label="10">九三社员</el-checkbox>
                        <el-checkbox label="11">台盟盟员</el-checkbox>
                        <el-checkbox label="12">民主人士</el-checkbox>
                        <el-checkbox label="01">党员</el-checkbox>
                        <el-checkbox label="02">预备</el-checkbox>
                        <el-checkbox label="03">共青</el-checkbox>
                        <el-checkbox label="04">民革</el-checkbox>
                        <el-checkbox label="05">民盟</el-checkbox>
                        <el-checkbox label="06">民建</el-checkbox>
                        <el-checkbox label="07">民进</el-checkbox>
                        <el-checkbox label="08">农工</el-checkbox>
                        <el-checkbox label="09">致公</el-checkbox>
                        <el-checkbox label="10">九三</el-checkbox>
                        <el-checkbox label="11">台盟</el-checkbox>
                        <el-checkbox label="12">民主</el-checkbox>
                        <el-checkbox label="13">群众</el-checkbox>
                      </el-checkbox-group>
                    </td>
                  </tr>
                  <tr>
                    <td>年龄：</td>
                    <td>
                      <el-checkbox-group v-model="queryParams.ageStr">
                    <td class="td">年龄：</td>
                    <td class="td-group">
                      <el-checkbox-group v-model="queryParams.ageStr" class="fj-checkbox">
                        <el-checkbox label="" @change="selectAllAgeStr">全部</el-checkbox>
                        <el-checkbox label="18-29">18-29</el-checkbox>
                        <el-checkbox label="30-39">30-39</el-checkbox>
@@ -131,9 +131,9 @@
                    </td>
                  </tr>
                  <tr>
                    <td>档案情况：</td>
                    <td>
                      <el-checkbox-group v-model="queryParams.archivesStatus">
                    <td class="td">档案情况：</td>
                    <td class="td-group">
                      <el-checkbox-group v-model="queryParams.archivesStatus" class="fj-checkbox">
                        <el-checkbox label="" @change="selectAllArchivesStatus">全部</el-checkbox>
                        <el-checkbox label="0">已移交</el-checkbox>
                        <el-checkbox label="1">未移交</el-checkbox>
@@ -141,9 +141,9 @@
                    </td>
                  </tr>
                  <tr>
                    <td>保险类型：</td>
                    <td>
                      <el-checkbox-group v-model="queryParams.insuranceType">
                    <td class="td">保险类型：</td>
                    <td class="td-group">
                      <el-checkbox-group v-model="queryParams.insuranceType" class="fj-checkbox">
                        <el-checkbox label="" @change="selectAllInsuranceType">全部</el-checkbox>
                        <el-checkbox label="1">深户（五险一档）</el-checkbox>
                        <el-checkbox label="2">非深户(五险一档)</el-checkbox>
@@ -153,18 +153,17 @@
                      </el-checkbox-group>
                    </td>
                  </tr>
                  <tr>
                    <td>员工状态：</td>
                    <td>
                      <el-checkbox-group v-model="queryParams.empStatus">
                        <el-checkbox label="" @change="selectAllEmpStatus">全部</el-checkbox>
                        <el-checkbox label="0">在职</el-checkbox>
                        <el-checkbox label="1">正常离职</el-checkbox>
                        <el-checkbox label="2">自动离职</el-checkbox>
                        <el-checkbox label="3">公司辞退</el-checkbox>
                      </el-checkbox-group>
                  <!-- <tr>
                    <td class="td">员工状态：</td>
                    <td class="td-group">
                      <el-checkbox-group v-model="queryParams.empStatus" class="fj-checkbox">
                      <el-checkbox label="" @change="selectAllEmpStatus">全部</el-checkbox>
                      <el-checkbox label="0">在职</el-checkbox>
                      <el-checkbox label="1">离职</el-checkbox>
                      <el-checkbox label="2">退休</el-checkbox>
                    </el-checkbox-group>
                    </td>
                  </tr>
                  </tr> -->
                </table>
              </el-col>
            </el-row>
@@ -172,7 +171,7 @@
        </div>
      </el-header>
      <el-main style="height: 85%;">
        <el-row>
        <el-row style="margin: 10px 0 10px 0;">
          <el-col :span="24">
            <el-button type="primary" @click="delEmp">删除员工</el-button>
            <el-button type="danger" @click="showDkda(0)">打开档案</el-button>
@@ -199,9 +198,14 @@
          <el-table-column prop="censusAddress" label="籍贯" />
          <el-table-column prop="telePhone" label="联系电话" />
          <el-table-column prop="entryDate" label="入职日期" width="100" />
          <el-table-column prop="delFlag" label="员工状态">
          <el-table-column prop="empStatus" label="员工状态">
            <template slot-scope="{row}">
              {{ transDelFlag(row.delFlag) }}
              {{ transEmpStatus(row.empStatus) }}
            </template>
          </el-table-column>
          <el-table-column prop="dimissionType" label="离职类型">
            <template slot-scope="{row}">
              {{ transDimissionType(row.dimissionType) }}
            </template>
          </el-table-column>
        </el-table>
@@ -904,7 +908,12 @@
              （主要对已退休员工返聘）
            </el-form-item>
            <el-form-item label="打开日期">
              <el-input v-model="baseicInformationForm.openDate" />
              <el-date-picker
                v-model="baseicInformationForm.openDate"
                value-format="yyyy-MM-dd"
                type="date"
                placeholder="选择打开日期"
              />
            </el-form-item>
            <el-form-item label="备注说明">
              <el-input v-model="baseicInformationForm.remark" type="textarea" :rows="4" />
@@ -957,7 +966,9 @@
      dialogShowXzyg: false,
      dialogShowXzbm: false,
      tableData: [],
      baseicInformationForm: {}
      baseicInformationForm: {
        openDate: new Date()
      }
    }
  },
  mounted() {
@@ -992,7 +1003,7 @@
      params.pageSize = this.pagination.size
      params.pageNum = this.pagination.num
      params.delFlag = 0
      params.empStatus = 1
      params.empStatus = '1,2,3'
      this.$get('hr/empBaseInfo/zslist', {
        ...params
      }).then((r) => {
@@ -1008,14 +1019,28 @@
        deptName: this.queryParams.vague
      })
    },
    transDelFlag(delFlag) {
      switch (delFlag) {
        case 0:
          return '正常'
        case 1:
          return '删除'
        case 2:
          return '暂存'
    transEmpStatus(empStatus) {
      switch (empStatus) {
        case '0':
          return '在职'
        case '1':
          return '离职'
        case '2':
          return '退休'
      }
    },
    transDimissionType(dimissionType) {
      switch (dimissionType) {
        case '1':
          return '正常离职'
        case '2':
          return '自动离职'
        case '3':
          return '公司劝退'
        case '4':
          return '公司辞退'
        case '5':
          return '试用期内'
      }
    },
    advancedQueryShowMethods() {
@@ -1177,6 +1202,18 @@
  }
}
</script>
<style lang="scss">

.fj-checkbox{
  .el-checkbox__input.is-checked .el-checkbox__inner {
      border-color: #a32c30;;
      background: #a32c30;;
  }
  .el-checkbox__label {
    color: #000 !important;
  }
}
</style>
<style lang="scss" scoped>
  .el-main {
    height: 600px;
@@ -1188,25 +1225,26 @@

  }

  .searchTable {
      margin-top: 10px;
      border-collapse: collapse;
      width: 100%;
    }

    .searchTable td,
    .searchTable th {
      border: 1px solid #b0b0b0;
      color: #000;
      height: 40px;
      background-color: #fff;
    }

    .searchTable tr td:first-child {
      background-color: #dddcdc !important;
      width: 160px;
      text-align: center;
    }
.searchTable {
   margin-top: 10px;
   border-collapse: collapse;
   width: 100%;
  .td {
   background-color: #dddcdc !important;
   width: 160px;
   text-align: center;
  }
  .td-group {
   padding-left: 20px;
  }
}
.searchTable td,
.searchTable th {
   border: 1px solid #b0b0b0;
   color: #000;
   height: 40px;
   background-color: #fff;
}

  #ygxq table {
    border-collapse: collapse;