Merge remote-tracking branch 'origin/master'

孔祥富

2021-03-11 7369fd5866a78cde7ecbb4721d9decdfa181fd39

 src/views/user/Informationinput.vue

@@ -80,33 +80,33 @@
                编辑
              </span>
            </template>
          </el-table-column>
          <el-table-column label="照片" width="60">
            <template slot-scope="scope">
              <!--              <img :src="scope.row.imagePath">-->
              <el-image
                v-if="scope.row.imagePath && scope.row.imagePath != ''"
                style="width: 30px; height: 30px"
                :src="scope.row.imagePath"
                fit="cover"
              />
          </el-table-column>-->
          <!--          <el-table-column label="照片" width="60">-->
          <!--            <template slot-scope="scope">-->
          <!--              &lt;!&ndash;              <img :src="scope.row.imagePath">&ndash;&gt;-->
          <!--              <el-image-->
          <!--                v-if="scope.row.imagePath && scope.row.imagePath != ''"-->
          <!--                style="width: 30px; height: 30px"-->
          <!--                :src="scope.row.imagePath"-->
          <!--                fit="cover"-->
          <!--              />-->

              <el-image
                v-else
                style="width: 30px; height: 30px"
                :src="defaultImg"
                fit="cover"
              />
            </template>
          </el-table-column>
          <!--              <el-image-->
          <!--                v-else-->
          <!--                style="width: 30px; height: 30px"-->
          <!--                :src="defaultImg"-->
          <!--                fit="cover"-->
          <!--              />-->
          <!--            </template>-->
          <!--          </el-table-column>-->
          <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="50" />
          <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="50" />
          <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="80" />
          <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" />
          <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="50" />
          <el-table-column show-overflow-tooltip prop="empType" label="员工类别" width="80" :formatter="empTypeFormat" />
          <el-table-column show-overflow-tooltip prop="sex" label="性别" width="50" :formatter="sexFormat" />
          <el-table-column show-overflow-tooltip prop="nation" label="民族" width="50" :formatter="nationFormat" />
          <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
          <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="180" />
          <el-table-column show-overflow-tooltip prop="marriage" label="婚姻状况" width="80" :formatter="marriageFormat" />
          <el-table-column show-overflow-tooltip prop="politics" label="政治面貌" width="80" :formatter="politicsFormat" />
          <el-table-column show-overflow-tooltip prop="education" label="学历" width="50" :formatter="educationFormat" />
@@ -149,7 +149,7 @@
            </template>
          </el-table-column>
          <el-table-column prop="empNumb" label="编号" width="100" />
          <el-table-column prop="empName" label="员工姓名" width="100" />
          <el-table-column prop="empName" label="姓名" width="100" />
          <el-table-column prop="certificateNumb" show-overflow-tooltip label="身份证号码" />
          <el-table-column prop="workUnit" show-overflow-tooltip label="工作单位" />
          <el-table-column prop="beginDate" label="开始日期" width="120" />
@@ -183,8 +183,8 @@
            </template>
          </el-table-column>
          <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
          <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="80" />
          <el-table-column show-overflow-tooltip prop="empName" label="员工姓名" width="80" />
          <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="80" />
          <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" />
          <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
          <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="80" />
          <el-table-column prop="hospital" show-overflow-tooltip label="体检医院" />
@@ -200,7 +200,7 @@
          <el-table-column show-overflow-tooltip prop="transaminase" label="转氨酶" width="80" />
          <el-table-column prop="ecg" show-overflow-tooltip label="心电图" width="80" :formatter="ecgNameFormat" />
          <el-table-column prop="conclusion" show-overflow-tooltip label="体检结论" />
          <el-table-column prop="reviewRecord" show-overflow-tooltip label="复查记录" />
          <el-table-column prop="reviewRecord" show-overflow-tooltip label="复查日期" />
          <el-table-column prop="remark" show-overflow-tooltip label="备注" />
        </el-table>
        <el-table
@@ -230,8 +230,8 @@
            </template>
          </el-table-column>
          <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" />
          <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="150" />
          <el-table-column prop="empName" label="员工姓名" width="100" />
          <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="150" />
          <el-table-column prop="empName" label="姓名" width="100" />
          <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
          <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
          <el-table-column show-overflow-tooltip prop="signingDate" label="合同签订日期" />
@@ -262,8 +262,8 @@
            </template>
          </el-table-column>
          <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
          <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="80" />
          <el-table-column show-overflow-tooltip prop="empName" label="员工姓名" width="80" />
          <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="80" />
          <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" />
          <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
          <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="60" />
          <el-table-column show-overflow-tooltip prop="attendMonth" label="离职考勤月份" width="120" />
