bonus
/
gz-att-web-new
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化

This commit is contained in:
BianLzhaoMin 2026-01-29 17:13:50 +08:00
parent 44de375bdc
commit 066157da50
2 changed files with 192 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/views/report/cardReplenishmentManage/index.vue Normal file
View File

@ -0,0 +1,11 @@
<template>
<div>补卡管理</div>
</template>
<script>
export default {};
</script>
<style>
</style>

218
src/views/setting/change/index.vue
View File

@ -1,6 +1,12 @@
<template>
<div class="app-container" id="userInfo">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" >
<el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
>
<el-form-item label="姓名" prop="userName">
<el-input
v-model="queryParams.userName"
@ -23,33 +29,89 @@
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['system:user:add']"
>新增</el-button>
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['system:user:add']"
>新增</el-button
>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
<right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="userList">
<el-table-column label="序号" align="center" width="80" type="index">
<template slot-scope="scope">
<span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
<span>{{
(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
}}</span>
</template>
</el-table-column>
<el-table-column label="姓名" align="center" prop="userName" />
<el-table-column label="手机号" align="center" prop="phone" />
<el-table-column label="变动前部门" align="center" prop="oldOrgName" :show-overflow-tooltip="true" />
<el-table-column label="变动前考勤规则" align="center" prop="oldAttName" :show-overflow-tooltip="true"/>
<el-table-column label="变动后部门" align="center" prop="afterOrgName" :show-overflow-tooltip="true" />
<el-table-column label="变动后考勤规则" align="center" prop="afterAttName" :show-overflow-tooltip="true" />
<el-table-column label="变动人" align="center" prop="createName" :show-overflow-tooltip="true" />
<el-table-column label="变动时间" align="center" prop="createTime" :show-overflow-tooltip="true" />
<el-table-column
label="变动前部门"
align="center"
prop="oldOrgName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="变动前考勤规则"
align="center"
prop="oldAttName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="变动后部门"
align="center"
prop="afterOrgName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="变动后考勤规则"
align="center"
prop="afterAttName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="变动人"
align="center"
prop="createName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="考勤变更时间"
align="center"
prop="updateTime"
:show-overflow-tooltip="true"
/>
<el-table-column
label="变动时间"
align="center"
prop="createTime"
:show-overflow-tooltip="true"
/>
</el-table>
<pagination
@ -61,12 +123,25 @@
/>
<!-- 添加参数配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body @close="handleClose">
<el-dialog
:title="title"
:visible.sync="open"
width="800px"
append-to-body
@close="handleClose"
>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row>
<el-col :span="12">
<el-form-item label="姓名" prop="userIds">
<el-select v-model="form.userIds" filterable placeholder="请选择人员姓名" clearable style="width: 100%;" @change="handlePersonChange">
<el-select
v-model="form.userIds"
filterable
placeholder="请选择人员姓名"
clearable
style="width: 100%"
@change="handlePersonChange"
>
<el-option
v-for="item in personOptions"
:key="item.userIds"
@ -99,12 +174,25 @@
<el-row>
<el-col :span="12">
<el-form-item label="变动后部门" prop="orgIds">
<treeselect v-model="form.orgIds" :multiple="false" :flat="true" :options="deptOptions" :normalizer="normalizer" placeholder="选择所属部门"/>
<treeselect
v-model="form.orgIds"
:multiple="false"
:flat="true"
:options="deptOptions"
:normalizer="normalizer"
placeholder="选择所属部门"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="变动后考勤规则" prop="afterAttId">
<el-select v-model="form.afterAttId" filterable placeholder="请选择考勤规则" clearable style="width: 100%;">
<el-select
v-model="form.afterAttId"
filterable
placeholder="请选择考勤规则"
clearable
style="width: 100%"
>
<el-option
v-for="item in attOptions"
:key="item.afterAttId"
@ -115,9 +203,20 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="考勤变更时间" prop="updateTime">
<el-date-picker
type="date"
placeholder="选择日期"
v-model="form.updateTime"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
:picker-options="pickerOptions"
/>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
@ -134,7 +233,7 @@ import {
listDeptTree,
getPersonSelect,
getAttGroup,
getOldData
getOldData,
} from "@/api/setting/change";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@ -179,14 +278,26 @@ export default {
// 表单校验
rules: {
userIds: [
{ required: true, message: "人员姓名不能为空", trigger: "blur" }
{ required: true, message: "人员姓名不能为空", trigger: "blur" },
],
orgIds: [
{ required: true, message: "所属部门不能为空", trigger: "blur" }
{ required: true, message: "所属部门不能为空", trigger: "blur" },
],
afterAttId: [
{ required: true, message: "考勤组不能为空", trigger: "blur" }
]
{ required: true, message: "考勤组不能为空", trigger: "blur" },
],
updateTime: [
{ required: true, message: "考勤变更时间不能为空", trigger: "blur" },
],
},
// 日期选择器配置
pickerOptions: {
disabledDate(time) {
// 禁用今天之后的日期（今天可以选择）
const today = new Date();
today.setHours(23, 59, 59, 999);
return time.getTime() > today.getTime();
},
},
};
},
@ -199,8 +310,8 @@ export default {
methods: {
/** 人员选择下拉 */
getPersonSelect() {
getPersonSelect().then(response => {
this.personOptions=response.data
getPersonSelect().then((response) => {
this.personOptions = response.data;
});
},
@ -208,8 +319,8 @@ export default {
* 考勤班组
*/
getAttGroup() {
getAttGroup().then(response => {
this.attOptions=response.data
getAttGroup().then((response) => {
this.attOptions = response.data;
});
},
@ -217,7 +328,7 @@ export default {
* 部门
*/
getDeptList() {
listDeptTree().then(response => {
listDeptTree().then((response) => {
this.deptOptions = this.handleTree(response.data, "id");
});
},
@ -227,24 +338,24 @@ export default {
* @param selectedValues
*/
handlePersonChange(selectedValues) {
console.log('选择的人员ID:', selectedValues);
console.log("选择的人员ID:", selectedValues);
this.form.userId = selectedValues;
if (selectedValues) {
getOldData(this.form).then(response => {
this.form.phoneNumber = response.data.phoneNumber || '';
this.form.oldOrgId = response.data.oldOrgId || '';
this.form.oldOrgName = response.data.oldOrgName || '';
this.form.oldAttId = response.data.oldAttId || '';
this.form.oldAttName = response.data.oldAttName || '';
getOldData(this.form).then((response) => {
this.form.phoneNumber = response.data.phoneNumber || "";
this.form.oldOrgId = response.data.oldOrgId || "";
this.form.oldOrgName = response.data.oldOrgName || "";
this.form.oldAttId = response.data.oldAttId || "";
this.form.oldAttName = response.data.oldAttName || "";
this.form.updateTime = response.data.updateTime || "";
// alert(1);
});
} else {
// 当取消选择时，清空之前的数据
this.form.phoneNumber = '';
this.form.oldOrgName = '';
this.form.oldAttName = '';
this.form.phoneNumber = "";
this.form.oldOrgName = "";
this.form.oldAttName = "";
}
},
/** 转换部门数据结构 */
@ -255,18 +366,17 @@ export default {
return {
id: node.id,
label: node.orgName,
children: node.children
children: node.children,
};
},
/** 查询列表 */
getList() {
this.loading = true;
listChange(this.queryParams).then(response => {
listChange(this.queryParams).then((response) => {
this.userList = response.rows;
this.total = response.total;
this.loading = false;
}
);
});
},
// 取消按钮
cancel() {
@ -287,22 +397,22 @@ export default {
this.form = {
userIds: undefined,
userId: undefined,
phoneNumber: '',
oldOrgName: '',
oldAttName: '',
phoneNumber: "",
oldOrgName: "",
oldAttName: "",
orgIds: null,
afterAttId: [],
roleIds: [],
oldAttId: null,
oldOrgId: null
oldOrgId: null,
updateTime: null,
};
this.resetForm("form");
},
// 表单重置
resets() {
this.form = {
};
this.form = {};
this.resetForm("forms");
},
@ -324,12 +434,12 @@ export default {
},
/** 提交按钮 */
submitForm: function () {
this.$refs["form"].validate(valid => {
this.$refs["form"].validate((valid) => {
if (valid) {
this.form.userId = this.form.userIds;
this.form.afterOrgId = this.form.orgIds;
console.log("变动方法", this.form);
addAtt(this.form).then(response => {
addAtt(this.form).then((response) => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.isEditing = false;
@ -338,6 +448,6 @@ export default {
}
});
},
}
},
};
</script>