Merge remote-tracking branch 'origin/master'

孔祥富

2021-03-14 680c4f9e4e8b079593c8e57c100b92890e70960d

 src/views/user/archivesEdit.vue

@@ -532,7 +532,7 @@
                  </el-col>
                  <el-col :span="8">
                    <el-form-item label="相关证件" prop="certificateList">
                      <el-select v-model="empBaseInfoForm.certificateList" placeholder="请选择相关证件" :disabled="readon ? false : true">
                      <el-select v-model="empBaseInfoForm.certificateList" multiple placeholder="请选择相关证件" :disabled="readon ? false : true">
                        <el-option
                          v-for="dict in certificateListOptions"
                          :key="dict.dicItemCode"
@@ -714,6 +714,7 @@
                <el-table-column show-overflow-tooltip="true" prop="oldJobName" label="原岗位" />
                <el-table-column show-overflow-tooltip="true" prop="changeDate" label="调岗日期" />
                <el-table-column show-overflow-tooltip="true" prop="changeType" label="调岗类型" :formatter="changeTypeFormat" />
                <el-table-column show-overflow-tooltip="true" prop="changeReason" label="调岗理由" />
              </el-table>
              <pagination
                v-show="jobChangeDatatotal>0"
@@ -1329,6 +1330,7 @@
                          >下载
                          </el-button>
                          <el-button
                            class="pri-del-btn"
                            type="primary"
                            icon="el-icon-search"
                            size="mini"
@@ -1336,7 +1338,7 @@
                          >删除
                          </el-button>
                          <el-popconfirm title="是否移动附件？" @onConfirm="mvdialogFormVisible = true">
                            <el-button slot="reference" class="hr-but" type="danger">转存</el-button>
                            <el-button slot="reference" type="danger">转存</el-button>
                          </el-popconfirm>
                        </el-col>
                      </el-row>
@@ -1459,8 +1461,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" />
@@ -1561,8 +1563,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" />
@@ -1670,8 +1672,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" />
@@ -1752,8 +1754,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" />
@@ -1841,8 +1843,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" />
@@ -1920,8 +1922,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" />
@@ -1995,8 +1997,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" />
@@ -2084,8 +2086,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" />
@@ -2165,8 +2167,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" />
@@ -2317,8 +2319,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" />
@@ -2524,8 +2526,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" />
@@ -2618,8 +2620,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" />
@@ -2690,8 +2692,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" />
@@ -2773,6 +2775,33 @@
      },
      readon: false,
      workExperienceModal: true,
      restaurJob: [{ value: '总经理', code: '2942725270000031' },
        { value: '总秘', code: '2942725270000032' },
        { value: '总助', code: '2942725270000033' },
        { value: '经理', code: '2942725270000022' },
        { value: '副经理', code: '2942725270000015' },
        { value: '助理', code: '2942725270000030' },
        { value: '项目经理', code: '2942725270000027' },
        { value: '大队长', code: '2942725270000006' },
        { value: '大队长兼内勤', code: '2942725270000007' },
        { value: '中队长', code: '2942725270000029' },
        { value: '队长', code: '2942725270000011' },
        { value: '分队长', code: '2942725270000013' },
        { value: '副队长', code: '2942725270000014' },
        { value: '班长', code: '2942725270000002' },
        { value: '保安员', code: '2942725270000003' },
        { value: '内勤', code: '2942725270000024' },
        { value: '保洁', code: '2942725270000004' },
        { value: '电工', code: '2942725270000010' },
        { value: '绿化工', code: '2942725270000023' },
        { value: '出纳', code: '2942725270000005' },
        { value: '人事专员', code: '2942725270000025' },
        { value: '司机', code: '2942725270000026' },
        { value: '购买保险', code: '2942725270000016' },
        { value: '广州燃气中队长', code: '2942725270000018' },
        { value: '管理员', code: '2942725270000017' },
        { value: '监控员', code: '2942725270000021' },
        { value: '员工', code: '2942725270000028' }],
      dialogshowArr: [
        {
          show: false
@@ -3089,33 +3118,6 @@
        { value: '台湾省', code: '710000' },
        { value: '香港特别行政区', code: '810000' },
        { value: '澳门特别行政区', code: '820000' }],
      restaurJob: [{ value: '总经理', code: '2942725270000031' },
        { value: '总秘', code: '2942725270000032' },
        { value: '总助', code: '2942725270000033' },
        { value: '经理', code: '2942725270000022' },
        { value: '副经理', code: '2942725270000015' },
        { value: '助理', code: '2942725270000030' },
        { value: '项目经理', code: '2942725270000027' },
        { value: '大队长', code: '2942725270000006' },
        { value: '大队长兼内勤', code: '2942725270000007' },
        { value: '中队长', code: '2942725270000029' },
        { value: '队长', code: '2942725270000011' },
        { value: '分队长', code: '2942725270000013' },
        { value: '副队长', code: '2942725270000014' },
        { value: '班长', code: '2942725270000002' },
        { value: '保安员', code: '2942725270000003' },
        { value: '内勤', code: '2942725270000024' },
        { value: '保洁', code: '2942725270000004' },
        { value: '电工', code: '2942725270000010' },
        { value: '绿化工', code: '2942725270000023' },
        { value: '出纳', code: '2942725270000005' },
        { value: '人事专员', code: '2942725270000025' },
        { value: '司机', code: '2942725270000026' },
        { value: '购买保险', code: '2942725270000016' },
        { value: '广州燃气中队长', code: '2942725270000018' },
        { value: '管理员', code: '2942725270000017' },
        { value: '监控员', code: '2942725270000021' },
        { value: '员工', code: '2942725270000028' }],
      types: '',
      physicalExamData: [],
      physicalExamDataselection: [],
@@ -4101,6 +4103,11 @@
      })
    },
    setArchives(val) {
      let certificateList = []
      if (val.certificateList && typeof val.certificateList === 'string') {
        certificateList = val.certificateList.split(',')
        val.certificateList = certificateList
      }
      this.empBaseInfoForm = { ...val }
      this.empBaseInfoImageUrl = pages.getEmpBaseInfoImage + this.empBaseInfoForm.empId
      this.fileDate.empId = this.empBaseInfoForm.empId
@@ -4164,6 +4171,7 @@
    initdimissionLogData(params = {}) {
      params.pageSize = this.pagination.size
      params.pageNum = this.pagination.num
      params.certificateNumb = this.empBaseInfoForm.certificateNumb
      params.dimissionType = ''
      params.delFlag = '0'
      this.$get('hr/empDimissionlog/list', {
@@ -5561,6 +5569,11 @@
      // 调用 callback 返回建议列表的数据
      cb(results)
    },
    createFilter(queryString) {
      return (restaurant) => {
        return (restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0)
      }
    },
    jobNameSelect(items) {
      this.empBaseInfoForm.jobName = items.value
      this.empBaseInfoForm.JobId = items.code
@@ -6142,5 +6155,9 @@
    color: #333 !important;
  }
}
.pri-del-btn {
  background-color: rgb(64, 158, 255) !important;
  border-color: rgb(64, 158, 255) !important;
}
</style>