Merge remote-tracking branch 'origin/master'

Alan

2021-02-20 d6f69af30f85add247d5e7e2ee8a9c1b7368d6cf

Merge remote-tracking branch 'origin/master'

 src/utils/myUtil.js

@@ -29,6 +29,7 @@
  }
  return { birth: birth, sex: sex, age: age }
}

/**
 * 计算工龄
 * @param {*} entryDate 入职日期
@@ -51,3 +52,18 @@
  }
  return age
}

export function dateDifference(begin, end, flag) {
  let dateSpan
  let iReturn
  begin = Date.parse(begin)
  end = Date.parse(end)
  dateSpan = end - begin
  dateSpan = Math.abs(dateSpan)
  switch (flag) {
    case 'd':
      iReturn = Math.floor(dateSpan / (24 * 3600 * 1000))
      break
  }
  return iReturn
}

 src/views/user/Informationinput.vue

@@ -59,7 +59,7 @@
          v-show="showArr[0].show"
          ref="empBaseInfoTable"
          :data="basicInformationData"
          style="width: 100%;height: 70%;"
          style="width: 100%;"
        >
          <el-table-column type="selection" width="55" />
          <el-table-column fixed="left" label="操作" width="100">
@@ -95,7 +95,7 @@
          v-show="showArr[1].show"
          ref="workExperienceTable"
          :data="workExperienceData"
          style="width: 100%;height: 70%;"
          style="width: 100%;"
        >
          <el-table-column type="selection" width="55" />
          <el-table-column fixed="left" label="操作" width="100">
@@ -108,19 +108,19 @@
              </el-button>
            </template>
          </el-table-column>
          <el-table-column prop="empNumb" label="员工编号" width="180" />
          <el-table-column prop="empName" label="员工姓名" width="180" />
          <el-table-column prop="empNumb" label="员工编号" width="100" />
          <el-table-column prop="empName" label="员工姓名" width="100" />
          <el-table-column prop="certificateNumb" label="证件号码" width="180" />
          <el-table-column prop="workUnit" label="工作单位" width="180" />
          <el-table-column prop="beginDate" label="开始日期" width="180" />
          <el-table-column prop="endDate" label="结束日期" width="180" />
          <el-table-column prop="jobContent" label="主要工作内容" width="180" />
          <el-table-column prop="workUnit" label="工作单位" width="240" />
          <el-table-column prop="beginDate" label="开始日期" width="100" />
          <el-table-column prop="endDate" label="结束日期" width="100" />
          <el-table-column prop="jobContent" label="主要工作内容" width="300" />
        </el-table>
        <el-table
          v-show="showArr[2].show"
          ref="physicalExamTable"
          :data="physicalExamData"
          style="width: 100%;height: 70%;"
          style="width: 100%;"
        >
          <el-table-column type="selection" width="55" />
          <el-table-column fixed="left" label="操作" width="100">
@@ -152,7 +152,7 @@
          v-show="showArr[3].show"
          ref="contractInfoTable"
          :data="contractInfoData"
          style="width: 100%;height: 70%;"
          style="width: 100%;"
        >
          <el-table-column type="selection" width="55" />
          <el-table-column fixed="left" label="操作" width="100">
@@ -180,7 +180,7 @@
          v-show="showArr[4].show"
          ref="dimissionAttendTable"
          :data="dimissionAttendData"
          style="width: 100%;height: 70%;"
          style="width: 100%;"
        >
          <el-table-column type="selection" width="55" />
          <el-table-column fixed="left" label="操作" width="100">
@@ -202,7 +202,7 @@
          <el-table-column prop="absenteeism" label="旷工（天）" width="180" />
          <el-table-column prop="remark" label="备注" width="180" />
        </el-table>
        <el-table v-show="showArr[5].show" ref="leaveInfoTable" :data="leaveInfoData" style="width: 100%;height: 70%;">
        <el-table v-show="showArr[5].show" ref="leaveInfoTable" :data="leaveInfoData" style="width: 100%;">
          <el-table-column type="selection" width="55" />
          <el-table-column fixed="left" label="操作" width="100">
            <template slot-scope="scope">
@@ -222,7 +222,7 @@
          <el-table-column prop="reporter" label="报备人" width="180" />
          <el-table-column prop="remark" label="备注" width="180" />
        </el-table>
        <el-table v-show="showArr[6].show" ref="resignTable" :data="resignData" style="width: 100%;height: 70%;">
        <el-table v-show="showArr[6].show" ref="resignTable" :data="resignData" style="width: 100%;">
          <el-table-column type="selection" width="55" />
          <el-table-column fixed="left" label="操作" width="100">
            <template slot-scope="scope">
@@ -243,7 +243,7 @@
          v-show="showArr[7].show"
          ref="unemploymentTable"
          :data="unemploymentData"
          style="width: 100%;height: 70%;"
          style="width: 100%;"
        >
          <el-table-column type="selection" width="55" />
          <el-table-column fixed="left" label="操作" width="100">
@@ -262,7 +262,7 @@
          <el-table-column prop="auditor" label="审核人" width="180" />
          <el-table-column prop="remark" label="备注" width="180" />
        </el-table>
        <el-table v-show="showArr[8].show" ref="insuranceTable" :data="insuranceData" style="width: 100%;height: 70%;">
        <el-table v-show="showArr[8].show" ref="insuranceTable" :data="insuranceData" style="width: 100%;">
          <el-table-column type="selection" width="55" />
          <el-table-column fixed="left" label="操作" width="100">
            <template slot-scope="scope">
@@ -286,7 +286,7 @@
          v-show="showArr[9].show"
          ref="accidentCasesTable"
          :data="accidentCasesData"
          style="width: 100%;height: 70%;"
          style="width: 100%;"
        >
          <el-table-column type="selection" width="55" />
          <el-table-column fixed="left" label="操作" width="100">
@@ -318,7 +318,7 @@
          v-show="showArr[10].show"
          ref="occupationalTable"
          :data="occupationalData"
          style="width: 100%;height: 70%;"
          style="width: 100%;"
        >
          <el-table-column type="selection" width="55" />
          <el-table-column fixed="left" label="操作" width="100">
@@ -350,7 +350,7 @@
          v-show="showArr[11].show"
          ref="laborTroubleTable"
          :data="laborTroubleData"
          style="width: 100%;height: 70%;"
          style="width: 100%;"
        >
          <el-table-column type="selection" width="55" />
          <el-table-column fixed="left" label="操作" width="100">
@@ -377,7 +377,7 @@
          v-show="showArr[12].show"
          ref="badRecordTable"
          :data="badRecordData"
          style="width: 100%;height: 70%;"
          style="width: 100%;"
        >
          <el-table-column type="selection" width="55" />
          <el-table-column fixed="left" label="操作" width="100">
@@ -404,7 +404,7 @@
          v-show="showArr[13].show"
          ref="remarkInfoTable"
          :data="remarkInfoData"
          style="width: 100%;height: 70%;"
          style="width: 100%;"
        >
          <el-table-column type="selection" width="55" />
          <el-table-column fixed="left" label="操作" width="100">
@@ -1077,11 +1077,11 @@
              />
            </el-form-item>

            <el-form-item label="请假天数">
            <el-form-item label="请假天数" prop="leaveDay">
              <el-input v-model="leaveInfoForm.leaveDay" />
            </el-form-item>

            <el-form-item label="到岗时间">
            <el-form-item label="到岗时间" prop="returnDate">
              <el-date-picker
                v-model="leaveInfoForm.returnDate"
                value-format="yyyy-MM-dd"
@@ -1818,7 +1818,7 @@
  </div>
</template>
<script>
import { calculateSeniority, toCardGetUserInfo } from '@/utils/myUtil'
import { calculateSeniority, toCardGetUserInfo, dateDifference } from '@/utils/myUtil'
import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import Pagination from '@/components/Pagination'
@@ -1872,14 +1872,14 @@
        urgencyPhone: [{ max: 30, message: '长度不超过30个字符', trigger: 'blur' }]
      },
      workExperienceRules: {
        empName: [{ required: true, message: '请选择员工', trigger: 'blur' }],
        empName: [{ required: true, message: '请选择员工', trigger: 'change' }],
        workUnit: [{ required: true, message: '请输入工作单位', trigger: 'blur' }, { max: 128, message: '长度不超过128个字符', trigger: 'blur' }],
        beginDate: [{ required: true, validator: this.startDate }],
        endDate: [{ required: true, validator: this.endDate }],
        jobContent: [{ max: 512, message: '长度不超过512个字符', trigger: 'blur' }]
      },
      physicalExamRules: {
        empName: [{ required: true, message: '请选择员工', trigger: 'blur' }],
        empName: [{ required: true, message: '请选择员工', trigger: 'change' }],
        physicalExamDate: [{ required: true, message: '请选择体检日期', trigger: 'change' }],
        hospital: [{ required: true, message: '请输入体检医院', trigger: 'blur' }, { max: 64, message: '长度不超过64个字符', trigger: 'blur' }],
        physicalExamType: [{ required: true, message: '请选择体检类型', trigger: 'change' }],
@@ -1891,7 +1891,7 @@
        remark: [{ max: 512, message: '长度不超过512个字符', trigger: 'blur' }]
      },
      contractInfoRules: {
        empName: [{ required: true, message: '请选择员工', trigger: 'blur' }],
        empName: [{ required: true, message: '请选择员工', trigger: 'change' }],
        signingDate: [{ required: true, message: '请选择合同签订日期', trigger: 'change' }],
        contractStatus: [{ required: true, message: '请选择合同状态', trigger: 'change' }],
        transactor: [{ max: 40, message: '长度不超过40个字符', trigger: 'blur' }],
@@ -1900,28 +1900,29 @@
        remark: [{ max: 512, message: '长度不超过512个字符', trigger: 'blur' }]
      },
      dimissionAttendRules: {
        empName: [{ required: true, message: '请选择员工', trigger: 'blur' }],
        empName: [{ required: true, message: '请选择员工', trigger: 'change' }],
        attendMonth: [{ required: true, message: '请选择出勤月份', trigger: 'change' }],
        deduct: [{ required: true, message: '请输入代扣填款项', trigger: 'blur' }],
        attendDays: [{ required: true, message: '请输入出勤天数', trigger: 'blur' }]
      },
      leaveInfoRules: {
        empName: [{ required: true, message: '请选择员工', trigger: 'blur' }],
        beginTime: [{ required: true, message: '请选择请假开始时间', trigger: 'change' }],
        empName: [{ required: true, message: '请选择员工', trigger: 'change' }],
        beginTime: [{ required: true, validator: this.startDate }],
        leaveType: [{ required: true, message: '请选择请假类型', trigger: 'change' }],
        endTime: [{ required: true, message: '请选择请假结束时间', trigger: 'change' }],
        endTime: [{ required: true, validator: this.endDate }],
        returnDate: [{ required: true, message: '请选择到岗时间', trigger: 'change' }],
        reporter: [{ required: true, message: '请输入报备人', trigger: 'blur' }],
        remark: [{ max: 512, message: '长度不超过512个字符', trigger: 'blur' }]
      },
      resignRules: {
        empName: [{ required: true, message: '请选择员工', trigger: 'blur' }],
        empName: [{ required: true, message: '请选择员工', trigger: 'change' }],
        applayDate: [{ required: true, message: '请选择申请日期', trigger: 'change' }],
        reason: [{ required: true, message: '请输入事由', trigger: 'blur' }, { max: 256, message: '长度不超过256个字符', trigger: 'blur' }],
        remark: [{ max: 512, message: '长度不超过512个字符', trigger: 'blur' }],
        reporter: [{ max: 40, message: '长度不超过40个字符', trigger: 'blur' }]
      },
      unemploymentRules: {
        empName: [{ required: true, message: '请选择员工', trigger: 'blur' }],
        empName: [{ required: true, message: '请选择员工', trigger: 'change' }],
        applayDate: [{ required: true, message: '请选择申请日期', trigger: 'change' }],
        applayReason: [{ required: true, message: '请输入申报事由', trigger: 'blur' }, { max: 128, message: '长度不超过128个字符', trigger: 'blur' }],
        reporter: [{ max: 40, message: '长度不超过40个字符', trigger: 'blur' }],
@@ -1929,7 +1930,7 @@
        remark: [{ max: 512, message: '长度不超过512个字符', trigger: 'blur' }]
      },
      insuranceRules: {
        empName: [{ required: true, message: '请选择员工', trigger: 'blur' }],
        empName: [{ required: true, message: '请选择员工', trigger: 'change' }],
        applayDate: [{ required: true, message: '请选择申请日期', trigger: 'change' }],
        proposer: [{ required: true, message: '请输入申请人', trigger: 'blur' }, { max: 40, message: '长度不超过40个字符', trigger: 'blur' }],
        insuranceGaers: [{ required: true, message: '请选择社保档位', trigger: 'change' }],
@@ -1938,7 +1939,7 @@
        applayStatus: [{ required: true, message: '请选择申请状态', trigger: 'change' }]
      },
      accidentCasesRules: {
        empName: [{ required: true, message: '请选择员工', trigger: 'blur' }],
        empName: [{ required: true, message: '请选择员工', trigger: 'change' }],
        injuredTime: [{ required: true, message: '请选择受伤时间', trigger: 'blur' }],
        injuredPart: [{ required: true, message: '请输入受伤部位', trigger: 'blur' }, { max: 40, message: '长度不超过40个字符', trigger: 'blur' }],
        injuredAddress: [{ required: true, message: '请输入受伤地点', trigger: 'blur' }, { max: 64, message: '长度不超过64个字符', trigger: 'blur' }],
@@ -1954,7 +1955,7 @@
        remark: [{ max: 512, message: '长度不超过512个字符', trigger: 'blur' }]
      },
      occupationalRules: {
        empName: [{ required: true, message: '请选择员工', trigger: 'blur' }],
        empName: [{ required: true, message: '请选择员工', trigger: 'change' }],
        injuredTime: [{ required: true, message: '请选择受伤时间', trigger: 'blur' }],
        injuredPart: [{ required: true, message: '请输入受伤部位', trigger: 'blur' }, { max: 40, message: '长度不超过40个字符', trigger: 'blur' }],
        injuredDescribe: [{ required: true, message: '请输入受伤经过描述', trigger: 'blur' }, { max: 512, message: '长度不超过512个字符', trigger: 'blur' }],
@@ -1969,7 +1970,7 @@
        companyCompensation: [{ required: true, message: '请输入公司赔偿总费用', trigger: 'blur' }]
      },
      laborTroubleRules: {
        empName: [{ required: true, message: '请选择员工', trigger: 'blur' }],
        empName: [{ required: true, message: '请选择员工', trigger: 'change' }],
        arbitrationType: [{ required: true, message: '请选择仲裁类型', trigger: 'change' }],
        arbitrationDate: [{ required: true, message: '请选择仲裁日期', trigger: 'change' }],
        arbitrationReason: [{ required: true, message: '请输入仲裁事由', trigger: 'blur' }, { max: 1024, message: '长度不超过1024个字符', trigger: 'blur' }],
@@ -1978,7 +1979,7 @@
        reporter: [{ max: 40, message: '长度不超过40个字符', trigger: 'blur' }]
      },
      badRecordRules: {
        empName: [{ required: true, message: '请选择员工', trigger: 'blur' }],
        empName: [{ required: true, message: '请选择员工', trigger: 'change' }],
        badDate: [{ required: true, message: '请选择不良记录日期', trigger: 'change' }],
        badContent: [{ required: true, message: '请输入不良记录描述', trigger: 'blur' }, {
          max: 512,
@@ -1993,7 +1994,7 @@
        remark: [{ max: 512, message: '长度不超过512个字符', trigger: 'blur' }]
      },
      remarkInfoRules: {
        empName: [{ required: true, message: '请选择员工', trigger: 'blur' }],
        empName: [{ required: true, message: '请选择员工', trigger: 'change' }],
        remarkDate: [{ required: true, message: '请选择备注日期', trigger: 'change' }],
        remarkContent: [{ required: true, message: '请输入备注内容', trigger: 'blur' },
          { max: 512, message: this.$t('rules.noMoreThan512'), trigger: 'blur' }]
@@ -2967,7 +2968,21 @@
                // 如果起始在结束之前
                callback()
              } else {
                callback(new Error('开始始日期不能在结束日期之后，请重新选择'))
                callback(new Error('开始日期不能在结束日期之后，请重新选择'))
              }
            }
            break
          case 5:
            // 如果结束日期没选，cb
            if (!this.leaveInfoForm.endTime) {
              callback()
            } else {
              // 结束日期有，进行判断
              if (this.compareDate(value, this.leaveInfoForm.endTime)) {
                // 如果起始在结束之前
                callback()
              } else {
                callback(new Error('开始时间不能在结束时间之后，请重新选择'))
              }
            }
            break
@@ -2987,6 +3002,22 @@
              // 起始日期有，进行判断
              if (this.compareDate(this.workExperienceForm.beginDate, value)) {
                // 如果起始在结束之前
                this.leaveInfoForm.leaveDay = dateDifference(this.leaveInfoForm.beginTime, this.leaveInfoForm.endTime, 'd')
                callback()
              } else {
                callback(new Error('结束日期不能在开始始日期之前，请重新选择'))
              }
            }
            break
          case 5:
            // 如果起始日期没选，cb
            if (!this.leaveInfoForm.beginTime) {
              callback()
            } else {
              // 起始日期有，进行判断
              if (this.compareDate(this.leaveInfoForm.beginTime, value)) {
                // 如果起始在结束之前
                this.leaveInfoForm.leaveDay = dateDifference(this.leaveInfoForm.beginTime, this.leaveInfoForm.endTime, 'd')
                callback()
              } else {
                callback(new Error('结束日期不能在开始始日期之前，请重新选择'))

 src/views/user/inemployees.vue

@@ -6,12 +6,13 @@
          <el-col :span="16">
            <h3 class="bu-tian-jia-title">在职员工</h3>
          </el-col>
          <el-col :span="8">
          <el-col :span="8" style="margin-top: 15px;">
            <el-input v-model="queryParams.vague" placeholder="请输入内容" style="width:200px" />
            <el-button type="primary" @click="vagueSearch">查询</el-button>
            <el-button type="danger" @click="advancedQueryShowMethods">高级查询</el-button>
          </el-col>
        </el-row>
        <div v-show="advancedQueryShow">
        <el-row>
          <el-col :span="3">员工编号：
            <el-input v-model="queryParams.empNumb" size="small" maxlength="20" style="width:85px" />
@@ -46,7 +47,6 @@
          </el-col>
        </el-row>
        <el-row>
          <div v-show="advancedQueryShow">
            <el-col :span="24">
              <table id="searchTable">
                <tr>
@@ -169,11 +169,10 @@
                </tr>
              </table>
            </el-col>
          </div>
        </el-row>
        </div>
      </el-header>
      <el-container>
        <el-main>
      <el-main style="height: 85%;">
          <el-row>
            <el-col :span="24">
              <el-button type="danger" @click="showXzyg(0)">新增员工</el-button>
@@ -218,7 +217,6 @@
            @pagination="search"
          />
        </el-main>
      </el-container>
    </el-container>
    <el-dialog title="新增员工" :visible.sync="dialogShowXzyg" width="50%">
      <el-form
@@ -1690,7 +1688,7 @@
        { value: '管理员', code: '2942725270000017' },
        { value: '监控员', code: '2942725270000021' },
        { value: '员工', code: '2942725270000028' }],
      headerHeight: '70px',
      headerHeight: '30px',
      advancedQueryShow: false,
      dialogTableVisible: false,
      dialogShowDcyg: false,
@@ -1739,10 +1737,11 @@
      })
    },
    vagueSearch() {
      this.queryParams.empNumb = this.queryParams.vague
      this.queryParams.empName = this.queryParams.vague
      this.queryParams.deptName = this.queryParams.vague
      this.search()
      this.fetch({
        empNumb: this.queryParams.vague,
        empName: this.queryParams.vague,
        deptName: this.queryParams.vague
      })
    },
    transDelFlag(delFlag) {
      switch (delFlag) {
@@ -1768,7 +1767,7 @@
    },
    advancedQueryShowMethods() {
      if (this.advancedQueryShow) {
        this.headerHeight = '70px'
        this.headerHeight = '30px'
        this.advancedQueryShow = false
      } else {
        this.headerHeight = '350px'
@@ -1853,6 +1852,7 @@
      this.empBaseInfoForm.education = row.education
      this.empBaseInfoForm.seniority = row.seniority
      this.empBaseInfoForm.nativePlace = row.nativePlace
      this.empBaseInfoForm.nativePlaceName = row.nativePlaceName
      this.empBaseInfoForm.censusAddress = row.censusAddress
      this.empBaseInfoForm.currentAddress = row.currentAddress
      this.empBaseInfoForm.guardNumb = row.guardNumb
@@ -1862,7 +1862,8 @@
      this.empBaseInfoForm.archivesStatus = row.archivesStatus
      this.empBaseInfoForm.bankName = row.bankName
      this.empBaseInfoForm.bankNumb = row.bankNumb
      this.empBaseInfoForm.InsuranceType = row.InsuranceType
      this.empBaseInfoForm.insuranceType = row.insuranceType
      this.empBaseInfoForm.insuranceTypeName = row.insuranceTypeName
      this.empBaseInfoForm.socialNumb = row.socialNumb
      this.empBaseInfoForm.family = row.family
      this.empBaseInfoForm.handbookStatus = row.handbookStatus
@@ -1899,7 +1900,11 @@
              this.cleanEmpBase()
            })
          }
          this.fetch()
          this.fetch({
            ...this.queryParams,
            ...this.sort
          })
          this.cleanEmpBase()
          this.showXzyg()
        }
      })
@@ -1915,9 +1920,13 @@
                type: 'success'
              })
              this.cleanEmpBase()
              this.fetch()
            })
          }
          this.cleanEmpBase()
          this.fetch({
            ...this.queryParams,
            ...this.sort
          })
        }
      })
    },
@@ -1957,6 +1966,10 @@
        // this.isAdd = false
        this.dialogShowXzyg = false
      }
      this.fetch({
        ...this.queryParams,
        ...this.sort
      })
    },
    handleCheckAllChange(val) {
      this.checkedCities = val ? this.cityOptions : []

 src/views/user/outemployess.vue

@@ -6,12 +6,13 @@
          <el-col :span="16">
            <h3 class="bu-tian-jia-title">离职员工</h3>
          </el-col>
          <el-col :span="8">
            <el-input v-model="queryParams.empNumb" placeholder="请输入内容" style="width:200px" />
            <el-button type="primary" @click="search">查询</el-button>
          <el-col :span="8" style="margin-top: 15px;">
            <el-input v-model="queryParams.vague" placeholder="请输入内容" style="width:200px" />
            <el-button type="primary" @click="vagueSearch">查询</el-button>
            <el-button type="danger" @click="advancedQueryShowMethods">高级查询</el-button>
          </el-col>
        </el-row>
        <div v-show="advancedQueryShow">
        <el-row>
          <el-col :span="3">员工编号：
            <el-input v-model="queryParams.empNumb" size="small" maxlength="20" style="width:85px" />
@@ -62,7 +63,6 @@
            <el-button size="mini" class="hr-but" type="danger" @click="resetSearch">重置</el-button>
          </el-col>
        </el-row>
        <div v-show="advancedQueryShow">
          <form>
            <el-row>
              <el-col :span="24">
@@ -171,8 +171,7 @@
          </form>
        </div>
      </el-header>
      <el-container>
        <el-main>
      <el-main style="height: 85%;">
          <el-row>
            <el-col :span="24">
              <el-button type="primary" @click="delEmp">删除员工</el-button>
@@ -214,7 +213,6 @@
            @pagination="search"
          />
        </el-main>
      </el-container>
    </el-container>
    <el-dialog id="ygxq" title="" width="100%" :visible.sync="dialogTableVisible">
      <div>
@@ -944,7 +942,7 @@
        size: 5,
        num: 1
      },
      headerHeight: '100px',
      headerHeight: '30px',
      advancedQueryShow: false,
      dialogTableVisible: false,
      dialogShowDkda: false,
@@ -987,6 +985,13 @@
        that.tableData = data.rows
      })
    },
    vagueSearch() {
      this.fetch({
        empNumb: this.queryParams.vague,
        empName: this.queryParams.vague,
        deptName: this.queryParams.vague
      })
    },
    transDelFlag(delFlag) {
      switch (delFlag) {
        case 0:
@@ -999,7 +1004,7 @@
    },
    advancedQueryShowMethods() {
      if (this.advancedQueryShow) {
        this.headerHeight = '100px'
        this.headerHeight = '30px'
        this.advancedQueryShow = false
      } else {
        this.headerHeight = '330px'

 src/views/user/search.vue

@@ -45,10 +45,27 @@
          <el-timeline-item @click.native="isShow(showArr[13].show, 13)">

            <span :class="thisShowIndex===13?'selectedTimeline':''">备注信息</span>

          </el-timeline-item>

          <el-timeline-item @click.native="isShow(showArr[14].show, 14)">
            <span :class="thisShowIndex===14?'selectedTimeline':''">调岗记录</span>
          </el-timeline-item>
          <el-timeline-item @click.native="isShow(showArr[15].show, 15)">
            <span :class="thisShowIndex===15?'selectedTimeline':''">入离职记录</span>
          </el-timeline-item>

        </el-timeline>

      </el-aside>

      <el-main>

        <div v-show="showArr[0].show">
          <el-row>
            <el-col :span="17">
              <br>
            </el-col>
            <el-col :span="7">
              <el-input v-model="queryParams.vague" placeholder="请输入内容" style="width:200px" />
              <el-button type="primary" @click="vagueSearch">查询</el-button>
              <el-button type="danger" @click="advancedQueryShowMethods">高级查询</el-button>
            </el-col>
          </el-row>
          <div v-show="advancedQueryShow">
          <el-row>
            <el-col :span="3">员工编号：
              <el-input v-model="queryParams.empNumb" size="small" maxlength="20" style="width:85px" />
@@ -207,32 +224,21 @@
              </td>

            </tr>

          </table>

          </div>

          <el-table ref="empBaseInfoTable" :data="basicInformationData" style="width: 100%;height: 70%;">

            <el-table-column type="selection" width="55" />

            <el-table-column fixed="left" label="操作" width="100">

              <template slot-scope="scope">

                <el-button type="text" size="small" @click="editEmpBase(scope.row)">编辑

                </el-button>

              </template>

            </el-table-column>

            <el-table-column prop="" label="照片" width="60" />

            <el-table-column prop="empNumb" label="员工编号" width="100" />

            <el-table-column prop="empName" label="姓名" width="100" />

            <el-table-column prop="deptName" label="护卫点" width="100" />

            <el-table-column prop="jobName" label="岗位" width="100" />

            <el-table-column prop="empTypeName" label="员工类别" width="100" />

            <el-table-column prop="sexName" label="性别" width="50" />

            <el-table-column prop="nationName" label="民族" width="100" />

            <el-table-column type="index" label="序号" width="50" align="center" />

            <el-table-column prop="empNumb" label="员工编号" />
            <el-table-column prop="deptName" label="护卫点" />
            <el-table-column prop="jobName" label="岗位" />

            <el-table-column prop="empName" label="姓名" />
            <el-table-column prop="certificateNumb" label="身份证号码" width="180" />

            <el-table-column prop="marriageName" label="婚姻状况" width="80" />

            <el-table-column prop="politicsName" label="政治面貌" width="100" />

            <el-table-column prop="educationName" label="最高学历" width="100" />

            <el-table-column prop="entryDate" label="入职日期" width="100" />

            <el-table-column prop="insuranceType" label="保险类型" width="100" />

            <el-table-column prop="socialNumb" label="社保电脑号" width="150" />

            <el-table-column prop="guardNumb" label="保安员证号" width="100" />

            <el-table-column prop="archivesNumb" label="档案编号" width="100" />

            <el-table-column prop="archivesStatusName" label="档案情况" width="100" />

            <el-table-column prop="sexName" label="性别" width="50" />

            <el-table-column prop="educationName" label="学历" />

            <el-table-column prop="nativePlace" label="籍贯" />
            <el-table-column prop="telePhone" label="电话" />
            <el-table-column prop="empStatus" label="员工状态" />

            <el-table-column prop="entryDate" label="入职日期" />
            <el-table-column prop="dimissionDate" label="离职日期" />

          </el-table>

        </div>



@@ -247,14 +253,8 @@
            <el-col :span="4">身份证号：
              <el-input v-model="queryParams.certificateNumb" size="small" maxlength="18" style="width:140px" />
            </el-col>

            <el-col :span="5">员工状态：

              <el-select v-model="queryParams.empStatus" style="width:100px">

                <el-option label="全部" value="" />

                <el-option label="在职" value="1" />

                <el-option label="离职" value="2" />
                <el-option label="自动离职" value="3" />
                <el-option label="公司辞退" value="4" />

              </el-select>

            <el-col :span="5">主要工作类容：
              <el-input v-model="queryParams.jobContent" size="small" maxlength="18" style="width:140px" />
            </el-col>

            <el-col :span="3">
              <el-button size="mini" class="hr-but-all" type="primary" @click="search">查询</el-button>
@@ -262,19 +262,14 @@
            </el-col>

          </el-row>

          <el-table ref="workExperienceTable" :data="workExperienceData" style="width: 100%;height: 70%;">

            <el-table-column type="selection" width="55" />

            <el-table-column fixed="left" label="操作" width="100">

              <template slot-scope="scope">

                <el-button type="text" size="small" @click="editWorkExperience(scope.row)">编辑

                </el-button>

              </template>

            </el-table-column>

            <el-table-column prop="empNumb" label="员工编号" width="180" />

            <el-table-column prop="empName" label="员工姓名" width="180" />

            <el-table-column prop="certificateNumb" label="证件号码" width="180" />

            <el-table-column prop="workUnit" label="工作单位" width="180" />

            <el-table-column prop="beginDate" label="开始日期" width="180" />

            <el-table-column prop="endDate" label="结束日期" width="180" />

            <el-table-column type="index" label="序号" width="50" align="center" />

            <el-table-column prop="empNumb" label="员工编号" />

            <el-table-column prop="empName" label="员工姓名" />
            <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
            <el-table-column prop="sex" label="性别" width="50" />

            <el-table-column prop="workUnit" label="工作单位" />

            <el-table-column prop="beginDate" label="开始日期" />

            <el-table-column prop="endDate" label="结束日期" />

            <el-table-column prop="jobContent" label="主要工作内容" width="180" />

          </el-table>

        </div>

@@ -293,7 +288,7 @@
            <el-col :span="3">护卫点：
              <el-input v-model="queryParams.deptName" size="small" maxlength="20" style="width:100px" />
            </el-col>
            <el-col :span="8">体检日期：
            <el-col :span="9">体检日期：
              <el-date-picker
                v-model="queryParams.physicalExamDateStr"
                size="small"
@@ -308,57 +303,42 @@
                style="width: 400px;"
              />
            </el-col>

            <el-col :span="4">体检类型：
              <el-select v-model="queryParams.physicalExamType" style="width:100px">
                <el-option value="1" label="入职体检" />
                <el-option value="2" label="员工体检" />
              </el-select>
            </el-col>
            <el-col :span="4">心电图：
              <el-select v-model="queryParams.ecg" style="width:100px">
                <el-option label="正常" value="1" />
                <el-option label="异常" value="0" />
              </el-select>
            </el-col>
            <el-col :span="3">体检结论：
              <el-input v-model="queryParams.conclusion" size="small" maxlength="20" style="width:100px" />
            </el-col>

            <el-col :span="3">
              <el-button size="mini" class="hr-but-all" type="primary" @click="search">查询</el-button>
              <el-button size="mini" class="hr-but" type="danger" @click="resetSearch">重置</el-button>
            </el-col>

          </el-row>

          <table class="searchTable">

            <tr>

              <td>体检类型：</td>

              <td>

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

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

                  <el-radio :label="1">入职体检</el-radio>

                  <el-radio :label="2">员工体检</el-radio>

                </el-radio-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>

              </td>

            </tr>

          </table>

          <el-table ref="physicalExamTable" :data="physicalExamData" style="width: 100%;height: 70%;">

            <el-table-column type="selection" width="55" />

            <el-table-column fixed="left" label="操作" width="100">

              <template slot-scope="scope">

                <el-button type="text" size="small" @click="editPhysicalExam(scope.row)">编辑

                </el-button>

              </template>

            </el-table-column>

            <el-table-column prop="empNumb" label="员工编号" width="180" />

            <el-table-column prop="deptName" label="护卫点" width="180" />

            <el-table-column prop="empName" label="员工姓名" width="180" />

            <el-table-column type="index" label="序号" width="50" align="center" />
            <el-table-column prop="deptName" label="护卫点" />

            <el-table-column prop="empNumb" label="员工编号" />

            <el-table-column prop="empName" label="员工姓名" />

            <el-table-column prop="certificateNumb" label="身份证号码" width="180" />

            <el-table-column prop="jobName" label="岗位" width="180" />

            <el-table-column prop="hospital" label="体检医院" width="180" />

            <el-table-column prop="physicalExamDate" label="体检日期" width="180" />

            <el-table-column prop="physicalExamType" label="体检类型" width="180" />

            <el-table-column prop="bloodPressure" label="血压" width="180" />

            <el-table-column prop="transaminase" label="转氨酶" width="180" />

            <el-table-column prop="ecg" label="心电图" width="180" />

            <el-table-column prop="conclusion" label="体检结论" width="180" />

            <el-table-column prop="reviewRecord" label="复查记录" width="180" />

            <el-table-column prop="remark" label="备注" width="180" />

            <el-table-column prop="sex" label="性别" width="50" />

            <el-table-column prop="hospital" label="体检医院" />

            <el-table-column prop="physicalExamDate" label="体检日期" />

            <el-table-column prop="physicalExamType" label="体检类型" />

            <el-table-column prop="bloodPressure" label="血压" />

            <el-table-column prop="transaminase" label="转氨酶" />

            <el-table-column prop="ecg" label="心电图" />

            <el-table-column prop="conclusion" label="体检结论" />

            <el-table-column prop="reviewRecord" label="复查记录" />

            <el-table-column prop="remark" label="备注" />

          </el-table>

        </div>



@@ -408,45 +388,22 @@
                style="width: 400px;"
              />
            </el-col>

            <el-col :span="9">合同状态：
              <el-select v-model="queryParams.contractStatus" style="width:100px">
                <el-option value="" label="全部" />
                <el-option :value="1" label="有效" />
                <el-option :value="2" label="到期" />
                <el-option :value="3" label="续签" />
                <el-option :value="4" label="存档" />
              </el-select>
            </el-col>

            <el-col :span="4">

              <el-button size="mini" class="hr-but-all" type="primary" @click="search">查询</el-button>
              <el-button size="mini" class="hr-but" type="danger" @click="resetSearch">重置</el-button>

            </el-col>

          </el-row>

          <table class="searchTable">

            <tr>

              <td>合同状态：</td>

              <td>

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

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

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

              </td>

            </tr>

          </table>

          <el-table ref="contractInfoTable" :data="contractInfoData" style="width: 100%;height: 70%;">

            <el-table-column type="selection" width="55" />

            <el-table-column fixed="left" label="操作" width="100">

              <template slot-scope="scope">

                <el-button type="text" size="small" @click="editContractInfo(scope.row)">编辑

                </el-button>

              </template>

            </el-table-column>

            <el-table-column type="index" label="序号" width="50" align="center" />

            <el-table-column prop="empNumb" label="员工编号" width="180" />

            <el-table-column prop="deptName" label="护卫点" width="180" />

            <el-table-column prop="jobName" label="岗位" width="180" />

@@ -496,42 +453,20 @@
                <el-option label="1" value="1" />

              </el-select>

            </el-col>

            <el-col :span="5">有无代扣款项：
              <el-select v-model="queryParams.deductStr" style="width:100px">
                <el-option value="" label="全部" />
                <el-option :value="1" label="有代扣项" />
                <el-option :value="2" label="无代扣项" />
              </el-select>
            </el-col>

            <el-col :span="4">

              <el-button size="mini" class="hr-but-all" type="primary" @click="search">查询</el-button>
              <el-button size="mini" class="hr-but" type="danger" @click="resetSearch">重置</el-button>

            </el-col>

          </el-row>

          <table class="searchTable">

            <tr>

              <td>有无代扣款项：</td>

              <td>

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

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

                  <el-radio :label="1">有代扣项</el-radio>

                  <el-radio :label="2">无代扣项</el-radio>

                </el-radio-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>

              </td>

            </tr>

          </table>

          <el-table ref="dimissionAttendTable" :data="dimissionAttendData" style="width: 100%;height: 70%;">

            <el-table-column type="selection" width="55" />

            <el-table-column fixed="left" label="操作" width="100">

              <template slot-scope="scope">

                <el-button type="text" size="small" @click="editDimissionAttend(scope.row)">编辑</el-button>

              </template>

            </el-table-column>

            <el-table-column type="index" label="序号" width="50" align="center" />

            <el-table-column prop="empNumb" label="员工编号" width="180" />

            <el-table-column prop="deptName" label="护卫点" width="180" />

            <el-table-column prop="jobName" label="岗位名称" width="180" />

@@ -577,43 +512,21 @@
                style="width: 400px;"
              />
            </el-col>

            <el-col :span="4">请假类型：
              <el-select v-model="queryParams.leaveType" style="width:100px">
                <el-option value="" label="全部" />
                <el-option value="1" label="事假" />
                <el-option value="2" label="病假" />
                <el-option value="3" label="调休假" />
              </el-select>
            </el-col>

            <el-col :span="4">

              <el-button size="mini" class="hr-but-all" type="primary" @click="search">查询</el-button>
              <el-button size="mini" class="hr-but" type="danger" @click="resetSearch">重置</el-button>

            </el-col>

          </el-row>

          <table class="searchTable">

            <tr>

              <td>请假类型：</td>

              <td>

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

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

              </td>

            </tr>

          </table>

          <el-table v-show="showArr[5].show" ref="leaveInfoTable" :data="leaveInfoData" style="width: 100%;height: 70%;">

            <el-table-column type="selection" width="55" />

            <el-table-column fixed="left" label="操作" width="100">

              <template slot-scope="scope">

                <el-button type="text" size="small" @click="editLeaveInfo(scope.row)">编辑</el-button>

              </template>

            </el-table-column>

            <el-table-column type="index" label="序号" width="50" align="center" />

            <el-table-column prop="empNumb" label="员工编号" width="180" />

            <el-table-column prop="deptName" label="护卫点" width="180" />

            <el-table-column prop="jobName" label="岗位名称" width="180" />

@@ -658,18 +571,16 @@
                style="width: 400px;"
              />
            </el-col>

            <el-col :span="4">辞职事由：
              <el-input v-model="queryParams.reason" size="small" maxlength="18" style="width:140px" />
            </el-col>

            <el-col :span="4">

              <el-button size="mini" class="hr-but-all" type="primary" @click="search">查询</el-button>
              <el-button size="mini" class="hr-but" type="danger" @click="resetSearch">重置</el-button>

            </el-col>

          </el-row>

          <el-table ref="resignTable" :data="resignData" style="width: 100%;height: 70%;">

            <el-table-column type="selection" width="55" />

            <el-table-column fixed="left" label="操作" width="100">

              <template slot-scope="scope">

                <el-button type="text" size="small" @click="editResign(scope.row)">编辑</el-button>

              </template>

            </el-table-column>

            <el-table-column type="index" label="序号" width="50" align="center" />

            <el-table-column prop="deptName" label="护卫点" width="180" />

            <el-table-column prop="jobName" label="岗位名" width="180" />

            <el-table-column prop="empNumb" label="员工编号" width="180" />

@@ -711,21 +622,19 @@
                style="width: 400px;"
              />
            </el-col>

            <el-col :span="4">申报事由：
              <el-input v-model="queryParams.applayReason" size="small" maxlength="20" style="width:100px" />
            </el-col>

            <el-col :span="4">

              <el-button size="mini" class="hr-but-all" type="primary" @click="search">查询</el-button>
              <el-button size="mini" class="hr-but" type="danger" @click="resetSearch">重置</el-button>

            </el-col>

          </el-row>

          <el-table ref="unemploymentTable" :data="unemploymentData" style="width: 100%;height: 70%;">

            <el-table-column type="selection" width="55" />

            <el-table-column fixed="left" label="操作" width="100">

              <template slot-scope="scope">

                <el-button type="text" size="small" @click="editUnemployment(scope.row)">编辑</el-button>

              </template>

            </el-table-column>

            <el-table-column prop="empNumb" label="员工编号" width="180" />

            <el-table-column type="index" label="序号" width="50" align="center" />
            <el-table-column prop="deptName" label="护卫点" width="180" />

            <el-table-column prop="jobName" label="岗位名称" width="180" />

            <el-table-column prop="empNumb" label="员工编号" width="180" />

            <el-table-column prop="empName" label="姓名" width="180" />

            <el-table-column prop="certificateNumb" label="身份证号码" width="180" />

            <el-table-column prop="applayDate" label="失业金申请日期" width="180" />

@@ -750,7 +659,7 @@
            <el-col :span="3">护卫点：
              <el-input v-model="queryParams.deptName" size="small" maxlength="20" style="width:100px" />
            </el-col>
            <el-col :span="9">入职日期：
            <el-col :span="9">社保申请日期：
              <el-date-picker
                v-model="queryParams.applayDateStr"
                size="small"
@@ -765,60 +674,27 @@
                style="width: 400px;"
              />
            </el-col>

            <el-col :span="4">社保档位：
              <el-select v-model="queryParams.insuranceGaers" style="width:100px">
                <el-option value="" label="全部" />
                <el-option value="1" label="深户（五险一档）" />
                <el-option value="2" label="非深户(五险一档)" />
                <el-option value="3" label="非深户(五险二档)" />
                <el-option value="4" label="非深户(五险三档)" />
                <el-option value="5" label="非深户(四险三档)" />
              </el-select>
            </el-col>

            <el-col :span="4">

              <el-button size="mini" class="hr-but-all" type="primary" @click="search">查询</el-button>
              <el-button size="mini" class="hr-but" type="danger" @click="resetSearch">重置</el-button>

            </el-col>

          </el-row>

          <table class="searchTable">

            <tr>

              <td>社保档位：</td>

              <td>

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

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

              </td>

            </tr>

            <tr>

              <td>是否已报告：</td>

              <td>

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

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

                  <el-radio :label="0">已报告</el-radio>

                  <el-radio :label="1">未报告</el-radio>

                </el-radio-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>

              </td>

            </tr>

          </table>

          <el-table ref="insuranceTable" :data="insuranceData" style="width: 100%;height: 70%;">

            <el-table-column type="selection" width="55" />

            <el-table-column fixed="left" label="操作" width="100">

              <template slot-scope="scope">

                <el-button type="text" size="small" @click="editInsurance(scope.row)">编辑</el-button>

              </template>

            </el-table-column>

            <el-table-column type="index" label="序号" width="50" align="center" />

            <el-table-column prop="empNumb" label="员工编号" width="180" />

            <el-table-column prop="deptName" label="护卫点" width="180" />

            <el-table-column prop="jobName" label="岗位名称" width="180" />

            <el-table-column prop="empName" label="姓名" width="180" />

            <el-table-column prop="certificateNumb" label="身份证号码" width="180" />

            <el-table-column prop="deptName" label="护卫点" width="180" />

            <el-table-column prop="applayDate" label="社保申请日期" width="180" />

            <el-table-column prop="proposer" label="申请人" width="180" />

            <el-table-column prop="insuranceGaers" label="社保档位" width="180" />

@@ -873,52 +749,27 @@
                style="width: 400px;"
              />
            </el-col>

            <el-col :span="4">是否住院：
              <el-select v-model="queryParams.hospitalizatioFlag" style="width:100px">
                <el-option value="" label="全部" />
                <el-option value="1" label="是" />
                <el-option value="2" label="否" />
              </el-select>
            </el-col>
            <el-col :span="4">案结状态：
              <el-select v-model="queryParams.settleStatus" style="width:100px">
                <el-option value="" label="全部" />
                <el-option value="1" label="已结案" />
                <el-option value="0" label="未结案" />
              </el-select>
            </el-col>

            <el-col :span="4">

              <el-button size="mini" class="hr-but-all" type="primary" @click="search">查询</el-button>
              <el-button size="mini" class="hr-but" type="danger" @click="resetSearch">重置</el-button>

            </el-col>

          </el-row>

          <table class="searchTable">

            <tr>

              <td>是否住院：</td>

              <td>

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

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

                  <el-radio :label="1">是</el-radio>

                  <el-radio :label="0">否</el-radio>

                </el-radio-group>

              </td>

            </tr>

            <tr>

              <td>案结状态：</td>

              <td>

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

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

                  <el-radio :label="1">已结案</el-radio>

                  <el-radio :label="0">未结案</el-radio>

                </el-radio-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>

              </td>

            </tr>

          </table>

          <el-table ref="accidentCasesTable" :data="accidentCasesData" style="width: 100%;height: 70%;">

            <el-table-column type="selection" width="55" />

            <el-table-column fixed="left" label="操作" width="100">

              <template slot-scope="scope">

                <el-button type="text" size="small" @click="editAccidentCases(scope.row)">编辑</el-button>

              </template>

            </el-table-column>

            <el-table-column type="index" label="序号" width="50" align="center" />

            <el-table-column prop="empNumb" label="员工编号" width="180" />

            <el-table-column prop="deptName" label="护卫点" width="180" />

            <el-table-column prop="jobName" label="岗位名称" width="180" />

@@ -985,55 +836,30 @@
                style="width: 400px;"
              />
            </el-col>

            <el-col :span="4">是否住院：
              <el-select v-model="queryParams.hospitalizatioFlag" style="width:100px">
                <el-option value="" label="全部" />
                <el-option value="1" label="是" />
                <el-option value="2" label="否" />
              </el-select>
            </el-col>
            <el-col :span="4">案结状态：
              <el-select v-model="queryParams.settleStatus" style="width:100px">
                <el-option value="" label="全部" />
                <el-option value="1" label="已结案" />
                <el-option value="0" label="未结案" />
              </el-select>
            </el-col>

            <el-col :span="4">

              <el-button size="mini" class="hr-but-all" type="primary" @click="search">查询</el-button>
              <el-button size="mini" class="hr-but" type="danger" @click="resetSearch">重置</el-button>

            </el-col>

          </el-row>

          <table class="searchTable">

            <tr>

              <td>是否住院：</td>

              <td>

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

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

                  <el-radio :label="1">是</el-radio>

                  <el-radio :label="0">否</el-radio>

                </el-radio-group>

              </td>

            </tr>

            <tr>

              <td>案结状态：</td>

              <td>

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

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

                  <el-radio :label="1">已结案</el-radio>

                  <el-radio :label="0">未结案</el-radio>

                </el-radio-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>

              </td>

            </tr>

          </table>

          <el-table ref="occupationalTable" :data="occupationalData" style="width: 100%;height: 70%;">

            <el-table-column type="selection" width="55" />

            <el-table-column fixed="left" label="操作" width="100">

              <template slot-scope="scope">

                <el-button type="text" size="small" @click="editOccupational(scope.row)">编辑</el-button>

              </template>

            </el-table-column>

            <el-table-column prop="empNumb" label="员工编号" width="180" />

            <el-table-column type="index" label="序号" width="50" align="center" />
            <el-table-column prop="deptName" label="护卫点" width="180" />

            <el-table-column prop="jobName" label="岗位" width="180" />

            <el-table-column prop="empNumb" label="员工编号" width="180" />

            <el-table-column prop="empName" label="姓名" width="180" />

            <el-table-column prop="certificateNumb" label="身份证号码" width="180" />

            <el-table-column prop="injuredTime" label="受伤日期" width="180" />

@@ -1082,77 +908,39 @@
                style="width: 400px;"
              />
            </el-col>
            <el-col :span="9">案结日期：
              <el-date-picker
                v-model="queryParams.settleDateStr"
                size="small"
                type="daterange"
                align="right"
                unlink-panels
                range-separator="至"
                value-format="yyyy-MM-dd"
                start-placeholder="开始日期"
                end-placeholder="结束日期"
                :picker-options="pickerOptions"
                style="width: 400px;"
              />
            <el-col :span="4">仲裁类型：
              <el-select v-model="queryParams.arbitrationType" style="width:100px">
                <el-option value="" label="全部" />
                <el-option label="劳资纠纷" value="01" />
                <el-option label="民事纠纷" value="02" />
                <el-option label="合同纠纷" value="03" />
              </el-select>
            </el-col>
            <el-col :span="4">仲裁事由：
              <el-input v-model="queryParams.arbitrationReason" size="small" maxlength="18" style="width:140px" />
            </el-col>
            <el-col :span="4">案结状态：
              <el-select v-model="queryParams.arbitrationStatus" style="width:100px">
                <el-option value="" label="全部" />
                <el-option value="1" label="已结案" />
                <el-option value="0" label="未结案" />
              </el-select>
            </el-col>

            <el-col :span="4">

              <el-button size="mini" class="hr-but-all" type="primary" @click="search">查询</el-button>
              <el-button size="mini" class="hr-but" type="danger" @click="resetSearch">重置</el-button>

            </el-col>

          </el-row>

          <table class="searchTable">

            <tr>

              <td>仲裁类型：</td>

              <td>

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

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

                  <el-radio :label="0">劳资纠纷</el-radio>

                  <el-radio :label="1">劳资纠纷</el-radio>

                </el-radio-group>

              </td>

            </tr>

            <tr>

              <td>仲裁状态：</td>

              <td>

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

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

                  <el-radio :label="1">已结案</el-radio>

                  <el-radio :label="0">未结案</el-radio>

                </el-radio-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>

              </td>

            </tr>

          </table>

          <el-table ref="laborTroubleTable" :data="laborTroubleData" style="width: 100%;height: 70%;">

            <el-table-column type="selection" width="55" />

            <el-table-column fixed="left" label="操作" width="100">

              <template slot-scope="scope">

                <el-button type="text" size="small" @click="editLaborTrouble(scope.row)">编辑</el-button>

              </template>

            </el-table-column>

            <el-table-column prop="empNumb" label="员工编号" width="180" />

            <el-table-column type="index" label="序号" width="50" align="center" />
            <el-table-column prop="deptName" label="护卫点" width="180" />

            <el-table-column prop="jobName" label="岗位" width="180" />

            <el-table-column prop="empNumb" label="员工编号" width="180" />

            <el-table-column prop="empName" label="姓名" width="180" />

            <el-table-column prop="certificateNumb" label="身份证号码" width="180" />

            <el-table-column prop="arbitrationDate" label="仲裁日期" width="180" />

            <el-table-column prop="arbitrationDate" label="仲裁日期" width="180" />

            <el-table-column prop="arbitrationType" label="仲裁类型" width="180" />

            <el-table-column prop="arbitrationReason" label="仲裁事由" width="180" />

            <el-table-column prop="reporter" label="报备人" width="180" />

            <el-table-column prop="reporter" label="汇报人" width="180" />

            <el-table-column prop="remark" label="备注" width="180" />

            <el-table-column prop="arbitrationPay" label="仲裁赔付（元）" width="180" />

            <el-table-column prop="arbitrationStatus" label="状态" width="180" />

@@ -1189,22 +977,18 @@
                style="width: 400px;"
              />
            </el-col>

            <el-col :span="5">不良记录描述：
              <el-input v-model="queryParams.badContent" size="small" maxlength="18" style="width:140px" />
            </el-col>

            <el-col :span="3.5">

              <el-button size="mini" class="hr-but-all" type="primary" @click="search">查询</el-button>
              <el-button size="mini" class="hr-but" type="danger" @click="resetSearch">重置</el-button>

            </el-col>

          </el-row>

          <el-table ref="badRecordTable" :data="badRecordData" style="width: 100%;height: 70%;">

            <el-table-column type="selection" width="55" />

            <el-table-column fixed="left" label="操作" width="100">

              <template slot-scope="scope">

                <el-button type="text" size="small" @click="editBadRecord(scope.row)">编辑

                </el-button>

              </template>

            </el-table-column>

            <el-table-column prop="empNumb" label="员工编号" width="180" />

            <el-table-column type="index" label="序号" width="50" align="center" />
            <el-table-column prop="deptName" label="护卫点" width="180" />

            <el-table-column prop="jobName" label="岗位" width="180" />

            <el-table-column prop="empNumb" label="员工编号" width="180" />

            <el-table-column prop="empName" label="姓名" width="180" />

            <el-table-column prop="certificateNumb" label="身份证号码" width="180" />

            <el-table-column prop="badDate" label="不良记录日期" width="180" />

@@ -1243,25 +1027,146 @@
                style="width: 400px;"
              />
            </el-col>

            <el-col :span="4">备注信息：
              <el-input v-model="queryParams.remarkContent" size="small" maxlength="18" style="width:140px" />
            </el-col>

            <el-col :span="3.5">

              <el-button size="mini" class="hr-but-all" type="primary" @click="search">查询</el-button>
              <el-button size="mini" class="hr-but" type="danger" @click="resetSearch">重置</el-button>

            </el-col>

          </el-row>

          <el-table ref="remarkInfoTable" :data="remarkInfoData" style="width: 100%;height: 70%;">

            <el-table-column type="selection" width="55" />

            <el-table-column fixed="left" label="操作" width="100">

              <template slot-scope="scope">

                <el-button type="text" size="small" @click="editRemarkInfo(scope.row)">编辑</el-button>

              </template>

            </el-table-column>

            <el-table-column prop="empNumb" label="员工编号" width="180" />

            <el-table-column type="index" label="序号" width="50" align="center" />
            <el-table-column prop="deptName" label="护卫点" width="180" />

            <el-table-column prop="jobName" label="岗位" width="180" />

            <el-table-column prop="empNumb" label="员工编号" width="180" />

            <el-table-column prop="empName" label="姓名" width="180" />

            <el-table-column prop="certificateNumb" label="身份证号码" width="180" />

            <el-table-column prop="remarkDate" label="备注日期" width="180" />

            <el-table-column prop="remarkContent" label="备注信息" width="400" />

          </el-table>

        </div>
        <div v-show="showArr[14].show">
          <el-row>
            <el-col :span="3">员工编号：
              <el-input v-model="queryParams.empNumb" size="small" maxlength="20" style="width:85px" />
            </el-col>
            <el-col :span="3">姓名：
              <el-input v-model="queryParams.empName" size="small" maxlength="10" style="width:110px" />
            </el-col>
            <el-col :span="4">身份证号：
              <el-input v-model="queryParams.certificateNumb" size="small" maxlength="18" style="width:140px" />
            </el-col>
            <el-col :span="3">护卫点：
              <el-input v-model="queryParams.deptName" size="small" maxlength="20" style="width:100px" />
            </el-col>
            <el-col :span="9">调岗日期：
              <el-date-picker
                v-model="queryParams.changeDateStr"
                size="small"
                type="daterange"
                align="right"
                unlink-panels
                range-separator="至"
                value-format="yyyy-MM-dd"
                start-placeholder="开始日期"
                end-placeholder="结束日期"
                :picker-options="pickerOptions"
                style="width: 400px;"
              />
            </el-col>
            <el-col :span="3">调岗类型：
              <el-select v-model="queryParams.changeType" style="width:100px">
                <el-option label="全部" value="" />
                <el-option label="升职" value="2" />
                <el-option label="调动" value="3" />
              </el-select>
            </el-col>
            <el-col :span="3.5">
              <el-button size="mini" class="hr-but-all" type="primary" @click="search">查询</el-button>
              <el-button size="mini" class="hr-but" type="danger" @click="resetSearch">重置</el-button>
            </el-col>
          </el-row>
          <el-table ref="jobChangeTable" :data="jobChangeData" style="width: 100%;height: 70%;">
            <el-table-column type="selection" width="55" />
            <el-table-column prop="empNumb" label="员工编号" width="180" />
            <el-table-column prop="newDeptName" label="现部门" />
            <el-table-column prop="newJobName" label="现岗位" />
            <el-table-column prop="empName" label="姓名" width="180" />
            <el-table-column prop="oldDeptName" label="原部门" />
            <el-table-column prop="oldJobName" label="原岗位" />
            <el-table-column prop="changeDate" label="调岗日期" />
            <el-table-column prop="changeType" label="调岗类型" />
          </el-table>
        </div>
        <div v-show="showArr[15].show">
          <el-row>
            <el-col :span="3">员工编号：
              <el-input v-model="queryParams.empNumb" size="small" maxlength="20" style="width:85px" />
            </el-col>
            <el-col :span="3">姓名：
              <el-input v-model="queryParams.empName" size="small" maxlength="10" style="width:110px" />
            </el-col>
            <el-col :span="4">身份证号：
              <el-input v-model="queryParams.certificateNumb" size="small" maxlength="18" style="width:140px" />
            </el-col>
            <el-col :span="3">护卫点：
              <el-input v-model="queryParams.deptName" size="small" maxlength="20" style="width:100px" />
            </el-col>
            <el-col :span="9">入职日期：
              <el-date-picker
                v-model="queryParams.entryDateStr"
                size="small"
                type="daterange"
                align="right"
                unlink-panels
                range-separator="至"
                value-format="yyyy-MM-dd"
                start-placeholder="开始日期"
                end-placeholder="结束日期"
                :picker-options="pickerOptions"
                style="width: 400px;"
              />
            </el-col>
            <el-col :span="9">离职日期：
              <el-date-picker
                v-model="queryParams.dimissionDateStr"
                size="small"
                type="daterange"
                align="right"
                unlink-panels
                range-separator="至"
                value-format="yyyy-MM-dd"
                start-placeholder="开始日期"
                end-placeholder="结束日期"
                :picker-options="pickerOptions"
                style="width: 400px;"
              />
            </el-col>
            <el-col :span="3">离职类型：
              <el-select v-model="queryParams.dimissionType" style="width:100px">
                <el-option label="全部" value="" />
                <el-option label="正常离职" value="1" />
                <el-option label="自动离职" value="2" />
                <el-option label="公司劝退" value="3" />
                <el-option label="公司辞退" value="4" />
                <el-option label="试用期内" value="5" />
              </el-select>
            </el-col>
            <el-col :span="3.5">
              <el-button size="mini" class="hr-but-all" type="primary" @click="search">查询</el-button>
              <el-button size="mini" class="hr-but" type="danger" @click="resetSearch">重置</el-button>
            </el-col>
          </el-row>
          <el-table ref="dimissionLogTable" :data="dimissionLogData" style="width: 100%;height: 70%;">
            <el-table-column type="selection" width="55" />
            <el-table-column prop="empNumb" label="员工编号" width="180" />
            <el-table-column prop="newDeptName" label="现部门" />
            <el-table-column prop="newJobName" label="现岗位" />
            <el-table-column prop="empName" label="姓名" width="180" />
            <el-table-column prop="entryDate" label="入职日期" />
            <el-table-column prop="dimissionDate" label="离职日期" />
            <el-table-column prop="selfLeaveDay" label="自离天数" />
            <el-table-column prop="reporter" label="报备人" />
            <el-table-column prop="remark" label="备注" />
          </el-table>

        </div>

        <pagination
@@ -1447,6 +1352,12 @@
      },

      {

        show: false

      },

      {

        show: false

      },

      {

        show: false

      }

      ],

      // eslint-disable-next-line no-undef

@@ -1491,9 +1402,16 @@
      },

      {

        show: false

      },

      {

        show: false

      },

      {

        show: false

      }

      ],

      isAdd: false,

      advancedQueryShow: false,

      physicalExamData: [],

      workExperienceData: [],

      basicInformationData: [],

@@ -1509,6 +1427,8 @@
      badRecordData: [],

      accidentCasesData: [],

      dimissionAttendData: [],

      jobChangeData: [],
      dimissionLogData: [],

      pickerOptions: {
        shortcuts: [
          {
@@ -1549,7 +1469,7 @@
  methods: {
    resetSearch() {
      this.queryParams = {
        delFlag: 2
        delFlag: 0
      }
      this.search()
    },

@@ -1571,10 +1491,24 @@
        this[this.tableDataName] = data.rows

      })

    },

    vagueSearch() {
      this.fetch({
        empNumb: this.queryParams.vague,
        empName: this.queryParams.vague,
        deptName: this.queryParams.vague
      })
    },

    dialogIsShow() {

      this.isAdd = true

      this.dialogshowArr[this.thisShowIndex].show = !this.dialogshowArr[this.thisShowIndex]

        .show

    },
    advancedQueryShowMethods() {
      if (this.advancedQueryShow) {
        this.advancedQueryShow = false
      } else {
        this.advancedQueryShow = true
      }
    },

    isShow(tableShow, index) {

      if (index === this.thisShowIndex) {

@@ -1591,90 +1525,101 @@
        case 0:

          this.tableUrl = 'hr/empBaseInfo/list'

          this.tableDataName = 'basicInformationData'

          this.queryParams.delFlag = 2

          this.queryParams.delFlag = 0

          this.search()

          break

        case 1:

          this.tableUrl = 'hr/empWorkExperience/list'

          this.tableDataName = 'workExperienceData'

          this.queryParams.delFlag = 2

          this.queryParams.delFlag = 0

          this.search()

          break

        case 2:

          this.tableUrl = 'hr/empPhysicalExam/list'

          this.tableDataName = 'physicalExamData'

          this.queryParams.delFlag = 2

          this.queryParams.delFlag = 0

          this.search()

          break

        case 3:

          this.tableUrl = 'hr/empContractInfo/list'

          this.tableDataName = 'contractInfoData'

          this.queryParams.delFlag = 2

          this.queryParams.delFlag = 0

          this.search()

          break

        case 4:

          this.tableUrl = 'hr/empDimissionAttend/list'

          this.tableDataName = 'dimissionAttendData'

          this.queryParams.delFlag = 2

          this.queryParams.delFlag = 0

          this.search()

          break

        case 5:

          this.tableUrl = 'hr/empLeaveInfo/list'

          this.tableDataName = 'leaveInfoData'

          this.queryParams.delFlag = 2

          this.queryParams.delFlag = 0

          this.search()

          break

        case 6:

          this.tableUrl = 'hr/empResign/list'

          this.tableDataName = 'resignData'

          this.queryParams.delFlag = 2

          this.queryParams.delFlag = 0

          this.search()

          break

        case 7:

          this.tableUrl = 'hr/empUnemployment/list'

          this.tableDataName = 'unemploymentData'

          this.queryParams.delFlag = 2

          this.queryParams.delFlag = 0

          this.search()

          break

        case 8:

          this.tableUrl = 'hr/empInsurance/list'

          this.tableDataName = 'insuranceData'

          this.queryParams.delFlag = 2

          this.queryParams.delFlag = 0

          this.search()

          break

        case 9:

          this.tableUrl = 'hr/empAccidentCases/list'

          this.tableDataName = 'accidentCasesData'

          this.queryParams.delFlag = 2

          this.queryParams.delFlag = 0

          this.search()

          break

        case 10:

          this.tableUrl = 'hr/empOccupational/list'

          this.tableDataName = 'occupationalData'

          this.queryParams.delFlag = 2

          this.queryParams.delFlag = 0

          this.search()

          break

        case 11:

          this.tableUrl = 'hr/empLaborTrouble/list'

          this.tableDataName = 'laborTroubleData'

          this.queryParams.delFlag = 2

          this.queryParams.delFlag = 0

          this.search()

          break

        case 12:

          this.tableUrl = 'hr/empBadRecord/list'

          this.tableDataName = 'badRecordData'

          this.queryParams.delFlag = 2

          this.queryParams.delFlag = 0

          this.search()

          break

        case 13:

          this.tableUrl = 'hr/empRemarkInfo/list'

          this.tableDataName = 'remarkInfoData'

          this.queryParams.delFlag = 2

          this.queryParams.delFlag = 0

          this.search()

          break
        case 14:
          this.tableUrl = 'hr/empJobChange/list'
          this.tableDataName = 'jobChangeData'
          this.queryParams.delFlag = 0
          this.search()
          break
        case 15:
          this.tableUrl = 'hr/empDimissionlog/list'
          this.tableDataName = 'dimissionLogData'
          this.queryParams.delFlag = 0
          this.search()

          break

      }

    }



  }

}

</script>


 src/views/yunpan/fujian.vue

@@ -144,7 +144,9 @@
            </el-col>

          </el-row>

        </el-form>

        <el-row style="margin: 10px;">

      </el-header>

      <el-main>

        <el-row style="margin-bottom: 10px;">

          <el-col :span="24">

            <el-button class="hr-but-all" type="danger" @click="dialogFormVisible = true">新建标签</el-button>

            <el-popconfirm title="是否删除标签？" @onConfirm="deldialogFormVisible = true">

@@ -256,13 +258,10 @@


          </el-col>

        </el-row>

      </el-header>

      <el-dialog title="附件管理" :visible.sync="dialogShowUploadfj" :fullscreen="true">

        <el-dialog title="附件管理" :visible.sync="dialogShowUploadfj" width="80%" class="fjgl-class" top="10px">

        <uploadfj v-if="dialogShowUploadfj" :rowitem="rowitem" @cancleChooseUser="cancleChooseUser()" />

      </el-dialog>

      <el-container>

        <el-main>

          <el-table ref="empAccessoryTable" :data="tableData" class="fj-table" style="width: 100%;height: 480px;color: #000;">

        <el-table ref="empAccessoryTable" :data="tableData" class="fj-table" style="width: 100%;color: #000;">

            <el-table-column

              type="selection"

              width="55"

@@ -299,7 +298,6 @@
            @pagination="search"

          />

        </el-main>

      </el-container>

    </el-container>

  </div>

</template>

@@ -354,10 +352,10 @@
      },

      total: 0, // 总数量

      pagination: { // 分页参数

        size: 5,

        size: 10,

        num: 1

      },

      headerHeight: '70px',

      headerHeight: '20px',

      advancedQueryShow: false,

      dialogTableVisible: false,

      pickerOptions: {

@@ -533,7 +531,7 @@
        this.headerHeight = '70px'

        this.advancedQueryShow = false

      } else {

        this.headerHeight = '380px'

        this.headerHeight = '330px'

        this.advancedQueryShow = true

      }

    },

@@ -546,13 +544,16 @@
<style lang="scss" scoped>

.el-main {

    margin-top: 10px;

    height: 600px;

}

.el-input-number {

    width: 100%;

}

</style>

<style lang="scss">

.fjgl-class{

    height: 90%;

     overflow: auto;

}

.add-lable {

    text-align: initial;

}


 src/views/yunpan/uploadfj.vue

@@ -47,14 +47,14 @@
            />提示：文件不要超过10个，单个文件大小不超过50M，单击或者拖动文件到下面区域，支持单个或批量文件的上传。</el-col>
          </el-row>
          <el-row style="background-color: rgba(0,0,0,0.2);">
            <el-col :span="19">
            <el-col :span="16">
              <el-checkbox
                v-model="checkAll"
                class="myRedCheckBox"
                style="color: #000; margin-left: 20px;"
                @change="checkAllMethods()"
              >全选</el-checkbox></el-col>
            <el-col :span="5">
            <el-col :span="8">
              <el-button
                type="primary"
                icon="el-icon-download"