Merge remote-tracking branch 'origin/master'

孔祥富

2021-03-14 680c4f9e4e8b079593c8e57c100b92890e70960d

 src/views/user/Informationinput.vue

@@ -800,7 +800,7 @@
                <el-form-item label="姓名" prop="empName">
                  <el-input v-model="empBaseInfoForm.empName" />
                </el-form-item>
                <el-form-item label="部门(护卫点)" required message="请选择部门(护卫点)" prop="deptId">
                <el-form-item label="部门(护卫点)" required message="请选择部门(护卫点)" prop="allDeptName">
                  <treeselect
                    v-model="empBaseInfoForm.deptId"
                    :multiple="false"
@@ -909,7 +909,7 @@
              </el-col>
              <el-col :span="24">
                <el-form-item label="相关证件" prop="certificateList">
                  <el-select v-model="empBaseInfoForm.certificateList" placeholder="请选择相关证件">
                  <el-select v-model="empBaseInfoForm.certificateList" multiple placeholder="请选择相关证件">
                    <el-option
                      v-for="dict in certificateListOptions"
                      :key="dict.dicItemCode"
@@ -956,8 +956,8 @@
            <el-form-item label="编号" prop="empNumb">
              <el-input v-model="workExperienceForm.empNumb" />
            </el-form-item>
            <el-form-item label="部门(护卫点)" prop="deptName">
              <el-input v-model="workExperienceForm.deptName" />
            <el-form-item label="部门(护卫点)" prop="allDeptName">
              <el-input v-model="workExperienceForm.allDeptName" />
            </el-form-item>
            <el-form-item label="岗位" prop="jobName">
              <el-input v-model="workExperienceForm.jobName" />
@@ -1057,8 +1057,8 @@
            <el-form-item label="编号" prop="empNumb">
              <el-input v-model="physicalExamForm.empNumb" />
            </el-form-item>
            <el-form-item label="部门(护卫点)" prop="deptName">
              <el-input v-model="physicalExamForm.deptName" />
            <el-form-item label="部门(护卫点)" prop="allDeptName">
              <el-input v-model="physicalExamForm.allDeptName" />
            </el-form-item>
            <el-form-item label="岗位" prop="jobName">
              <el-input v-model="physicalExamForm.jobName" />
@@ -1170,8 +1170,8 @@
            <el-form-item label="编号" prop="empNumb">
              <el-input v-model="contractInfoForm.empNumb" />
            </el-form-item>
            <el-form-item label="部门(护卫点)" prop="deptName">
              <el-input v-model="contractInfoForm.deptName" />
            <el-form-item label="部门(护卫点)" prop="allDeptName">
              <el-input v-model="contractInfoForm.allDeptName" />
            </el-form-item>
            <el-form-item label="岗位" prop="jobName">
              <el-input v-model="contractInfoForm.jobName" />
@@ -1251,8 +1251,8 @@
            <el-form-item label="编号" prop="empNumb">
              <el-input v-model="dimissionAttendForm.empNumb" />
            </el-form-item>
            <el-form-item label="部门(护卫点)" prop="deptName">
              <el-input v-model="dimissionAttendForm.deptName" />
            <el-form-item label="部门(护卫点)" prop="allDeptName">
              <el-input v-model="dimissionAttendForm.allDeptName" />
            </el-form-item>
            <el-form-item label="岗位" prop="jobName">
              <el-input v-model="dimissionAttendForm.jobName" />
@@ -1335,8 +1335,8 @@
            <el-form-item label="编号" prop="empNumb">
              <el-input v-model="leaveInfoForm.empNumb" />
            </el-form-item>
            <el-form-item label="部门(护卫点)" prop="deptName">
              <el-input v-model="leaveInfoForm.deptName" />
            <el-form-item label="部门(护卫点)" prop="allDeptName">
              <el-input v-model="leaveInfoForm.allDeptName" />
            </el-form-item>
            <el-form-item label="岗位" prop="jobName">
              <el-input v-model="leaveInfoForm.jobName" />