@@ -296,15 +296,15 @@
            </template>
          </el-table-column>
          <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
          <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="80" />
          <el-table-column show-overflow-tooltip prop="jobName" label="岗位名称" width="80" />
          <el-table-column show-overflow-tooltip prop="empName" label="员工姓名" width="80" />
          <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="80" />
          <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="80" />
          <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" />
          <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
          <el-table-column show-overflow-tooltip prop="beginTime" label="开始时间" width="120" />
          <el-table-column show-overflow-tooltip prop="endTime" label="结束时间" width="120" />
          <el-table-column show-overflow-tooltip prop="leaveDay" label="请假天数" width="80" />
          <el-table-column show-overflow-tooltip prop="leaveType" label="请假类型" width="80" :formatter="leaveTypeFormat" />
          <el-table-column show-overflow-tooltip prop="returnDate" label="到岗时间" width="120" />
          <el-table-column show-overflow-tooltip prop="returnDate" label="返岗时间" width="120" />
          <el-table-column show-overflow-tooltip prop="reporter" label="报备人" width="80" />
          <el-table-column show-overflow-tooltip prop="remark" label="备注" />
        </el-table>
@@ -328,10 +328,10 @@
              </span>
            </template>
          </el-table-column>
          <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="100" />
          <el-table-column show-overflow-tooltip prop="jobName" label="岗位名" width="100" />
          <el-table-column show-overflow-tooltip prop="empNumb" label="编号" />
          <el-table-column show-overflow-tooltip prop="empName" label="员工姓名" width="100" />
          <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="100" />
          <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
          <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" />
          <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
          <el-table-column show-overflow-tooltip prop="applayDate" label="辞职申请日期" width="150" />
          <el-table-column show-overflow-tooltip prop="reason" label="辞职事由" width="150" />
@@ -359,8 +359,8 @@
            </template>
          </el-table-column>
          <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
          <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="100" />
          <el-table-column show-overflow-tooltip prop="jobName" label="岗位名称" width="100" />
          <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="100" />
          <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
          <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" />
          <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
          <el-table-column show-overflow-tooltip prop="applayDate" label="失业金申请日期" width="150" />
@@ -390,8 +390,8 @@
            </template>
          </el-table-column>
          <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
          <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="100" />
          <el-table-column show-overflow-tooltip prop="jobName" label="岗位名称" width="100" />
          <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="100" />
          <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
          <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" />
          <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
          <el-table-column show-overflow-tooltip prop="applayDate" label="社保申请日期" />
@@ -423,8 +423,8 @@
            </template>
          </el-table-column>
          <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="60" />
          <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="80" />
          <el-table-column show-overflow-tooltip prop="jobName" label="岗位名称" width="80" />
          <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="80" />
          <el-table-column show-overflow-tooltip prop="jobName" label="名称" width="80" />
          <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="60" />
          <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="120" />
          <el-table-column show-overflow-tooltip prop="injuredTime" label="受伤日期" />
@@ -469,7 +469,7 @@
            </template>
          </el-table-column>
          <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="60" />
          <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="80" />
          <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="80" />
          <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="60" />
          <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="60" />
          <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="120" />
@@ -516,7 +516,7 @@
            </template>
          </el-table-column>
          <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="60" />
          <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="80" />
          <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="80" />
          <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="80" />
          <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" />
          <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
@@ -568,7 +568,7 @@
            </template>
          </el-table-column>
          <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" />
          <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="120" />
          <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="120" />
          <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="120" />
          <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="120" />
          <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
@@ -598,7 +598,7 @@
            </template>
          </el-table-column>
          <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="180" />
          <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="120" />
          <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="120" />
          <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="120" />
          <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="120" />
          <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
@@ -625,14 +625,14 @@
        <el-row>
          <el-col span="24">
            <el-form-item label="员工模板下载" prop="region">
              <a href="http://120.24.23.155:8000/员工信息.xls" target="_blank" style="color: #3A8EE6;">员工信息.xlxs</a>
              <a :href="downloadEmpExcel" target="_blank" style="color: #3A8EE6;">员工信息.xlxs</a>
              <span style="margin-left: 100px;">点击下载</span>
            </el-form-item>
            <el-form-item label="导入员工">
              <el-upload
                ref="upload"
                class="upload-demo"
                action="http://120.24.23.155:8301/hr/empBaseInfo/importEmp"
                :action="uploadEmpExcel"
                accept=".xls, .xlsx, .excel"
                :headers="headers()"
                :on-success="importHandleAvatarSuccess"
@@ -700,7 +700,7 @@
                  </el-select>
                </el-form-item>
                <el-form-item label="民族" prop="nation">
                  <el-select v-model="empBaseInfoForm.nation" placeholder="请选择民族">
                  <el-select v-model="empBaseInfoForm.nation" filterable placeholder="请选择民族">
                    <el-option
                      v-for="dict in nationOptions"
                      :key="dict.dicItemCode"
