Skip to content

A
attendance-performance-platform
Commit 53f85486 authored by 王启林's avatar 王启林
Browse files
Options

Merge branch 'master' of http://gitlab.scsmile.cn/zxf/attendance-performance-platform

parents 191bbe05 cb8c41c9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 505 additions and 619 deletions
attendance-performance-manager-ui/admin/src/assets/mixins/formdialog.js
View file @ 53f85486
......@@ -8,12 +8,26 @@ export default {
methods: {
// 渲染前置处理
beforeRender(data) {
if (data.entity.attachmentPath) {
data.entity.attachmentPathList = [
{
url: data.entity.attachmentPath,
name: data.entity.attachmentPath,
},
];
}
console.log(data);
return data;
},
// 渲染后置处理
afterRender(data) {},
// 提交表单的前置处理
beforeSubmit(data) {
data.attachmentPathList && data.attachmentPathList.length > 0
? (data.attachmentPath = data.attachmentPathList[0].url)
: (data.attachmentPath = "");
console.log(data);
return data;
},
// 提交表单的后置处理, 会阻断默认的回退行为
......@@ -33,6 +47,7 @@ export default {
// 默认拉取数据
getData() {
this.loading = true;
this.$get(this.urls.currUrl || this.pageInfo.currUrl, this.query)
.then(({ data }) => {
const res = this.beforeRender(data);
......@@ -43,6 +58,7 @@ export default {
//
res.entity = this.util_toDateStr(res.entity, this.toDate);
this.form = Object.assign({}, this.form, res.entity);
this.dict = Object.assign({}, this.dict, res.dict);
this.afterRender(res);
})
......
attendance-performance-manager-ui/admin/src/assets/mixins/table.js
View file @ 53f85486
......@@ -221,6 +221,10 @@ export default {
) : (
<p>{content}</p>
)
) : row.subAddType == 1 && column.label.includes("分值") ? (
<el-link>+{content}</el-link>
) : row.subAddType == 2 && column.label.includes("分值") ? (
<el-link>{-content}</el-link>
) : (
<p>{content}</p>
)
......
attendance-performance-manager-ui/admin/src/components/SearchForm.vue
View file @ 53f85486
......@@ -361,10 +361,12 @@ export default {
}
}
});
console.log("search val",val)
newData[item] = this.decodeVal(val);
});
<<<<<<< HEAD
=======
>>>>>>> cb8c41c938e60ea55b316e6645df78f10e384fb3
return newData;
},
decodeVal(val) {
......
attendance-performance-manager-ui/admin/src/views/attendance/leave/record/draweraudit.vue
View file @ 53f85486
......@@ -39,15 +39,16 @@
label="开始时间"
prop="startTime"
v-model="form.startTime"
type="date"
type="datetime"
/>
<Field
disabled
label="结束时间"
prop="endTime"
v-model="form.endTime"
type="date"
type="datetime"
disabled
/>
<Field
disabled
label="时长,单位秒"
......@@ -66,8 +67,8 @@
<Field
disabled
label="审批负责人"
prop="approver"
v-model="form.approver"
prop="approverId"
v-model="form.approverId"
placeholder="请输入审批负责人"
/>
<Field
......@@ -147,6 +148,7 @@ export default {
open: false,
// urls: { saveUrl: "/check/attend/record/examine" },
toString: ["leaveType", "auditResult", "processStatus"],
toDate: ["startTime", "endTime"],
// 表单校验
rules: {},
};
......@@ -157,8 +159,11 @@ export default {
edit(row) {
this.reset();
this.query = { id: row.id };
this.urls.currUrl = "attendance/leave/record/edit";
this.getData();
// this.urls.currUrl = "attendance/leave/record/edit";
// this.getData();
this.$post("attendance/leave/record/edit", { id: row.id }).then((res) => {
console.log(res);
});
this.pageInfo.type = "edit";
this.title = "修改请假记录信息";
},
......@@ -176,8 +181,8 @@ export default {
this.query = { id: row.id };
this.urls.currUrl = "attendance/leave/record/view";
this.getData();
this.pageInfo.type = "view";
this.title = "请假记录信息详细";
this.pageInfo.type = "check";
this.title = "审核请假记录";
},
/**取消按钮 */
cancel() {
......
attendance-performance-manager-ui/admin/src/views/attendance/leave/record/drawershow.vue
View file @ 53f85486
......@@ -16,6 +16,7 @@
v-model="form.leavePerson"
placeholder="请输入请假人"
:maxLength="10"
:disabled="pageInfo.type == 'view'"
/>
<Field
label="所属部门"
......@@ -24,6 +25,7 @@
type="select"
placeholder="请选择所属部门"
:enumData="dict.deptId"
:disabled="pageInfo.type == 'view'"
/>
<!-- <Field label="所属部门" prop="deptName" v-model="form.deptName" type="textarea" placeholder="请输入所属部门"/> -->
<Field
......@@ -32,6 +34,7 @@
v-model="form.phoneNumber"
placeholder="请输入电话号码"
:maxLength="11"
:disabled="pageInfo.type == 'view'"
/>
<Field
label="请假类型"
......@@ -40,13 +43,16 @@
type="select"
:enumData="dict.leaveType"
placeholder="请选择请假类型"
:disabled="pageInfo.type == 'view'"
/>
<Field
label="开始时间"
prop="startTime"
v-model="form.startTime"
type="datetime"
@change="changedate"
:disabled="pageInfo.type == 'view'"
/>
<Field
label="结束时间"
......@@ -54,6 +60,7 @@
v-model="form.endTime"
type="datetime"
@change="changedate"
:disabled="pageInfo.type == 'view'"
/>
<Field
......@@ -70,6 +77,23 @@
v-model="form.reason"
type="textarea"
placeholder="请输入请假事由"
:disabled="pageInfo.type == 'view'"
/>
<Field
label="审核结果"
prop="auditResult"
v-model="form.auditResult"
type="radio"
:enumData="dict.auditResult"
placeholder="请选择审核结果"
:disabled="pageInfo.type == 'view'"
/>
<Field
label="审核说明"
prop="auditDesc"
v-model="form.auditDesc"
placeholder="请输入审核说明"
:disabled="pageInfo.type == 'view'"
/>
<Field
label="审批负责人"
......@@ -78,6 +102,7 @@
v-model="form.approverId"
placeholder="请选择审批负责人"
:enumData="dict.approverId"
:disabled="pageInfo.type == 'view'"
/>
<!-- <Field label="审批负责人" prop="approver" v-model="form.approver" placeholder="请输入审批负责人"/> -->
<!-- <Field label="附件" prop="attachment" v-model="form.attachment" type="textarea" placeholder="请输入附件"/> -->
......@@ -87,16 +112,29 @@
v-model="form.remark"
type="textarea"
placeholder="请输入备注"
:disabled="pageInfo.type == 'view'"
/>
<Field
label="申请时间"
prop="createTime"
v-model="form.createTime"
type="datetime"
disabled
/>
</el-row>
<el-form-item label="附件路径" prop="attachmentPath">
<el-form-item label="附件路径" prop="attachmentPathList">
<FileUpload
@input="uploadFn"
:value="attachmentPath"
:value="form.attachmentPathList"
:fileNumber="1"
:disabled="pageInfo.type == 'view'"
/>
</el-form-item>
<form-buttons @submit="submitForm" noCancelBtn />
<form-buttons
@submit="submitForm"
noCancelBtn
v-if="pageInfo.type !== 'view'"
/>
</el-form>
</div>
</el-drawer>
......@@ -123,8 +161,8 @@ export default {
// 是否显示弹出层
open: false,
direction: "rtl",
toString: ["leaveType", "deptId", "approverId"],
toDate: ["startTime", "endTime"],
toString: ["leaveType", "deptId", "approverId", "auditResult"],
toDate: ["startTime", "endTime", "createTime"],
// 表单校验
rules: {
leavePerson: [
......@@ -155,14 +193,17 @@ export default {
approverId: [
{ required: true, message: "请选择审批人", trigger: "change" },
],
attachmentPath: [
{ required: true, message: "请上传附件文件", trigger: "change" },
// attachmentPathList: [
// { required: true, message: "请上传附件文件", trigger: "change" },
// ],
auditResult: [
{ required: true, message: "请选择审核结果", trigger: "change" },
],
},
attachmentPath: "",
};
},
watch: {},
methods: {
// beforeSubmit() {
// if (this.form.endTime.valueOf() > this.form.startTime.valueOf()) {
......@@ -172,8 +213,8 @@ export default {
// }
// },
uploadFn(e) {
this.attachmentPath = e;
this.form.attachmentPath = this.attachmentPath[0].url;
this.form.attachmentPathList = e;
this.$forceUpdate(this.form.attachmentPathList);
},
/** 编辑 */
edit(row) {
......@@ -181,6 +222,23 @@ export default {
this.query = { id: row.id };
this.urls.currUrl = "attendance/leave/record/edit";
this.getData();
// this.$get("attendance/leave/record/edit", { id: row.id }).then((res) => {
// if (res.code == 1) {
// this.form = res.data.entity;
// this.attachmentPath = res.data
// ? [
// {
// url: res.data.entity.attachmentPath,
// name: res.data.entity.attachmentPath,
// },
// ]
// : "";
// this.dict = res.data.dict;
// this.open = true;
// } else {
// this.reset();
// }
// });
this.pageInfo.type = "edit";
this.title = "修改请假记录信息";
},
......@@ -198,6 +256,7 @@ export default {
this.query = { id: row.id };
this.urls.currUrl = "attendance/leave/record/view";
this.getData();
this.pageInfo.type = "view";
this.title = "请假记录信息详细";
},
......
attendance-performance-manager-ui/admin/src/views/attendance/leave/record/list.vue
View file @ 53f85486
<template>
<div class="page">
<LayoutTable :data="tableData" :config="tableConfig" notDel>
<el-button type="primary" @click="doExport" :disabled="isExport"
size="mini" slot="table-head-left2">导出
<el-button
type="primary"
@click="doExport"
:disabled="isExport"
size="mini"
slot="table-head-left2"
>导出
</el-button>
</LayoutTable>
<drawer-show ref="drawerform" @ok="getData"/>
<drawer-audit ref="draweraudit" @ok="getData"/>
<drawer-show ref="drawerform" @ok="getData" />
<drawer-audit ref="draweraudit" @ok="getData" />
</div>
</template>
<script>
/** 表单弹出框模式需引入 */
import drawerShow from "./drawershow";
import drawerAudit from "./draweraudit";
import table from "@/assets/mixins/table";
export default {
name: "AttendanceLeaveRecordList",
components: {
drawerShow
drawerShow,
drawerAudit,
},
mixins: [table],
created() {
},
created() {},
methods: {
/** 重写新增方法 */
toAdd(row) {
......@@ -39,18 +44,24 @@ export default {
},
audit(row) {
//todo 审核页面进行审核
this.$refs.draweraudit.view(row);
this.$refs.drawerform.edit(row);
// this.$refs.draweraudit.view(row);
},
doExport() {
this.isExport = true;
this.$download("/attendance/leave/record/exportExcel", {
"idList": this.selection,
'name': this.$route.query['name'],
}, {type: "excel"}).then(() => this.isExport = false).catch(error => {
this.isExport = false;
this.$message.error(error.message);
})
this.$download(
"/attendance/leave/record/exportExcel",
{
idList: this.selection,
name: this.$route.query["name"],
},
{ type: "excel" }
)
.then(() => (this.isExport = false))
.catch((error) => {
this.isExport = false;
this.$message.error(error.message);
});
},
},
data() {
......@@ -63,101 +74,123 @@ export default {
name: "leavePerson",
type: "text",
label: "请假人",
fuzzy: true
fuzzy: true,
},
{
name: "phoneNumber",
type: "text",
label: "电话号码",
fuzzy: true
fuzzy: true,
},
{
name: "deptId",
type: "select",
label: "全部部门",
fuzzy: false
fuzzy: false,
},
{
name: "leaveType",
type: "select",
label: "请假类型",
fuzzy: false
fuzzy: false,
},
{
name: "startTime",
type: "date",
label: "开始时间",
fuzzy: false
fuzzy: false,
},
{
name: "endTime",
type: "date",
label: "结束时间",
fuzzy: false
fuzzy: false,
},
],
columns: [
{type: "selection", width: 60},
{type: "index", label: "序号", width: 50},
{ type: "selection", width: 60 },
{ type: "index", label: "序号", width: 50 },
// {label: "请假人id", prop: "leavePersonId", formatter: this.formatter},
{label: "请假人", prop: "leavePerson"},
{ label: "请假人", prop: "leavePerson" },
// {label: "所属部门id", prop: "deptId", formatter: this.formatter},
{label: "所属部门", prop: "deptName"},
{ label: "所属部门", prop: "deptName" },
{label: "电话号码", prop: "phoneNumber"},
{ label: "电话号码", prop: "phoneNumber" },
{label: "请假类型", prop: "leaveType", formatter: this.formatterLeaveType},
{
label: "请假类型",
prop: "leaveType",
formatter: this.formatterLeaveType,
},
{label: "开始时间", prop: "startTime", formatter: this.formatterDate},
{
label: "开始时间",
prop: "startTime",
formatter: this.formatterDate,
},
{label: "结束时间", prop: "endTime", formatter: this.formatterDate},
{ label: "结束时间", prop: "endTime", formatter: this.formatterDate },
{label: "时长", prop: "duration", formatter: this.formatter},
{ label: "时长", prop: "duration", formatter: this.formatter },
// {label: "审批负责人Id", prop: "approverId", formatter: this.formatter},
/* {label: "处理状态", prop: "processStatus", formatter: this.formatter},*/
/* {label: "处理状态", prop: "processStatus", formatter: this.formatter},*/
{label: "状态", prop: "auditResult", formatter: this.formatter},
{label: "审批负责人", prop: "approver"},
{ label: "状态", prop: "auditResult", formatter: this.formatter },
{ label: "审批负责人", prop: "approver" },
{label: "创建用户", prop: "createUserId", formatter: this.formatter},
{
label: "创建用户",
prop: "createUserId",
formatter: this.formatter,
},
{label: "创建时间", prop: "createTime", formatter: this.formatterDate},
{
label: "创建时间",
prop: "createTime",
formatter: this.formatterDate,
},
{
label: "操作",
width: 240,
formatter: row => {
formatter: (row) => {
return (
<div>
<table-buttons noAdd row={row} onEdit={this.toEdit} onView={this.toView} onDel={this.toDel}/>
<span> </span>
{row.processStatus === 1 ? (
<el-button
size="mini"
type="text"
icon="el-icon-open"
onClick={() => {
this.audit(row);
}}
>
审核
</el-button>
) : (
""
)}
</div>
<div>
<table-buttons
noAdd
row={row}
onEdit={this.toEdit}
onView={this.toView}
onDel={this.toDel}
/>
<span> </span>
{row.processStatus === 1 ? (
<el-button
size="mini"
type="text"
icon="el-icon-open"
onClick={() => {
this.audit(row);
}}
>
审核
</el-button>
) : (
""
)}
</div>
);
}
}
]
}
},
},
],
},
};
}
},
};
</script>
attendance-performance-manager-ui/admin/src/views/perform/rules/attend/components/AttendIndex.vue
View file @ 53f85486
......@@ -121,7 +121,7 @@ export default {
{ label: "增减类型", prop: "subAddType", formatter: this.formatter },
{ label: "分值", prop: "score" },
{ label: "分值", prop: "score", formatter: this.formatter },
{ label: "负责人分值", prop: "ownerScore" },
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/job/model/JobEntity.java
View file @ 53f85486
......@@ -159,7 +159,7 @@ public class JobEntity extends JobVo {
public void initAttrValue(){
this.groupId = 0L;
this.groupId = null;
this.groupName = "";
......
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