Merge remote-tracking branch 'origin/master'

luoyb

2021-02-21 f30e0cf4d83073f65a8d0250851b0b90f6b79922

Merge remote-tracking branch 'origin/master'

 src/views/user/inemployees.vue

@@ -140,10 +140,10 @@
                  <td>
                    <el-radio-group v-model="queryParams.empStatus">
                      <el-radio label="">全部</el-radio>
                      <el-radio :label="1">在职</el-radio>
                      <el-radio :label="2">正常离职</el-radio>
                      <el-radio :label="3">自动离职</el-radio>
                      <el-radio :label="4">公司辞退</el-radio>
                      <el-radio :label="0">在职</el-radio>
                      <el-radio :label="1">正常离职</el-radio>
                      <el-radio :label="2">自动离职</el-radio>
                      <el-radio :label="3">公司辞退</el-radio>
                    </el-radio-group>
                  </td>
                </tr>

 src/views/user/outemployess.vue

@@ -158,10 +158,10 @@
                    <td>
                      <el-radio-group v-model="queryParams.empStatus">
                        <el-radio label="">全部</el-radio>
                        <el-radio :label="1">在职</el-radio>
                        <el-radio :label="2">正常离职</el-radio>
                        <el-radio :label="3">自动离职</el-radio>
                        <el-radio :label="4">公司辞退</el-radio>
                        <el-radio :label="0">在职</el-radio>
                        <el-radio :label="1">正常离职</el-radio>
                        <el-radio :label="2">自动离职</el-radio>
                        <el-radio :label="3">公司辞退</el-radio>
                      </el-radio-group>
                    </td>
                  </tr>

 src/views/user/search.vue

@@ -119,108 +119,100 @@
            <table class="searchTable">

              <tr>

                <td>性别：</td>

                <td>

                  <el-radio-group v-model="queryParams.sex">

                    <el-radio label="">全部</el-radio>

                    <el-radio label="1">男性</el-radio>

                    <el-radio label="2">女性</el-radio>

                  </el-radio-group>

                <td>
                  <el-checkbox-group v-model="queryParams.sex">
                    <el-checkbox label="" @change="selectAllSex">全部</el-checkbox>
                    <el-checkbox label="1">男性</el-checkbox>
                    <el-checkbox label="2">女性</el-checkbox>
                  </el-checkbox-group>

                </td>

              </tr>

              <tr>

                <td>最高学历：</td>

                <td>

                  <el-radio-group v-model="queryParams.education">

                    <el-radio label="">全部</el-radio>

                    <el-radio label="91">无学历</el-radio>

                    <el-radio label="81">小学</el-radio>

                    <el-radio label="71">初中</el-radio>

                    <el-radio label="61">高中</el-radio>

                    <el-radio label="42">中技</el-radio>

                    <el-radio label="41">中专</el-radio>

                    <el-radio label="31">大学专科</el-radio>

                    <el-radio label="21">大学本科</el-radio>

                    <el-radio label="11">硕士</el-radio>

                    <el-radio label="10">博士</el-radio>

                  </el-radio-group>

                  <el-checkbox-group v-model="queryParams.education">

                    <el-checkbox label="" @change="selectAllEducation">全部</el-checkbox>

                    <el-checkbox label="91">无学历</el-checkbox>

                    <el-checkbox label="81">小学</el-checkbox>

                    <el-checkbox label="71">初中</el-checkbox>

                    <el-checkbox label="61">高中</el-checkbox>

                    <el-checkbox label="42">中技</el-checkbox>

                    <el-checkbox label="41">中专</el-checkbox>

                    <el-checkbox label="31">大学专科</el-checkbox>

                    <el-checkbox label="21">大学本科</el-checkbox>

                    <el-checkbox label="11">硕士</el-checkbox>

                    <el-checkbox label="10">博士</el-checkbox>

                  </el-checkbox-group>

                </td>

              </tr>

              <tr>

                <td>政治面貌：</td>

                <td>

                  <el-radio-group v-model="queryParams.politics">

                    <el-radio label="">全部</el-radio>

                    <el-radio label="01">中共党员</el-radio>

                    <el-radio label="02">预备党员</el-radio>

                    <el-radio label="03">共青团员</el-radio>

                    <el-radio label="04">民革会员</el-radio>

                    <el-radio label="05">民盟盟员</el-radio>

                    <el-radio label="06">民建会员</el-radio>

                    <el-radio label="07">民进会员</el-radio>

                    <el-radio label="08">农工党员</el-radio>

                    <el-radio label="09">致公党员</el-radio>

                    <el-radio label="10">九三社员</el-radio>

                    <el-radio label="11">台盟盟员</el-radio>

                    <el-radio label="12">民主人士</el-radio>

                    <el-radio label="13">群众</el-radio>

                  </el-radio-group>

                  <el-checkbox-group v-model="queryParams.politics">

                    <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="13">群众</el-checkbox>

                  </el-checkbox-group>

                </td>

              </tr>

              <!-- <tr>

              <td>入职日期：</td>

              <td>

                <el-radio-group v-model="radio">

                  <el-radio label="">全部</el-radio>

                </el-radio-group>

              </td>

            </tr> -->

              <tr>

                <td>年龄：</td>

                <td>

                  <el-radio-group v-model="queryParams.ageStr">

                    <el-radio label="">全部</el-radio>

                    <el-radio label="18-29">18-29</el-radio>

                    <el-radio label="30-39">30-39</el-radio>

                    <el-radio label="40-49">40-49</el-radio>

                    <el-radio label="50-59">50-59</el-radio>

                    <el-radio label="60-69">60-69</el-radio>

                    <el-radio label="69-999">69及以上</el-radio>

                  </el-radio-group>

                  <el-checkbox-group v-model="queryParams.ageStr">

                    <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>

                    <el-checkbox label="40-49">40-49</el-checkbox>

                    <el-checkbox label="50-59">50-59</el-checkbox>

                    <el-checkbox label="60-69">60-69</el-checkbox>

                    <el-checkbox label="69-999">69及以上</el-checkbox>

                  </el-checkbox-group>

                </td>

              </tr>

              <tr>

                <td>档案情况：</td>

                <td>

                  <el-radio-group v-model="queryParams.archivesStatus">

                    <el-radio label="">全部</el-radio>

                    <el-radio label="0">已移交</el-radio>

                    <el-radio label="1">未移交</el-radio>

                  </el-radio-group>

                  <el-checkbox-group v-model="queryParams.archivesStatus">

                    <el-checkbox label="" @change="selectAllArchivesStatus">全部</el-checkbox>

                    <el-checkbox label="0">已移交</el-checkbox>

                    <el-checkbox label="1">未移交</el-checkbox>

                  </el-checkbox-group>

                </td>

              </tr>

              <tr>

                <td>保险类型：</td>

                <td>

                  <el-radio-group v-model="queryParams.insuranceType">

                    <el-radio label="">全部</el-radio>

                    <el-radio :label="1">深户（五险一档）</el-radio>

                    <el-radio :label="2">非深户(五险一档)</el-radio>

                    <el-radio :label="3">非深户(五险二档)</el-radio>

                    <el-radio :label="4">非深户(五险三档)</el-radio>

                    <el-radio :label="5">非深户(四险三档)</el-radio>

                  </el-radio-group>

                  <el-checkbox-group v-model="queryParams.insuranceType">

                    <el-checkbox label="" @change="selectAllInsuranceType">全部</el-checkbox>

                    <el-checkbox label="1">深户（五险一档）</el-checkbox>

                    <el-checkbox label="2">非深户(五险一档)</el-checkbox>

                    <el-checkbox label="3">非深户(五险二档)</el-checkbox>

                    <el-checkbox label="4">非深户(五险三档)</el-checkbox>

                    <el-checkbox label="5">非深户(四险三档)</el-checkbox>

                  </el-checkbox-group>

                </td>

              </tr>

              <tr>

                <td>员工状态：</td>

                <td>

                  <el-radio-group v-model="queryParams.empStatus">

                    <el-radio label="">全部</el-radio>

                    <el-radio :label="1">在职</el-radio>
                    <el-radio :label="2">正常离职</el-radio>
                    <el-radio :label="3">自动离职</el-radio>
                    <el-radio :label="4">公司辞退</el-radio>

                  </el-radio-group>

                  <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>

                </td>

              </tr>

            </table>