@@ -1077,8 +1077,13 @@
            <el-form-item label="体检结论" prop="conclusion">
              <el-input v-model="physicalExamForm.conclusion" />
            </el-form-item>
            <el-form-item label="复查记录" prop="reviewRecord">
              <el-input v-model="physicalExamForm.reviewRecord" />
            <el-form-item label="复查日期" prop="reviewRecord">
              <el-date-picker
                v-model="physicalExamForm.reviewRecord"
                value-format="yyyy-MM-dd"
                type="date"
                placeholder="选择复查日期"
              />
            </el-form-item>
          </el-col>
        </el-row>
@@ -1336,12 +1341,12 @@
              <el-input v-model="leaveInfoForm.leaveDay" />
            </el-form-item>

            <el-form-item label="到岗时间" prop="returnDate">
            <el-form-item label="返岗时间" prop="returnDate">
              <el-date-picker
                v-model="leaveInfoForm.returnDate"
                value-format="yyyy-MM-dd"
                type="date"
                placeholder="选择到岗时间"
                placeholder="选择返岗时间"
              />
            </el-form-item>

@@ -2158,6 +2163,8 @@
  components: { Treeselect, Pagination },
  data() {
    return {
      downloadEmpExcel: pages.downloadEmpExcel,
      uploadEmpExcel: pages.uploadEmpExcel,
      defaultImg: require('../../assets/avatar/20180414165936.jpg'),
      baseicInformationForm: {},
      dialogShowDryg: false,
@@ -2178,7 +2185,7 @@
          message: this.$t('rules.noMoreThan20'),
          trigger: 'blur'
        }],
        empName: [{ required: true, message: '请输入员工姓名', trigger: 'blur' },
        empName: [{ required: true, message: '请输入姓名', trigger: 'blur' },
          { min: 2, max: 50, message: this.$t('rules.noMoreThan50'), trigger: 'blur' }],
        empNumb: [{ required: true, message: '请输入编号', trigger: 'blur' },
          { min: 2, max: 20, message: this.$t('rules.noMoreThan20'), trigger: 'blur' }],
@@ -2282,7 +2289,7 @@
        beginTime: [{ required: true, validator: this.startDate }],
        leaveType: [{ required: true, message: '请选择请假类型', trigger: 'change' }],
        endTime: [{ required: true, validator: this.endDate }],
        returnDate: [{ required: true, message: '请选择到岗时间', trigger: 'change' }],
        returnDate: [{ required: true, message: '请选择返岗时间', trigger: 'change' }],
        reporter: [{ required: true, message: '请输入报备人', trigger: 'blur' }],
        remark: [{ max: 512, message: '长度不超过512个字符', trigger: 'blur' }]
      },
@@ -3112,6 +3119,7 @@
    this.initDept()
    this.thisShowIndex = 1
    this.isShow(false, 0)
    this.initJob()
  },
  methods: {
    importHandleAvatarError() {
@@ -3121,7 +3129,7 @@
      })
    },
    importHandleAvatarSuccess(res, file) {
      if (res.data === null) {
      if (res.data === null || res.data.length === 0) {
        this.$notify({
          title: '成功',
          message: '导入成功!',
@@ -3382,6 +3390,11 @@
    resetDeptTree() {
      this.$refs.deptTree.setCheckedKeys([])
    },
    initJob() {
      this.$get('system/position/dicJob').then((r) => {
        this.restaurJob = r.data.data
      })
    },
    butDelete() {
      let selected
      switch (this.thisShowIndex) {
@@ -3612,7 +3625,7 @@
          }
          break
        case 11:
          selected = this.$refs.occupationalTable.selection
          selected = this.$refs.laborTroubleTable.selection
          if (selected.length > 0) {
            const delIds = []
            selected.forEach((j) => {
@@ -4347,6 +4360,7 @@
      this.$refs[formName].validate((valid) => {
        if (valid) {
          if (this.isAdd) {
            this.workExperienceForm.delFlag = '2'
            this.$post('hr/empWorkExperience', { ...this.workExperienceForm }).then(() => {
              this.buttonLoading = false
              this.$message({
@@ -4375,6 +4389,7 @@
      this.$refs[formName].validate((valid) => {
        if (valid) {
          if (this.isAdd) {
            this.workExperienceForm.delFlag = '2'
            this.$post('hr/empWorkExperience', { ...this.workExperienceForm }).then(() => {
              this.buttonLoading = false
              this.$message({
@@ -4417,7 +4432,7 @@
      this.workExperienceForm.empNumb = row.empNumb
      this.workExperienceForm.empName = row.empName
      this.workExperienceForm.certificateNumb = row.certificateNumb
      this.workExperienceForm.sex = row.sex
      this.workExperienceForm.sexName = row.sex
      this.workExperienceForm.deptId = row.deptId
      this.workExperienceForm.deptName = row.deptName
      this.workExperienceForm.JobId = row.JobId