Merge remote-tracking branch 'origin/master'

yz_08

2021-02-26 e6505dfd6607c8fbc2e89ebf7cb5c66179ee77d4

 src/views/user/Informationinput.vue

@@ -16,7 +16,7 @@
            <span :class="thisShowIndex===3?'selectedTimeline':''">合同信息</span>
          </el-timeline-item>
          <el-timeline-item @click.native="isShow(showArr[4].show, 4)">
            <span :class="thisShowIndex===4?'selectedTimeline':''">考勤情况</span>
            <span :class="thisShowIndex===4?'selectedTimeline':''">离职当月考勤</span>
          </el-timeline-item>
          <el-timeline-item @click.native="isShow(showArr[5].show, 5)">
            <span :class="thisShowIndex===5?'selectedTimeline':''">请假记录</span>
@@ -850,6 +850,7 @@
              >
                <el-option label="普通体检" value="1" />
                <el-option label="员工体检" value="2" />
                <el-option label="入职体检" value="03" />
              </el-select>
            </el-form-item>
            <el-form-item label="转氨酶" prop="transaminase">
@@ -2558,14 +2559,14 @@
        empId: '',
        customerId: '',
        archivesNumb: '',
        deptId: '',
        deptId: '1',
        deptName: '',
        empNumb: '',
        empName: '',
        sex: '1',
        JobId: '',
        jobName: '',
        empType: '1',
        empType: '01',
        certificateType: '',
        certificateNumb: '',
        nation: '01',
@@ -2833,6 +2834,11 @@
              })
              this.selectEmpBase()
            })
          } else {
            this.$message({
              message: '请先选中需要删除的记录',
              type: 'error'
            })
          }
          break
        case 1:
@@ -2848,6 +2854,11 @@
                type: 'success'
              })
              this.selectWorkExperience()
            })
          } else {
            this.$message({
              message: '请先选中需要删除的记录',
              type: 'error'
            })
          }
          break
@@ -2865,6 +2876,11 @@
              })
              this.selectPhysicalExam()
            })
          } else {
            this.$message({
              message: '请先选中需要删除的记录',
              type: 'error'
            })
          }
          break
        case 3:
@@ -2880,6 +2896,11 @@
                type: 'success'
              })
              this.selectContractInfo()
            })
          } else {
            this.$message({
              message: '请先选中需要删除的记录',
              type: 'error'
            })
          }
          break
@@ -2913,6 +2934,11 @@
              })
              this.selectLeaveInfo()
            })
          } else {
            this.$message({
              message: '请先选中需要删除的记录',
              type: 'error'
            })
          }
          break
        case 6:
@@ -2928,6 +2954,11 @@
                type: 'success'
              })
              this.selectResign()
            })
          } else {
            this.$message({
              message: '请先选中需要删除的记录',
              type: 'error'
            })
          }
          break
@@ -2945,6 +2976,11 @@
              })
              this.selectUnemployment()
            })
          } else {
            this.$message({
              message: '请先选中需要删除的记录',
              type: 'error'
            })
          }
          break
        case 8:
@@ -2960,6 +2996,11 @@
                type: 'success'
              })
              this.selectInsurance()
            })
          } else {
            this.$message({
              message: '请先选中需要删除的记录',
              type: 'error'
            })
          }
          break
@@ -2977,6 +3018,11 @@
              })
              this.selectAccidentCases()
            })
          } else {
            this.$message({
              message: '请先选中需要删除的记录',
              type: 'error'
            })
          }
          break
        case 10:
@@ -2992,6 +3038,11 @@
                type: 'success'
              })
              this.selectOccupational()
            })
          } else {
            this.$message({
              message: '请先选中需要删除的记录',
              type: 'error'
            })
          }
          break
@@ -3009,6 +3060,11 @@
              })
              this.selectLaborTrouble()
            })
          } else {
            this.$message({
              message: '请先选中需要删除的记录',
              type: 'error'
            })
          }
          break
        case 12:
