Skip to content

A
attendance-performance-platform
Commit 2f07af48 authored by 廖旭伟's avatar 廖旭伟
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents de043183 47295783
Hide whitespace changes
Inline Side-by-side
Showing with 196 additions and 41 deletions
attendance-performance-manager-ui/admin/src/views/check/window/perform/drawershow.vue
View file @ 2f07af48
......@@ -41,7 +41,17 @@
<div class="text_line">
<div class="text_box">
<span style="width: 120px;">加分申报：</span>
<span>{{ form.bonusReport ? form.bonusReport : "--" }}</span>
<span v-if="form.bonusarrText">
<span
style="width: auto;"
v-for="val in form.bonusarrText"
:key="val.id"
>{{ val.content }}（{{
dict.subAddType[val.subAddType] + val.score
}}分）</span
>
</span>
<span v-else>--</span>
</div>
</div>
<div class="text_line">
......@@ -62,7 +72,17 @@
<div class="text_line">
<div class="text_box">
<span style="width: 140px;">扣分情况：</span>
<span>{{ form.deductStatement ? form.deductStatement : "--" }}</span>
<span v-if="form.deductarrText">
<span
style="width: auto;"
v-for="val in form.deductarrText"
:key="val.id"
>{{ val.content }}（{{
dict.subAddType[val.subAddType] + val.score
}}分）</span
>
</span>
<span v-else>--</span>
</div>
</div>
<div class="text_line">
......@@ -133,7 +153,7 @@
style="display: flex; justify-content: space-between;"
>
<span class="left">
{{ form.manageCheckResult }}
{{ dict.manageCheckResult[form.manageCheckResult] }}
</span>
<span class="right">
{{ form.manageCheckPerson }}
......@@ -144,7 +164,7 @@
<el-radio
v-for="(val, i) in dict.manageCheckResult"
:key="i"
:label="val"
:label="i"
>{{ val }}</el-radio
>
</el-radio-group>
......@@ -163,7 +183,7 @@
style="display: flex; justify-content: space-between;"
>
<span class="left">
{{ form.leaderCheckResult }}
{{ dict.leaderCheckResult[form.leaderCheckResult] }}
</span>
<span class="right">
{{ form.leaderCheckPerson }}
......@@ -174,7 +194,7 @@
<el-radio
v-for="(val, i) in dict.leaderCheckResult"
:key="i"
:label="val"
:label="i"
>{{ val }}</el-radio
>
</el-radio-group>
......@@ -379,7 +399,7 @@ export default {
// 遮罩层
loading: true,
// 弹出层标题
title: "窗口考核核查",
title: "市政务服务大厅窗口考核登记表",
// 是否显示弹出层
open: false,
direction: "rtl",
......@@ -434,11 +454,41 @@ export default {
(response) => {
if (response.code == 1) {
this.form = { ...this.form, ...response.data };
this.dict = { ...this.dict, ...response.dict };
this.$post("/perform/rules/list", {
page: 1,
size: -1,
}).then((responsed) => {
if (responsed.code == 1) {
this.dict = { ...this.dict, ...responsed.dict };
if (this.form.bonusReport && this.form.bonusReport != "[]") {
let bonusArr = [];
bonusArr = JSON.parse(this.form.bonusReport);
let bonusarrText = responsed.data.data.filter((item) =>
bonusArr.includes(item.id)
);
this.form.bonusarrText = bonusarrText;
}
if (
this.form.deductStatement &&
this.form.deductStatement != "[]"
) {
let deductArr = [];
deductArr = JSON.parse(this.form.deductStatement);
let deductarrText = responsed.data.data.filter((item) =>
deductArr.includes(item.id)
);
this.form.deductarrText = deductarrText;
}
this.form.view = "修改";
this.open = true;
}
});
}
}
);
this.tableData = [];
this.tableData.push({
discipline: this.form["discipline"] ? this.form["discipline"] : "--",
......@@ -453,11 +503,9 @@ export default {
: "黑旗窗口"
: "--",
});
this.form.view = "修改";
this.open = true;
});
this.pageInfo.type = "edit";
this.title = "自评绩效核查";
this.title = "市政务服务大厅窗口考核登记表";
},
/** 新增 */
add(row) {
......@@ -506,6 +554,35 @@ export default {
this.form = { ...this.form, ...response.data };
this.dict = { ...this.dict, ...response.dict };
this.$post("/perform/rules/list", {
page: 1,
size: -1,
}).then((responsed) => {
if (responsed.code == 1) {
this.dict = { ...this.dict, ...responsed.dict };
if (this.form.bonusReport && this.form.bonusReport != "[]") {
let bonusArr = [];
bonusArr = JSON.parse(this.form.bonusReport);
let bonusarrText = responsed.data.data.filter((item) =>
bonusArr.includes(item.id)
);
this.form.bonusarrText = bonusarrText;
}
if (
this.form.deductStatement &&
this.form.deductStatement != "[]"
) {
let deductArr = [];
deductArr = JSON.parse(this.form.deductStatement);
let deductarrText = responsed.data.data.filter((item) =>
deductArr.includes(item.id)
);
this.form.deductarrText = deductarrText;
}
this.form.view = "查看";
this.open = true;
}
});
}
}
);
......@@ -523,11 +600,9 @@ export default {
: "黑旗窗口"
: "--",
});
this.form.view = "查看";
this.open = true;
});
this.pageInfo.type = "view";
this.title = "自评绩效核查信息详细";
this.title = "市政务服务大厅窗口考核登记表";
},
/**取消按钮 */
cancel() {
......
attendance-performance-manager-ui/admin/src/views/check/window/workman/perform/drawershow.vue
View file @ 2f07af48
......@@ -10,7 +10,7 @@
<div class="content_box">
<div class="text_line">
<div class="text_box">
<span>窗口负责人：</span>
<span style="width: 160px;">窗门 (单位) 名称：</span>
<span>{{ form.ownerName || "--" }}</span>
</div>
<div class="text_box">
......@@ -129,7 +129,7 @@
style="display: flex; justify-content: space-between;"
>
<span class="left">
{{ form.manageCheckResult }}
{{ dict.manageCheckResult[form.manageCheckResult] }}
</span>
<span class="right">
{{ form.manageCheckPerson }}
......@@ -140,7 +140,7 @@
<el-radio
v-for="(val, i) in dict.manageCheckResult"
:key="i"
:label="val"
:label="i"
>{{ val }}</el-radio
>
</el-radio-group>
......@@ -304,7 +304,7 @@ export default {
// 遮罩层
loading: true,
// 弹出层标题
title: "窗口人员考核汇总核查",
title: "市政务服务大厅窗口工作人员考核汇总表",
// 是否显示弹出层
open: false,
direction: "rtl",
......@@ -348,7 +348,7 @@ export default {
this.open = true;
});
this.pageInfo.type = "edit";
this.title = "窗口人员自评绩效核查";
this.title = "市政务服务大厅窗口工作人员考核汇总表";
// await this.$get("/check/window/workman/perform/info", {
// id: row.id,
// }).then((res) => {
......@@ -456,7 +456,7 @@ export default {
);
});
this.pageInfo.type = "view";
this.title = "窗口人员自评绩效核查信息详细";
this.title = "市政务服务大厅窗口工作人员考核汇总表";
// this.form = row;
// this.reset();
// this.query = { id: row.id };
......
attendance-performance-manager-ui/admin/src/views/window/perform/drawershow.vue
View file @ 2f07af48
......@@ -41,7 +41,17 @@
<div class="text_line">
<div class="text_box">
<span style="width: 140px;">加分申报：</span>
<span>{{ form.bonusReport ? form.bonusReport : "--" }}</span>
<span v-if="form.bonusarrText">
<span
style="width: auto;"
v-for="val in form.bonusarrText"
:key="val.id"
>{{ val.content }}（{{
dict.subAddType[val.subAddType] + val.score
}}分）</span
>
</span>
<span v-else>--</span>
</div>
</div>
<div class="text_line">
......@@ -62,7 +72,17 @@
<div class="text_line">
<div class="text_box">
<span style="width: 140px;">扣分情况：</span>
<span>{{ form.deductStatement ? form.deductStatement : "--" }}</span>
<span v-if="form.deductarrText">
<span
style="width: auto;"
v-for="val in form.deductarrText"
:key="val.id"
>{{ val.content }}（{{
dict.subAddType[val.subAddType] + val.score
}}分）
</span>
</span>
<span v-else>--</span>
</div>
</div>
<div class="text_line">
......@@ -133,7 +153,7 @@
style="display: flex; justify-content: space-between;"
>
<span class="left">
{{ form.manageCheckResult }}
{{ dict.manageCheckResult[form.manageCheckResult] }}
</span>
<span class="right">
{{ form.manageCheckPerson }}
......@@ -144,7 +164,7 @@
<el-radio
v-for="(val, i) in dict.manageCheckResult"
:key="i"
:label="val"
:label="i"
>{{ val }}</el-radio
>
</el-radio-group>
......@@ -163,7 +183,7 @@
style="display: flex; justify-content: space-between;"
>
<span class="left">
{{ form.leaderCheckResult }}
{{ dict.leaderCheckResult[form.leaderCheckResult] }}
</span>
<span class="right">
{{ form.leaderCheckPerson }}
......@@ -174,7 +194,7 @@
<el-radio
v-for="(val, i) in dict.leaderCheckResult"
:key="i"
:label="val"
:label="i"
>{{ val }}</el-radio
>
</el-radio-group>
......@@ -379,7 +399,7 @@ export default {
// 遮罩层
loading: true,
// 弹出层标题
title: "窗口考核核查",
title: "市政务服务大厅窗口考核登记表",
// 是否显示弹出层
open: false,
direction: "rtl",
......@@ -435,9 +455,39 @@ export default {
this.form = { ...this.form, ...response.data };
this.dict = { ...this.dict, ...response.dict };
this.$post("/perform/rules/list", {
page: 1,
size: -1,
}).then((responsed) => {
if (responsed.code == 1) {
this.dict = { ...this.dict, ...responsed.dict };
if (this.form.bonusReport && this.form.bonusReport != "[]") {
let bonusArr = [];
bonusArr = JSON.parse(this.form.bonusReport);
let bonusarrText = responsed.data.data.filter((item) =>
bonusArr.includes(item.id)
);
this.form.bonusarrText = bonusarrText;
}
if (
this.form.deductStatement &&
this.form.deductStatement != "[]"
) {
let deductArr = [];
deductArr = JSON.parse(this.form.deductStatement);
let deductarrText = responsed.data.data.filter((item) =>
deductArr.includes(item.id)
);
this.form.deductarrText = deductarrText;
}
this.form.view = "修改";
this.open = true;
}
});
}
}
);
this.tableData = [];
this.tableData.push({
discipline: this.form["discipline"] ? this.form["discipline"] : "--",
......@@ -452,11 +502,9 @@ export default {
: "黑旗窗口"
: "--",
});
this.form.view = "修改";
this.open = true;
});
this.pageInfo.type = "edit";
this.title = "自评绩效核查";
this.title = "市政务服务大厅窗口考核登记表";
},
/** 新增 */
add(row) {
......@@ -464,7 +512,7 @@ export default {
this.urls.currUrl = "check/window/perform/add";
this.getData();
this.pageInfo.type = "add";
this.title = "新增窗口考核核查";
this.title = "市政务服务大厅窗口考核登记表";
},
/** 查看*/
async view(row) {
......@@ -505,9 +553,43 @@ export default {
this.form = { ...this.form, ...response.data };
this.dict = { ...this.dict, ...response.dict };
this.$post("/perform/rules/list", {
page: 1,
size: -1,
}).then((responsed) => {
if (responsed.code == 1) {
this.dict = { ...this.dict, ...responsed.dict };
if (this.form.bonusReport && this.form.bonusReport != "[]") {
let bonusArr = [];
bonusArr = JSON.parse(this.form.bonusReport);
let bonusarrText = responsed.data.data.filter((item) =>
bonusArr.includes(item.id)
);
this.form.bonusarrText = bonusarrText;
}
if (
this.form.deductStatement &&
this.form.deductStatement != "[]"
) {
let deductArr = [];
deductArr = JSON.parse(this.form.deductStatement);
let deductarrText = responsed.data.data.filter((item) =>
deductArr.includes(item.id)
);
this.form.deductarrText = deductarrText;
}
this.form.view = "查看";
this.open = true;
}
});
}
}
);
// this.$get("/perform/rules/list").then((response) => {
// if (response.code == 1) {
// console.log(response);
// }
// });
this.tableData = [];
this.tableData.push({
discipline: this.form["discipline"] ? this.form["discipline"] : "--",
......@@ -522,11 +604,9 @@ export default {
: "黑旗窗口"
: "--",
});
this.form.view = "查看";
this.open = true;
});
this.pageInfo.type = "view";
this.title = "自评绩效核查信息详细";
this.title = "市政务服务大厅窗口考核登记表";
},
/**取消按钮 */
cancel() {
......
attendance-performance-manager-ui/admin/src/views/window/workman/perform/drawershow.vue
View file @ 2f07af48
......@@ -10,7 +10,7 @@
<div class="content_box">
<div class="text_line">
<div class="text_box">
<span>窗口负责人：</span>
<span style="width: 160px;">窗门 (单位) 名称:</span>
<span>{{ form.ownerName || "--" }}</span>
</div>
<div class="text_box">
......@@ -129,7 +129,7 @@
style="display: flex; justify-content: space-between;"
>
<span class="left">
{{ form.manageCheckResult }}
{{ dict.manageCheckResult[form.manageCheckResult] }}
</span>
<span class="right">
{{ form.manageCheckPerson }}
......@@ -140,7 +140,7 @@
<el-radio
v-for="(val, i) in dict.manageCheckResult"
:key="i"
:label="val"
:label="i"
>{{ val }}</el-radio
>
</el-radio-group>
......@@ -346,7 +346,7 @@ export default {
this.open = true;
});
this.pageInfo.type = "edit";
this.title = "窗口人员自评绩效核查";
this.title = "市政务服务大厅窗口工作人员考核汇总表";
// await this.$get("/check/window/workman/perform/info", {
// id: row.id,
// }).then((res) => {
......@@ -417,7 +417,7 @@ export default {
this.urls.currUrl = "check/window/workman/perform/add";
this.getData();
this.pageInfo.type = "add";
this.title = "新增窗口人员考核汇总核查";
this.title = "市政务服务大厅窗口工作人员考核汇总表";
},
/** 查看*/
async view(row) {
......@@ -492,7 +492,7 @@ export default {
this.open = true;
});
this.pageInfo.type = "view";
this.title = "窗口人员自评绩效核查信息详细";
this.title = "市政务服务大厅窗口工作人员考核汇总表";
},
/**取消按钮 */
cancel() {
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/window/service/impl/WindowPerformServiceImpl.java
View file @ 2f07af48
......@@ -166,7 +166,7 @@ public class WindowPerformServiceImpl extends AbstractCRUDServiceImpl<WindowPerf
allList.addAll(collect);
}
allList = allList.stream().sorted(Comparator.comparing(WindowPerformAllVo::getFillDate)).collect(Collectors.toList());
allList = allList.stream().sorted(Comparator.comparing(WindowPerformAllVo::getFillDate).reversed()).collect(Collectors.toList());
return Rest.ok(allList);
......
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