修改bug

yz_08

2021-02-25 4e0d848df7535bdf1b92dabaf1799a75754c1df0

修改bug

 src/views/user/Informationinput.vue

@@ -5044,6 +5044,7 @@
  .el-main {
    background-color: #fff;
  }

}
.el-container {
  height: 770px;
@@ -5059,6 +5060,12 @@
    background-color: #e9eef3;
    color: #333;
    height: 100%;
    .el-table{
      margin-top: 10px;
    }
  }
  .el-timeline-item{
      padding-bottom: 5px;
  }
}


 src/views/user/archivesEdit.vue

@@ -13,7 +13,7 @@
        <div>
          <img src="https://ss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=1333074204,3035391839&fm=26&gp=0.jpg" class="jbxxImg">
          <div class="title-da">
            {{ this.empBaseInfoForm.empNumb }}
            {{ empBaseInfoForm.empNumb }}
          </div>
        </div>
        <ul>
@@ -828,26 +828,26 @@
        <el-row>
          <el-col :span="12">
            <el-form-item label="姓名" prop="empName">
              <el-input v-model="this.empBaseInfoForm.empName" suffix-icon="el-icon-search" />
              <el-input v-model="empBaseInfoForm.empName" suffix-icon="el-icon-search" />
            </el-form-item>
            <el-form-item label="身份证号码" prop="certificateNumb">
              <el-input
                v-model="this.empBaseInfoForm.certificateNumb"
                v-model="empBaseInfoForm.certificateNumb"
              />
            </el-form-item>
            <el-form-item label="性别" prop="sex">
              <el-input v-model="this.empBaseInfoForm.sex" />
              <el-input v-model="empBaseInfoForm.sex" />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="员工编号" prop="empNumb">
              <el-input v-model="this.empBaseInfoForm.empNumb" />
              <el-input v-model="empBaseInfoForm.empNumb" />
            </el-form-item>
            <el-form-item label="部门(护卫点)" prop="deptName">
              <el-input v-model="this.empBaseInfoForm.deptName" />
              <el-input v-model="empBaseInfoForm.deptName" />
            </el-form-item>
            <el-form-item label="岗位" prop="jobName">
              <el-input v-model="this.empBaseInfoForm.jobName" />
              <el-input v-model="empBaseInfoForm.jobName" />
            </el-form-item>
          </el-col>
        </el-row>
@@ -898,15 +898,15 @@
        <el-row>
          <el-col :span="12">
            <el-form-item label="姓名" prop="empName">
              <el-input v-model="this.empBaseInfoForm.empName" suffix-icon="el-icon-search" />
              <el-input v-model="empBaseInfoForm.empName" suffix-icon="el-icon-search" />
            </el-form-item>
            <el-form-item label="身份证号码" prop="certificateNumb">
              <el-input
                v-model="this.empBaseInfoForm.certificateNumb"
                v-model="empBaseInfoForm.certificateNumb"
              />
            </el-form-item>
            <el-form-item label="性别" prop="sex">
              <el-input v-model="this.empBaseInfoForm.sex" />
              <el-input v-model="empBaseInfoForm.sex" />
            </el-form-item>
            <el-form-item label="体检医院" prop="hospital">
              <el-input v-model="physicalExamForm.hospital" />
@@ -926,13 +926,13 @@
          </el-col>
          <el-col :span="12">
            <el-form-item label="员工编号" prop="empNumb">
              <el-input v-model="this.empBaseInfoForm.empNumb" />
              <el-input v-model="empBaseInfoForm.empNumb" />
            </el-form-item>
            <el-form-item label="部门(护卫点)" prop="deptName">
              <el-input v-model="this.empBaseInfoForm.deptName" />
              <el-input v-model="empBaseInfoForm.deptName" />
            </el-form-item>
            <el-form-item label="岗位" prop="jobName">
              <el-input v-model="this.empBaseInfoForm.jobName" />
              <el-input v-model="empBaseInfoForm.jobName" />
            </el-form-item>
            <el-form-item label="体检日期" prop="physicalExamDate">
              <el-date-picker
