Merge remote-tracking branch 'origin/master'

luoyb

2021-04-23 3e17cbacf0deb6d55988b531b584c4a81b50c6f9

Merge remote-tracking branch 'origin/master'

 src/views/user/outemployess.vue

@@ -193,6 +193,21 @@
                      </el-checkbox-group>
                    </td>
                  </tr>
                  <tr>
                    <td class="td">相关证件：</td>
                    <td class="td-group">
                      <el-checkbox-group v-model="queryParams.certificateList" class="fj-checkbox">
                        <el-checkbox label="" @change="selectAllCertificateList">全部</el-checkbox>
                        <el-checkbox
                          v-for="data in certificateListOptions"
                          :key="data.dicItemName"
                          :label="data.dicItemCode"
                        >
                          {{ data.dicItemName }}
                        </el-checkbox>
                      </el-checkbox-group>
                    </td>
                  </tr>
                  <!-- <tr>
                    <td class="td">员工状态：</td>
                    <td class="td-group">
@@ -1258,7 +1273,8 @@
        insuranceType: [],
        empStatus: [],
        dimissionType: [],
        empType: []
        empType: [],
        certificateList: []
      }, // 查询参数
      sort: {}, // 排序
      pagination: { // 分页参数
@@ -1314,6 +1330,9 @@
    })
    this.getDicts('EMPTYPE').then(response => {
      this.empTypeOptions = response.data
    })
    this.getDicts('certificateList').then(response => {
      this.certificateListOptions = response.data
    })
  },
  methods: {
@@ -1645,6 +1664,13 @@
      this.checkedCities = val ? this.cityOptions : []
      this.isIndeterminate = false
    },
    selectAllCertificateList(val) {
      if (val) {
        this.queryParams.certificateList = this.dicListToArr(this.certificateListOptions)
      } else {
        this.queryParams.certificateList = []
      }
    },
    showDcyg(operate) {
      switch (operate) {
        case 0:

 src/views/user/search.vue

@@ -248,6 +248,21 @@
                  </el-checkbox-group>
                </td>
              </tr>
              <tr>
                <td class="td">相关证件：</td>
                <td class="td-group">
                  <el-checkbox-group v-model="queryParams.certificateList" class="fj-checkbox">
                    <el-checkbox label="" @change="selectAllCertificateList">全部</el-checkbox>
                    <el-checkbox
                      v-for="data in certificateListOptions"
                      :key="data.dicItemName"
                      :label="data.dicItemCode"
                    >
                      {{ data.dicItemName }}
                    </el-checkbox>
                  </el-checkbox-group>
                </td>
              </tr>
            </table>
          </div>
          <el-row>
@@ -1992,7 +2007,8 @@
        empName: '',
        certificateNumb: '',
        jobContent: '',
        inOutType: []
        inOutType: [],
        certificateList: []
      }, // 查询参数
      sort: {}, // 排序
      pagination: { // 分页参数
@@ -2948,6 +2964,13 @@
          return '调动'
      }
    },
    selectAllCertificateList(val) {
      if (val) {
        this.queryParams.certificateList = this.dicListToArr(this.certificateListOptions)
      } else {
        this.queryParams.certificateList = []
      }
    },
    changeSort(val) {
      this.sort.field = val.prop
      this.sort.order = val.order