@@ -1408,8 +1408,8 @@
            <el-form-item label="编号" prop="empNumb">
              <el-input v-model="resignForm.empNumb" />
            </el-form-item>
            <el-form-item label="部门(护卫点)" prop="deptName">
              <el-input v-model="resignForm.deptName" />
            <el-form-item label="部门(护卫点)" prop="allDeptName">
              <el-input v-model="resignForm.allDeptName" />
            </el-form-item>
            <el-form-item label="岗位" prop="jobName">
              <el-input v-model="resignForm.jobName" />
@@ -1477,8 +1477,8 @@
            <el-form-item label="编号" prop="empNumb">
              <el-input v-model="unemploymentForm.empNumb" />
            </el-form-item>
            <el-form-item label="部门(护卫点)" prop="deptName">
              <el-input v-model="unemploymentForm.deptName" />
            <el-form-item label="部门(护卫点)" prop="allDeptName">
              <el-input v-model="unemploymentForm.allDeptName" />
            </el-form-item>
            <el-form-item label="岗位" prop="jobName">
              <el-input v-model="unemploymentForm.jobName" />
@@ -1560,8 +1560,8 @@
            <el-form-item label="编号" prop="empNumb">
              <el-input v-model="insuranceForm.empNumb" />
            </el-form-item>
            <el-form-item label="部门(护卫点)" prop="deptName">
              <el-input v-model="insuranceForm.deptName" />
            <el-form-item label="部门(护卫点)" prop="allDeptName">
              <el-input v-model="insuranceForm.allDeptName" />
            </el-form-item>
            <el-form-item label="岗位" prop="jobName">
              <el-input v-model="insuranceForm.jobName" />
@@ -1635,8 +1635,8 @@
            <el-form-item label="编号" prop="empNumb">
              <el-input v-model="accidentCasesForm.empNumb" />
            </el-form-item>
            <el-form-item label="部门(护卫点)" prop="deptName">
              <el-input v-model="accidentCasesForm.deptName" />
            <el-form-item label="部门(护卫点)" prop="allDeptName">
              <el-input v-model="accidentCasesForm.allDeptName" />
            </el-form-item>
            <el-form-item label="岗位" prop="jobName">
              <el-input v-model="accidentCasesForm.jobName" />
@@ -1782,8 +1782,8 @@
            <el-form-item label="编号" prop="empNumb">
              <el-input v-model="occupationalForm.empNumb" />
            </el-form-item>
            <el-form-item label="部门(护卫点)" prop="deptName">
              <el-input v-model="occupationalForm.deptName" />
            <el-form-item label="部门(护卫点)" prop="allDeptName">
              <el-input v-model="occupationalForm.allDeptName" />
            </el-form-item>
            <el-form-item label="岗位" prop="jobName">
              <el-input v-model="occupationalForm.jobName" />
@@ -1983,8 +1983,8 @@
            <el-form-item label="编号" prop="empNumb">
              <el-input v-model="laborTroubleForm.empNumb" />
            </el-form-item>
            <el-form-item label="部门(护卫点)" prop="deptName">
              <el-input v-model="laborTroubleForm.deptName" />
            <el-form-item label="部门(护卫点)" prop="allDeptName">
              <el-input v-model="laborTroubleForm.allDeptName" />
            </el-form-item>
            <el-form-item label="岗位" prop="jobName">
              <el-input v-model="laborTroubleForm.jobName" />
@@ -2071,8 +2071,8 @@
            <el-form-item label="编号" prop="empNumb">
              <el-input v-model="badRecordForm.empNumb" />
            </el-form-item>
            <el-form-item label="部门(护卫点)" prop="deptName">
              <el-input v-model="badRecordForm.deptName" />
            <el-form-item label="部门(护卫点)" prop="allDeptName">
              <el-input v-model="badRecordForm.allDeptName" />
            </el-form-item>
            <el-form-item label="岗位" prop="jobName">
              <el-input v-model="badRecordForm.jobName" />