@@ -981,11 +981,11 @@
        <el-row>
          <el-col :span="12">
            <el-form-item label="姓名" prop="empName">
              <el-input v-model="this.empBaseInfoForm.empName" suffix-icon="el-icon-search" />
              <el-input v-model="empBaseInfoForm.empName" suffix-icon="el-icon-search" />
            </el-form-item>
            <el-form-item label="身份证号码" prop="certificateNumb">
              <el-input
                v-model="this.empBaseInfoForm.certificateNumb"
                v-model="empBaseInfoForm.certificateNumb"
              />
            </el-form-item>
            <el-form-item label="性别" this-emp-base-info-form="sex">
@@ -1014,13 +1014,13 @@
          </el-col>
          <el-col :span="12">
            <el-form-item label="员工编号" prop="empNumb">
              <el-input v-model="this.empBaseInfoForm.empNumb" />
              <el-input v-model="empBaseInfoForm.empNumb" />
            </el-form-item>
            <el-form-item label="部门(护卫点)" prop="deptName">
              <el-input v-model="this.empBaseInfoForm.deptName" />
              <el-input v-model="empBaseInfoForm.deptName" />
            </el-form-item>
            <el-form-item label="岗位" prop="jobName">
              <el-input v-model="this.empBaseInfoForm.jobName" />
              <el-input v-model="empBaseInfoForm.jobName" />
            </el-form-item>
            <el-form-item label="合同结束日期" prop="endDate">
              <el-date-picker
@@ -1053,15 +1053,15 @@
        <el-row>
          <el-col :span="12">
            <el-form-item label="姓名" prop="empName">
              <el-input v-model="this.empBaseInfoForm.empName" suffix-icon="el-icon-search" />
              <el-input v-model="empBaseInfoForm.empName" suffix-icon="el-icon-search" />
            </el-form-item>
            <el-form-item label="身份证号码" prop="certificateNumb">
              <el-this.empBaseInfoForm
              <el-empBaseInfoForm
                v-model="dimissionAttendForm.certificateNumb"
              />
            </el-form-item>
            <el-form-item label="性别" prop="sex">
              <el-input v-model="this.empBaseInfoForm.sex" />
              <el-input v-model="empBaseInfoForm.sex" />
            </el-form-item>
            <el-form-item label="离职考勤月份" prop="attendMonth">
              <el-date-picker
@@ -1083,13 +1083,13 @@
          </el-col>
          <el-col :span="12">
            <el-form-item label="员工编号" prop="empNumb">
              <el-input v-model="this.empBaseInfoForm.empNumb" />
              <el-input v-model="empBaseInfoForm.empNumb" />
            </el-form-item>
            <el-form-item label="部门(护卫点)" prop="deptName">
              <el-input v-model="this.empBaseInfoForm.deptName" />
              <el-input v-model="empBaseInfoForm.deptName" />
            </el-form-item>
            <el-form-item label="岗位" prop="jobName">
              <el-input v-model="this.empBaseInfoForm.jobName" />
              <el-input v-model="empBaseInfoForm.jobName" />
            </el-form-item>
            <el-form-item label="出勤天数" prop="attendDays">
              <el-input v-model="dimissionAttendForm.attendDays" />
@@ -1122,15 +1122,15 @@
        <el-row>
          <el-col :span="12">
            <el-form-item label="姓名" prop="empName">
              <el-input v-model="this.empBaseInfoForm.empName" suffix-icon="el-icon-search" />
              <el-input v-model="empBaseInfoForm.empName" suffix-icon="el-icon-search" />
            </el-form-item>
            <el-form-item label="身份证号码" prop="certificateNumb">
              <el-input
                v-model="this.empBaseInfoForm.certificateNumb"
                v-model="empBaseInfoForm.certificateNumb"
              />
            </el-form-item>
            <el-form-item label="性别" prop="sex">
              <el-input v-model="this.empBaseInfoForm.sex" />
              <el-input v-model="empBaseInfoForm.sex" />
            </el-form-item>
            <el-form-item label="请假开始时间" prop="beginTime">
              <el-date-picker