@@ -3025,6 +3081,11 @@
              })
              this.selectBadRecord()
            })
          } else {
            this.$message({
              message: '请先选中需要删除的记录',
              type: 'error'
            })
          }
          break
        case 13:
@@ -3040,6 +3101,11 @@
                type: 'success'
              })
              this.selectBadRecord()
            })
          } else {
            this.$message({
              message: '请先选中需要删除的记录',
              type: 'error'
            })
          }
          break
@@ -3174,6 +3240,11 @@
              this.queryParams.delFlag = 2
              this.search()
            })
          } else {
            this.$message({
              message: '请先选中需要提交的记录',
              type: 'error'
            })
          }
          break
        case 1:
@@ -3192,6 +3263,11 @@
              this.tableDataName = 'workExperienceData'
              this.queryParams.delFlag = 2
              this.search()
            })
          } else {
            this.$message({
              message: '请先选中需要提交的记录',
              type: 'error'
            })
          }
          break
@@ -3212,6 +3288,11 @@
              this.queryParams.delFlag = 2
              this.search()
            })
          } else {
            this.$message({
              message: '请先选中需要提交的记录',
              type: 'error'
            })
          }
          break
        case 3:
@@ -3230,6 +3311,11 @@
              this.tableDataName = 'contractInfoData'
              this.queryParams.delFlag = 2
              this.search()
            })
          } else {
            this.$message({
              message: '请先选中需要提交的记录',
              type: 'error'
            })
          }
          break
@@ -3250,6 +3336,11 @@
              this.queryParams.delFlag = 2
              this.search()
            })
          } else {
            this.$message({
              message: '请先选中需要提交的记录',
              type: 'error'
            })
          }
          break
        case 5:
@@ -3268,6 +3359,11 @@
              this.tableDataName = 'leaveInfoData'
              this.queryParams.delFlag = 2
              this.search()
            })
          } else {
            this.$message({
              message: '请先选中需要提交的记录',
              type: 'error'
            })
          }
          break
@@ -3288,6 +3384,11 @@
              this.queryParams.delFlag = 2
              this.search()
            })
          } else {
            this.$message({
              message: '请先选中需要提交的记录',
              type: 'error'
            })
          }
          break
        case 7:
@@ -3306,6 +3407,11 @@
              this.tableDataName = 'unemploymentData'
              this.queryParams.delFlag = 2
              this.search()
            })
          } else {
            this.$message({
              message: '请先选中需要提交的记录',
              type: 'error'
            })
          }
          break
@@ -3326,6 +3432,11 @@
              this.queryParams.delFlag = 2
              this.search()
            })
          } else {
            this.$message({
              message: '请先选中需要提交的记录',
              type: 'error'
            })
          }
          break
        case 9:
@@ -3344,6 +3455,11 @@
              this.tableDataName = 'accidentCasesData'
              this.queryParams.delFlag = 2
              this.search()
            })
          } else {
            this.$message({
              message: '请先选中需要提交的记录',
              type: 'error'
            })
          }
          break
@@ -3364,6 +3480,11 @@
              this.queryParams.delFlag = 2
              this.search()
            })
          } else {
            this.$message({
              message: '请先选中需要提交的记录',
              type: 'error'
            })
          }
          break
        case 11:
@@ -3382,6 +3503,11 @@
              this.tableDataName = 'laborTroubleData'
              this.queryParams.delFlag = 2
              this.search()
            })
          } else {
            this.$message({
              message: '请先选中需要提交的记录',
              type: 'error'
            })
          }
          break
@@ -3402,6 +3528,11 @@
              this.queryParams.delFlag = 2
              this.search()
            })
          } else {
            this.$message({
              message: '请先选中需要提交的记录',
              type: 'error'
            })
          }
          break
        case 13:
@@ -3421,6 +3552,11 @@
              this.queryParams.delFlag = 2
              this.search()
            })
          } else {
            this.$message({
              message: '请先选中需要提交的记录',
              type: 'error'
            })
          }
          break
      }