考勤异常添加绩效考核

attendance-performance-manager-ui/admin/src/views/attendance/record/error/drawershow.vue

@@ -19,18 +19,21 @@
                     <span class="ml10">修改为</span>
                 </div>
                 <div class="mt10">
+
+                  <Field label=""  v-model="dealParams.processResult" type="select" :enumData="dict.errorStatus"/>
+
                   <!-- 处理异常状态 -->
-                    <el-select v-model="dealParams.processResult">
+<!--                    <el-select v-model="dealParams.processResult">
                         <el-option
                         v-for='($label, $value) in dict.errorStatus'
                         :key="$value"
                             :label="$label"
                             :value="$label">
                         </el-option>
-                    </el-select>
+                    </el-select>-->
                     <!-- 早退/迟到 -->
                     <el-input style="width:220px" placeholder="请输入数字" :maxlength="4" v-model="duration"
-                    v-if="dealParams.processResult == '迟到'|| dealParams.processResult == '早退'"
+                    v-if="dealParams.processResult == '1'|| dealParams.processResult == '2'"
                     class="ml20" type="number">
                         <template slot="append">分钟</template>
                     </el-input>
@@ -65,6 +68,7 @@
                 // 是否显示弹出层
                 open: false,
                 direction:"rtl",
+                toString: ["processResult"],
                 // 表单校验
                 rules: {
                     staffName: [
@@ -77,6 +81,8 @@
                 },
                 dealParams:{
                     remark:'',
+                    errorStatus:null,
+                    durtion:0,
                     processResult:'',
                     recordErrorEntities:[],//处理员工
                     processStatus:1//处理状态
@@ -133,6 +139,9 @@
                 }
                 if(this.duration && (this.dealParams.processResult == '早退' || this.dealParams.processResult == '迟到')){
                     this.dealParams.processResult = this.dealParams.processResult + this.duration +'分钟'
+
+                  this.dealParams.durtion=this.duration
+
                 }
                 // 保存结果处理
                 this.$post(this.urls.saveUrl,this.dealParams).then(res => {
@@ -145,6 +154,8 @@
                 this.open = false
                 this.dealParams = {
                     remark:'',
+                    errorStatus:null,
+                    durtion:0,
                     processResult:'',
                     recordErrorEntities:[],//处理员工
                     processStatus:1//处理状态

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/vo/AttendanceRecordErrorVo.java

@@ -32,4 +32,8 @@ public class AttendanceRecordErrorVo extends BaseEntityLong {
     private String errorDateTimeEnd;
 
 
+    private Integer duration;
+
+
+
 }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceRecordErrorController.java

@@ -146,6 +146,7 @@ public class AttendanceRecordErrorController extends BaseCRUDJsonBodyMappingCont
             updateEntity.setProcessStatus(entity.getProcessStatus());
             updateEntity.setGoOffDateTime(null);
             updateEntity.setProcessResult(entity.getProcessResult());
+            updateEntity.setErrorStatus(entity.getErrorStatus());
             updateEntity.setOpertor(context.getUser().getRealName());
             updateEntity.setOperDateTime(new Date());
             updateEntity.setRemark(entity.getRemark());