@@ -1155,13 +1155,13 @@
          </el-col>
          <el-col :span="12">
            <el-form-item label="员工编号" prop="empNumb">
              <el-input v-model="this.empBaseInfoForm.empNumb" />
              <el-input v-model="empBaseInfoForm.empNumb" />
            </el-form-item>
            <el-form-item label="部门(护卫点)" prop="deptName">
              <el-input v-model="this.empBaseInfoForm.deptName" />
              <el-input v-model="empBaseInfoForm.deptName" />
            </el-form-item>
            <el-form-item label="岗位" prop="jobName">
              <el-input v-model="this.empBaseInfoForm.jobName" />
              <el-input v-model="empBaseInfoForm.jobName" />
            </el-form-item>
            <el-form-item label="请假结束时间" prop="endTime">
              <el-date-picker
@@ -1206,15 +1206,15 @@
        <el-row>
          <el-col :span="12">
            <el-form-item label="姓名" prop="empName">
              <el-input v-model="this.empBaseInfoForm.empName" suffix-icon="el-icon-search" />
              <el-input v-model="empBaseInfoForm.empName" suffix-icon="el-icon-search" />
            </el-form-item>
            <el-form-item label="身份证号码" prop="certificateNumb">
              <el-input
                v-model="this.empBaseInfoForm.certificateNumb"
                v-model="empBaseInfoForm.certificateNumb"
              />
            </el-form-item>
            <el-form-item label="性别" prop="sex">
              <el-input v-model="this.empBaseInfoForm.sex" />
              <el-input v-model="empBaseInfoForm.sex" />
            </el-form-item>
            <el-form-item label="辞职申请日期" prop="applayDate">
              <el-date-picker
@@ -1227,13 +1227,13 @@
          </el-col>
          <el-col :span="12">
            <el-form-item label="员工编号" prop="empNumb">
              <el-input v-model="this.empBaseInfoForm.empNumb" />
              <el-input v-model="empBaseInfoForm.empNumb" />
            </el-form-item>
            <el-form-item label="部门(护卫点)" prop="deptName">
              <el-input v-model="this.empBaseInfoForm.deptName" />
              <el-input v-model="empBaseInfoForm.deptName" />
            </el-form-item>
            <el-form-item label="岗位" prop="jobName">
              <el-input v-model="this.empBaseInfoForm.jobName" />
              <el-input v-model="empBaseInfoForm.jobName" />
            </el-form-item>
            <el-form-item label="报备人">
              <el-input v-model="resignForm.reporter" />
@@ -1265,15 +1265,15 @@
        <el-row>
          <el-col :span="12">
            <el-form-item label="姓名" prop="empName">
              <el-input v-model="this.empBaseInfoForm.empName" suffix-icon="el-icon-search" />
              <el-input v-model="empBaseInfoForm.empName" suffix-icon="el-icon-search" />
            </el-form-item>
            <el-form-item label="身份证号码" prop="certificateNumb">
              <el-input
                v-model="this.empBaseInfoForm.certificateNumb"
                v-model="empBaseInfoForm.certificateNumb"
              />
            </el-form-item>
            <el-form-item label="性别" prop="sex">
              <el-input v-model="this.empBaseInfoForm.sex" />
              <el-input v-model="empBaseInfoForm.sex" />
            </el-form-item>
            <el-form-item label="失业金申请日期" prop="applayDate" label-width="130px">
              <el-date-picker
@@ -1289,13 +1289,13 @@
          </el-col>
          <el-col :span="12">
            <el-form-item label="员工编号" prop="empNumb">
              <el-input v-model="this.empBaseInfoForm.empNumb" />
              <el-input v-model="empBaseInfoForm.empNumb" />
            </el-form-item>
            <el-form-item label="部门(护卫点)" prop="deptName">
              <el-input v-model="this.empBaseInfoForm.deptName" />
              <el-input v-model="empBaseInfoForm.deptName" />
            </el-form-item>
            <el-form-item label="岗位" prop="jobName">
              <el-input v-model="this.empBaseInfoForm.jobName" />
              <el-input v-model="empBaseInfoForm.jobName" />
            </el-form-item>
            <el-form-item label="汇报人">
              <el-input v-model="unemploymentForm.reporter" />
