Merge remote-tracking branch 'origin/master'

Alan

2021-02-21 a647e7f3df66d963679b65bcd741cbc40b303c2c

Merge remote-tracking branch 'origin/master'

 src/views/user/Informationinput.vue

@@ -974,13 +974,13 @@
                placeholder="选择考勤月份"
              />
            </el-form-item>
            <el-form-item label="加班（天）">
            <el-form-item label="加班（天）" prop="overtimeDay">
              <el-input v-model="dimissionAttendForm.overtimeDay" />
            </el-form-item>
            <el-form-item label="有无代扣款项" prop="deduct">
              <el-input v-model="dimissionAttendForm.deduct" />
            </el-form-item>
            <el-form-item label="旷工（天）">
            <el-form-item label="旷工（天）" prop="absenteeism">
              <el-input v-model="dimissionAttendForm.absenteeism" />
            </el-form-item>
          </el-col>
@@ -998,18 +998,18 @@
              <el-input v-model="dimissionAttendForm.attendDays" />
            </el-form-item>

            <el-form-item label="加班（小时）">
            <el-form-item label="加班（小时）" prop="overtimeHour">
              <el-input v-model="dimissionAttendForm.overtimeHour" />
            </el-form-item>

            <el-form-item label="请假（天）">
            <el-form-item label="请假（天）" prop="leaveDay">
              <el-input v-model="dimissionAttendForm.leaveDay" />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <el-col :span="24">
            <el-form-item label="备注">
            <el-form-item label="备注" prop="remark">
              <el-input v-model="dimissionAttendForm.remark" type="textarea" />
            </el-form-item>
          </el-col>
@@ -1902,8 +1902,13 @@
      dimissionAttendRules: {
        empName: [{ required: true, message: '请选择员工', trigger: 'change' }],
        attendMonth: [{ required: true, message: '请选择出勤月份', trigger: 'change' }],
        deduct: [{ required: true, message: '请输入代扣填款项', trigger: 'blur' }],
        attendDays: [{ required: true, message: '请输入出勤天数', trigger: 'blur' }]
        deduct: [{ required: true, message: '请输入代扣填款项', trigger: 'blur' }, { max: 100, message: '长度不超过100个字符', trigger: 'blur' }],
        attendDays: [{ required: true, message: '请输入出勤天数', trigger: 'blur' }, { pattern: /^\d{1,2}(\.\d{1,1})?$/, message: '出勤天数精确到1位小数' }],
        overtimeDay: [{ pattern: /^\d{1,2}(\.\d{1,1})?$/, message: '加班（天）精确到1位小数' }],
        overtimeHour: [{ pattern: /^\d{1,2}(\.\d{1,1})?$/, message: '加班（小时）精确到1位小数' }],
        leaveDay: [{ pattern: /^\d{1,2}(\.\d{1,1})?$/, message: '请假（天）精确到1位小数' }],
        absenteeism: [{ pattern: /^\d{1,2}(\.\d{1,1})?$/, message: '旷工（天）精确到1位小数' }],
        remark: [{ max: 512, message: '长度不超过512个字符', trigger: 'blur' }]
      },
      leaveInfoRules: {
        empName: [{ required: true, message: '请选择员工', trigger: 'change' }],