admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

flx:优化

Browse Source
This commit is contained in:
Rain_ 2025-06-27 18:19:37 +08:00
parent 24aa249589
commit a4168b5bd3
3 changed files with 93 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/assets/images/laborManage/opensuccess.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 726 B

56
src/views/projectFront/laborManage/attendanceGroup.vue
View File

@ -132,7 +132,7 @@
<div>
<div>企业名称</div>
<el-input
@blur="getRiskListLibraryList"
@input="getRiskListLibraryList"
size="medium"
placeholder="请输入"
suffix-icon="el-icon-search"
@ -175,7 +175,16 @@
待选择人员({{ selectLeftTableData.length }}/{{ staffInfo.total }})
</div>
<div>
<el-checkbox @change="getUpdatePersonListFn" v-model="searchInfo.checked">包含下级</el-checkbox>
<template v-if="treeListDetail.id == ''">
<el-checkbox disabled :value="true">包含下级</el-checkbox>
</template>
<template v-else>
<el-checkbox
@change="getUpdatePersonListFn"
v-model="searchInfo.checked"
>包含下级</el-checkbox
>
</template>
</div>
</div>
<div class="flex">
@ -189,7 +198,7 @@
<el-option label="身份证号" :value="2"> </el-option>
</el-select>
<el-input
@blur="getUpdatePersonListFn"
@input="getUpdatePersonListFn"
size="medium"
placeholder="请输入"
suffix-icon="el-icon-search"
@ -296,7 +305,7 @@
<el-option label="身份证号" :value="2"> </el-option>
</el-select>
<el-input
@blur="selectSearchValueFilter"
@input="selectSearchValueFilter"
size="medium"
placeholder="请输入"
suffix-icon="el-icon-search"
@ -583,7 +592,7 @@
<div>
<div>企业名称</div>
<el-input
@blur="getRiskListLibraryList"
@input="getRiskListLibraryList"
size="medium"
placeholder="请输入"
suffix-icon="el-icon-search"
@ -626,7 +635,16 @@
待选择人员({{ selectLeftTableData.length }}/{{ staffInfo.total }})
</div>
<div>
<el-checkbox @change="getUpdatePersonListFn" v-model="searchInfo.checked">包含下级</el-checkbox>
<template v-if="treeListDetail.id == ''">
<el-checkbox disabled :value="true">包含下级</el-checkbox>
</template>
<template v-else>
<el-checkbox
@change="getUpdatePersonListFn"
v-model="searchInfo.checked"
>包含下级</el-checkbox
>
</template>
</div>
</div>
<div class="flex">
@ -640,7 +658,7 @@
<el-option label="身份证号" :value="2"> </el-option>
</el-select>
<el-input
@blur="getUpdatePersonListFn"
@input="getUpdatePersonListFn"
size="medium"
placeholder="请输入"
suffix-icon="el-icon-search"
@ -747,7 +765,7 @@
<el-option label="身份证号" :value="2"> </el-option>
</el-select>
<el-input
@blur="selectSearchValueFilter"
@input="selectSearchValueFilter"
size="medium"
placeholder="请输入"
suffix-icon="el-icon-search"
@ -1043,7 +1061,7 @@ export default {
editWorkerAttendanceGroupV2Api(data).then((res) => {
// 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;

62
src/views/projectFront/laborManage/attendanceManage/attendanceManage.vue
View File

@ -110,6 +110,10 @@
}}</el-button>
<el-button
type="primary"
v-permission="{
key: 'rykq_exportDetailData',
menuPath: '/project/labor/newAttendanceManage',
}"
@click="
selectDateType = 1;
exportDialog = true;
@ -553,10 +557,6 @@
icon="el-icon-circle-check"
@click="exportFn"
size="medium"
v-permission="{
key: 'rykq_exportDetailData',
menuPath: '/project/labor/newAttendanceManage',
}"
>{{ $t("message.personnelPosition.determine") }}
</el-button>
</div>
@ -642,7 +642,7 @@
</el-form-item>
<el-form-item label="出入时间" prop="createTime">
<el-date-picker
value-format="yyyy-MM-dd hh:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss"
type="datetime"
placeholder="开始时间"
v-model="uploadAttendanceForm.createTime"
@ -792,7 +792,57 @@ export default {
// 上传考勤表单
uploadAttendanceShow: false,
uploadAttendanceFormRules: {},
uploadAttendanceFormRules: {
enterpriseId: [
{
required: true,
message: "请选择企业",
trigger: "change",
},
],
departmentId: [
{
required: true,
message: "请选择部门&班组",
trigger: "change",
},
],
workerId: [
{
required: true,
message: "请选择姓名",
trigger: "change",
},
],
passType: [
{
required: true,
message: "请选择进入/出",
trigger: "change",
},
],
createTime: [
{
required: true,
message: "请选择时间",
trigger: "change",
},
],
inletOutletPosition: [
{
required: true,
message: "请选择进出位置",
trigger: "change",
},
],
cardType: [
{
required: true,
message: "请选择进出方式",
trigger: "change",
},
],
},
uploadAttendanceForm: {
enterpriseId: "",
teamId: "",