@@ -1324,15 +1324,15 @@
        <el-row>
          <el-col :span="12">
            <el-form-item label="姓名" prop="empName">
              <el-input v-model="this.empBaseInfoForm.empName" suffix-icon="el-icon-search" />
              <el-input v-model="empBaseInfoForm.empName" suffix-icon="el-icon-search" />
            </el-form-item>
            <el-form-item label="身份证号码" prop="certificateNumb">
              <el-input
                v-model="this.empBaseInfoForm.certificateNumb"
                v-model="empBaseInfoForm.certificateNumb"
              />
            </el-form-item>
            <el-form-item label="性别" prop="sex">
              <el-input v-model="this.empBaseInfoForm.sex" />
              <el-input v-model="empBaseInfoForm.sex" />
            </el-form-item>
            <el-form-item label="社保申请日期" prop="applayDate">
              <el-date-picker
@@ -1360,13 +1360,13 @@
          </el-col>
          <el-col :span="12">
            <el-form-item label="员工编号" prop="empNumb">
              <el-input v-model="this.empBaseInfoForm.empNumb" />
              <el-input v-model="empBaseInfoForm.empNumb" />
            </el-form-item>
            <el-form-item label="部门(护卫点)" prop="deptName">
              <el-input v-model="this.empBaseInfoForm.deptName" />
              <el-input v-model="empBaseInfoForm.deptName" />
            </el-form-item>
            <el-form-item label="岗位" prop="jobName">
              <el-input v-model="this.empBaseInfoForm.jobName" />
              <el-input v-model="empBaseInfoForm.jobName" />
            </el-form-item>
            <el-form-item label="申请人" prop="proposer">
              <el-input v-model="insuranceForm.proposer" />
@@ -1400,15 +1400,15 @@
        <el-row>
          <el-col :span="12">
            <el-form-item label="姓名" prop="empName">
              <el-input v-model="this.empBaseInfoForm.empName" suffix-icon="el-icon-search" />
              <el-input v-model="empBaseInfoForm.empName" suffix-icon="el-icon-search" />
            </el-form-item>
            <el-form-item label="身份证号码" prop="certificateNumb">
              <el-input
                v-model="this.empBaseInfoForm.certificateNumb"
                v-model="empBaseInfoForm.certificateNumb"
              />
            </el-form-item>
            <el-form-item label="性别" prop="sex">
              <el-input v-model="this.empBaseInfoForm.sex" />
              <el-input v-model="empBaseInfoForm.sex" />
            </el-form-item>
            <el-form-item label="受伤时间" prop="injuredTime">
              <el-date-picker
@@ -1424,13 +1424,13 @@
          </el-col>
          <el-col :span="12">
            <el-form-item label="员工编号" prop="empNumb">
              <el-input v-model="this.empBaseInfoForm.empNumb" />
              <el-input v-model="empBaseInfoForm.empNumb" />
            </el-form-item>
            <el-form-item label="部门(护卫点)" prop="deptName">
              <el-input v-model="this.empBaseInfoForm.deptName" />
              <el-input v-model="empBaseInfoForm.deptName" />
            </el-form-item>
            <el-form-item label="岗位" prop="jobName">
              <el-input v-model="this.empBaseInfoForm.jobName" />
              <el-input v-model="empBaseInfoForm.jobName" />
            </el-form-item>
            <el-form-item label="受伤地点">
              <el-input v-model="accidentCasesForm.injuredAddress" />
@@ -1531,15 +1531,15 @@
        <el-row>
          <el-col :span="12">
            <el-form-item label="姓名" prop="empName">
              <el-input v-model="this.empBaseInfoForm.empName" suffix-icon="el-icon-search" />
              <el-input v-model="empBaseInfoForm.empName" suffix-icon="el-icon-search" />
            </el-form-item>
            <el-form-item label="身份证号码" prop="certificateNumb">
              <el-input
                v-model="this.empBaseInfoForm.certificateNumb"
                v-model="empBaseInfoForm.certificateNumb"
              />
            </el-form-item>
            <el-form-item label="性别" prop="sex">
              <el-input v-model="this.empBaseInfoForm.sex" />
              <el-input v-model="empBaseInfoForm.sex" />
            </el-form-item>
            <el-form-item label="受伤时间" prop="injuredTime">
              <el-date-picker