@@ -1190,7 +1182,15 @@
  data() {

    return {

      total: 0, // 总数量

      queryParams: {}, // 查询参数

      queryParams: {
        sex: [],
        education: [],
        politics: [],
        ageStr: [],
        archivesStatus: [],
        insuranceType: [],
        empStatus: []
      }, // 查询参数

      sort: {}, // 排序

      pagination: { // 分页参数

        size: 20,

@@ -1469,7 +1469,14 @@
  methods: {
    resetSearch() {
      this.queryParams = {
        delFlag: 0
        delFlag: 0,
        sex: [],
        education: [],
        politics: [],
        ageStr: [],
        archivesStatus: [],
        insuranceType: [],
        empStatus: []
      }
      this.search()
    },

@@ -1509,7 +1516,7 @@
      } else {
        this.advancedQueryShow = true
      }
    },

    },
    isShow(tableShow, index) {

      if (index === this.thisShowIndex) {

        return

@@ -1523,7 +1530,7 @@
      this.thisShowIndex = index

      switch (this.thisShowIndex) {

        case 0:

          this.tableUrl = 'hr/empBaseInfo/list'

          this.tableUrl = 'hr/empBaseInfo/zslist'

          this.tableDataName = 'basicInformationData'

          this.queryParams.delFlag = 0

          this.search()

@@ -1619,6 +1626,55 @@
          this.search()
          break
      }

    },
    selectAllSex(val) {
      if (val) {
        this.queryParams.sex = ['1', '2']
      } else {
        this.queryParams.sex = []
      }
    },
    selectAllEducation(val) {
      if (val) {
        this.queryParams.education = ['91', '81', '71', '61', '42', '41', '31', '21', '11', '10']
      } else {
        this.queryParams.education = []
      }
    },
    selectAllPolitics(val) {
      if (val) {
        this.queryParams.politics = ['01', '02', '03', '04', '05', '06', '07', '08', '09', '10', '11', '12', '13']
      } else {
        this.queryParams.politics = []
      }
    },
    selectAllAgeStr(val) {
      if (val) {
        this.queryParams.ageStr = ['18-29', '30-39', '40-49', '50-59', '60-69', '69-999']
      } else {
        this.queryParams.ageStr = []
      }
    },
    selectAllArchivesStatus(val) {
      if (val) {
        this.queryParams.archivesStatus = ['0', '1']
      } else {
        this.queryParams.archivesStatus = []
      }
    },
    selectAllInsuranceType(val) {
      if (val) {
        this.queryParams.insuranceType = ['1', '2', '3', '4', '5']
      } else {
        this.queryParams.insuranceType = []
      }
    },
    selectAllEmpStatus(val) {
      if (val) {
        this.queryParams.empStatus = ['0', '1', '2', '3']
      } else {
        this.queryParams.empStatus = []
      }
    }

  }

}

@@ -1644,7 +1700,7 @@
  .searchTable {

    margin-top: 10px;

    border-collapse: collapse;

    width: 100%;

    width: 100%;
  }



  .searchTable td,