Merge remote-tracking branch 'origin/master'

yz

2021-03-10 9d8df3f4cfdf8fab10f8dd5057ee4cb58a9c2f84

 src/views/user/search.vue

@@ -59,7 +59,7 @@
              <br>
            </el-col>
            <el-col :span="7">
              <el-input v-model="queryParams.vague" placeholder="请输入内容" style="width:200px" />
              <el-input v-model="queryParams.baseKey" placeholder="请输入内容" style="width:200px" />
              <span class="search-btn" @click="vagueSearch">查询</span>
              <span class="sup-search-btn" @click="advancedQueryShowMethods">高级查询</span>
            </el-col>
@@ -235,13 +235,24 @@
              </tr>
              <tr>
                <td class="td">入离职类型：</td>
                <td class="td-group" />
                <td class="td-group">
                  <el-checkbox-group v-model="queryParams.inOutType" class="fj-checkbox">
                    <el-checkbox label="" @change="selectAllDimissionType">全部</el-checkbox>
                    <el-checkbox
                      v-for="data in dimissionTypeOptions"
                      :key="data.dicItemName"
                      :label="data.dicItemCode"
                    >
                      {{ data.dicItemName }}
                    </el-checkbox>
                  </el-checkbox-group>
                </td>
              </tr>
            </table>
          </div>
          <el-row>
            <el-col :span="21" style="line-height: 50px;">
              已为您搜索出<span style="color:red">{{ total }}</span>条符合条件的记录
              已为您搜索出<span style="color:#ff0000">{{ total }}</span>条符合条件的记录
            </el-col>
            <el-col :span="3" style="text-align: right;padding-right: 10px">
              <el-button class="hr-but-all" type="success" @click.native="showDcyg(0)">
@@ -263,7 +274,7 @@
            <el-table-column show-overflow-tooltip prop="deptName" label="(部门)护卫点" width="140" />
            <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
            <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" />
            <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
            <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="150" />
            <el-table-column show-overflow-tooltip prop="sex" label="性别" width="60" :formatter="sexFormat" />
            <el-table-column show-overflow-tooltip prop="age" label="年龄" width="60" />
            <el-table-column show-overflow-tooltip prop="education" label="学历" width="80" :formatter="educationFormat" />
@@ -275,6 +286,7 @@
                {{ transEmpStatus(row.empStatus) }}
              </template>
            </el-table-column>
            <el-table-column show-overflow-tooltip prop="dimissionTypeName" label="离职类型" width="100" />
            <el-table-column show-overflow-tooltip prop="entryDate" label="入职日期" width="120" />
            <el-table-column show-overflow-tooltip prop="dimissionDate" label="离职日期" width="120" />
          </el-table>
@@ -401,17 +413,17 @@
                  </td>
                </tr>
                <tr>
                  <td>员工类型</td>
                  <td>家庭成员及关系</td>
                  <td>
                    <el-checkbox label=""><span /></el-checkbox>
                    <el-checkbox label="family"><span /></el-checkbox>
                  </td>
                  <td>员工状态</td>
                  <td>
                    <el-checkbox label=""><span /></el-checkbox>
                    <el-checkbox label="empStatusName"><span /></el-checkbox>
                  </td>
                  <td>离职日期</td>
                  <td>
                    <el-checkbox label=""><span /></el-checkbox>
                    <el-checkbox label="dimissionDate"><span /></el-checkbox>
                  </td>
                </tr>
                <tr>
@@ -455,16 +467,6 @@
                  <td>
                    <el-checkbox label="handbookStatusName"><span /></el-checkbox>
                  </td>
                </tr>
                <tr>
                  <td>家庭成员及关系</td>
                  <td>
                    <el-checkbox label="family"><span /></el-checkbox>
                  </td>
                  <td />
                  <td />
                  <td />
                  <td />
                </tr>
              </el-checkbox-group>
            </table>
@@ -569,8 +571,12 @@
          <el-row style="margin-bottom: 10px;">
            <el-col :span="4">体检类型：
              <el-select v-model="queryParams.physicalExamType" style="width:140px">
                <el-option value="1" label="入职体检" />
                <el-option value="2" label="员工体检" />
                <el-option
                  v-for="dict in physicalExamTypeOptions"
                  :key="dict.dicItemCode"
                  :label="dict.dicItemName"
                  :value="dict.dicItemCode"
                />
              </el-select>
            </el-col>
            <el-col :span="4">心电图：
@@ -1932,7 +1938,7 @@
  },
  data() {
    return {
      cityOptions: ['archivesNumb', 'deptName', 'jobName', 'empName', 'certificateNumb', 'certificateValidity', 'sexName', 'nationName', 'age', 'marriageName', 'stature', 'birthdate', 'politicsName', 'empTypeName', 'educationName', 'nativePlaceName', 'censusAddress', 'currentAddress', 'guardNumb', 'returnReceipt', 'archivesStatusName', 'bankName', 'bankNumb', 'telePhone', 'entryDate', 'InsuranceTypeName', 'socialNumb', 'introducer', 'seniority', 'empCardStatus', 'certificateList', 'urgencyPhone', 'handbookStatusName', 'family'],
      cityOptions: ['archivesNumb', 'deptName', 'jobName', 'empName', 'certificateNumb', 'certificateValidity', 'sexName', 'nationName', 'age', 'marriageName', 'stature', 'birthdate', 'politicsName', 'empTypeName', 'educationName', 'nativePlaceName', 'censusAddress', 'currentAddress', 'guardNumb', 'returnReceipt', 'archivesStatusName', 'bankName', 'bankNumb', 'telePhone', 'entryDate', 'InsuranceTypeName', 'socialNumb', 'introducer', 'seniority', 'empCardStatusName', 'certificateList', 'urgencyPhone', 'handbookStatusName', 'family', 'empStatusName', 'dimissionDate'],
      dialogShowDcyg: false,
      isIndeterminate: false,
      checkedCities: [],
@@ -1948,7 +1954,12 @@
        insuranceType: [],
        empStatus: [],
        empType: [],
        baseKey: ''
        baseKey: '',
        empNumb: '',
        empName: '',
        certificateNumb: '',
        jobContent: '',
        inOutType: []
      }, // 查询参数
      sort: {}, // 排序
      pagination: { // 分页参数
@@ -2432,11 +2443,17 @@
        ageStr: [],
        archivesStatus: [],
        insuranceType: [],
        empStatus: []
        empStatus: [],
        baseKey: '',
        empNumb: '',
        empName: '',
        certificateNumb: '',
        jobContent: ''
      }
      this.search()
    },
    search() {
      this.queryParams.baseKey = ''
      this.fetch({
        ...this.queryParams,
        ...this.sort
@@ -2456,8 +2473,8 @@
    },
    vagueSearch() {
      this.fetch({
        baseKey: this.queryParams.vague,
        delFlag: 0
        baseKey: this.queryParams.baseKey
        // delFlag: 0
      })
    },
    dialogIsShow() {
@@ -2638,6 +2655,13 @@
        this.queryParams.empStatus = []
      }
    },
    selectAllDimissionType(val) {
      if (val) {
        this.queryParams.inOutType = ['1', '2', '3', '4', '5', '6']
      } else {
        this.queryParams.inOutType = []
      }
    },
    exportExcel(params = {}) {
      params.pageSize = this.pagination.size
      params.pageNum = this.pagination.num
@@ -2755,11 +2779,7 @@
        case '0':
          return '在职'
        case '1':
          return '正常离职'
        case '2':
          return '自动离职'
        case '3':
          return '公司辞退'
          return '离职'
      }
    },
    transLeaveType(leaveType) {