@@ -2137,8 +2137,8 @@
            <el-form-item label="编号" prop="empNumb">
              <el-input v-model="remarkInfoForm.empNumb" />
            </el-form-item>
            <el-form-item label="部门(护卫点)" prop="deptName">
              <el-input v-model="remarkInfoForm.deptName" />
            <el-form-item label="部门(护卫点)" prop="allDeptName">
              <el-input v-model="remarkInfoForm.allDeptName" />
            </el-form-item>
            <el-form-item label="岗位" prop="jobName">
              <el-input v-model="remarkInfoForm.jobName" />
@@ -2618,6 +2618,7 @@
        JobId: '',
        deptId: '',
        deptName: '',
        allDeptName: '',
        jobName: '',
        remarkContent: '',
        remarkDate: '',
@@ -2639,6 +2640,7 @@
        certificateNumb: '',
        deptId: '',
        deptName: '',
        allDeptName: '',
        JobId: '',
        jobName: '',
        arbitrationDate: '',
@@ -2667,6 +2669,7 @@
        certificateNumb: '',
        deptId: '',
        deptName: '',
        allDeptName: '',
        JobId: '',
        jobName: '',
        injuredTime: '',
@@ -2715,6 +2718,7 @@
        certificateNumb: '',
        deptId: '',
        deptName: '',
        allDeptName: '',
        JobId: '',
        jobName: '',
        injuredTime: '',
@@ -2754,6 +2758,7 @@
        certificateNumb: '',
        deptId: '',
        deptName: '',
        allDeptName: '',
        JobId: '',
        jobName: '',
        applayDate: '',
@@ -2781,6 +2786,7 @@
        certificateNumb: '',
        deptId: '',
        deptName: '',
        allDeptName: '',
        JobId: '',
        jobName: '',
        applayDate: '',
@@ -2806,6 +2812,7 @@
        certificateNumb: '',
        deptId: '',
        deptName: '',
        allDeptName: '',
        JobId: '',
        jobName: '',
        applayDate: '',
@@ -2830,6 +2837,7 @@
        certificateNumb: '',
        deptId: '',
        deptName: '',
        allDeptName: '',
        JobId: '',
        jobName: '',
        beginTime: '',
@@ -2857,6 +2865,7 @@
        sexName: '',
        deptId: '',
        deptName: '',
        allDeptName: '',
        JobId: '',
        jobName: '',
        beginDate: '',
@@ -2883,6 +2892,7 @@
        sexName: '',
        deptId: '',
        deptName: '',
        allDeptName: '',
        JobId: '',
        jobName: '',
        certificateNumb: '',
@@ -2912,6 +2922,7 @@
        sexName: '',
        deptId: '',
        deptName: '',
        allDeptName: '',
        JobId: '',
        jobName: '',
        hospital: '',
@@ -2941,6 +2952,7 @@
        sexName: '',
        deptId: '',
        deptName: '',
        allDeptName: '',
        JobId: '',
        jobName: '',
        workUnit: '',
@@ -2960,7 +2972,7 @@
        empId: '',
        customerId: '',
        archivesNumb: '',
        deptId: '',
        deptId: null,
        deptName: '',
        allDeptName: '',
        empNumb: '',
@@ -3018,6 +3030,7 @@
        certificateNumb: '',
        deptId: '',
        deptName: '',
        allDeptName: '',
        JobId: '',
        jobName: '',
        badDate: '',
@@ -4221,7 +4234,7 @@
      this.empBaseInfoForm.empId = ''
      this.empBaseInfoForm.customerId = ''
      this.empBaseInfoForm.archivesNumb = ''
      this.empBaseInfoForm.deptId = ''
      this.empBaseInfoForm.deptId = null
      this.empBaseInfoForm.deptName = ''
      this.empBaseInfoForm.allDeptName = ''
      this.empBaseInfoForm.empNumb = ''
