Skip to content

A
attendance-performance-manager-ui
Commit a03b5678 authored by 姬鋆屾's avatar 姬鋆屾
Browse files
Options

feat:黑名单，员工关怀及离职信息

parent c72189b5
Show whitespace changes
Inline Side-by-side
Showing with 526 additions and 295 deletions
src/views/staff/adjust/log/dialogshow.vue
View file @ a03b5678
...@@ -3,45 +3,164 @@ ...@@ -3,45 +3,164 @@
<el-dialog :title="title" :visible.sync="open" width="90%" append-to-body> <el-dialog :title="title" :visible.sync="open" width="90%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row> <el-row>
<Field label="员工ID" prop="staffId" v-model="form.staffId" placeholder="请输入员工ID"/> <Field
<Field label="员工姓名" prop="fullName" v-model="form.fullName" placeholder="请输入员工姓名"/> label="员工ID"
<Field label="性别1男2女" prop="gender" v-model="form.gender" type="select" :enumData="dict.gender" placeholder="请选择性别1男2女"/> prop="staffId"
<Field label="出生日期" prop="birthday" v-model="form.birthday" type="date" /> v-model="form.staffId"
<Field label="照片" prop="photoPath" v-model="form.photoPath" type="textarea" placeholder="请输入照片"/> placeholder="请输入员工ID"
<Field label="联系电话" prop="phoneNumber" v-model="form.phoneNumber" placeholder="请输入联系电话"/> />
<Field label="身份证号码" prop="idCard" v-model="form.idCard" placeholder="请输入身份证号码"/> <Field
<Field label="工号" prop="workNum" v-model="form.workNum" placeholder="请输入工号"/> label="员工姓名"
<Field label="政治面貌 " prop="politicalstatus" v-model="form.politicalstatus" type="select" :enumData="dict.politicalstatus" placeholder="请选择政治面貌 "/> prop="fullName"
<Field label="所属部门" prop="deptId" v-model="form.deptId" placeholder="请输入所属部门"/> v-model="form.fullName"
<Field label="所属部门名称" prop="deptName" v-model="form.deptName" placeholder="请输入所属部门名称"/> placeholder="请输入员工姓名"
<Field label="职位ID" prop="jobId" v-model="form.jobId" placeholder="请输入职位ID"/> />
<Field label="职位名称" prop="jobName" v-model="form.jobName" placeholder="请输入职位名称"/> <Field
<Field label="员工类型1全职2兼职3实习" prop="staffType" v-model="form.staffType" type="select" :enumData="dict.staffType" placeholder="请选择员工类型1全职2兼职3实习"/> label="性别"
<Field label="员工状态1正式2试用3离职" prop="status" v-model="form.status" type="select" :enumData="dict.status" placeholder="请选择员工状态1正式2试用3离职"/> prop="gender"
<Field label="入职时间" prop="entryDate" v-model="form.entryDate" type="date" /> v-model="form.gender"
<Field label="调岗后所属部门" prop="newDeptId" v-model="form.newDeptId" placeholder="请输入调岗后所属部门"/> type="select"
<Field label="调岗后所属部门名称" prop="newDeptName" v-model="form.newDeptName" placeholder="请输入调岗后所属部门名称"/> :enumData="dict.gender"
<Field label="调岗后职位ID" prop="newJobId" v-model="form.newJobId" placeholder="请输入调岗后职位ID"/> placeholder="请选择性别1男2女"
<Field label="调岗后职位名称" prop="newJobName" v-model="form.newJobName" placeholder="请输入调岗后职位名称"/> />
<Field label="审核状态0待审核1通过2拒绝" prop="auditStatus" v-model="form.auditStatus" type="select" :enumData="dict.auditStatus" placeholder="请选择审核状态0待审核1通过2拒绝"/> <Field
label="出生日期"
prop="birthday"
v-model="form.birthday"
type="date"
/>
<Field
label="照片"
prop="photoPath"
v-model="form.photoPath"
type="textarea"
placeholder="请输入照片"
/>
<Field
label="联系电话"
prop="phoneNumber"
v-model="form.phoneNumber"
placeholder="请输入联系电话"
/>
<Field
label="身份证号码"
prop="idCard"
v-model="form.idCard"
placeholder="请输入身份证号码"
/>
<Field
label="工号"
prop="workNum"
v-model="form.workNum"
placeholder="请输入工号"
/>
<Field
label="政治面貌 "
prop="politicalstatus"
v-model="form.politicalstatus"
type="select"
:enumData="dict.politicalstatus"
placeholder="请选择政治面貌 "
/>
<Field
label="所属部门"
prop="deptId"
v-model="form.deptId"
placeholder="请输入所属部门"
/>
<Field
label="所属部门名称"
prop="deptName"
v-model="form.deptName"
placeholder="请输入所属部门名称"
/>
<Field
label="职位ID"
prop="jobId"
v-model="form.jobId"
placeholder="请输入职位ID"
/>
<Field
label="职位名称"
prop="jobName"
v-model="form.jobName"
placeholder="请输入职位名称"
/>
<Field
label="员工类型"
prop="staffType"
v-model="form.staffType"
type="select"
:enumData="dict.staffType"
placeholder="请选择员工类型1全职2兼职3实习"
/>
<Field
label="员工状态"
prop="status"
v-model="form.status"
type="select"
:enumData="dict.status"
placeholder="请选择员工状态1正式2试用3离职"
/>
<Field
label="入职时间"
prop="entryDate"
v-model="form.entryDate"
type="date"
/>
<Field
label="调岗后所属部门"
prop="newDeptId"
v-model="form.newDeptId"
placeholder="请输入调岗后所属部门"
/>
<Field
label="调岗后所属部门名称"
prop="newDeptName"
v-model="form.newDeptName"
placeholder="请输入调岗后所属部门名称"
/>
<Field
label="调岗后职位ID"
prop="newJobId"
v-model="form.newJobId"
placeholder="请输入调岗后职位ID"
/>
<Field
label="调岗后职位名称"
prop="newJobName"
v-model="form.newJobName"
placeholder="请输入调岗后职位名称"
/>
<Field
label="审核状态"
prop="auditStatus"
v-model="form.auditStatus"
type="select"
:enumData="dict.auditStatus"
placeholder="请选择审核状态0待审核1通过2拒绝"
/>
</el-row> </el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" v-if="pageInfo.type !== 'view'" @click="submitForm">确 定</el-button> <el-button
type="primary"
v-if="pageInfo.type !== 'view'"
@click="submitForm"
>确 定</el-button
>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
</template> </template>
<script> <script>
import form from "@/assets/mixins/formdialog"; import form from "@/assets/mixins/formdialog";
import dialogShow from "./dialogshow"; import dialogShow from "./dialogshow";
export default { export default {
mixins: [form], mixins: [form],
components: { components: {
dialogShow , dialogShow,
}, },
data() { data() {
return { return {
...@@ -51,7 +170,7 @@ ...@@ -51,7 +170,7 @@
title: "员工调岗信息", title: "员工调岗信息",
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
toString:[ toString: [
"gender", "gender",
"politicalstatus", "politicalstatus",
"staffType", "staffType",
...@@ -61,41 +180,39 @@ ...@@ -61,41 +180,39 @@
// 表单校验 // 表单校验
rules: { rules: {
fullName: [ fullName: [
{required: true,message: "请输入员工姓名", trigger: "blur" }, { required: true, message: "请输入员工姓名", trigger: "blur" },
{max: 64,message: "最多只能录入64个字符",trigger: "blur",}, { max: 64, message: "最多只能录入64个字符", trigger: "blur" },
],
createTime: [
{required: true,message: "请选择创建时间" },
], ],
} createTime: [{ required: true, message: "请选择创建时间" }],
},
}; };
}, },
methods: { methods: {
/** 编辑 */ /** 编辑 */
edit(row) { edit(row) {
this.reset() this.reset();
this.query = { id: row.id }; this.query = { id: row.id };
this.urls.currUrl ="staff/adjust/log/edit"; this.urls.currUrl = "staff/adjust/log/edit";
this.getData(); this.getData();
this.pageInfo.type="edit" this.pageInfo.type = "edit";
this.title = "修改员工调岗信息"; this.title = "修改员工调岗信息";
}, },
/** 新增 */ /** 新增 */
add(row) { add(row) {
this.reset() this.reset();
this.urls.currUrl = "staff/adjust/log/add"; this.urls.currUrl = "staff/adjust/log/add";
this.getData(); this.getData();
this.pageInfo.type="add" this.pageInfo.type = "add";
this.title = "新增员工调岗信息"; this.title = "新增员工调岗信息";
}, },
/** 查看*/ /** 查看*/
view(row) { view(row) {
this.reset() this.reset();
this.query = { id: row.id }; this.query = { id: row.id };
this.urls.currUrl ="staff/adjust/log/view"; this.urls.currUrl = "staff/adjust/log/view";
this.getData(); this.getData();
this.pageInfo.type="view" this.pageInfo.type = "view";
this.title = "员工调岗信息详细"; this.title = "员工调岗信息详细";
}, },
/**取消按钮 */ /**取消按钮 */
...@@ -115,27 +232,27 @@ ...@@ -115,27 +232,27 @@
// 表单重置 // 表单重置
reset() { reset() {
this.form = { this.form = {
staffId : null, staffId: null,
fullName : "", fullName: "",
gender : 1, gender: null,
birthday : null, birthday: null,
photoPath : "", photoPath: "",
phoneNumber : "", phoneNumber: "",
idCard : "", idCard: "",
workNum : "", workNum: "",
politicalstatus : 1, politicalstatus: null,
deptId : null, deptId: null,
deptName : "", deptName: "",
jobId : null, jobId: null,
jobName : "", jobName: "",
staffType : 1, staffType: null,
status : 1, status: null,
entryDate : null, entryDate: null,
newDeptId : null, newDeptId: null,
newDeptName : "", newDeptName: "",
newJobId : null, newJobId: null,
newJobName : "", newJobName: "",
auditStatus : 0, auditStatus: null,
}; };
this.resetForm("form"); this.resetForm("form");
}, },
...@@ -145,5 +262,5 @@ ...@@ -145,5 +262,5 @@
} }
}, },
}, },
}; };
</script> </script>
src/views/staff/adjust/log/drawershow.vue
View file @ a03b5678
...@@ -4,49 +4,162 @@ ...@@ -4,49 +4,162 @@
:title="title" :title="title"
:visible.sync="open" :visible.sync="open"
:direction="direction" :direction="direction"
size="50%"> size="50%"
>
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row> <el-row>
<Field label="员工ID" prop="staffId" v-model="form.staffId" placeholder="请输入员工ID"/> <Field
<Field label="员工姓名" prop="fullName" v-model="form.fullName" placeholder="请输入员工姓名"/> label="员工ID"
<Field label="性别1男2女" prop="gender" v-model="form.gender" type="select" :enumData="dict.gender" placeholder="请选择性别1男2女"/> prop="staffId"
<Field label="出生日期" prop="birthday" v-model="form.birthday" type="date" /> v-model="form.staffId"
<Field label="照片" prop="photoPath" v-model="form.photoPath" type="textarea" placeholder="请输入照片"/> placeholder="请输入员工ID"
<Field label="联系电话" prop="phoneNumber" v-model="form.phoneNumber" placeholder="请输入联系电话"/> />
<Field label="身份证号码" prop="idCard" v-model="form.idCard" placeholder="请输入身份证号码"/> <Field
<Field label="工号" prop="workNum" v-model="form.workNum" placeholder="请输入工号"/> label="员工姓名"
<Field label="政治面貌 " prop="politicalstatus" v-model="form.politicalstatus" type="select" :enumData="dict.politicalstatus" placeholder="请选择政治面貌 "/> prop="fullName"
<Field label="所属部门" prop="deptId" v-model="form.deptId" placeholder="请输入所属部门"/> v-model="form.fullName"
<Field label="所属部门名称" prop="deptName" v-model="form.deptName" placeholder="请输入所属部门名称"/> placeholder="请输入员工姓名"
<Field label="职位ID" prop="jobId" v-model="form.jobId" placeholder="请输入职位ID"/> />
<Field label="职位名称" prop="jobName" v-model="form.jobName" placeholder="请输入职位名称"/> <Field
<Field label="员工类型1全职2兼职3实习" prop="staffType" v-model="form.staffType" type="select" :enumData="dict.staffType" placeholder="请选择员工类型1全职2兼职3实习"/> label="性别"
<Field label="员工状态1正式2试用3离职" prop="status" v-model="form.status" type="select" :enumData="dict.status" placeholder="请选择员工状态1正式2试用3离职"/> prop="gender"
<Field label="入职时间" prop="entryDate" v-model="form.entryDate" type="date" /> v-model="form.gender"
<Field label="调岗后所属部门" prop="newDeptId" v-model="form.newDeptId" placeholder="请输入调岗后所属部门"/> type="select"
<Field label="调岗后所属部门名称" prop="newDeptName" v-model="form.newDeptName" placeholder="请输入调岗后所属部门名称"/> :enumData="dict.gender"
<Field label="调岗后职位ID" prop="newJobId" v-model="form.newJobId" placeholder="请输入调岗后职位ID"/> placeholder="请选择性别"
<Field label="调岗后职位名称" prop="newJobName" v-model="form.newJobName" placeholder="请输入调岗后职位名称"/> />
<Field label="审核状态0待审核1通过2拒绝" prop="auditStatus" v-model="form.auditStatus" type="select" :enumData="dict.auditStatus" placeholder="请选择审核状态0待审核1通过2拒绝"/> <Field
label="出生日期"
prop="birthday"
v-model="form.birthday"
type="date"
/>
<Field
label="照片"
prop="photoPath"
v-model="form.photoPath"
type="textarea"
placeholder="请输入照片"
/>
<Field
label="联系电话"
prop="phoneNumber"
v-model="form.phoneNumber"
placeholder="请输入联系电话"
/>
<Field
label="身份证号码"
prop="idCard"
v-model="form.idCard"
placeholder="请输入身份证号码"
/>
<Field
label="工号"
prop="workNum"
v-model="form.workNum"
placeholder="请输入工号"
/>
<Field
label="政治面貌 "
prop="politicalstatus"
v-model="form.politicalstatus"
type="select"
:enumData="dict.politicalstatus"
placeholder="请选择政治面貌 "
/>
<Field
label="所属部门"
prop="deptId"
v-model="form.deptId"
placeholder="请输入所属部门"
/>
<Field
label="所属部门名称"
prop="deptName"
v-model="form.deptName"
placeholder="请输入所属部门名称"
/>
<Field
label="职位ID"
prop="jobId"
v-model="form.jobId"
placeholder="请输入职位ID"
/>
<Field
label="职位名称"
prop="jobName"
v-model="form.jobName"
placeholder="请输入职位名称"
/>
<Field
label="员工类型"
prop="staffType"
v-model="form.staffType"
type="select"
:enumData="dict.staffType"
placeholder="请选择员工类型"
/>
<Field
label="员工状态"
prop="status"
v-model="form.status"
type="select"
:enumData="dict.status"
placeholder="请选择员工状态"
/>
<Field
label="入职时间"
prop="entryDate"
v-model="form.entryDate"
type="date"
/>
<Field
label="调岗后所属部门"
prop="newDeptId"
v-model="form.newDeptId"
placeholder="请输入调岗后所属部门"
/>
<Field
label="调岗后所属部门名称"
prop="newDeptName"
v-model="form.newDeptName"
placeholder="请输入调岗后所属部门名称"
/>
<Field
label="调岗后职位ID"
prop="newJobId"
v-model="form.newJobId"
placeholder="请输入调岗后职位ID"
/>
<Field
label="调岗后职位名称"
prop="newJobName"
v-model="form.newJobName"
placeholder="请输入调岗后职位名称"
/>
<Field
label="审核状态"
prop="auditStatus"
v-model="form.auditStatus"
type="select"
:enumData="dict.auditStatus"
placeholder="请选择审核状态"
/>
</el-row> </el-row>
<form-buttons @submit='submitForm' noCancelBtn /> <form-buttons @submit="submitForm" noCancelBtn />
</el-form> </el-form>
</el-drawer> </el-drawer>
</template> </template>
<script> <script>
import form from "@/assets/mixins/formdialog"; import form from "@/assets/mixins/formdialog";
export default { export default {
name: "StaffAdjustLogDetail", name: "StaffAdjustLogDetail",
mixins: [form], mixins: [form],
components: { components: {},
},
created() { created() {
this.changePath("staff/adjust/log") this.changePath("staff/adjust/log");
}, },
data() { data() {
return { return {
...@@ -56,56 +169,51 @@ ...@@ -56,56 +169,51 @@
title: "员工调岗信息", title: "员工调岗信息",
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
direction:"rtl", direction: "rtl",
toString:[ toString: [
"gender", "gender",
"politicalstatus", "politicalstatus",
"staffType", "staffType",
"status", "status",
"auditStatus", "auditStatus",
], ],
toDate:[ toDate: ["birthday", "entryDate"],
"birthday",
"entryDate",
],
// 表单校验 // 表单校验
rules: { rules: {
fullName: [ fullName: [
{required: true,message: "请输入员工姓名", trigger: "blur" }, { required: true, message: "请输入员工姓名", trigger: "blur" },
{max: 64,message: "最多只能录入64个字符",trigger: "blur",}, { max: 64, message: "最多只能录入64个字符", trigger: "blur" },
], ],
createTime: [ createTime: [{ required: true, message: "请选择创建时间" }],
{required: true,message: "请选择创建时间" }, },
],
}
}; };
}, },
methods: { methods: {
/** 编辑 */ /** 编辑 */
edit(row) { edit(row) {
this.reset() this.reset();
this.query = { id: row.id }; this.query = { id: row.id };
this.urls.currUrl ="staff/adjust/log/edit"; this.urls.currUrl = "staff/adjust/log/edit";
this.getData(); this.getData();
this.pageInfo.type="edit" this.pageInfo.type = "edit";
this.title = "修改员工调岗信息"; this.title = "修改员工调岗信息";
}, },
/** 新增 */ /** 新增 */
add(row) { add(row) {
this.reset() this.reset();
this.urls.currUrl = "staff/adjust/log/add"; this.urls.currUrl = "staff/adjust/log/add";
this.getData(); this.getData();
this.pageInfo.type="add" this.pageInfo.type = "add";
this.title = "新增员工调岗信息"; this.title = "新增员工调岗信息";
}, },
/** 查看*/ /** 查看*/
view(row) { view(row) {
this.reset() this.reset();
this.query = { id: row.id }; this.query = { id: row.id };
this.urls.currUrl ="staff/adjust/log/view"; this.urls.currUrl = "staff/adjust/log/view";
this.getData(); this.getData();
this.pageInfo.type="view" this.pageInfo.type = "view";
this.title = "员工调岗信息详细"; this.title = "员工调岗信息详细";
}, },
/**取消按钮 */ /**取消按钮 */
...@@ -125,27 +233,27 @@ ...@@ -125,27 +233,27 @@
// 表单重置 // 表单重置
reset() { reset() {
this.form = { this.form = {
staffId : null, staffId: null,
fullName : "", fullName: "",
gender : 1, gender: null,
birthday : null, birthday: null,
photoPath : "", photoPath: "",
phoneNumber : "", phoneNumber: "",
idCard : "", idCard: "",
workNum : "", workNum: "",
politicalstatus : 1, politicalstatus: null,
deptId : null, deptId: null,
deptName : "", deptName: "",
jobId : null, jobId: null,
jobName : "", jobName: "",
staffType : 1, staffType: null,
status : 1, status: null,
entryDate : null, entryDate: null,
newDeptId : null, newDeptId: null,
newDeptName : "", newDeptName: "",
newJobId : null, newJobId: null,
newJobName : "", newJobName: "",
auditStatus : 0, auditStatus: null,
}; };
this.resetForm("form"); this.resetForm("form");
}, },
...@@ -155,5 +263,5 @@ ...@@ -155,5 +263,5 @@
} }
}, },
}, },
}; };
</script> </script>
src/views/staff/adjust/log/view.vue
View file @ a03b5678
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<el-descriptions-item label="员工姓名" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="员工姓名" label-class-name="labelClass" content-class-name="contentClass">
{{form.fullName}} {{form.fullName}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="性别1男2女" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="性别" label-class-name="labelClass" content-class-name="contentClass">
{{form.gender}} {{form.gender}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="出生日期" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="出生日期" label-class-name="labelClass" content-class-name="contentClass">
...@@ -47,10 +47,10 @@ ...@@ -47,10 +47,10 @@
<el-descriptions-item label="职位名称" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="职位名称" label-class-name="labelClass" content-class-name="contentClass">
{{form.jobName}} {{form.jobName}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="员工类型1全职2兼职3实习" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="员工类型" label-class-name="labelClass" content-class-name="contentClass">
{{form.staffType}} {{form.staffType}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="员工状态1正式2试用3离职" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="员工状态" label-class-name="labelClass" content-class-name="contentClass">
{{form.status}} {{form.status}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="入职时间" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="入职时间" label-class-name="labelClass" content-class-name="contentClass">
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
<el-descriptions-item label="调岗后职位名称" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="调岗后职位名称" label-class-name="labelClass" content-class-name="contentClass">
{{form.newJobName}} {{form.newJobName}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="审核状态0待审核1通过2拒绝" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item label="审核状态" label-class-name="labelClass" content-class-name="contentClass">
{{form.auditStatus}} {{form.auditStatus}}
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
......
src/views/staff/black/list.vue
View file @ a03b5678
...@@ -40,6 +40,11 @@ export default { ...@@ -40,6 +40,11 @@ export default {
label: "员工姓名", label: "员工姓名",
fuzzy: true, fuzzy: true,
}, },
{
name: "blackDate",
type: "month",
label: "拉黑时间",
},
], ],
isshowTabPane: true, isshowTabPane: true,
columns: [ columns: [
...@@ -72,6 +77,7 @@ export default { ...@@ -72,6 +77,7 @@ export default {
return ( return (
<table-buttons <table-buttons
noAdd noAdd
noView
row={row} row={row}
onEdit={this.toEdit} onEdit={this.toEdit}
onView={this.toView} onView={this.toView}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment