Merge remote-tracking branch 'origin/master'

attendance-performance-manager-ui/admin/src/assets/mixins/formdialog.js

@@ -93,8 +93,6 @@ export default {
     },
     // 提交表单
     submitForm(ref) {
-      this.beforeSubmit(this.form);
-      return;
       let url = this.urls.saveUrl || this.pageInfo.saveUrl;
       if (url == "/staff/perform/stat/save") {
         url = "/perform/perpose/save";

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

@@ -18,6 +18,15 @@
             :maxLength="10"
             :disabled="pageInfo.type == 'view'"
           /> -->
+          <Field
+            label="所属部门"
+            prop="deptId"
+            v-model="form.deptId"
+            type="select"
+            placeholder="请选择所属部门"
+            :enumData="dict.deptId"
+            @change="changeDept(form.deptId)"
+          />
           <Field
             label="请假人"
             prop="leavePerson"
@@ -26,21 +35,12 @@
             remote
             v-model="form.leavePerson"
             placeholder="请输入请假人"
-            @change="changeStaff(form.leavePerson)"
             :remote-method="remoteMethod"
             :maxLength="10"
             :enumData="dict.staffList"
             :disabled="pageInfo.type == 'view'"
           />
-          <Field
-            label="所属部门"
-            prop="deptId"
-            v-model="form.deptId"
-            type="select"
-            placeholder="请选择所属部门"
-            :enumData="dict.deptId"
-            :disabled="true"
-          />
+
           <!-- <Field label="所属部门" prop="deptName" v-model="form.deptName" type="textarea" placeholder="请输入所属部门"/> -->
           <Field
             label="电话号码"
@@ -259,7 +259,19 @@ export default {
     this.remoteMethod();
   },
   methods: {
+    changeDept(val) {
+      console.log(val);
+      this.form.leavePerson = "";
+      let arr = this.staffList.filter((v) => v.deptId == val);
+      let obj = {};
+      for (let key in arr) {
+        obj[arr[key].id] = arr[key].name;
+      }
+      this.dict.staffList = obj;
+      console.log(this.staffList);
+    },
     changeStaff(val) {
+      console.log(val);
       let person = this.staffList.filter((v) => v.id == val);
       console.log(person);
       console.log(this.form);

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

@@ -325,7 +325,13 @@ export default {
           property === "offWorkResult"
         ) {
           let val = arr[index][property];
-          return this.tableData.dict.goWorkResult[val];
+          return val == 1 ? (
+            this.tableData.dict.goWorkResult[val]
+          ) : (
+            <el-tag type={"danger"} size="mini">
+              {this.tableData.dict.goWorkResult[val]}
+            </el-tag>
+          );
         }
       } else {
         return "-";

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceStatServiceImpl.java

@@ -210,13 +210,12 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
             Calendar cal = Calendar.getInstance();
             cal.setTime(summaryDate);
             int dayOfWeek = cal.get(Calendar.DAY_OF_WEEK);
+            query.setDayOfWeek(dayOfWeek);
             if(dayOfWeek==1||dayOfWeek==7){
                 //节假日周末补班
-                if(!isReturn){
+                if(holidayEntity != null && holidayEntity.getWorkorholiday()==1){
                     query.setDayOfWeek(2);
                 }
-            }else {
-                query.setDayOfWeek(dayOfWeek);
             }
             int y = cal.get(Calendar.YEAR);
             int m = cal.get(Calendar.MONTH)+1;

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

@@ -25,6 +25,7 @@ import com.mortals.xhx.module.staff.model.StaffEntity;
 import com.mortals.xhx.module.staff.service.StaffService;
 import com.mortals.xhx.module.workman.model.WorkmanQuery;
 import com.mortals.xhx.module.workman.service.WorkmanService;
+import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -146,4 +147,13 @@ public class AttendanceLeaveRecordController extends BaseCRUDJsonBodyMappingCont
         }
     }
 
+    @Override
+    protected void addAfter(Map<String, Object> model) throws AppException {
+        AttendanceLeaveRecordEntity entity = new AttendanceLeaveRecordEntity();
+        entity.initAttrValue();
+        String dateStr = DateUtils.getCurrStrDate();
+        entity.setStartTime(DateUtils.StrToDateTime(dateStr+" 09:00:00","yyyy-MM-dd HH:mm:ss"));
+        entity.setEndTime(DateUtils.StrToDateTime(dateStr+" 17:00:00","yyyy-MM-dd HH:mm:ss"));
+        model.put("entity",entity);
+    }
 }
\ No newline at end of file