diff --git a/src/assets/images/laborManage/opensuccess.png b/src/assets/images/laborManage/opensuccess.png index 40df69ad..630d3543 100644 Binary files a/src/assets/images/laborManage/opensuccess.png and b/src/assets/images/laborManage/opensuccess.png differ diff --git a/src/views/projectFront/laborManage/attendanceGroup.vue b/src/views/projectFront/laborManage/attendanceGroup.vue index 3fea3ade..a51b7453 100644 --- a/src/views/projectFront/laborManage/attendanceGroup.vue +++ b/src/views/projectFront/laborManage/attendanceGroup.vue @@ -132,7 +132,7 @@
企业名称
- 包含下级 + +
@@ -189,7 +198,7 @@
企业名称
- 包含下级 + +
@@ -640,7 +658,7 @@ { // console.log(res); if (res.code == 200) { - this.$message.success(this.$t("message.quality.newSuccess")); + this.$message.success("编辑成功"); this.setDialog = false; this.getDataList(); } @@ -1092,14 +1110,14 @@ export default { }); }, onEnterpriseChange() { - this.selectWorkerInfo.teamId = ""; - this.selectWorkerInfo.departmentId = ""; - this.teamOptions = []; - this.departmentOptions = []; - if(this.selectWorkerInfo.enterpriseId) { - this.getTeamList(); - this.getDepartmentList(); - } + this.selectWorkerInfo.teamId = ""; + this.selectWorkerInfo.departmentId = ""; + this.teamOptions = []; + this.departmentOptions = []; + if (this.selectWorkerInfo.enterpriseId) { + this.getTeamList(); + this.getDepartmentList(); + } }, /** 查询班组列表 */ getTeamList() { @@ -1386,9 +1404,9 @@ export default { } else if (this.searchInfo.searchType == 2) { data.idCard = this.searchInfo.searchValue; } - if(this.searchInfo.checked) { + if (this.searchInfo.checked) { data.containEnterpriseId = this.treeListDetail.id; - }else { + } else { data.enterpriseId = this.treeListDetail.id; } this.staffInfo.pageNo = 1; diff --git a/src/views/projectFront/laborManage/attendanceManage/attendanceManage.vue b/src/views/projectFront/laborManage/attendanceManage/attendanceManage.vue index 6f2aa5d4..fafc9923 100644 --- a/src/views/projectFront/laborManage/attendanceManage/attendanceManage.vue +++ b/src/views/projectFront/laborManage/attendanceManage/attendanceManage.vue @@ -110,6 +110,10 @@ }} {{ $t("message.personnelPosition.determine") }}
@@ -642,7 +642,7 @@