@@ -4271,6 +4284,11 @@
    },
    editEmpBase(row) {
      this.isAdd = false
      let certificateList = []
      if (row.certificateList && typeof row.certificateList === 'string') {
        certificateList = row.certificateList.split(',')
        row.certificateList = certificateList
      }
      this.empBaseInfoForm.empId = row.empId
      this.empBaseInfoForm.customerId = row.customerId
      this.empBaseInfoForm.archivesNumb = row.archivesNumb
@@ -4425,6 +4443,7 @@
      this.workExperienceForm.archivesNumb = ''
      this.workExperienceForm.deptId = ''
      this.workExperienceForm.deptName = ''
      this.workExperienceForm.allDeptName = ''
      this.workExperienceForm.empNumb = ''
      this.workExperienceForm.empName = ''
      this.workExperienceForm.sex = ''
@@ -4452,6 +4471,7 @@
      this.workExperienceForm.sexName = row.sex
      this.workExperienceForm.deptId = row.deptId
      this.workExperienceForm.deptName = row.deptName
      this.workExperienceForm.allDeptName = row.allDeptName
      this.workExperienceForm.JobId = row.JobId
      this.workExperienceForm.jobName = row.jobName
      this.workExperienceForm.workUnit = row.workUnit
@@ -4522,6 +4542,7 @@
      this.physicalExamForm.archivesNumb = ''
      this.physicalExamForm.deptId = ''
      this.physicalExamForm.deptName = ''
      this.physicalExamForm.allDeptName = ''
      this.physicalExamForm.empNumb = ''
      this.physicalExamForm.empName = ''
      this.physicalExamForm.sex = ''
@@ -4548,6 +4569,7 @@
      this.physicalExamForm.sex = row.sex
      this.physicalExamForm.deptId = row.deptId
      this.physicalExamForm.deptName = row.deptName
      this.physicalExamForm.allDeptName = row.allDeptName
      this.physicalExamForm.JobId = row.JobId
      this.physicalExamForm.jobName = row.jobName
      this.physicalExamForm.hospital = row.hospital
@@ -4624,6 +4646,7 @@
      this.contractInfoForm.archivesNumb = ''
      this.contractInfoForm.deptId = ''
      this.contractInfoForm.deptName = ''
      this.contractInfoForm.allDeptName = ''
      this.contractInfoForm.empNumb = ''
      this.contractInfoForm.empName = ''
      this.contractInfoForm.sex = ''
@@ -4656,6 +4679,7 @@
      this.contractInfoForm.sex = row.sex
      this.contractInfoForm.deptId = row.deptId
      this.contractInfoForm.deptName = row.deptName
      this.contractInfoForm.allDeptName = row.allDeptName
      this.contractInfoForm.JobId = row.JobId
      this.contractInfoForm.jobName = row.jobName
      this.contractInfoForm.beginDate = row.beginDate
@@ -4730,6 +4754,7 @@
      this.dimissionAttendForm.archivesNumb = ''
      this.dimissionAttendForm.deptId = ''
      this.dimissionAttendForm.deptName = ''
      this.dimissionAttendForm.allDeptName = ''
      this.dimissionAttendForm.empNumb = ''
      this.dimissionAttendForm.empName = ''
      this.dimissionAttendForm.sex = ''
@@ -4761,6 +4786,7 @@
      this.dimissionAttendForm.certificateNumb = row.certificateNumb
      this.dimissionAttendForm.deptId = row.deptId
      this.dimissionAttendForm.deptName = row.deptName
      this.dimissionAttendForm.allDeptName = row.allDeptName
      this.dimissionAttendForm.JobId = row.JobId
      this.dimissionAttendForm.jobName = row.jobName
      this.dimissionAttendForm.attendMonth = row.attendMonth
@@ -4834,6 +4860,7 @@
      this.leaveInfoForm.archivesNumb = ''
      this.leaveInfoForm.deptId = ''
      this.leaveInfoForm.deptName = ''
      this.leaveInfoForm.allDeptName = ''
      this.leaveInfoForm.empNumb = ''
      this.leaveInfoForm.empName = ''
      this.leaveInfoForm.sex = ''
@@ -4866,6 +4893,7 @@
      this.leaveInfoForm.certificateNumb = row.certificateNumb
      this.leaveInfoForm.deptId = row.deptId
      this.leaveInfoForm.deptName = row.deptName
      this.leaveInfoForm.allDeptName = row.allDeptName
      this.leaveInfoForm.JobId = row.JobId
      this.leaveInfoForm.jobName = row.jobName
      this.leaveInfoForm.beginTime = row.beginTime
@@ -4940,6 +4968,7 @@
      this.resignForm.archivesNumb = ''
      this.resignForm.deptId = ''
      this.resignForm.deptName = ''
      this.resignForm.allDeptName = ''
      this.resignForm.empNumb = ''
      this.resignForm.empName = ''
      this.resignForm.sex = ''
@@ -4969,6 +4998,7 @@
      this.resignForm.certificateNumb = row.certificateNumb
      this.resignForm.deptId = row.deptId
      this.resignForm.deptName = row.deptName
      this.resignForm.allDeptName = row.allDeptName
      this.resignForm.JobId = row.JobId
      this.resignForm.jobName = row.jobName
      this.resignForm.applayDate = row.applayDate
@@ -5040,6 +5070,7 @@
      this.unemploymentForm.archivesNumb = ''
      this.unemploymentForm.deptId = ''
      this.unemploymentForm.deptName = ''
      this.unemploymentForm.allDeptName = ''
      this.unemploymentForm.empNumb = ''
      this.unemploymentForm.empName = ''
      this.unemploymentForm.sex = ''
@@ -5070,6 +5101,7 @@
      this.unemploymentForm.certificateNumb = row.certificateNumb
      this.unemploymentForm.deptId = row.deptId
      this.unemploymentForm.deptName = row.deptName
      this.unemploymentForm.allDeptName = row.allDeptName
      this.unemploymentForm.JobId = row.JobId
      this.unemploymentForm.jobName = row.jobName
      this.unemploymentForm.applayDate = row.applayDate
@@ -5142,6 +5174,7 @@
      this.insuranceForm.archivesNumb = ''
      this.insuranceForm.deptId = ''
      this.insuranceForm.deptName = ''
      this.insuranceForm.allDeptName = ''
      this.insuranceForm.empNumb = ''
      this.insuranceForm.empName = ''
      this.insuranceForm.sex = ''
@@ -5174,6 +5207,7 @@
      this.insuranceForm.certificateNumb = row.certificateNumb
      this.insuranceForm.deptId = row.deptId
      this.insuranceForm.deptName = row.deptName
      this.insuranceForm.allDeptName = row.allDeptName
      this.insuranceForm.JobId = row.JobId
      this.insuranceForm.jobName = row.jobName
      this.insuranceForm.applayDate = row.applayDate
@@ -5247,6 +5281,7 @@
      this.accidentCasesForm.archivesNumb = ''
      this.accidentCasesForm.deptId = ''
      this.accidentCasesForm.deptName = ''
      this.accidentCasesForm.allDeptName = ''
      this.accidentCasesForm.empNumb = ''
      this.accidentCasesForm.empName = ''
      this.accidentCasesForm.sex = ''
@@ -5291,6 +5326,7 @@
      this.accidentCasesForm.certificateNumb = row.certificateNumb
      this.accidentCasesForm.deptId = row.deptId
      this.accidentCasesForm.deptName = row.deptName
      this.accidentCasesForm.allDeptName = row.allDeptName
      this.accidentCasesForm.JobId = row.JobId
      this.accidentCasesForm.jobName = row.jobName
      this.accidentCasesForm.injuredTime = row.injuredTime
@@ -5377,6 +5413,7 @@
      this.occupationalForm.archivesNumb = ''
      this.occupationalForm.deptId = ''
      this.occupationalForm.deptName = ''
      this.occupationalForm.allDeptName = ''
      this.occupationalForm.empNumb = ''
      this.occupationalForm.empName = ''
      this.occupationalForm.sex = ''
@@ -5430,6 +5467,7 @@
      this.occupationalForm.certificateNumb = row.certificateNumb
      this.occupationalForm.deptId = row.deptId
      this.occupationalForm.deptName = row.deptName
      this.occupationalForm.allDeptName = row.allDeptName
      this.occupationalForm.JobId = row.JobId
      this.occupationalForm.jobName = row.jobName
      this.occupationalForm.injuredTime = row.injuredTime
@@ -5527,6 +5565,7 @@
      this.laborTroubleForm.archivesNumb = ''
      this.laborTroubleForm.deptId = ''
      this.laborTroubleForm.deptName = ''
      this.laborTroubleForm.allDeptName = ''
      this.laborTroubleForm.empNumb = ''
      this.laborTroubleForm.empName = ''
      this.laborTroubleForm.sex = ''
@@ -5559,6 +5598,7 @@
      this.laborTroubleForm.certificateNumb = row.certificateNumb
      this.laborTroubleForm.deptId = row.deptId
      this.laborTroubleForm.deptName = row.deptName
      this.laborTroubleForm.allDeptName = row.allDeptName
      this.laborTroubleForm.JobId = row.JobId
      this.laborTroubleForm.jobName = row.jobName
      this.laborTroubleForm.arbitrationDate = row.arbitrationDate
@@ -5589,6 +5629,7 @@
      this.badRecordForm.archivesNumb = ''
      this.badRecordForm.deptId = ''
      this.badRecordForm.deptName = ''
      this.badRecordForm.allDeptName = ''
      this.badRecordForm.empNumb = ''
      this.badRecordForm.empName = ''
      this.badRecordForm.sex = ''
@@ -5662,6 +5703,7 @@
      this.badRecordForm.certificateNumb = row.certificateNumb
      this.badRecordForm.deptId = row.deptId
      this.badRecordForm.deptName = row.deptName
      this.badRecordForm.allDeptName = row.allDeptName
      this.badRecordForm.JobId = row.JobId
      this.badRecordForm.jobName = row.jobName
      this.badRecordForm.badDate = row.badDate
@@ -5732,6 +5774,7 @@
      this.remarkInfoForm.archivesNumb = ''
      this.remarkInfoForm.deptId = ''
      this.remarkInfoForm.deptName = ''
      this.remarkInfoForm.allDeptName = ''
      this.remarkInfoForm.empNumb = ''
      this.remarkInfoForm.empName = ''
      this.remarkInfoForm.sex = ''
@@ -5759,6 +5802,7 @@
      this.remarkInfoForm.JobId = row.JobId
      this.remarkInfoForm.deptId = row.deptId
      this.remarkInfoForm.deptName = row.deptName
      this.remarkInfoForm.allDeptName = row.allDeptName
      this.remarkInfoForm.jobName = row.jobName
      this.remarkInfoForm.remarkContent = row.remarkContent
      this.remarkInfoForm.remarkDate = row.remarkDate
@@ -5827,6 +5871,7 @@
        this[this.inputForName].certificateNumb = data.certificateNumb
        this[this.inputForName].deptId = data.deptId
        this[this.inputForName].deptName = data.deptName
        this[this.inputForName].allDeptName = data.allDeptName
        this[this.inputForName].JobId = data.jobId
        this[this.inputForName].jobName = data.jobName
        this[this.inputForName].sex = data.sex === '1' ? '男' : '女'