Merge remote-tracking branch 'origin/master'

孔祥富

2021-03-09 2409b3d86a217ebbfb01f80ac3d43ff5da7c37dd

 src/views/user/Informationinput.vue

@@ -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
@@ -304,7 +304,7 @@
          <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,9 +328,9 @@
              </span>
            </template>
          </el-table-column>
          <el-table-column show-overflow-tooltip prop="empNumb" label="编号" />
          <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="certificateNumb" label="身份证号码" />
          <el-table-column show-overflow-tooltip prop="applayDate" label="辞职申请日期" width="150" />
@@ -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>

@@ -2282,7 +2287,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' }]
      },
@@ -4347,6 +4352,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 +4381,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({