Skip to content

A
attendance-performance-platform
Commit c065bbdc authored by 赵啸非's avatar 赵啸非
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents be973bfd e065a875
Expand all Show whitespace changes
Inline Side-by-side
Showing with 2019 additions and 129 deletions
attendance-performance-manager-ui/admin/src/assets/mixins/table.js
View file @ c065bbdc
......@@ -689,6 +689,10 @@ export default {
list:
this.$route.path.indexOf("/attendance/stat/list") == 0
? "/attendance/stat/listExt"
: this.$route.path.indexOf("/window/perform/list") == 0
? "/check/window/perform/list"
: this.$route.path.indexOf("/window/workman/perform/list") == 0
? "/check/window/workman/perform/list"
: this.$route.path,
edit: this.$route.path.replace("/list", "/edit"),
save: this.$route.path.replace("/list", "/save"),
......
attendance-performance-manager-ui/admin/src/router.js
View file @ c065bbdc
......@@ -114,6 +114,8 @@ const router = new Router({
...restBuilder("perform/gowork/record", "perform/gowork/record"), //办件绩效记录信息
...restBuilder("perform/effect/record", "perform/effect/record"), //效能绩效记录信息
...restBuilder("perform/other/record", "perform/other/record"), //其它绩效记录信息
...restBuilder("window/perform", "window/perform"), //自评绩效核查信息（窗口）
...restBuilder("window/workman/perform", "window/workman/perform"), //自评绩效核查信息（工作人员）
...restBuilder("check/attend/record", "check/attend/record"), //考勤绩效核查信息
...restBuilder("check/review/record", "check/review/record"), //评价绩效核查信息
......
attendance-performance-manager-ui/admin/src/views/check/window/perform/drawershow.vue
View file @ c065bbdc
......@@ -14,7 +14,7 @@
<span>{{ form.ownerName }}</span>
</div>
<div class="text_box">
<span>登记年月：</span>
<span style="width: 120px;">登记年月：</span>
<span>{{
`${form.year ? form.year : "--"}-${
form.month
......@@ -26,44 +26,54 @@
}}</span>
</div>
<div class="text_box">
<span>窗口编号：</span>
<span>{{ form.windowName }}</span>
<span style="width: 140px;">窗口编号：</span>
<span>{{ form.windowCode ? form.windowCode : "--" }}</span>
</div>
</div>
<div class="text_line">
<div class="text_box">
<span>工作总结：</span>
<span>{{ form.workSummary }}</span>
<span style="width: 90px;">工作总结：</span>
<span style="display: inline-block;">{{
form.workSummary ? form.workSummary : "--"
}}</span>
</div>
</div>
<div class="text_line">
<div class="text_box">
<span>加分申报：</span>
<span>{{ form.bonusReport }}</span>
<span style="width: 90px;">加分申报：</span>
<span>{{ form.bonusReport ? form.bonusReport : "--" }}</span>
</div>
</div>
<div class="text_line">
<div class="text_box">
<span>加分佐证材料：</span>
<span>{{ form.bonusReport }}</span>
<span style="width: 110px;">加分佐证材料：</span>
<el-link
v-if="form.proofUrl"
:href="baseUrl + form.proofUrl"
target="_blank"
type="primary"
>
{{ form.proof || "--" }}</el-link
>
<span v-else> {{ form.proof || "--" }}</span>
</div>
</div>
<div class="text_line">
<div class="text_box">
<span>扣分情况：</span>
<span>{{ form.deductStatement }}</span>
<span style="width: 130px;">扣分情况：</span>
<span>{{ form.deductStatement ? form.deductStatement : "--" }}</span>
</div>
</div>
<div class="text_line">
<div class="text_box">
<span>扣分分值：</span>
<span>{{ form.deductScore }}</span>
<span>{{ form.deductScore ? form.deductScore : "--" }}</span>
</div>
</div>
<div class="text_line">
<div class="text_box">
<span>自评得分：</span>
<span style="width: 820px;"
<span style="width: 80px;">自评得分：</span>
<span style="width: 700px;"
><el-table :data="tableData" border style="width: 100%">
<el-table-column
prop="discipline"
......@@ -89,14 +99,22 @@
</div>
<div class="text_line">
<div class="text_box">
<span>备注：</span>
<span>{{ form.remark }}</span>
<span style="width: 90px;">备注：</span>
<span>{{ form.remark ? form.remark : "--" }}</span>
</div>
</div>
<div class="text_line">
<div class="text_box">
<span>附件材料：</span>
<span>{{ form.annex }}</span>
<span style="width: 70px;">附件材料：</span>
<el-link
v-if="form.annexUrl"
:href="baseUrl + form.annexUrl"
target="_blank"
type="primary"
>
{{ form.annex || "--" }}</el-link
>
<span v-else> {{ form.annex || "--" }}</span>
</div>
</div>
<div class="hecha_box">
......@@ -355,6 +373,7 @@ export default {
},
data() {
return {
baseUrl: process.env.VUE_APP_API_BASE_URL + "/",
// 遮罩层
loading: true,
// 弹出层标题
......@@ -379,7 +398,7 @@ export default {
async edit(row) {
// this.reset();
// this.query = { id: row.id };
this.urls.currUrl = "check/window/perform/save";
this.urls.saveUrl = "check/window/perform/examine";
// this.getData();
// this.pageInfo.type = "edit";
// this.title = "修改窗口考核核查";
......@@ -389,6 +408,7 @@ export default {
await this.$get("/window/perform/info", { id: row.id }).then((res) => {
if (res.code == 1) {
this.form = res.data;
this.form.id = row.id;
this.dict = res.dict;
} else {
this.form = row;
......@@ -573,12 +593,12 @@ export default {
.text_box {
display: flex;
span {
text-align: end;
width: 100px;
width: 160px;
display: inline-block;
}
span:nth-child(2) {
text-align: start;
width: 100%;
}
}
}
......
attendance-performance-manager-ui/admin/src/views/check/window/perform/list.vue
View file @ c065bbdc
......@@ -145,7 +145,7 @@ export default {
label: "操作",
width: 240,
formatter: (row) => {
return (
return row.checkStatus == 1 ? (
<table-buttons
noAdd
noDel
......@@ -157,6 +157,17 @@ export default {
onView={this.toView}
onDel={this.toDel}
/>
) : (
<table-buttons
noAdd
noDel
noEdit
text={"自评核查"}
row={row}
onEdit={this.toEdit}
onView={this.toView}
onDel={this.toDel}
/>
);
},
},
......
attendance-performance-manager-ui/admin/src/views/check/window/workman/perform/list.vue
View file @ c065bbdc
......@@ -153,7 +153,7 @@ export default {
label: "操作",
width: 240,
formatter: (row) => {
return (
return row.checkStatus == 1 ? (
<table-buttons
noAdd
noDel
......@@ -165,6 +165,17 @@ export default {
onView={this.toView}
onDel={this.toDel}
/>
) : (
<table-buttons
noAdd
noDel
noEdit
text={"自评核查"}
row={row}
onEdit={this.toEdit}
onView={this.toView}
onDel={this.toDel}
/>
);
},
},
......
attendance-performance-manager-ui/admin/src/views/window/perform/list.vue 0 → 100644
View file @ c065bbdc
<template>
<div class="page">
<div class="btn_box" style="position: absolute;top: 54px;left: 10px;">
<el-radio-group v-model="radio1" @input="changeRadio">
<el-radio-button label="1">窗口考核</el-radio-button>
<el-radio-button label="2">工作人员考核</el-radio-button>
</el-radio-group>
<el-button
slot="table-head-left2"
style="margin-left: 10px"
icon="el-icon-tickets"
size="mini"
@click="doExport"
:disabled="isExport"
>导出</el-button
>
</div>
<LayoutTable :data="tableData" notAdd notDel :config="tableConfig">
</LayoutTable>
<drawer-show ref="drawerform" @ok="getData" />
</div>
</template>
<script>
/** 表单弹出框模式需引入 */
import drawerShow from "./drawershow";
import table from "@/assets/mixins/table";
export default {
name: "WindowPerformList",
components: {
drawerShow,
},
mixins: [table],
created() {
this.pageInfo.list = "/check/window/perform/list";
},
methods: {
/** 重写新增方法 */
toAdd(row) {
this.$refs.drawerform.add(row);
},
/** 重写编辑方法 */
toEdit(row) {
this.$refs.drawerform.edit(row);
},
/** 重写查看方法 */
toView(row) {
this.$refs.drawerform.view(row);
},
/** 导出Excel */
doExport() {
this.isExport = true;
this.$download(
"/check/window/perform/exportExcel",
{
page: 1,
size: -1,
},
{ type: "excel" }
)
.then(() => (this.isExport = false))
.catch((error) => {
this.isExport = false;
this.$message.error(error.message);
});
},
// 切换表格
changeRadio() {
this.radio1 == 2
? this.$router.push("/window/workman/perform/list?page=1")
: "";
},
},
data() {
return {
radio1: "1",
isExport: false,
config: {
isshowTabPane: true,
search: [
{
name: "deptId",
type: "select",
label: "所属部门",
fuzzy: false,
},
{
name: "checkStatus",
type: "select",
label: "核查状态",
fuzzy: false,
},
{
name: "createTimeMonth",
type: "month",
label: "请选择月份",
fuzzy: false,
},
{
name: "ownerName",
type: "text",
width: 200,
label: "窗口负责人姓名搜索",
fuzzy: false,
},
],
columns: [
{ type: "selection", width: 60 },
{ type: "index", label: "序号", width: 50 },
{ label: "窗口负责人", prop: "ownerName" },
{
label: "登记年月",
formatter: (row) => {
return `${row.year ? row.year : "--"}-${
row.month
? [1, 2, 3, 4, 5, 6, 7, 8, 9].includes(row.month)
? "0" + row.month
: row.month
: "--"
}`;
},
},
{ label: "所属大厅", prop: "salaName" },
{
label: "所属部门",
prop: "deptName",
},
{ label: "考核窗口", prop: "windowName" },
{ label: "表单名称", prop: "fromName" },
{ label: "总分分值", prop: "sumScore", formatter: this.formatter },
{
label: "提交时间",
prop: "submitDate",
formatter: this.formatterDate,
},
{ label: "处理状态", prop: "checkStatus", formatter: this.formatter },
{
label: "操作",
width: 240,
formatter: (row) => {
return (
<table-buttons
noAdd
noDel
noEdit
text={"自评核查"}
row={row}
onEdit={this.toEdit}
onView={this.toView}
onDel={this.toDel}
/>
);
},
},
],
},
};
},
};
</script>
<style lang="less" scoped>
/deep/.el-radio-button__inner {
border: 1px solid #eee !important;
height: 28px;
line-height: 3px;
}
/deep/.el-radio-button__orig-radio:checked + .el-radio-button__inner {
background: #00b565;
border: none !important;
color: #fff !important;
line-height: 3px;
}
</style>
attendance-performance-manager-ui/admin/src/views/window/perform/view.vue 0 → 100644
View file @ c065bbdc
<template>
<layout-view>
<el-descriptions :title="title" :column="column" :size="size" :colon="false" border>
<template slot="title">
<i class="el-icon-tickets"></i>
基本详细信息
</template>
<template slot="extra">
<el-button type="primary" @click="$router.go(-1)" size="small">返回</el-button>
</template>
<el-descriptions-item label="记录ID" label-class-name="labelClass" content-class-name="contentClass">
{{form.recordId}}
</el-descriptions-item>
<el-descriptions-item label="考核年度" label-class-name="labelClass" content-class-name="contentClass">
{{form.year}}
</el-descriptions-item>
<el-descriptions-item label="考核月份" label-class-name="labelClass" content-class-name="contentClass">
{{form.month}}
</el-descriptions-item>
<el-descriptions-item label="窗口ID" label-class-name="labelClass" content-class-name="contentClass">
{{form.windowId}}
</el-descriptions-item>
<el-descriptions-item label="窗口名称" label-class-name="labelClass" content-class-name="contentClass">
{{form.windowName}}
</el-descriptions-item>
<el-descriptions-item label="窗口负责人id" label-class-name="labelClass" content-class-name="contentClass">
{{form.ownerId}}
</el-descriptions-item>
<el-descriptions-item label="窗口负责人名称" label-class-name="labelClass" content-class-name="contentClass">
{{form.ownerName}}
</el-descriptions-item>
<el-descriptions-item label="所属部门id" label-class-name="labelClass" content-class-name="contentClass">
{{form.deptId}}
</el-descriptions-item>
<el-descriptions-item label="所属部门名称" label-class-name="labelClass" content-class-name="contentClass">
{{form.deptName}}
</el-descriptions-item>
<el-descriptions-item label="所属大厅" label-class-name="labelClass" content-class-name="contentClass">
{{form.salaId}}
</el-descriptions-item>
<el-descriptions-item label="所属大厅名称" label-class-name="labelClass" content-class-name="contentClass">
{{form.salaName}}
</el-descriptions-item>
<el-descriptions-item label="考核表单名称" label-class-name="labelClass" content-class-name="contentClass">
{{form.fromName}}
</el-descriptions-item>
<el-descriptions-item label="合计得分" label-class-name="labelClass" content-class-name="contentClass">
{{form.sumScore}}
</el-descriptions-item>
<el-descriptions-item label="提交时间" label-class-name="labelClass" content-class-name="contentClass">
{{ util_formatterDate(form.submitDate)}}
</el-descriptions-item>
<el-descriptions-item label="管理组核查人员" label-class-name="labelClass" content-class-name="contentClass">
{{form.manageCheckPerson}}
</el-descriptions-item>
<el-descriptions-item label="管理组核查时间" label-class-name="labelClass" content-class-name="contentClass">
{{ util_formatterDate(form.manageCheckTime)}}
</el-descriptions-item>
<el-descriptions-item label="管理组核查说明" label-class-name="labelClass" content-class-name="contentClass">
{{form.manageCheckDesc}}
</el-descriptions-item>
<el-descriptions-item label="管理组核查结果" label-class-name="labelClass" content-class-name="contentClass">
{{ util_formatters("manageCheckResult", form.manageCheckResult) }}
</el-descriptions-item>
<el-descriptions-item label="领导组核查人员" label-class-name="labelClass" content-class-name="contentClass">
{{form.leaderCheckPerson}}
</el-descriptions-item>
<el-descriptions-item label="领导组核查时间" label-class-name="labelClass" content-class-name="contentClass">
{{ util_formatterDate(form.leaderCheckTime)}}
</el-descriptions-item>
<el-descriptions-item label="领导组核查说明" label-class-name="labelClass" content-class-name="contentClass">
{{form.leaderCheckDesc}}
</el-descriptions-item>
<el-descriptions-item label="领导组核查结果" label-class-name="labelClass" content-class-name="contentClass">
{{ util_formatters("leaderCheckResult", form.leaderCheckResult) }}
</el-descriptions-item>
<el-descriptions-item label="处理状态" label-class-name="labelClass" content-class-name="contentClass">
{{ util_formatters("checkStatus", form.checkStatus) }}
</el-descriptions-item>
<el-descriptions-item label="备注" label-class-name="labelClass" content-class-name="contentClass">
{{form.remark}}
</el-descriptions-item>
</el-descriptions>
</layout-view>
</template>
<script>
import view from "@/assets/mixins/view";
export default {
mixins: [view],
components: {
},
methods: {
},
data() {
return {
size:"small",
column:2,
toString:[
"checkStatus",
],
toArrays: [
],
toDate: [
]
}
}
}
</script>
<style lang="less">
.labelClass{
width: 200px;
}
.el-descriptions__body{
margin-left: 5px;
margin-right: 5px;
color: #606266;
background-color: #FFF;
}
.contentClass{
width: 600px;
}
</style>
\ No newline at end of file
attendance-performance-manager-ui/admin/src/views/window/workman/perform/list.vue 0 → 100644
View file @ c065bbdc
<template>
<div class="page">
<div class="btn_box" style="position: absolute;top: 54px;left: 10px;">
<el-radio-group v-model="radio1" @input="changeRadio">
<el-radio-button label="1">窗口考核</el-radio-button>
<el-radio-button label="2">工作人员考核</el-radio-button>
</el-radio-group>
<el-button
slot="table-head-left2"
style="margin-left: 10px"
icon="el-icon-tickets"
size="mini"
@click="doExport"
:disabled="isExport"
>导出</el-button
>
</div>
<LayoutTable :data="tableData" notAdd notDel :config="tableConfig">
</LayoutTable>
<drawer-show ref="drawerform" @ok="getData" />
</div>
</template>
<script>
/** 表单弹出框模式需引入 */
import drawerShow from "./drawershow";
import table from "@/assets/mixins/table";
export default {
name: "WindowWorkmanPerformList",
components: {
drawerShow,
},
mixins: [table],
created() {
// this.getData();
},
methods: {
/** 重写新增方法 */
toAdd(row) {
this.$refs.drawerform.add(row);
},
/** 重写编辑方法 */
toEdit(row) {
console.log(row);
this.$refs.drawerform.edit(row);
},
/** 重写查看方法 */
toView(row) {
this.$refs.drawerform.view(row);
},
/** 导出Excel */
doExport() {
this.isExport = true;
this.$download(
"/check/window/workman/perform/exportExcel",
{
page: 1,
size: -1,
},
{ type: "excel" }
)
.then(() => (this.isExport = false))
.catch((error) => {
this.isExport = false;
this.$message.error(error.message);
});
},
// 切换表格
changeRadio() {
this.radio1 == 1
? this.$router.push("/window/perform/list?page=1")
: "";
},
},
data() {
return {
radio1: 2,
isExport: false,
config: {
isshowTabPane: true,
search: [
{
name: "deptId",
type: "select",
label: "所属部门",
fuzzy: false,
},
{
name: "checkStatus",
type: "select",
label: "核查状态",
fuzzy: false,
},
{
name: "createTimeMonth",
type: "month",
label: "请选择月份",
fuzzy: false,
},
{
name: "ownerName",
type: "text",
width: 200,
label: "窗口负责人姓名搜索",
fuzzy: false,
},
],
columns: [
{ type: "selection", width: 60 },
{ type: "index", label: "序号", width: 50 },
{ label: "窗口负责人", prop: "ownerName" },
{
label: "登记年月",
formatter: (row) => {
return `${row.year ? row.year : "--"}-${
row.month
? [1, 2, 3, 4, 5, 6, 7, 8, 9].includes(row.month)
? "0" + row.month
: row.month
: "--"
}`;
},
},
{ label: "所属大厅", prop: "salaName" },
{
label: "所属部门",
prop: "deptName",
},
{ label: "考核窗口", prop: "windowName" },
{ label: "表单名称", prop: "fromName" },
{ label: "总分分值", prop: "sumScore", formatter: this.formatter },
{
label: "提交时间",
prop: "submitDate",
width: 110,
formatter: this.formatterDate,
},
{
label: "最新核查时间",
prop: "updateTime",
width: 150,
formatter: this.formatterDate,
},
{ label: "处理状态", prop: "checkStatus", formatter: this.formatter },
{
label: "操作",
width: 240,
formatter: (row) => {
return (
<table-buttons
noAdd
noDel
noEdit
text={"自评核查"}
row={row}
onEdit={this.toEdit}
onView={this.toView}
onDel={this.toDel}
/>
);
},
},
],
},
};
},
};
</script>
<style lang="less" scoped>
/deep/.el-radio-button__inner {
border: 1px solid #eee !important;
height: 28px;
line-height: 3px;
}
/deep/.el-radio-button__orig-radio:checked + .el-radio-button__inner {
background: #00b565;
border: none !important;
color: #fff !important;
line-height: 3px;
}
</style>
attendance-performance-manager-ui/admin/src/views/window/workman/perform/view.vue 0 → 100644
View file @ c065bbdc
<template>
<layout-view>
<el-descriptions :title="title" :column="column" :size="size" :colon="false" border>
<template slot="title">
<i class="el-icon-tickets"></i>
基本详细信息
</template>
<template slot="extra">
<el-button type="primary" @click="$router.go(-1)" size="small">返回</el-button>
</template>
<el-descriptions-item label="记录ID" label-class-name="labelClass" content-class-name="contentClass">
{{form.recordId}}
</el-descriptions-item>
<el-descriptions-item label="考核年度" label-class-name="labelClass" content-class-name="contentClass">
{{form.year}}
</el-descriptions-item>
<el-descriptions-item label="考核月份" label-class-name="labelClass" content-class-name="contentClass">
{{form.month}}
</el-descriptions-item>
<el-descriptions-item label="窗口ID" label-class-name="labelClass" content-class-name="contentClass">
{{form.windowId}}
</el-descriptions-item>
<el-descriptions-item label="窗口名称" label-class-name="labelClass" content-class-name="contentClass">
{{form.windowName}}
</el-descriptions-item>
<el-descriptions-item label="窗口负责人id" label-class-name="labelClass" content-class-name="contentClass">
{{form.ownerId}}
</el-descriptions-item>
<el-descriptions-item label="窗口负责人名称" label-class-name="labelClass" content-class-name="contentClass">
{{form.ownerName}}
</el-descriptions-item>
<el-descriptions-item label="所属部门id" label-class-name="labelClass" content-class-name="contentClass">
{{form.deptId}}
</el-descriptions-item>
<el-descriptions-item label="所属部门名称" label-class-name="labelClass" content-class-name="contentClass">
{{form.deptName}}
</el-descriptions-item>
<el-descriptions-item label="所属大厅" label-class-name="labelClass" content-class-name="contentClass">
{{form.salaId}}
</el-descriptions-item>
<el-descriptions-item label="所属大厅名称" label-class-name="labelClass" content-class-name="contentClass">
{{form.salaName}}
</el-descriptions-item>
<el-descriptions-item label="考核表单名称" label-class-name="labelClass" content-class-name="contentClass">
{{form.fromName}}
</el-descriptions-item>
<el-descriptions-item label="提交时间" label-class-name="labelClass" content-class-name="contentClass">
{{ util_formatterDate(form.submitDate)}}
</el-descriptions-item>
<el-descriptions-item label="管理组核查人员" label-class-name="labelClass" content-class-name="contentClass">
{{form.manageCheckPerson}}
</el-descriptions-item>
<el-descriptions-item label="管理组核查时间" label-class-name="labelClass" content-class-name="contentClass">
{{ util_formatterDate(form.manageCheckTime)}}
</el-descriptions-item>
<el-descriptions-item label="管理组核查说明" label-class-name="labelClass" content-class-name="contentClass">
{{form.manageCheckDesc}}
</el-descriptions-item>
<el-descriptions-item label="管理组核查结果" label-class-name="labelClass" content-class-name="contentClass">
{{ util_formatters("manageCheckResult", form.manageCheckResult) }}
</el-descriptions-item>
<el-descriptions-item label="备注" label-class-name="labelClass" content-class-name="contentClass">
{{form.remark}}
</el-descriptions-item>
</el-descriptions>
</layout-view>
</template>
<script>
import view from "@/assets/mixins/view";
export default {
mixins: [view],
components: {
},
methods: {
},
data() {
return {
size:"small",
column:2,
toString:[
],
toArrays: [
],
toDate: [
]
}
}
}
</script>
<style lang="less">
.labelClass{
width: 200px;
}
.el-descriptions__body{
margin-left: 5px;
margin-right: 5px;
color: #606266;
background-color: #FFF;
}
.contentClass{
width: 600px;
}
</style>
\ No newline at end of file
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