@@ -1555,13 +1555,13 @@
          </el-col>
          <el-col :span="12">
            <el-form-item label="员工编号" prop="empNumb">
              <el-input v-model="this.empBaseInfoForm.empNumb" />
              <el-input v-model="empBaseInfoForm.empNumb" />
            </el-form-item>
            <el-form-item label="部门(护卫点)" prop="deptName">
              <el-input v-model="this.empBaseInfoForm.deptName" />
              <el-input v-model="empBaseInfoForm.deptName" />
            </el-form-item>
            <el-form-item label="岗位" prop="jobName">
              <el-input v-model="this.empBaseInfoForm.jobName" />
              <el-input v-model="empBaseInfoForm.jobName" />
            </el-form-item>
            <el-form-item label="受伤地点" prop="injuredAddress">
              <el-input v-model="occupationalForm.injuredAddress" />
@@ -1707,15 +1707,15 @@
        <el-row>
          <el-col :span="12">
            <el-form-item label="姓名" prop="empName">
              <el-input v-model="this.empBaseInfoForm.empName" suffix-icon="el-icon-search" />
              <el-input v-model="empBaseInfoForm.empName" suffix-icon="el-icon-search" />
            </el-form-item>
            <el-form-item label="身份证号码" prop="certificateNumb">
              <el-input
                v-model="this.empBaseInfoForm.certificateNumb"
                v-model="empBaseInfoForm.certificateNumb"
              />
            </el-form-item>
            <el-form-item label="性别" prop="sex">
              <el-input v-model="this.empBaseInfoForm.sex" />
              <el-input v-model="empBaseInfoForm.sex" />
            </el-form-item>
            <el-form-item label="仲裁日期" prop="arbitrationDate">
              <el-date-picker
@@ -1737,13 +1737,13 @@
          </el-col>
          <el-col :span="12">
            <el-form-item label="员工编号" prop="empNumb">
              <el-input v-model="this.empBaseInfoForm.empNumb" />
              <el-input v-model="empBaseInfoForm.empNumb" />
            </el-form-item>
            <el-form-item label="部门(护卫点)" prop="deptName">
              <el-input v-model="this.empBaseInfoForm.deptName" />
              <el-input v-model="empBaseInfoForm.deptName" />
            </el-form-item>
            <el-form-item label="岗位" prop="jobName">
              <el-input v-model="this.empBaseInfoForm.jobName" />
              <el-input v-model="empBaseInfoForm.jobName" />
            </el-form-item>
            <el-form-item label="仲裁类型" prop="arbitrationType">
              <el-select v-model="laborTroubleForm.arbitrationType" placeholder="请选择仲裁类型">
@@ -1790,15 +1790,15 @@
        <el-row>
          <el-col :span="12">
            <el-form-item label="姓名" prop="empName">
              <el-input v-model="this.empBaseInfoForm.empName" suffix-icon="el-icon-search" />
              <el-input v-model="empBaseInfoForm.empName" suffix-icon="el-icon-search" />
            </el-form-item>
            <el-form-item label="身份证号码" prop="certificateNumb">
              <el-input
                v-model="this.empBaseInfoForm.certificateNumb"
                v-model="empBaseInfoForm.certificateNumb"
              />
            </el-form-item>
            <el-form-item label="性别" prop="sex">
              <el-input v-model="this.empBaseInfoForm.sex" />
              <el-input v-model="empBaseInfoForm.sex" />
            </el-form-item>
            <el-form-item label="不良记录日期" prop="badDate">
              <el-date-picker
@@ -1811,13 +1811,13 @@
          </el-col>
          <el-col :span="12">
            <el-form-item label="员工编号" prop="empNumb">
              <el-input v-model="this.empBaseInfoForm.empNumb" />
              <el-input v-model="empBaseInfoForm.empNumb" />
            </el-form-item>
            <el-form-item label="部门(护卫点)" prop="deptName">
              <el-input v-model="this.empBaseInfoForm.deptName" />
              <el-input v-model="empBaseInfoForm.deptName" />
            </el-form-item>
            <el-form-item label="岗位" prop="jobName">
              <el-input v-model="this.empBaseInfoForm.jobName" />
              <el-input v-model="empBaseInfoForm.jobName" />
            </el-form-item>
            <el-form-item label="汇报人" prop="reporter">
              <el-input v-model="badRecordForm.reporter" />
