Commit c4beeab5 authored by 赵啸非's avatar 赵啸非

Merge remote-tracking branch 'origin/master'

parents 6c73c38c 8c8adc8f
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<div class="text_line"> <div class="text_line">
<div class="text_box"> <div class="text_box">
<span style="width: 160px;">窗口 (单位) 名称:</span> <span style="width: 160px;">窗口 (单位) 名称:</span>
<span>{{ form.deptName || "--" }}</span> <span>{{ windowName || "--" }}</span>
</div> </div>
<div class="text_box"> <div class="text_box">
<span>登记年月:</span> <span>登记年月:</span>
...@@ -301,6 +301,7 @@ export default { ...@@ -301,6 +301,7 @@ export default {
}, },
data() { data() {
return { return {
windowName: "",
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 弹出层标题 // 弹出层标题
...@@ -324,6 +325,7 @@ export default { ...@@ -324,6 +325,7 @@ export default {
}, },
/** 编辑 */ /** 编辑 */
async edit(row) { async edit(row) {
this.windowName = row.windowName;
// this.reset(); // this.reset();
// this.query = { id: row.id }; // this.query = { id: row.id };
this.urls.saveUrl = "check/window/workman/perform/examine"; this.urls.saveUrl = "check/window/workman/perform/examine";
...@@ -429,14 +431,13 @@ export default { ...@@ -429,14 +431,13 @@ export default {
// this.getData(); // this.getData();
// this.pageInfo.type = "view"; // this.pageInfo.type = "view";
// this.title = "窗口人员考核汇总核查详细"; // this.title = "窗口人员考核汇总核查详细";
this.windowName = row.windowName;
this.form = row; this.form = row;
this.reset(); this.reset();
this.query = { id: row.id }; this.query = { id: row.id };
await this.$get("/window/workman/perform/info", { await this.$get("/window/workman/perform/info", {
id: row.recordId, id: row.recordId,
}).then((res) => { }).then((res) => {
console.log(res);
if (res.code == 1) { if (res.code == 1) {
this.form = res.data; this.form = res.data;
this.form.id = row.id; this.form.id = row.id;
......
...@@ -12,7 +12,10 @@ ...@@ -12,7 +12,10 @@
</div> </div>
</div> </div>
<div class="user-right"> <div class="user-right">
<div class="n">{{ form.totalScore }}</div> <div class="n">{{ form.otherScore }}</div>
<div class="m">{{ form.month }}月自评绩效得分</div>
<div class="n" style="margin-top: 10px;">{{ form.totalScore }}</div>
<div class="m">{{ form.month }}月得分</div> <div class="m">{{ form.month }}月得分</div>
</div> </div>
</div> </div>
......
<template> <template>
<layout-view> <layout-view>
<el-descriptions :title="title" :column="column" :size="size" :colon="false" border> <el-descriptions
<template slot="title"> :title="title"
<i class="el-icon-tickets"></i> :column="column"
基本详细信息 :size="size"
</template> :colon="false"
<template slot="extra"> border
<el-button type="primary" @click="$router.go(-1)" size="small">返回</el-button> >
</template> <template slot="title">
<el-descriptions-item label="人员id" label-class-name="labelClass" content-class-name="contentClass"> <i class="el-icon-tickets"></i>
{{form.staffId}} 基本详细信息
</el-descriptions-item> </template>
<el-descriptions-item label="工号" label-class-name="labelClass" content-class-name="contentClass"> <template slot="extra">
{{form.workNum}} <el-button type="primary" @click="$router.go(-1)" size="small"
</el-descriptions-item> >返回</el-button
<el-descriptions-item label="人员名称" label-class-name="labelClass" content-class-name="contentClass"> >
{{form.staffName}} </template>
</el-descriptions-item> <el-descriptions-item
<el-descriptions-item label="部门id号" label-class-name="labelClass" content-class-name="contentClass"> label="人员id"
{{form.deptId}} label-class-name="labelClass"
</el-descriptions-item> content-class-name="contentClass"
<el-descriptions-item label="部门名称" label-class-name="labelClass" content-class-name="contentClass"> >
{{form.deptName}} {{ form.staffId }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="考勤绩效指标分数" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item
{{form.attendScore}} label="工号"
</el-descriptions-item> label-class-name="labelClass"
<el-descriptions-item label="评价绩效指标分数" label-class-name="labelClass" content-class-name="contentClass"> content-class-name="contentClass"
{{form.assessScore}} >
</el-descriptions-item> {{ form.workNum }}
<el-descriptions-item label="办件绩效分数" label-class-name="labelClass" content-class-name="contentClass"> </el-descriptions-item>
{{form.workScore}} <el-descriptions-item
</el-descriptions-item> label="人员名称"
<el-descriptions-item label="效能绩效分数" label-class-name="labelClass" content-class-name="contentClass"> label-class-name="labelClass"
{{form.effectScore}} content-class-name="contentClass"
</el-descriptions-item> >
<el-descriptions-item label="自评绩效分数" label-class-name="labelClass" content-class-name="contentClass"> {{ form.staffName }}
{{form.otherScore}} </el-descriptions-item>
</el-descriptions-item> <el-descriptions-item
<el-descriptions-item label="累计异常分数" label-class-name="labelClass" content-class-name="contentClass"> label="部门id号"
{{form.errorScore}} label-class-name="labelClass"
</el-descriptions-item> content-class-name="contentClass"
<el-descriptions-item label="当月得分数" label-class-name="labelClass" content-class-name="contentClass"> >
{{form.totalScore}} {{ form.deptId }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="备注" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item
{{form.remark}} label="部门名称"
</el-descriptions-item> label-class-name="labelClass"
<el-descriptions-item label="年" label-class-name="labelClass" content-class-name="contentClass"> content-class-name="contentClass"
{{form.year}} >
</el-descriptions-item> {{ form.deptName }}
<el-descriptions-item label="月" label-class-name="labelClass" content-class-name="contentClass"> </el-descriptions-item>
{{form.month}} <el-descriptions-item
</el-descriptions-item> label="考勤绩效指标分数"
</el-descriptions> label-class-name="labelClass"
content-class-name="contentClass"
</layout-view> >
{{ form.attendScore }}
</el-descriptions-item>
<el-descriptions-item
label="评价绩效指标分数"
label-class-name="labelClass"
content-class-name="contentClass"
>
{{ form.assessScore }}
</el-descriptions-item>
<el-descriptions-item
label="办件绩效分数"
label-class-name="labelClass"
content-class-name="contentClass"
>
{{ form.workScore }}
</el-descriptions-item>
<el-descriptions-item
label="效能绩效分数"
label-class-name="labelClass"
content-class-name="contentClass"
>
{{ form.effectScore }}
</el-descriptions-item>
<el-descriptions-item
label="自评绩效分数"
label-class-name="labelClass"
content-class-name="contentClass"
>
{{ form.otherScore }}
</el-descriptions-item>
<el-descriptions-item
label="累计异常分数"
label-class-name="labelClass"
content-class-name="contentClass"
>
{{ form.errorScore }}
</el-descriptions-item>
<el-descriptions-item
label="当月得分数"
label-class-name="labelClass"
content-class-name="contentClass"
>
{{ form.totalScore }}
</el-descriptions-item>
<el-descriptions-item
label="备注"
label-class-name="labelClass"
content-class-name="contentClass"
>
{{ form.remark }}
</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>
</layout-view>
</template> </template>
<script> <script>
import view from "@/assets/mixins/view"; import view from "@/assets/mixins/view";
export default { export default {
mixins: [view], mixins: [view],
components: { components: {},
}, methods: {},
methods: { data() {
return {
}, size: "small",
data() { column: 2,
return { toString: ["month"],
size:"small", toArrays: [],
column:2, toDate: [],
toString:[ };
"month", },
], };
toArrays: [
],
toDate: [
]
}
}
}
</script> </script>
<style lang="less"> <style lang="less">
.labelClass{ .labelClass {
width: 200px; width: 200px;
} }
.el-descriptions__body{ .el-descriptions__body {
margin-left: 5px; margin-left: 5px;
margin-right: 5px; margin-right: 5px;
color: #606266; color: #606266;
background-color: #FFF; background-color: #fff;
} }
.contentClass{ .contentClass {
width: 600px; width: 600px;
} }
</style> </style>
\ No newline at end of file
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<div class="text_line"> <div class="text_line">
<div class="text_box"> <div class="text_box">
<span style="width: 160px;">窗口 (单位) 名称:</span> <span style="width: 160px;">窗口 (单位) 名称:</span>
<span>{{ form.deptName || "--" }}</span> <span>{{ windowName || "--" }}</span>
</div> </div>
<div class="text_box"> <div class="text_box">
<span>登记年月:</span> <span>登记年月:</span>
...@@ -301,6 +301,7 @@ export default { ...@@ -301,6 +301,7 @@ export default {
}, },
data() { data() {
return { return {
windowName: "",
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 弹出层标题 // 弹出层标题
...@@ -324,6 +325,7 @@ export default { ...@@ -324,6 +325,7 @@ export default {
}, },
/** 编辑 */ /** 编辑 */
async edit(row) { async edit(row) {
this.windowName = row.windowName;
// this.reset(); // this.reset();
// this.query = { id: row.id }; // this.query = { id: row.id };
this.urls.currUrl = "check/window/workman/perform/save"; this.urls.currUrl = "check/window/workman/perform/save";
...@@ -421,6 +423,7 @@ export default { ...@@ -421,6 +423,7 @@ export default {
}, },
/** 查看*/ /** 查看*/
async view(row) { async view(row) {
this.windowName = row.windowName;
// this.reset(); // this.reset();
// this.query = { id: row.id }; // this.query = { id: row.id };
// this.urls.currUrl = "check/window/workman/perform/view"; // this.urls.currUrl = "check/window/workman/perform/view";
......
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