@@ -1855,15 +1855,15 @@
        <el-row>
          <el-col :span="12">
            <el-form-item label="姓名" prop="empName">
              <el-input v-model="this.empBaseInfoForm.empName" suffix-icon="el-icon-search" />
              <el-input v-model="empBaseInfoForm.empName" suffix-icon="el-icon-search" />
            </el-form-item>
            <el-form-item label="身份证号码" prop="certificateNumb">
              <el-input
                v-model="this.empBaseInfoForm.certificateNumb"
                v-model="empBaseInfoForm.certificateNumb"
              />
            </el-form-item>
            <el-form-item label="性别" prop="sex">
              <el-input v-model="this.empBaseInfoForm.sex" />
              <el-input v-model="empBaseInfoForm.sex" />
            </el-form-item>
            <el-form-item label="备注日期" prop="remarkDate">
              <el-date-picker
@@ -1876,13 +1876,13 @@
          </el-col>
          <el-col :span="12">
            <el-form-item label="员工编号" prop="empNumb">
              <el-input v-model="this.empBaseInfoForm.empNumb" />
              <el-input v-model="empBaseInfoForm.empNumb" />
            </el-form-item>
            <el-form-item label="部门(护卫点)" prop="deptName">
              <el-input v-model="this.empBaseInfoForm.deptName" />
              <el-input v-model="empBaseInfoForm.deptName" />
            </el-form-item>
            <el-form-item label="岗位" prop="jobName">
              <el-input v-model="this.empBaseInfoForm.jobName" />
              <el-input v-model="empBaseInfoForm.jobName" />
            </el-form-item>
          </el-col>
        </el-row>

 src/views/user/inemployees.vue

@@ -1556,7 +1556,7 @@
        archivesStatus: '0',
        bankName: '',
        bankNumb: '',
        InsuranceType: '',
        insuranceType: '',
        socialNumb: '',
        family: '',
        handbookStatus: '0',

 src/views/user/outemployess.vue

@@ -199,9 +199,14 @@
          <el-table-column prop="censusAddress" label="籍贯" />
          <el-table-column prop="telePhone" label="联系电话" />
          <el-table-column prop="entryDate" label="入职日期" width="100" />
          <el-table-column prop="delFlag" label="员工状态">
          <el-table-column prop="empStatus" label="员工状态">
            <template slot-scope="{row}">
              {{ transDelFlag(row.delFlag) }}
              {{ transDelFlag(row.empStatus) }}
            </template>
          </el-table-column>
          <el-table-column prop="dimissionType" label="离职类型">
            <template slot-scope="{row}">
              {{ transDimissionType(row.dimissionType) }}
            </template>
          </el-table-column>
        </el-table>
@@ -1008,14 +1013,28 @@
        deptName: this.queryParams.vague
      })
    },
    transDelFlag(delFlag) {
      switch (delFlag) {
        case 0:
          return '正常'
        case 1:
          return '删除'
        case 2:
          return '暂存'
    transDelFlag(empStatus) {
      switch (empStatus) {
        case '0':
          return '在职'
        case '1':
          return '离职'
        case '2':
          return '退休'
      }
    },
    transDimissionType(dimissionType) {
      switch (dimissionType) {
        case '1':
          return '正常离职'
        case '2':
          return '自动离职'
        case '3':
          return '公司劝退'
        case '4':
          return '公司辞退'
        case '5':
          return '试用期内'
      }
    },
    advancedQueryShowMethods() {

 src/views/yunpan/fujian.vue

@@ -160,9 +160,7 @@
        <el-row style="margin-bottom: 10px;height: 40px;">
          <el-col :span="24">
            <el-button class="hr-but-all" type="danger" @click="dialogFormVisible = true">新建标签</el-button>
            <el-popconfirm title="是否删除标签？" @onConfirm="deldialogFormVisible = true">
              <el-button slot="reference" class="hr-but" type="danger">删除标签</el-button>
            </el-popconfirm>
            <el-button class="hr-but" type="danger" @click="deldialogFormVisible = true">删除标签</el-button>
            <el-button class="hr-but-all" type="danger" @click="downloaddialogFormVisible = true">下载附件</el-button>
            <el-dialog
              title="新建标签"