Skip to content

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

Merge remote-tracking branch 'origin/master'

parents cc6c0472 34d0dab6
Show whitespace changes
Inline Side-by-side
Showing with 756 additions and 548 deletions
attendance-performance-manager-ui/admin/src/assets/mixins/table.js
View file @ 71bc4695
...@@ -194,10 +194,32 @@ export default { ...@@ -194,10 +194,32 @@ export default {
// 格式化单元格数据 // 格式化单元格数据
formatter(row, column, val) { formatter(row, column, val) {
const content = formatter(this.tableData, column, val); const content = formatter(this.tableData, column, val);
return content ? ( return content == 0 ? (
<el-tag type={"info"} size="mini">
{content}
</el-tag>
) : content ? (
content == "未处理" ? (
<el-tag type={"danger"} size="mini">
{content}
</el-tag>
) : content == "已处理" ? (
<el-tag type={"success"} size="mini">
{content}
</el-tag>
) : row.subAddType == 1 && column.label.includes("分值") ? (
<el-tag type={"info"} size="mini">
{content}
</el-tag>
) : row.subAddType == 2 && column.label.includes("分值") ? (
<el-tag type={"info"} size="mini">
{-content}
</el-tag>
) : (
<el-tag type={"info"} size="mini"> <el-tag type={"info"} size="mini">
{content} {content}
</el-tag> </el-tag>
)
) : ( ) : (
val val
); );
......
attendance-performance-manager-ui/admin/src/components/DataTable.vue
View file @ 71bc4695
...@@ -112,13 +112,13 @@ export default { ...@@ -112,13 +112,13 @@ export default {
return !this.loading && !this.tableData.length ? "暂无数据" : "加载中..."; return !this.loading && !this.tableData.length ? "暂无数据" : "加载中...";
}, },
}, },
mounted() { mounted() {},
},
watch: { watch: {
tableData(val) { tableData(val) {
val.length == 0 || val.length > 0 val.length == 0 || val.length > 0
? (this.emptytxt = "暂无数据") ? (this.emptytxt = "暂无数据")
: (this.emptytxt = "加载中..."); : (this.emptytxt = "加载中...");
}, },
}, },
methods: {}, methods: {},
......
attendance-performance-manager-ui/admin/src/views/check/attend/record/drawershow.vue
View file @ 71bc4695
...@@ -49,18 +49,23 @@ ...@@ -49,18 +49,23 @@
> >
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12" <el-col :span="12">
>扣分方式：{{ form.subMethod ? form.subMethod : "--" }}</el-col {{ form.subAddType == 1 ? "加分方式：" : "扣分方式：" }}
{{
form.subMethod ? dict.subMethod[form.subMethod] : "--"
}}</el-col
> >
<el-col :span="12" <el-col :span="12">
>扣分时间：{{ form.deductTime ? form.deductTime : "--" }}</el-col {{ form.subAddType == 1 ? "加分时间：" : "扣分时间：" }}
{{ form.deductTime ? form.deductTime : "--" }}</el-col
> >
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12" <el-col :span="12">
>扣分人员：{{ {{ form.subAddType == 1 ? "加分人员：" : "扣分人员：" }}
form.deductPerson ? form.deductPerson : "--" {{ form.deductPerson ? form.deductPerson : "--" }}</el-col
}}</el-col
> >
<el-col :span="12" <el-col :span="12"
>图片凭证：{{ >图片凭证：{{
...@@ -135,11 +140,16 @@ ...@@ -135,11 +140,16 @@
</el-form-item> </el-form-item>
</el-row> </el-row>
<el-row> <el-row>
<el-form-item label="加分/扣除分值："> <el-form-item
:label="form.subAddType == 1 ? '加分分值：' : '扣分分值：'"
>
<p v-if="form.view == '查看'"> <p v-if="form.view == '查看'">
{{form.subAddType==1?'+':'-'}} {{ form.score ? form.score : "--" }} {{ form.subAddType == 1 ? "+" : "-"
}}{{ form.score ? form.score : "--" }}
</p>
<p v-else>
{{ form.subAddType == 1 ? "+" : "-" }}{{ form.score }}
</p> </p>
<p v-else>{{form.subAddType==1?'+':'-'}}{{ form.score }}</p>
</el-form-item> </el-form-item>
</el-row> </el-row>
</div> </div>
...@@ -368,7 +378,8 @@ export default { ...@@ -368,7 +378,8 @@ export default {
kaoqinCateArr: [], kaoqinCateArr: [],
kaoqinArr: [], kaoqinArr: [],
baseUrl: process.env.VUE_APP_API_BASE_URL + "/", baseUrl: process.env.VUE_APP_API_BASE_URL + "/",
urls:{saveUrl:'/check/attend/record/examine'}//重写核查地址 subMethodObj: {},
urls: { saveUrl: "/check/attend/record/examine" }, //重写核查地址
}; };
}, },
computed: {}, computed: {},
...@@ -384,7 +395,9 @@ export default { ...@@ -384,7 +395,9 @@ export default {
return ( return (
<el-image <el-image
src={val.indexOf("http") == -1 ? this.baseUrl + val : val} src={val.indexOf("http") == -1 ? this.baseUrl + val : val}
preview-src-list={val.indexOf("http") == -1 ? this.baseUrl + val : val} preview-src-list={
val.indexOf("http") == -1 ? this.baseUrl + val : val
}
style="width: 100px" style="width: 100px"
></el-image> ></el-image>
); );
...@@ -409,16 +422,18 @@ export default { ...@@ -409,16 +422,18 @@ export default {
}); });
}, },
/** 编辑 */ /** 编辑 */
edit(row) { async edit(row) {
this.reset(); this.reset();
this.query = { id: row.id }; this.query = { id: row.id };
// this.urls.currUrl = "check/attend/record/edit"; // this.urls.currUrl = "check/attend/record/edit";
// this.getData(); // this.getData();
this.$get("/check/attend/record/info", { id: row.id }).then((res) => { await this.$get("/check/attend/record/info", { id: row.id }).then(
(res) => {
console.log(res.data); console.log(res.data);
if (res.code == 1) { if (res.code == 1) {
this.form = res.data; this.form = res.data;
this.dict = res.dict;
} else { } else {
this.form = row; this.form = row;
} }
...@@ -438,9 +453,17 @@ export default { ...@@ -438,9 +453,17 @@ export default {
: ""; : "";
} }
this.form.checkResult = 1; this.form.checkResult = 1;
this.$post("/perform/rules/list", {
page: 1,
size: -1,
categoryId: this.form.categoryId,
}).then((res) => {
this.ruleArr = res.data.data;
});
this.form.view = "核查"; this.form.view = "核查";
this.open = true; this.open = true;
}); }
);
this.pageInfo.type = "edit"; this.pageInfo.type = "edit";
row.view == "核查" row.view == "核查"
? (this.title = "考勤绩效记录核查") ? (this.title = "考勤绩效记录核查")
...@@ -455,14 +478,16 @@ export default { ...@@ -455,14 +478,16 @@ export default {
this.title = "新增考勤绩效记录核查信息"; this.title = "新增考勤绩效记录核查信息";
}, },
/** 查看*/ /** 查看*/
view(row) { async view(row) {
this.reset(); this.reset();
this.query = { id: row.id }; this.query = { id: row.id };
// this.urls.currUrl = "check/attend/record/view"; // this.urls.currUrl = "check/attend/record/view";
// this.getData(); // this.getData();
this.$get("/check/attend/record/info", { id: row.id }).then((res) => { await this.$get("/check/attend/record/info", { id: row.id }).then(
(res) => {
if (res.code == 1) { if (res.code == 1) {
this.form = res.data; this.form = res.data;
this.dict = res.dict;
} else { } else {
this.form = row; this.form = row;
} }
...@@ -484,7 +509,8 @@ export default { ...@@ -484,7 +509,8 @@ export default {
this.form.view = "查看"; this.form.view = "查看";
console.log(this.form); console.log(this.form);
this.open = true; this.open = true;
}); }
);
this.pageInfo.type = "view"; this.pageInfo.type = "view";
this.title = "考勤绩效记录核查信息详细"; this.title = "考勤绩效记录核查信息详细";
}, },
......
attendance-performance-manager-ui/admin/src/views/check/attend/record/list.vue
View file @ 71bc4695
...@@ -218,17 +218,17 @@ export default { ...@@ -218,17 +218,17 @@ export default {
{ label: "绩效规则", prop: "ruleName" }, { label: "绩效规则", prop: "ruleName" },
{ label: "扣分方式", prop: "subMethod", formatter: this.formatter }, { label: "加分/扣分方式", prop: "subMethod", formatter: this.formatter },
{ {
label: "扣分时间", label: "加分/扣分时间",
prop: "deductTime", prop: "deductTime",
formatter: this.formatterDate, formatter: this.formatterDate,
}, },
{ label: "扣分人员", prop: "deductPerson" }, { label: "加分/扣分人员", prop: "deductPerson" },
{ label: "扣分分值", prop: "score", formatter: this.formatter }, { label: "分值", prop: "score", formatter: this.formatter },
{ {
label: "处理状态", label: "处理状态",
......
attendance-performance-manager-ui/admin/src/views/check/complain/record/drawershow.vue
View file @ 71bc4695
...@@ -65,18 +65,23 @@ ...@@ -65,18 +65,23 @@
> >
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12" <el-col :span="12">
>扣分方式：{{ form.subMethod ? form.subMethod : "--" }}</el-col {{ form.subAddType == 1 ? "加分方式：" : "扣分方式：" }}
>
<el-col :span="12" {{
>扣分人员：{{ form.subMethod ? dict.subMethod[form.subMethod] : "--"
form.deductPerson ? form.deductPerson : "--"
}}</el-col }}</el-col
> >
<el-col :span="12">
{{ form.subAddType == 1 ? "加分人员：" : "扣分人员：" }}
{{ form.deductPerson ? form.deductPerson : "--" }}</el-col
>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12" <el-col :span="12">
>扣分时间：{{ form.deductTime ? form.deductTime : "--" }}</el-col {{ form.subAddType == 1 ? "加分时间：" : "扣分时间：" }}
{{ form.deductTime ? form.deductTime : "--" }}</el-col
> >
<el-col :span="12" <el-col :span="12"
>图片凭证：{{ >图片凭证：{{
...@@ -151,11 +156,16 @@ ...@@ -151,11 +156,16 @@
</el-form-item> </el-form-item>
</el-row> </el-row>
<el-row> <el-row>
<el-form-item label="加分/扣除分值："> <el-form-item
:label="form.subAddType == 1 ? '加分分值：' : '扣分分值：'"
>
<p v-if="form.view == '查看'"> <p v-if="form.view == '查看'">
{{form.subAddType==1?'+':'-'}} {{ form.score ? form.score : "--" }} {{ form.subAddType == 1 ? "+" : "-"
}}{{ form.score ? form.score : "--" }}
</p>
<p v-else>
{{ form.subAddType == 1 ? "+" : "-" }}{{ form.score }}
</p> </p>
<p v-else>{{form.subAddType==1?'+':'-'}} {{ form.score }}</p>
</el-form-item> </el-form-item>
</el-row> </el-row>
</div> </div>
...@@ -285,7 +295,7 @@ ...@@ -285,7 +295,7 @@
placeholder="请输入规则名称" placeholder="请输入规则名称"
/> />
<Field <Field
label="扣分方式" label="加分/扣分方式"
prop="subMethod" prop="subMethod"
v-model="form.subMethod" v-model="form.subMethod"
type="select" type="select"
...@@ -293,13 +303,13 @@ ...@@ -293,13 +303,13 @@
placeholder="请选择扣分方式" placeholder="请选择扣分方式"
/> />
<Field <Field
label="扣分人员" label="加分/扣分人员"
prop="deductPerson" prop="deductPerson"
v-model="form.deductPerson" v-model="form.deductPerson"
placeholder="请输入扣分人员" placeholder="请输入扣分人员"
/> />
<Field <Field
label="扣分时间" label="加分/扣分时间"
prop="deductTime" prop="deductTime"
v-model="form.deductTime" v-model="form.deductTime"
type="date" type="date"
...@@ -404,7 +414,7 @@ export default { ...@@ -404,7 +414,7 @@ export default {
kaoqinCateArr: [], kaoqinCateArr: [],
kaoqinArr: [], kaoqinArr: [],
baseUrl: process.env.VUE_APP_API_BASE_URL + "/", baseUrl: process.env.VUE_APP_API_BASE_URL + "/",
urls:{saveUrl:'/check/complain/record/examine'}//重写核查地址 urls: { saveUrl: "/check/complain/record/examine" }, //重写核查地址
}; };
}, },
...@@ -418,7 +428,9 @@ export default { ...@@ -418,7 +428,9 @@ export default {
return ( return (
<el-image <el-image
src={val.indexOf("http") == -1 ? this.baseUrl + val : val} src={val.indexOf("http") == -1 ? this.baseUrl + val : val}
preview-src-list={val.indexOf("http") == -1 ? this.baseUrl + val : val} preview-src-list={
val.indexOf("http") == -1 ? this.baseUrl + val : val
}
style="width: 100px" style="width: 100px"
></el-image> ></el-image>
); );
...@@ -442,16 +454,18 @@ export default { ...@@ -442,16 +454,18 @@ export default {
}); });
}, },
/** 编辑 */ /** 编辑 */
edit(row) { async edit(row) {
this.form = row; this.form = row;
this.reset(); this.reset();
this.query = { id: row.id }; this.query = { id: row.id };
// this.urls.currUrl = "check/complain/record/edit"; // this.urls.currUrl = "check/complain/record/edit";
// this.getData(); // this.getData();
this.$get("/check/complain/record/info", { id: row.id }).then((res) => { await this.$get("/check/complain/record/info", { id: row.id }).then(
(res) => {
console.log(res.data); console.log(res.data);
if (res.code == 1) { if (res.code == 1) {
this.form = res.data; this.form = res.data;
this.dict = res.dict;
} else { } else {
this.form = row; this.form = row;
} }
...@@ -462,18 +476,28 @@ export default { ...@@ -462,18 +476,28 @@ export default {
? (this.form[key] = timestampToTime(this.form[key], 6)) ? (this.form[key] = timestampToTime(this.form[key], 6))
: key == "createTime" : key == "createTime"
? (this.form[key] = timestampToTime(this.form[key], 6)) ? (this.form[key] = timestampToTime(this.form[key], 6))
: key == "errorTime" : key == "deductTime"
? (this.form[key] = timestampToTime(this.form[key], 6)) ? (this.form[key] = timestampToTime(this.form[key], 6))
: key == "updateTime" : key == "updateTime"
? (this.form[key] = timestampToTime(this.form[key], 6)) ? (this.form[key] = timestampToTime(this.form[key], 6))
: key == "checkTime" : key == "checkTime"
? (this.form[key] = timestampToTime(this.form[key], 6)) ? (this.form[key] = timestampToTime(this.form[key], 6))
: key == "complainTime"
? (this.form[key] = timestampToTime(this.form[key], 6))
: ""; : "";
} }
this.form.checkResult = 1; this.form.checkResult = 1;
this.$post("/perform/rules/list", {
page: 1,
size: -1,
categoryId: this.form.categoryId,
}).then((res) => {
this.ruleArr = res.data.data;
});
this.form.view = "核查"; this.form.view = "核查";
this.open = true; this.open = true;
}); }
);
this.pageInfo.type = "edit"; this.pageInfo.type = "edit";
row.view == "核查" row.view == "核查"
? (this.title = "评价绩效投诉核查") ? (this.title = "评价绩效投诉核查")
...@@ -488,15 +512,17 @@ export default { ...@@ -488,15 +512,17 @@ export default {
this.title = "新增评价绩效投诉核查信息"; this.title = "新增评价绩效投诉核查信息";
}, },
/** 查看*/ /** 查看*/
view(row) { async view(row) {
this.form = row; this.form = row;
this.reset(); this.reset();
this.query = { id: row.id }; this.query = { id: row.id };
// this.urls.currUrl = "check/complain/record/view"; // this.urls.currUrl = "check/complain/record/view";
// this.getData(); // this.getData();
this.$get("/check/complain/record/info", { id: row.id }).then((res) => { await this.$get("/check/complain/record/info", { id: row.id }).then(
(res) => {
if (res.code == 1) { if (res.code == 1) {
this.form = res.data; this.form = res.data;
this.dict = res.dict;
} else { } else {
this.form = row; this.form = row;
} }
...@@ -507,18 +533,21 @@ export default { ...@@ -507,18 +533,21 @@ export default {
? (this.form[key] = timestampToTime(this.form[key], 6)) ? (this.form[key] = timestampToTime(this.form[key], 6))
: key == "createTime" : key == "createTime"
? (this.form[key] = timestampToTime(this.form[key], 6)) ? (this.form[key] = timestampToTime(this.form[key], 6))
: key == "errorTime" : key == "deductTime"
? (this.form[key] = timestampToTime(this.form[key], 6)) ? (this.form[key] = timestampToTime(this.form[key], 6))
: key == "updateTime" : key == "updateTime"
? (this.form[key] = timestampToTime(this.form[key], 6)) ? (this.form[key] = timestampToTime(this.form[key], 6))
: key == "checkTime" : key == "checkTime"
? (this.form[key] = timestampToTime(this.form[key], 6)) ? (this.form[key] = timestampToTime(this.form[key], 6))
: key == "complainTime"
? (this.form[key] = timestampToTime(this.form[key], 6))
: ""; : "";
} }
this.form.view = "查看"; this.form.view = "查看";
console.log(this.form); console.log(this.form);
this.open = true; this.open = true;
}); }
);
this.pageInfo.type = "view"; this.pageInfo.type = "view";
this.title = "评价绩效投诉核查信息详细"; this.title = "评价绩效投诉核查信息详细";
}, },
......
attendance-performance-manager-ui/admin/src/views/check/complain/record/list.vue
View file @ 71bc4695
...@@ -225,17 +225,17 @@ export default { ...@@ -225,17 +225,17 @@ export default {
{ label: "绩效规则", prop: "ruleNme" }, { label: "绩效规则", prop: "ruleNme" },
{ label: "扣分方式", prop: "subMethod", formatter: this.formatter }, { label: "加分/扣分方式", prop: "subMethod", formatter: this.formatter },
{ {
label: "扣分时间", label: "加分/扣分时间",
prop: "deductTime", prop: "deductTime",
formatter: this.formatterDate, formatter: this.formatterDate,
}, },
{ label: "扣分人员", prop: "deductPerson" }, { label: "加分/扣分人员", prop: "deductPerson" },
{ label: "扣分分值", prop: "score", formatter: this.formatter }, { label: "分值", prop: "score", formatter: this.formatter },
{ {
label: "处理状态", label: "处理状态",
......
attendance-performance-manager-ui/admin/src/views/check/complain/record/view.vue
View file @ 71bc4695
...@@ -56,13 +56,13 @@ ...@@ -56,13 +56,13 @@
<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.ruleName}} {{form.ruleName}}
</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">
{{ util_formatters("subMethod", form.subMethod) }} {{ util_formatters("subMethod", form.subMethod) }}
</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">
{{form.deductPerson}} {{form.deductPerson}}
</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">
{{ util_formatterDate(form.deductTime)}} {{ util_formatterDate(form.deductTime)}}
</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">
......
attendance-performance-manager-ui/admin/src/views/check/effect/record/drawershow.vue
View file @ 71bc4695
...@@ -41,19 +41,22 @@ ...@@ -41,19 +41,22 @@
<el-col :span="12" <el-col :span="12"
>报警时间：{{ form.alarmTime ? form.alarmTime : "--" }}</el-col >报警时间：{{ form.alarmTime ? form.alarmTime : "--" }}</el-col
> >
<el-col :span="12" <el-col :span="12">
>扣分方式：{{ form.subMethod ? form.subMethod : "--" }}</el-col {{ form.subAddType == 1 ? "加分方式：" : "扣分方式：" }}
{{
form.subMethod ? dict.subMethod[form.subMethod] : "--"
}}</el-col
> >
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12" <el-col :span="12">
>扣分时间：{{ form.deductTime ? form.deductTime : "--" }}</el-col {{ form.subAddType == 1 ? "加分时间：" : "扣分时间：" }}
{{ form.deductTime ? form.deductTime : "--" }}</el-col
> >
<el-col :span="12"> <el-col :span="12">
扣分人员：{{ {{ form.subAddType == 1 ? "加分人员：" : "扣分人员：" }}
form.deductPerson ? form.deductPerson : "--" {{ form.deductPerson ? form.deductPerson : "--" }}</el-col
}}</el-col
> >
</el-row> </el-row>
<el-row> <el-row>
...@@ -130,11 +133,16 @@ ...@@ -130,11 +133,16 @@
</el-form-item> </el-form-item>
</el-row> </el-row>
<el-row> <el-row>
<el-form-item label="加分/扣除分值："> <el-form-item
:label="form.subAddType == 1 ? '加分分值：' : '扣分分值：'"
>
<p v-if="form.view == '查看'"> <p v-if="form.view == '查看'">
{{form.subAddType==1?'+':'-'}} {{ form.score ? form.score : "--" }} {{ form.subAddType == 1 ? "+" : "-"
}}{{ form.score ? form.score : "--" }}
</p>
<p v-else>
{{ form.subAddType == 1 ? "+" : "-" }}{{ form.score }}
</p> </p>
<p v-else>{{form.subAddType==1?'+':'-'}} {{ form.score }}</p>
</el-form-item> </el-form-item>
</el-row> </el-row>
</div> </div>
...@@ -258,7 +266,7 @@ ...@@ -258,7 +266,7 @@
placeholder="请输入规则名称" placeholder="请输入规则名称"
/> />
<Field <Field
label="扣分方式" label="加分/扣分方式"
prop="subMethod" prop="subMethod"
v-model="form.subMethod" v-model="form.subMethod"
type="select" type="select"
...@@ -266,13 +274,13 @@ ...@@ -266,13 +274,13 @@
placeholder="请选择扣分方式" placeholder="请选择扣分方式"
/> />
<Field <Field
label="扣分人员" label="加分/扣分人员"
prop="deductPerson" prop="deductPerson"
v-model="form.deductPerson" v-model="form.deductPerson"
placeholder="请输入扣分人员" placeholder="请输入扣分人员"
/> />
<Field <Field
label="扣分时间" label="加分/扣分时间"
prop="deductTime" prop="deductTime"
v-model="form.deductTime" v-model="form.deductTime"
type="date" type="date"
...@@ -377,7 +385,7 @@ export default { ...@@ -377,7 +385,7 @@ export default {
kaoqinCateArr: [], kaoqinCateArr: [],
kaoqinArr: [], kaoqinArr: [],
baseUrl: process.env.VUE_APP_API_BASE_URL + "/", baseUrl: process.env.VUE_APP_API_BASE_URL + "/",
urls:{saveUrl:'/check/effect/record/examine'}//重写核查地址 urls: { saveUrl: "/check/effect/record/examine" }, //重写核查地址
}; };
}, },
...@@ -417,16 +425,18 @@ export default { ...@@ -417,16 +425,18 @@ export default {
}); });
}, },
/** 编辑 */ /** 编辑 */
edit(row) { async edit(row) {
this.form = row; this.form = row;
this.reset(); this.reset();
this.query = { id: row.id }; this.query = { id: row.id };
// this.urls.currUrl = "check/effect/record/edit"; // this.urls.currUrl = "check/effect/record/edit";
// this.getData(); // this.getData();
this.$get("/check/effect/record/info", { id: row.id }).then((res) => { await this.$get("/check/effect/record/info", { id: row.id }).then(
(res) => {
console.log(res.data); console.log(res.data);
if (res.code == 1) { if (res.code == 1) {
this.form = res.data; this.form = res.data;
this.dict = res.dict;
} else { } else {
this.form = row; this.form = row;
} }
...@@ -437,18 +447,30 @@ export default { ...@@ -437,18 +447,30 @@ export default {
? (this.form[key] = timestampToTime(this.form[key], 6)) ? (this.form[key] = timestampToTime(this.form[key], 6))
: key == "createTime" : key == "createTime"
? (this.form[key] = timestampToTime(this.form[key], 6)) ? (this.form[key] = timestampToTime(this.form[key], 6))
: key == "errorTime" : key == "deductTime"
? (this.form[key] = timestampToTime(this.form[key], 6)) ? (this.form[key] = timestampToTime(this.form[key], 6))
: key == "updateTime" : key == "updateTime"
? (this.form[key] = timestampToTime(this.form[key], 6)) ? (this.form[key] = timestampToTime(this.form[key], 6))
: key == "checkTime" : key == "checkTime"
? (this.form[key] = timestampToTime(this.form[key], 6)) ? (this.form[key] = timestampToTime(this.form[key], 6))
: key == "alarmTime"
? (this.form[key] = timestampToTime(this.form[key], 6))
: key == "happenTime"
? (this.form[key] = timestampToTime(this.form[key], 6))
: ""; : "";
} }
this.form.checkResult = 1; this.form.checkResult = 1;
this.$post("/perform/rules/list", {
page: 1,
size: -1,
categoryId: this.form.categoryId,
}).then((res) => {
this.ruleArr = res.data.data;
});
this.form.view = "核查"; this.form.view = "核查";
this.open = true; this.open = true;
}); }
);
this.pageInfo.type = "edit"; this.pageInfo.type = "edit";
row.view == "核查" row.view == "核查"
? (this.title = "效能绩效核查") ? (this.title = "效能绩效核查")
...@@ -463,15 +485,17 @@ export default { ...@@ -463,15 +485,17 @@ export default {
this.title = "新增效能绩效核查信息"; this.title = "新增效能绩效核查信息";
}, },
/** 查看*/ /** 查看*/
view(row) { async view(row) {
this.form = row; this.form = row;
this.reset(); this.reset();
this.query = { id: row.id }; this.query = { id: row.id };
// this.urls.currUrl = "check/effect/record/view"; // this.urls.currUrl = "check/effect/record/view";
// this.getData(); // this.getData();
this.$get("/check/effect/record/info", { id: row.id }).then((res) => { await this.$get("/check/effect/record/info", { id: row.id }).then(
(res) => {
if (res.code == 1) { if (res.code == 1) {
this.form = res.data; this.form = res.data;
this.dict = res.dict;
} else { } else {
this.form = row; this.form = row;
} }
...@@ -482,18 +506,23 @@ export default { ...@@ -482,18 +506,23 @@ export default {
? (this.form[key] = timestampToTime(this.form[key], 6)) ? (this.form[key] = timestampToTime(this.form[key], 6))
: key == "createTime" : key == "createTime"
? (this.form[key] = timestampToTime(this.form[key], 6)) ? (this.form[key] = timestampToTime(this.form[key], 6))
: key == "errorTime" : key == "deductTime"
? (this.form[key] = timestampToTime(this.form[key], 6)) ? (this.form[key] = timestampToTime(this.form[key], 6))
: key == "updateTime" : key == "updateTime"
? (this.form[key] = timestampToTime(this.form[key], 6)) ? (this.form[key] = timestampToTime(this.form[key], 6))
: key == "checkTime" : key == "checkTime"
? (this.form[key] = timestampToTime(this.form[key], 6)) ? (this.form[key] = timestampToTime(this.form[key], 6))
: key == "alarmTime"
? (this.form[key] = timestampToTime(this.form[key], 6))
: key == "happenTime"
? (this.form[key] = timestampToTime(this.form[key], 6))
: ""; : "";
} }
this.form.view = "查看"; this.form.view = "查看";
console.log(this.form); console.log(this.form);
this.open = true; this.open = true;
}); }
);
this.pageInfo.type = "view"; this.pageInfo.type = "view";
this.title = "效能绩效核查信息详细"; this.title = "效能绩效核查信息详细";
}, },
......
attendance-performance-manager-ui/admin/src/views/check/effect/record/list.vue
View file @ 71bc4695
...@@ -225,17 +225,17 @@ export default { ...@@ -225,17 +225,17 @@ export default {
{ label: "绩效规则", prop: "ruleName" }, { label: "绩效规则", prop: "ruleName" },
{ label: "扣分方式", prop: "subMethod", formatter: this.formatter }, { label: "加分/扣分方式", prop: "subMethod", formatter: this.formatter },
{ {
label: "扣分时间", label: "加分/扣分时间",
prop: "deductTime", prop: "deductTime",
formatter: this.formatterDate, formatter: this.formatterDate,
}, },
{ label: "扣分人员", prop: "deductPerson" }, { label: "加分/扣分人员", prop: "deductPerson" },
{ label: "扣分分值", prop: "score", formatter: this.formatter }, { label: "分值", prop: "score", formatter: this.formatter },
{ {
label: "处理状态", label: "处理状态",
......
attendance-performance-manager-ui/admin/src/views/check/effect/record/view.vue
View file @ 71bc4695
...@@ -50,13 +50,13 @@ ...@@ -50,13 +50,13 @@
<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.ruleName}} {{form.ruleName}}
</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">
{{ util_formatters("subMethod", form.subMethod) }} {{ util_formatters("subMethod", form.subMethod) }}
</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">
{{form.deductPerson}} {{form.deductPerson}}
</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">
{{ util_formatterDate(form.deductTime)}} {{ util_formatterDate(form.deductTime)}}
</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">
......
attendance-performance-manager-ui/admin/src/views/check/gowork/record/drawershow.vue
View file @ 71bc4695
...@@ -44,18 +44,21 @@ ...@@ -44,18 +44,21 @@
>办件时间：{{ form.goworkTime ? form.goworkTime : "--" }}</el-col >办件时间：{{ form.goworkTime ? form.goworkTime : "--" }}</el-col
> >
<el-col :span="12" <el-col :span="12"
>扣分方式：{{ form.subMethod ? form.subMethod : "--" }}</el-col >{{ form.subAddType == 1 ? "加分方式：" : "扣分方式："
}}{{
form.subMethod ? dict.subMethod[form.subMethod] : "--"
}}</el-col
> >
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12" <el-col :span="12">
>扣分时间：{{ form.deductTime ? form.deductTime : "--" }}</el-col {{ form.subAddType == 1 ? "加分时间：" : "扣分时间：" }}
{{ form.deductTime ? form.deductTime : "--" }}</el-col
> >
<el-col :span="12"> <el-col :span="12">
扣分人员：{{ {{ form.subAddType == 1 ? "加分人员：" : "扣分人员：" }}
form.deductPerson ? form.deductPerson : "--" {{ form.deductPerson ? form.deductPerson : "--" }}</el-col
}}</el-col
> >
</el-row> </el-row>
<el-row> <el-row>
...@@ -132,11 +135,16 @@ ...@@ -132,11 +135,16 @@
</el-form-item> </el-form-item>
</el-row> </el-row>
<el-row> <el-row>
<el-form-item label="加分/扣除分值："> <el-form-item
:label="form.subAddType == 1 ? '加分分值：' : '扣分分值：'"
>
<p v-if="form.view == '查看'"> <p v-if="form.view == '查看'">
{{form.subAddType==1?'+':'-'}}{{ form.score ? form.score : "--" }} {{ form.subAddType == 1 ? "+" : "-"
}}{{ form.score ? form.score : "--" }}
</p>
<p v-else>
{{ form.subAddType == 1 ? "+" : "-" }}{{ form.score }}
</p> </p>
<p v-else>{{form.subAddType==1?'+':'-'}}{{ form.score }}</p>
</el-form-item> </el-form-item>
</el-row> </el-row>
</div> </div>
...@@ -253,7 +261,7 @@ ...@@ -253,7 +261,7 @@
placeholder="请输入规则名称" placeholder="请输入规则名称"
/> />
<Field <Field
label="扣分方式" label="加分/扣分方式"
prop="subMethod" prop="subMethod"
v-model="form.subMethod" v-model="form.subMethod"
type="select" type="select"
...@@ -261,13 +269,13 @@ ...@@ -261,13 +269,13 @@
placeholder="请选择扣分方式" placeholder="请选择扣分方式"
/> />
<Field <Field
label="扣分人员" label="加分/扣分人员"
prop="deductPerson" prop="deductPerson"
v-model="form.deductPerson" v-model="form.deductPerson"
placeholder="请输入扣分人员" placeholder="请输入扣分人员"
/> />
<Field <Field
label="扣分时间" label="加分/扣分时间"
prop="deductTime" prop="deductTime"
v-model="form.deductTime" v-model="form.deductTime"
type="date" type="date"
...@@ -372,7 +380,7 @@ export default { ...@@ -372,7 +380,7 @@ export default {
kaoqinCateArr: [], kaoqinCateArr: [],
kaoqinArr: [], kaoqinArr: [],
baseUrl: process.env.VUE_APP_API_BASE_URL + "/", baseUrl: process.env.VUE_APP_API_BASE_URL + "/",
urls:{saveUrl:'/check/gowork/record/examine'}//重写核查地址 urls: { saveUrl: "/check/gowork/record/examine" }, //重写核查地址
}; };
}, },
...@@ -386,7 +394,9 @@ export default { ...@@ -386,7 +394,9 @@ export default {
return ( return (
<el-image <el-image
src={val.c == -1 ? this.baseUrl + val : val} src={val.c == -1 ? this.baseUrl + val : val}
preview-src-list={val.indexOf("http") == -1 ? this.baseUrl + val : val} preview-src-list={
val.indexOf("http") == -1 ? this.baseUrl + val : val
}
style="width: 100px" style="width: 100px"
></el-image> ></el-image>
); );
...@@ -410,16 +420,18 @@ export default { ...@@ -410,16 +420,18 @@ export default {
}); });
}, },
/** 编辑 */ /** 编辑 */
edit(row) { async edit(row) {
this.form = row; this.form = row;
this.reset(); this.reset();
this.query = { id: row.id }; this.query = { id: row.id };
// this.urls.currUrl = "check/gowork/record/edit"; // this.urls.currUrl = "check/gowork/record/edit";
// this.getData(); // this.getData();
this.$get("/check/gowork/record/info", { id: row.id }).then((res) => { await this.$get("/check/gowork/record/info", { id: row.id }).then(
(res) => {
console.log(res.data); console.log(res.data);
if (res.code == 1) { if (res.code == 1) {
this.form = res.data; this.form = res.data;
this.dict = res.dict;
} else { } else {
this.form = row; this.form = row;
} }
...@@ -430,18 +442,28 @@ export default { ...@@ -430,18 +442,28 @@ export default {
? (this.form[key] = timestampToTime(this.form[key], 6)) ? (this.form[key] = timestampToTime(this.form[key], 6))
: key == "createTime" : key == "createTime"
? (this.form[key] = timestampToTime(this.form[key], 6)) ? (this.form[key] = timestampToTime(this.form[key], 6))
: key == "errorTime" : key == "goworkTime"
? (this.form[key] = timestampToTime(this.form[key], 6)) ? (this.form[key] = timestampToTime(this.form[key], 6))
: key == "updateTime" : key == "updateTime"
? (this.form[key] = timestampToTime(this.form[key], 6)) ? (this.form[key] = timestampToTime(this.form[key], 6))
: key == "checkTime" : key == "checkTime"
? (this.form[key] = timestampToTime(this.form[key], 6)) ? (this.form[key] = timestampToTime(this.form[key], 6))
: key == "deductTime"
? (this.form[key] = timestampToTime(this.form[key], 6))
: ""; : "";
} }
this.form.checkResult = 1; this.form.checkResult = 1;
this.$post("/perform/rules/list", {
page: 1,
size: -1,
categoryId: this.form.categoryId,
}).then((res) => {
this.ruleArr = res.data.data;
});
this.form.view = "核查"; this.form.view = "核查";
this.open = true; this.open = true;
}); }
);
this.pageInfo.type = "edit"; this.pageInfo.type = "edit";
row.view == "核查" row.view == "核查"
? (this.title = "办件绩效核查") ? (this.title = "办件绩效核查")
...@@ -456,15 +478,17 @@ export default { ...@@ -456,15 +478,17 @@ export default {
this.title = "新增办件绩效核查信息"; this.title = "新增办件绩效核查信息";
}, },
/** 查看*/ /** 查看*/
view(row) { async view(row) {
this.form = row; this.form = row;
this.reset(); this.reset();
this.query = { id: row.id }; this.query = { id: row.id };
// this.urls.currUrl = "check/gowork/record/view"; // this.urls.currUrl = "check/gowork/record/view";
// this.getData(); // this.getData();
this.$get("/check/gowork/record/info", { id: row.id }).then((res) => { await this.$get("/check/gowork/record/info", { id: row.id }).then(
(res) => {
if (res.code == 1) { if (res.code == 1) {
this.form = res.data; this.form = res.data;
this.dict = res.dict;
} else { } else {
this.form = row; this.form = row;
} }
...@@ -475,18 +499,20 @@ export default { ...@@ -475,18 +499,20 @@ export default {
? (this.form[key] = timestampToTime(this.form[key], 6)) ? (this.form[key] = timestampToTime(this.form[key], 6))
: key == "createTime" : key == "createTime"
? (this.form[key] = timestampToTime(this.form[key], 6)) ? (this.form[key] = timestampToTime(this.form[key], 6))
: key == "errorTime" : key == "goworkTime"
? (this.form[key] = timestampToTime(this.form[key], 6)) ? (this.form[key] = timestampToTime(this.form[key], 6))
: key == "updateTime" : key == "updateTime"
? (this.form[key] = timestampToTime(this.form[key], 6)) ? (this.form[key] = timestampToTime(this.form[key], 6))
: key == "checkTime" : key == "checkTime"
? (this.form[key] = timestampToTime(this.form[key], 6)) ? (this.form[key] = timestampToTime(this.form[key], 6))
: key == "deductTime"
? (this.form[key] = timestampToTime(this.form[key], 6))
: ""; : "";
} }
this.form.view = "查看"; this.form.view = "查看";
console.log(this.form);
this.open = true; this.open = true;
}); }
);
this.pageInfo.type = "view"; this.pageInfo.type = "view";
this.title = "办件绩效核查信息详细"; this.title = "办件绩效核查信息详细";
}, },
......
attendance-performance-manager-ui/admin/src/views/check/gowork/record/list.vue
View file @ 71bc4695
...@@ -213,17 +213,17 @@ export default { ...@@ -213,17 +213,17 @@ export default {
{ label: "绩效规则", prop: "ruleName" }, { label: "绩效规则", prop: "ruleName" },
{ label: "扣分方式", prop: "subMethod", formatter: this.formatter }, { label: "加分/扣分方式", prop: "subMethod", formatter: this.formatter },
{ {
label: "扣分时间", label: "加分/扣分时间",
prop: "deductTime", prop: "deductTime",
formatter: this.formatterDate, formatter: this.formatterDate,
}, },
{ label: "扣分人员", prop: "deductPerson" }, { label: "加分/扣分人员", prop: "deductPerson" },
{ label: "扣分分值", prop: "score", formatter: this.formatter }, { label: "分值", prop: "score", formatter: this.formatter },
{ {
label: "处理状态", label: "处理状态",
......
attendance-performance-manager-ui/admin/src/views/check/gowork/record/view.vue
View file @ 71bc4695
...@@ -47,13 +47,13 @@ ...@@ -47,13 +47,13 @@
<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.ruleName}} {{form.ruleName}}
</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">
{{ util_formatters("subMethod", form.subMethod) }} {{ util_formatters("subMethod", form.subMethod) }}
</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">
{{form.deductPerson}} {{form.deductPerson}}
</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">
{{ util_formatterDate(form.deductTime)}} {{ util_formatterDate(form.deductTime)}}
</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">
......
attendance-performance-manager-ui/admin/src/views/check/other/record/drawershow.vue
View file @ 71bc4695
...@@ -41,15 +41,20 @@ ...@@ -41,15 +41,20 @@
<el-row> <el-row>
<el-col :span="12" <el-col :span="12"
>扣分方式：{{ form.subMethod ? form.subMethod : "--" }}</el-col >{{ form.subAddType == 1 ? "加分方式：" : "扣分方式："
}}{{
form.subMethod ? dict.subMethod[form.subMethod] : "--"
}}</el-col
> >
<el-col :span="12"> <el-col :span="12">
扣分时间：{{ form.deductTime ? form.deductTime : "--" }} {{ form.subAddType == 1 ? "加分时间：" : "扣分时间：" }}
{{ form.deductTime ? form.deductTime : "--" }}
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
扣分人员：{{ form.deductPerson ? form.deductPerson : "--" }} {{ form.subAddType == 1 ? "加分人员：" : "扣分人员：" }}
{{ form.deductPerson ? form.deductPerson : "--" }}
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
...@@ -126,11 +131,16 @@ ...@@ -126,11 +131,16 @@
</el-form-item> </el-form-item>
</el-row> </el-row>
<el-row> <el-row>
<el-form-item label="加分/扣除分值："> <el-form-item
:label="form.subAddType == 1 ? '加分分值：' : '扣分分值：'"
>
<p v-if="form.view == '查看'"> <p v-if="form.view == '查看'">
{{form.subAddType==1?'+':'-'}}{{ form.score ? form.score : "--" }} {{ form.subAddType == 1 ? "+" : "-"
}}{{ form.score ? form.score : "--" }}
</p>
<p v-else>
{{ form.subAddType == 1 ? "+" : "-" }}{{ form.score }}
</p> </p>
<p v-else>{{form.subAddType==1?'+':'-'}}{{ form.score }}</p>
</el-form-item> </el-form-item>
</el-row> </el-row>
</div> </div>
...@@ -248,7 +258,7 @@ ...@@ -248,7 +258,7 @@
placeholder="请输入评分标准" placeholder="请输入评分标准"
/> />
<Field <Field
label="扣分方式" label="加分/扣分方式"
prop="subMethod" prop="subMethod"
v-model="form.subMethod" v-model="form.subMethod"
type="select" type="select"
...@@ -256,13 +266,13 @@ ...@@ -256,13 +266,13 @@
placeholder="请选择扣分方式" placeholder="请选择扣分方式"
/> />
<Field <Field
label="扣分人员" label="加分/扣分人员"
prop="deductPerson" prop="deductPerson"
v-model="form.deductPerson" v-model="form.deductPerson"
placeholder="请输入扣分人员" placeholder="请输入扣分人员"
/> />
<Field <Field
label="扣分时间" label="加分/扣分时间"
prop="deductTime" prop="deductTime"
v-model="form.deductTime" v-model="form.deductTime"
type="date" type="date"
...@@ -367,7 +377,7 @@ export default { ...@@ -367,7 +377,7 @@ export default {
kaoqinCateArr: [], kaoqinCateArr: [],
kaoqinArr: [], kaoqinArr: [],
baseUrl: process.env.VUE_APP_API_BASE_URL + "/", baseUrl: process.env.VUE_APP_API_BASE_URL + "/",
urls:{saveUrl:'/check/other/record/examine'}//重写核查地址 urls: { saveUrl: "/check/other/record/examine" }, //重写核查地址
}; };
}, },
...@@ -407,16 +417,18 @@ export default { ...@@ -407,16 +417,18 @@ export default {
}); });
}, },
/** 编辑 */ /** 编辑 */
edit(row) { async edit(row) {
this.form = row; this.form = row;
this.reset(); this.reset();
this.query = { id: row.id }; this.query = { id: row.id };
// this.urls.currUrl = "check/other/record/edit"; // this.urls.currUrl = "check/other/record/edit";
// this.getData(); // this.getData();
this.$get("/check/other/record/info", { id: row.id }).then((res) => { await this.$get("/check/other/record/info", { id: row.id }).then(
(res) => {
console.log(res.data); console.log(res.data);
if (res.code == 1) { if (res.code == 1) {
this.form = res.data; this.form = res.data;
this.dict = res.dict;
} else { } else {
this.form = row; this.form = row;
} }
...@@ -427,18 +439,30 @@ export default { ...@@ -427,18 +439,30 @@ export default {
? (this.form[key] = timestampToTime(this.form[key], 6)) ? (this.form[key] = timestampToTime(this.form[key], 6))
: key == "createTime" : key == "createTime"
? (this.form[key] = timestampToTime(this.form[key], 6)) ? (this.form[key] = timestampToTime(this.form[key], 6))
: key == "errorTime" : key == "deductTime"
? (this.form[key] = timestampToTime(this.form[key], 6)) ? (this.form[key] = timestampToTime(this.form[key], 6))
: key == "updateTime" : key == "updateTime"
? (this.form[key] = timestampToTime(this.form[key], 6)) ? (this.form[key] = timestampToTime(this.form[key], 6))
: key == "checkTime" : key == "checkTime"
? (this.form[key] = timestampToTime(this.form[key], 6)) ? (this.form[key] = timestampToTime(this.form[key], 6))
: key == "alarmTime"
? (this.form[key] = timestampToTime(this.form[key], 6))
: key == "happenTime"
? (this.form[key] = timestampToTime(this.form[key], 6))
: ""; : "";
} }
this.form.checkResult = 1; this.form.checkResult = 1;
this.$post("/perform/rules/list", {
page: 1,
size: -1,
categoryId: this.form.categoryId,
}).then((res) => {
this.ruleArr = res.data.data;
});
this.form.view = "核查"; this.form.view = "核查";
this.open = true; this.open = true;
}); }
);
this.pageInfo.type = "edit"; this.pageInfo.type = "edit";
row.view == "核查" row.view == "核查"
? (this.title = "其它绩效核查") ? (this.title = "其它绩效核查")
...@@ -453,15 +477,17 @@ export default { ...@@ -453,15 +477,17 @@ export default {
this.title = "新增其它绩效核查信息"; this.title = "新增其它绩效核查信息";
}, },
/** 查看*/ /** 查看*/
view(row) { async view(row) {
this.form = row; this.form = row;
this.reset(); this.reset();
this.query = { id: row.id }; this.query = { id: row.id };
// this.urls.currUrl = "check/other/record/view"; // this.urls.currUrl = "check/other/record/view";
// this.getData(); // this.getData();
this.$get("/check/other/record/info", { id: row.id }).then((res) => { await this.$get("/check/other/record/info", { id: row.id }).then(
(res) => {
if (res.code == 1) { if (res.code == 1) {
this.form = res.data; this.form = res.data;
this.dict = res.dict;
} else { } else {
this.form = row; this.form = row;
} }
...@@ -472,18 +498,23 @@ export default { ...@@ -472,18 +498,23 @@ export default {
? (this.form[key] = timestampToTime(this.form[key], 6)) ? (this.form[key] = timestampToTime(this.form[key], 6))
: key == "createTime" : key == "createTime"
? (this.form[key] = timestampToTime(this.form[key], 6)) ? (this.form[key] = timestampToTime(this.form[key], 6))
: key == "errorTime" : key == "deductTime"
? (this.form[key] = timestampToTime(this.form[key], 6)) ? (this.form[key] = timestampToTime(this.form[key], 6))
: key == "updateTime" : key == "updateTime"
? (this.form[key] = timestampToTime(this.form[key], 6)) ? (this.form[key] = timestampToTime(this.form[key], 6))
: key == "checkTime" : key == "checkTime"
? (this.form[key] = timestampToTime(this.form[key], 6)) ? (this.form[key] = timestampToTime(this.form[key], 6))
: key == "alarmTime"
? (this.form[key] = timestampToTime(this.form[key], 6))
: key == "happenTime"
? (this.form[key] = timestampToTime(this.form[key], 6))
: ""; : "";
} }
this.form.view = "查看"; this.form.view = "查看";
console.log(this.form); console.log(this.form);
this.open = true; this.open = true;
}); }
);
this.pageInfo.type = "view"; this.pageInfo.type = "view";
this.title = "其它绩效核查信息详细"; this.title = "其它绩效核查信息详细";
}, },
......
attendance-performance-manager-ui/admin/src/views/check/other/record/list.vue
View file @ 71bc4695
...@@ -221,17 +221,17 @@ export default { ...@@ -221,17 +221,17 @@ export default {
{ label: "绩效规则", prop: "ruleName" }, { label: "绩效规则", prop: "ruleName" },
{ label: "扣分方式", prop: "subMethod", formatter: this.formatter }, { label: "加分/扣分方式", prop: "subMethod", formatter: this.formatter },
{ {
label: "扣分时间", label: "加分/扣分时间",
prop: "deductTime", prop: "deductTime",
formatter: this.formatterDate, formatter: this.formatterDate,
}, },
{ label: "扣分人员", prop: "deductPerson" }, { label: "加分/扣分人员", prop: "deductPerson" },
{ label: "扣分分值", prop: "score", formatter: this.formatter }, { label: "分值", prop: "score", formatter: this.formatter },
{ {
label: "处理状态", label: "处理状态",
......
attendance-performance-manager-ui/admin/src/views/check/other/record/view.vue
View file @ 71bc4695
...@@ -47,13 +47,13 @@ ...@@ -47,13 +47,13 @@
<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.ruleDesc}} {{form.ruleDesc}}
</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">
{{ util_formatters("subMethod", form.subMethod) }} {{ util_formatters("subMethod", form.subMethod) }}
</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">
{{form.deductPerson}} {{form.deductPerson}}
</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">
{{ util_formatterDate(form.deductTime)}} {{ util_formatterDate(form.deductTime)}}
</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">
......
attendance-performance-manager-ui/admin/src/views/check/review/record/drawershow.vue
View file @ 71bc4695
...@@ -45,17 +45,20 @@ ...@@ -45,17 +45,20 @@
>评价时间：{{ form.reviewTime ? form.reviewTime : "--" }}</el-col >评价时间：{{ form.reviewTime ? form.reviewTime : "--" }}</el-col
> >
<el-col :span="12" <el-col :span="12"
>扣分方式：{{ form.subMethod ? form.subMethod : "--" }}</el-col >{{ form.subAddType == 1 ? "加分方式：" : "扣分方式："
}}{{
form.subMethod ? dict.subMethod[form.subMethod] : "--"
}}</el-col
> >
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12" <el-col :span="12"
>扣分时间：{{ form.deductTime ? form.deductTime : "--" }}</el-col >{{ form.subAddType == 1 ? "加分时间：" : "扣分时间："
}}{{ form.deductTime ? form.deductTime : "--" }}</el-col
> >
<el-col :span="12" <el-col :span="12"
>扣分人员：{{ >{{ form.subAddType == 1 ? "加分人员：" : "扣分人员："
form.deductPerson ? form.deductPerson : "--" }}{{ form.deductPerson ? form.deductPerson : "--" }}</el-col
}}</el-col
> >
</el-row> </el-row>
...@@ -133,11 +136,16 @@ ...@@ -133,11 +136,16 @@
</el-form-item> </el-form-item>
</el-row> </el-row>
<el-row> <el-row>
<el-form-item label="加分/扣除分值："> <el-form-item
:label="form.subAddType == 1 ? '加分分值：' : '扣分分值：'"
>
<p v-if="form.view == '查看'"> <p v-if="form.view == '查看'">
{{form.subAddType==1?'+':'-'}}{{ form.score ? form.score : "--" }} {{ form.subAddType == 1 ? "+" : "-"
}}{{ form.score ? form.score : "--" }}
</p>
<p v-else>
{{ form.subAddType == 1 ? "+" : "-" }}{{ form.score }}
</p> </p>
<p v-else>{{form.subAddType==1?'+':'-'}}{{ form.score }}</p>
</el-form-item> </el-form-item>
</el-row> </el-row>
</div> </div>
...@@ -256,7 +264,7 @@ ...@@ -256,7 +264,7 @@
placeholder="请输入规则名称" placeholder="请输入规则名称"
/> />
<Field <Field
label="扣分方式" label="加分/扣分方式"
prop="subMethod" prop="subMethod"
v-model="form.subMethod" v-model="form.subMethod"
type="select" type="select"
...@@ -264,13 +272,13 @@ ...@@ -264,13 +272,13 @@
placeholder="请选择扣分方式" placeholder="请选择扣分方式"
/> />
<Field <Field
label="扣分人员" label="加分/扣分人员"
prop="deductPerson" prop="deductPerson"
v-model="form.deductPerson" v-model="form.deductPerson"
placeholder="请输入扣分人员" placeholder="请输入扣分人员"
/> />
<Field <Field
label="扣分时间" label="加分/扣分时间"
prop="deductTime" prop="deductTime"
v-model="form.deductTime" v-model="form.deductTime"
type="date" type="date"
...@@ -374,7 +382,7 @@ export default { ...@@ -374,7 +382,7 @@ export default {
form: {}, form: {},
kaoqinCateArr: [], kaoqinCateArr: [],
kaoqinArr: [], kaoqinArr: [],
urls:{saveUrl:'/check/review/record/examine'}//重写核查地址 urls: { saveUrl: "/check/review/record/examine" }, //重写核查地址
}; };
}, },
...@@ -412,16 +420,18 @@ export default { ...@@ -412,16 +420,18 @@ export default {
}); });
}, },
/** 编辑 */ /** 编辑 */
edit(row) { async edit(row) {
this.form = row; this.form = row;
this.reset(); this.reset();
this.query = { id: row.id }; this.query = { id: row.id };
// this.urls.currUrl = "check/review/record/edit"; // this.urls.currUrl = "check/review/record/edit";
// this.getData(); // this.getData();
this.$get("/check/review/record/info", { id: row.id }).then((res) => { await this.$get("/check/review/record/info", { id: row.id }).then(
(res) => {
console.log(res.data); console.log(res.data);
if (res.code == 1) { if (res.code == 1) {
this.form = res.data; this.form = res.data;
this.dict = res.dict;
} else { } else {
this.form = row; this.form = row;
} }
...@@ -432,18 +442,28 @@ export default { ...@@ -432,18 +442,28 @@ export default {
? (this.form[key] = timestampToTime(this.form[key], 6)) ? (this.form[key] = timestampToTime(this.form[key], 6))
: key == "createTime" : key == "createTime"
? (this.form[key] = timestampToTime(this.form[key], 6)) ? (this.form[key] = timestampToTime(this.form[key], 6))
: key == "errorTime" : key == "deductTime"
? (this.form[key] = timestampToTime(this.form[key], 6)) ? (this.form[key] = timestampToTime(this.form[key], 6))
: key == "updateTime" : key == "updateTime"
? (this.form[key] = timestampToTime(this.form[key], 6)) ? (this.form[key] = timestampToTime(this.form[key], 6))
: key == "checkTime" : key == "checkTime"
? (this.form[key] = timestampToTime(this.form[key], 6)) ? (this.form[key] = timestampToTime(this.form[key], 6))
: key == "reviewTime"
? (this.form[key] = timestampToTime(this.form[key], 6))
: ""; : "";
} }
this.form.checkResult = 1; this.form.checkResult = 1;
this.$post("/perform/rules/list", {
page: 1,
size: -1,
categoryId: this.form.categoryId,
}).then((res) => {
this.ruleArr = res.data.data;
});
this.form.view = "核查"; this.form.view = "核查";
this.open = true; this.open = true;
}); }
);
this.pageInfo.type = "edit"; this.pageInfo.type = "edit";
row.view == "核查" row.view == "核查"
? (this.title = "评价差评绩效核查") ? (this.title = "评价差评绩效核查")
...@@ -458,15 +478,17 @@ export default { ...@@ -458,15 +478,17 @@ export default {
this.title = "新增评价差评绩效核查信息"; this.title = "新增评价差评绩效核查信息";
}, },
/** 查看*/ /** 查看*/
view(row) { async view(row) {
this.form = row; this.form = row;
this.reset(); this.reset();
this.query = { id: row.id }; this.query = { id: row.id };
// this.urls.currUrl = "check/review/record/view"; // this.urls.currUrl = "check/review/record/view";
// this.getData(); // this.getData();
this.$get("/check/review/record/info", { id: row.id }).then((res) => { await this.$get("/check/review/record/info", { id: row.id }).then(
(res) => {
if (res.code == 1) { if (res.code == 1) {
this.form = res.data; this.form = res.data;
this.dict = res.dict;
} else { } else {
this.form = row; this.form = row;
} }
...@@ -477,18 +499,21 @@ export default { ...@@ -477,18 +499,21 @@ export default {
? (this.form[key] = timestampToTime(this.form[key], 6)) ? (this.form[key] = timestampToTime(this.form[key], 6))
: key == "createTime" : key == "createTime"
? (this.form[key] = timestampToTime(this.form[key], 6)) ? (this.form[key] = timestampToTime(this.form[key], 6))
: key == "errorTime" : key == "deductTime"
? (this.form[key] = timestampToTime(this.form[key], 6)) ? (this.form[key] = timestampToTime(this.form[key], 6))
: key == "updateTime" : key == "updateTime"
? (this.form[key] = timestampToTime(this.form[key], 6)) ? (this.form[key] = timestampToTime(this.form[key], 6))
: key == "checkTime" : key == "checkTime"
? (this.form[key] = timestampToTime(this.form[key], 6)) ? (this.form[key] = timestampToTime(this.form[key], 6))
: key == "reviewTime"
? (this.form[key] = timestampToTime(this.form[key], 6))
: ""; : "";
} }
this.form.view = "查看"; this.form.view = "查看";
console.log(this.form); console.log(this.form);
this.open = true; this.open = true;
}); }
);
this.pageInfo.type = "view"; this.pageInfo.type = "view";
this.title = "评价差评绩效核查信息详细"; this.title = "评价差评绩效核查信息详细";
}, },
......
attendance-performance-manager-ui/admin/src/views/check/review/record/list.vue
View file @ 71bc4695
...@@ -222,17 +222,17 @@ export default { ...@@ -222,17 +222,17 @@ export default {
{ label: "绩效规则", prop: "ruleNme" }, { label: "绩效规则", prop: "ruleNme" },
{ label: "扣分方式", prop: "subMethod", formatter: this.formatter }, { label: "加分/扣分方式", prop: "subMethod", formatter: this.formatter },
{ {
label: "扣分时间", label: "加分/扣分时间",
prop: "deductTime", prop: "deductTime",
formatter: this.formatterDate, formatter: this.formatterDate,
}, },
{ label: "扣分人员", prop: "deductPerson" }, { label: "加分/扣分人员", prop: "deductPerson" },
{ label: "扣分分值", prop: "score", formatter: this.formatter }, { label: "分值", prop: "score", formatter: this.formatter },
{ {
label: "处理状态", label: "处理状态",
......
attendance-performance-manager-ui/admin/src/views/check/review/record/view.vue
View file @ 71bc4695
...@@ -47,13 +47,13 @@ ...@@ -47,13 +47,13 @@
<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.ruleName}} {{form.ruleName}}
</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">
{{ util_formatters("subMethod", form.subMethod) }} {{ util_formatters("subMethod", form.subMethod) }}
</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">
{{form.deductPerson}} {{form.deductPerson}}
</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">
{{ util_formatterDate(form.deductTime)}} {{ util_formatterDate(form.deductTime)}}
</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">
......
attendance-performance-manager-ui/admin/src/views/perform/attend/appeal/drawershow.vue
View file @ 71bc4695
...@@ -55,15 +55,15 @@ ...@@ -55,15 +55,15 @@
}}</el-col }}</el-col
> >
<el-col :span="5" <el-col :span="5"
>扣分方式：{{ form.subMethod ? form.subMethod : "--" }}</el-col >加分/扣分方式：{{ form.subMethod ? form.subMethod : "--" }}</el-col
> >
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8" <el-col :span="8"
>扣分时间：{{ form.deductTime ? form.deductTime : "--" }}</el-col >加分/扣分时间：{{ form.deductTime ? form.deductTime : "--" }}</el-col
> >
<el-col :span="8" <el-col :span="8"
>扣分人员：{{ >加分/扣分人员：{{
form.deductPerson ? form.deductPerson : "--" form.deductPerson ? form.deductPerson : "--"
}}</el-col }}</el-col
> >
...@@ -255,12 +255,12 @@ ...@@ -255,12 +255,12 @@
placeholder="请输入规则名称" placeholder="请输入规则名称"
/> />
<Field <Field
label="扣分方式" label="加分/扣分方式"
prop="subMethod" prop="subMethod"
v-model="form.subMethod" v-model="form.subMethod"
type="select" type="select"
:enumData="dict.subMethod" :enumData="dict.subMethod"
placeholder="请选择扣分方式" placeholder="请选择加分/扣分方式"
/> />
<Field <Field
label="增减类型" label="增减类型"
......
attendance-performance-manager-ui/admin/src/views/perform/attend/appeal/list(原绩效申诉).vue
View file @ 71bc4695
...@@ -78,11 +78,11 @@ ...@@ -78,11 +78,11 @@
{label: "违规类型", prop: "ruleName"}, {label: "违规类型", prop: "ruleName"},
{label: "绩效规则", prop: "ruleName"}, {label: "绩效规则", prop: "ruleName"},
{label: "扣分方式", prop: "subMethod",formatter: this.formatter}, {label: "加分/扣分方式", prop: "subMethod",formatter: this.formatter},
{label: "扣分时间", prop: "attendanceDate" , formatter: this.formatterDate }, {label: "加分/扣分时间", prop: "attendanceDate" , formatter: this.formatterDate },
{label: "扣分分值", prop: "score", formatter: this.formatter}, {label: "分值", prop: "score", formatter: this.formatter},
{label: "申诉时间", prop: "appealTime", formatter: this.formatterDate}, {label: "申诉时间", prop: "appealTime", formatter: this.formatterDate},
......
attendance-performance-manager-ui/admin/src/views/perform/attend/appeal/list.vue
View file @ 71bc4695
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
<!-- <bar-charts <!-- <bar-charts
:title="'部门扣分排名TOP10'" :title="'部门扣分排名TOP10'"
:id="'koufen_10'" :id="'koufen_10'"
:legendName="'部门扣分分值'" :legendName="'部门分值'"
:styleObj="{ width: '100%', height: '300px' }" :styleObj="{ width: '100%', height: '300px' }"
/> --> /> -->
<drawer-show ref="drawerform" @ok="getData" /> <drawer-show ref="drawerform" @ok="getData" />
...@@ -174,15 +174,15 @@ export default { ...@@ -174,15 +174,15 @@ export default {
{ label: "违规类型", prop: "irregularOtherType" }, { label: "违规类型", prop: "irregularOtherType" },
{ label: "绩效规则", prop: "ruleName" }, { label: "绩效规则", prop: "ruleName" },
{ label: "扣分方式", prop: "subMethod", formatter: this.formatter }, { label: "加分/扣分方式", prop: "subMethod", formatter: this.formatter },
{ {
label: "扣分时间", label: "加分/扣分时间",
prop: "attendanceDate", prop: "attendanceDate",
formatter: this.formatterDate, formatter: this.formatterDate,
}, },
{ label: "扣分分值", prop: "score", formatter: this.formatter }, { label: "分值", prop: "score", formatter: this.formatter },
{ {
label: "申诉时间", label: "申诉时间",
......
attendance-performance-manager-ui/admin/src/views/perform/attend/appeal/view.vue
View file @ 71bc4695
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,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.ruleName}} {{form.ruleName}}
</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">
{{ util_formatters("subMethod", form.subMethod) }} {{ util_formatters("subMethod", form.subMethod) }}
</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">
......
attendance-performance-manager-ui/admin/src/views/perform/attend/record/drawershow.vue
View file @ 71bc4695
...@@ -174,7 +174,7 @@ ...@@ -174,7 +174,7 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="22"> <el-col :span="22">
<el-form-item label="扣分分值："> <el-form-item label="加分/扣分分值：">
<p>{{ form.score }}</p> <p>{{ form.score }}</p>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -274,7 +274,7 @@ ...@@ -274,7 +274,7 @@
placeholder="请输入异常处理结果" placeholder="请输入异常处理结果"
/> />
<Field <Field
label="扣分方式" label="加分/扣分方式"
prop="subMethod" prop="subMethod"
v-model="form.subMethod" v-model="form.subMethod"
type="select" type="select"
...@@ -282,13 +282,13 @@ ...@@ -282,13 +282,13 @@
placeholder="请选择扣分方式" placeholder="请选择扣分方式"
/> />
<Field <Field
label="扣分人员" label="加分/扣分人员"
prop="deductPerson" prop="deductPerson"
v-model="form.deductPerson" v-model="form.deductPerson"
placeholder="请输入扣分人员" placeholder="请输入扣分人员"
/> />
<Field <Field
label="扣分时间" label="加分/扣分时间"
prop="deductTime" prop="deductTime"
v-model="form.deductTime" v-model="form.deductTime"
type="date" type="date"
...@@ -429,8 +429,8 @@ export default { ...@@ -429,8 +429,8 @@ export default {
this.form.score = arr && arr[0].score; this.form.score = arr && arr[0].score;
this.form.checkStatus == 1 ? (this.form.checkStatus = 2) : ""; this.form.checkStatus == 1 ? (this.form.checkStatus = 2) : "";
}, },
cateChange() { async cateChange() {
this.$post("/perform/rules/list", { await this.$post("/perform/rules/list", {
page: 1, page: 1,
size: -1, size: -1,
categoryId: this.form.categoryId, categoryId: this.form.categoryId,
...@@ -482,7 +482,13 @@ export default { ...@@ -482,7 +482,13 @@ export default {
this.form.processStatus = 2; this.form.processStatus = 2;
this.form.view = "核查"; this.form.view = "核查";
this.staffChange(this.form.staffId); this.staffChange(this.form.staffId);
this.$post("/perform/rules/list", {
page: 1,
size: -1,
categoryId: this.form.categoryId,
}).then((res) => {
this.ruleArr = res.data.data;
});
this.open = true; this.open = true;
}); });
this.pageInfo.type = "edit"; this.pageInfo.type = "edit";
......
attendance-performance-manager-ui/admin/src/views/perform/attend/record/list.vue
View file @ 71bc4695
...@@ -226,17 +226,17 @@ export default { ...@@ -226,17 +226,17 @@ export default {
{ label: "绩效规则", prop: "ruleNme" }, { label: "绩效规则", prop: "ruleNme" },
{ label: "扣分方式", prop: "subMethod", formatter: this.formatter }, { label: "加分/扣分方式", prop: "subMethod", formatter: this.formatter },
{ {
label: "扣分时间", label: "加分/扣分时间",
prop: "deductTime", prop: "deductTime",
formatter: this.formatterDate, formatter: this.formatterDate,
}, },
{ label: "扣分人员", prop: "deductPerson" }, { label: "加分/扣分人员", prop: "deductPerson" },
{ label: "扣分分值", prop: "score", formatter: this.formatter }, { label: "分值", prop: "score", formatter: this.formatter },
{ {
label: "处理状态", label: "处理状态",
...@@ -251,9 +251,6 @@ export default { ...@@ -251,9 +251,6 @@ export default {
return row.processStatus == 1 ? ( return row.processStatus == 1 ? (
<table-buttons <table-buttons
noAdd noAdd
noView
noEdit
reCheck
row={row} row={row}
onEdit={this.toEdit} onEdit={this.toEdit}
onView={this.toView} onView={this.toView}
......
attendance-performance-manager-ui/admin/src/views/perform/attend/record/list（原考勤绩效管理）.vue
View file @ 71bc4695
...@@ -198,12 +198,12 @@ export default { ...@@ -198,12 +198,12 @@ export default {
{ label: "异常处理结果", prop: "errorResult" }, { label: "异常处理结果", prop: "errorResult" },
{ label: "扣分方式", prop: "subMethod", formatter: this.formatter }, { label: "加分/扣分方式", prop: "subMethod", formatter: this.formatter },
{ label: "扣分人员", prop: "deductPerson" }, { label: "加分/扣分人员", prop: "deductPerson" },
{ {
label: "扣分时间", label: "加分/扣分时间",
prop: "deductTime", prop: "deductTime",
formatter: this.formatterDate, formatter: this.formatterDate,
}, },
......
attendance-performance-manager-ui/admin/src/views/perform/attend/record/view.vue
View file @ 71bc4695
...@@ -50,13 +50,13 @@ ...@@ -50,13 +50,13 @@
<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.errorResult}} {{form.errorResult}}
</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">
{{ util_formatters("subMethod", form.subMethod) }} {{ util_formatters("subMethod", form.subMethod) }}
</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">
{{form.deductPerson}} {{form.deductPerson}}
</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">
{{ util_formatterDate(form.deductTime)}} {{ util_formatterDate(form.deductTime)}}
</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">
......
attendance-performance-manager-ui/admin/src/views/perform/complain/record/drawershow.vue
View file @ 71bc4695
...@@ -225,7 +225,7 @@ ...@@ -225,7 +225,7 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="22"> <el-col :span="22">
<el-form-item label="扣分分值："> <el-form-item label="加分/扣分分值：">
<p>{{ form.score }}</p> <p>{{ form.score }}</p>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -327,7 +327,7 @@ ...@@ -327,7 +327,7 @@
placeholder="请输入规则名称" placeholder="请输入规则名称"
/> />
<Field <Field
label="扣分方式" label="加分/扣分方式"
prop="subMethod" prop="subMethod"
v-model="form.subMethod" v-model="form.subMethod"
type="select" type="select"
...@@ -335,13 +335,13 @@ ...@@ -335,13 +335,13 @@
placeholder="请选择扣分方式" placeholder="请选择扣分方式"
/> />
<Field <Field
label="扣分人员" label="加分/扣分人员"
prop="deductPerson" prop="deductPerson"
v-model="form.deductPerson" v-model="form.deductPerson"
placeholder="请输入扣分人员" placeholder="请输入扣分人员"
/> />
<Field <Field
label="扣分时间" label="加分/扣分时间"
prop="deductTime" prop="deductTime"
v-model="form.deductTime" v-model="form.deductTime"
type="date" type="date"
...@@ -544,6 +544,13 @@ export default { ...@@ -544,6 +544,13 @@ export default {
this.form.processStatus = 2; this.form.processStatus = 2;
this.form.view = "核查"; this.form.view = "核查";
this.staffChange(this.form.staffId); this.staffChange(this.form.staffId);
this.$post("/perform/rules/list", {
page: 1,
size: -1,
categoryId: this.form.categoryId,
}).then((res) => {
this.ruleArr = res.data.data;
});
this.open = true; this.open = true;
}); });
this.pageInfo.type = "edit"; this.pageInfo.type = "edit";
......
attendance-performance-manager-ui/admin/src/views/perform/complain/record/list(原投诉绩效管理).vue
View file @ 71bc4695
...@@ -194,12 +194,12 @@ export default { ...@@ -194,12 +194,12 @@ export default {
{ label: "规则名称", prop: "ruleName" }, { label: "规则名称", prop: "ruleName" },
{ label: "扣分方式", prop: "subMethod", formatter: this.formatter }, { label: "加分/扣分方式", prop: "subMethod", formatter: this.formatter },
{ label: "扣分人员", prop: "deductPerson" }, { label: "加分/扣分人员", prop: "deductPerson" },
{ {
label: "扣分时间", label: "加分/扣分时间",
prop: "deductTime", prop: "deductTime",
formatter: this.formatterDate, formatter: this.formatterDate,
}, },
......
attendance-performance-manager-ui/admin/src/views/perform/complain/record/list.vue
View file @ 71bc4695
...@@ -232,17 +232,17 @@ export default { ...@@ -232,17 +232,17 @@ export default {
{ label: "绩效规则", prop: "ruleNme" }, { label: "绩效规则", prop: "ruleNme" },
{ label: "扣分方式", prop: "subMethod", formatter: this.formatter }, { label: "加分/扣分方式", prop: "subMethod", formatter: this.formatter },
{ {
label: "扣分时间", label: "加分/扣分时间",
prop: "deductTime", prop: "deductTime",
formatter: this.formatterDate, formatter: this.formatterDate,
}, },
{ label: "扣分人员", prop: "deductPerson" }, { label: "加分/扣分人员", prop: "deductPerson" },
{ label: "扣分分值", prop: "score", formatter: this.formatter }, { label: "分值", prop: "score", formatter: this.formatter },
{ {
label: "处理状态", label: "处理状态",
...@@ -257,9 +257,6 @@ export default { ...@@ -257,9 +257,6 @@ export default {
return row.processStatus == 1 ? ( return row.processStatus == 1 ? (
<table-buttons <table-buttons
noAdd noAdd
noView
noEdit
reCheck
row={row} row={row}
onEdit={this.toEdit} onEdit={this.toEdit}
onView={this.toView} onView={this.toView}
......
attendance-performance-manager-ui/admin/src/views/perform/complain/record/view.vue
View file @ 71bc4695
...@@ -53,13 +53,13 @@ ...@@ -53,13 +53,13 @@
<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.ruleName}} {{form.ruleName}}
</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">
{{ util_formatters("subMethod", form.subMethod) }} {{ util_formatters("subMethod", form.subMethod) }}
</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">
{{form.deductPerson}} {{form.deductPerson}}
</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">
{{ util_formatterDate(form.deductTime)}} {{ util_formatterDate(form.deductTime)}}
</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">
......
attendance-performance-manager-ui/admin/src/views/perform/effect/record/drawershow.vue
View file @ 71bc4695
...@@ -199,7 +199,7 @@ ...@@ -199,7 +199,7 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="22"> <el-col :span="22">
<el-form-item label="扣分分值："> <el-form-item label="加分/扣分分值：">
<p>{{ form.score }}</p> <p>{{ form.score }}</p>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -296,7 +296,7 @@ ...@@ -296,7 +296,7 @@
placeholder="请输入规则名称" placeholder="请输入规则名称"
/> />
<Field <Field
label="扣分方式" label="加分/扣分方式"
prop="subMethod" prop="subMethod"
v-model="form.subMethod" v-model="form.subMethod"
type="select" type="select"
...@@ -304,13 +304,13 @@ ...@@ -304,13 +304,13 @@
placeholder="请选择扣分方式" placeholder="请选择扣分方式"
/> />
<Field <Field
label="扣分人员" label="加分/扣分人员"
prop="deductPerson" prop="deductPerson"
v-model="form.deductPerson" v-model="form.deductPerson"
placeholder="请输入扣分人员" placeholder="请输入扣分人员"
/> />
<Field <Field
label="扣分时间" label="加分/扣分时间"
prop="deductTime" prop="deductTime"
v-model="form.deductTime" v-model="form.deductTime"
type="date" type="date"
...@@ -518,6 +518,13 @@ export default { ...@@ -518,6 +518,13 @@ export default {
this.form.processStatus = 2; this.form.processStatus = 2;
this.form.view = "核查"; this.form.view = "核查";
this.staffChange(this.form.staffId); this.staffChange(this.form.staffId);
this.$post("/perform/rules/list", {
page: 1,
size: -1,
categoryId: this.form.categoryId,
}).then((res) => {
this.ruleArr = res.data.data;
});
this.open = true; this.open = true;
}); });
......
attendance-performance-manager-ui/admin/src/views/perform/effect/record/list.vue
View file @ 71bc4695
...@@ -232,17 +232,17 @@ export default { ...@@ -232,17 +232,17 @@ export default {
}, },
{ label: "绩效规则", prop: "ruleName" }, { label: "绩效规则", prop: "ruleName" },
{ label: "扣分方式", prop: "subMethod", formatter: this.formatter }, { label: "加分/扣分方式", prop: "subMethod", formatter: this.formatter },
{ {
label: "扣分时间", label: "加分/扣分时间",
prop: "deductTime", prop: "deductTime",
formatter: this.formatterDate, formatter: this.formatterDate,
}, },
{ label: "扣分人员", prop: "deductPerson" }, { label: "加分/扣分人员", prop: "deductPerson" },
{ label: "扣分分值", prop: "score", formatter: this.formatter }, { label: "分值", prop: "score", formatter: this.formatter },
{ {
label: "处理状态", label: "处理状态",
...@@ -257,9 +257,6 @@ export default { ...@@ -257,9 +257,6 @@ export default {
return row.processStatus == 1 ? ( return row.processStatus == 1 ? (
<table-buttons <table-buttons
noAdd noAdd
noView
noEdit
reCheck
row={row} row={row}
onEdit={this.toEdit} onEdit={this.toEdit}
onView={this.toView} onView={this.toView}
......
attendance-performance-manager-ui/admin/src/views/perform/effect/record/list（原效能绩效管理）.vue
View file @ 71bc4695
...@@ -206,12 +206,12 @@ export default { ...@@ -206,12 +206,12 @@ export default {
{ label: "规则名称", prop: "ruleName" }, { label: "规则名称", prop: "ruleName" },
{ label: "扣分方式", prop: "subMethod", formatter: this.formatter }, { label: "加分/扣分方式", prop: "subMethod", formatter: this.formatter },
{ label: "扣分人员", prop: "deductPerson" }, { label: "加分/扣分人员", prop: "deductPerson" },
{ {
label: "扣分时间", label: "加分/扣分时间",
prop: "deductTime", prop: "deductTime",
formatter: this.formatterDate, formatter: this.formatterDate,
}, },
......
attendance-performance-manager-ui/admin/src/views/perform/effect/record/view.vue
View file @ 71bc4695
...@@ -47,13 +47,13 @@ ...@@ -47,13 +47,13 @@
<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.ruleName}} {{form.ruleName}}
</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">
{{ util_formatters("subMethod", form.subMethod) }} {{ util_formatters("subMethod", form.subMethod) }}
</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">
{{form.deductPerson}} {{form.deductPerson}}
</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">
{{ util_formatterDate(form.deductTime)}} {{ util_formatterDate(form.deductTime)}}
</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">
......
attendance-performance-manager-ui/admin/src/views/perform/gowork/record/drawershow.vue
View file @ 71bc4695
...@@ -177,7 +177,7 @@ ...@@ -177,7 +177,7 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="22"> <el-col :span="22">
<el-form-item label="扣分分值："> <el-form-item label="加分/扣分分值：">
<p>{{ form.score }}</p> <p>{{ form.score }}</p>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -267,7 +267,7 @@ ...@@ -267,7 +267,7 @@
placeholder="请输入规则名称" placeholder="请输入规则名称"
/> />
<Field <Field
label="扣分方式" label="加分/扣分方式"
prop="subMethod" prop="subMethod"
v-model="form.subMethod" v-model="form.subMethod"
type="select" type="select"
...@@ -275,13 +275,13 @@ ...@@ -275,13 +275,13 @@
placeholder="请选择扣分方式" placeholder="请选择扣分方式"
/> />
<Field <Field
label="扣分人员" label="加分/扣分人员"
prop="deductPerson" prop="deductPerson"
v-model="form.deductPerson" v-model="form.deductPerson"
placeholder="请输入扣分人员" placeholder="请输入扣分人员"
/> />
<Field <Field
label="扣分时间" label="加分/扣分时间"
prop="deductTime" prop="deductTime"
v-model="form.deductTime" v-model="form.deductTime"
type="date" type="date"
...@@ -486,7 +486,13 @@ export default { ...@@ -486,7 +486,13 @@ export default {
this.form.processStatus = 2; this.form.processStatus = 2;
this.form.view = "核查"; this.form.view = "核查";
this.staffChange(this.form.staffId); this.staffChange(this.form.staffId);
this.$post("/perform/rules/list", {
page: 1,
size: -1,
categoryId: this.form.categoryId,
}).then((res) => {
this.ruleArr = res.data.data;
});
this.open = true; this.open = true;
}); });
this.pageInfo.type = "edit"; this.pageInfo.type = "edit";
......
attendance-performance-manager-ui/admin/src/views/perform/gowork/record/list.vue
View file @ 71bc4695
...@@ -219,17 +219,17 @@ export default { ...@@ -219,17 +219,17 @@ export default {
}, },
{ label: "绩效规则", prop: "ruleName" }, { label: "绩效规则", prop: "ruleName" },
{ label: "扣分方式", prop: "subMethod", formatter: this.formatter }, { label: "加分/扣分方式", prop: "subMethod", formatter: this.formatter },
{ {
label: "扣分时间", label: "加分/扣分时间",
prop: "deductTime", prop: "deductTime",
formatter: this.formatterDate, formatter: this.formatterDate,
}, },
{ label: "扣分人员", prop: "deductPerson" }, { label: "加分/扣分人员", prop: "deductPerson" },
{ label: "扣分分值", prop: "score", formatter: this.formatter }, { label: "分值", prop: "score", formatter: this.formatter },
{ {
label: "处理状态", label: "处理状态",
...@@ -244,9 +244,6 @@ export default { ...@@ -244,9 +244,6 @@ export default {
return row.processStatus == 1 ? ( return row.processStatus == 1 ? (
<table-buttons <table-buttons
noAdd noAdd
noView
noEdit
reCheck
row={row} row={row}
onEdit={this.toEdit} onEdit={this.toEdit}
onView={this.toView} onView={this.toView}
......
attendance-performance-manager-ui/admin/src/views/perform/gowork/record/list（原办件绩效管理）.vue
View file @ 71bc4695
...@@ -186,12 +186,12 @@ export default { ...@@ -186,12 +186,12 @@ export default {
{ label: "规则名称", prop: "ruleName" }, { label: "规则名称", prop: "ruleName" },
{ label: "扣分方式", prop: "subMethod", formatter: this.formatter }, { label: "加分/扣分方式", prop: "subMethod", formatter: this.formatter },
{ label: "扣分人员", prop: "deductPerson" }, { label: "加分/扣分人员", prop: "deductPerson" },
{ {
label: "扣分时间", label: "加分/扣分时间",
prop: "deductTime", prop: "deductTime",
formatter: this.formatterDate, formatter: this.formatterDate,
}, },
......
attendance-performance-manager-ui/admin/src/views/perform/gowork/record/view.vue
View file @ 71bc4695
...@@ -44,13 +44,13 @@ ...@@ -44,13 +44,13 @@
<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.ruleName}} {{form.ruleName}}
</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">
{{ util_formatters("subMethod", form.subMethod) }} {{ util_formatters("subMethod", form.subMethod) }}
</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">
{{form.deductPerson}} {{form.deductPerson}}
</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">
{{ util_formatterDate(form.deductTime)}} {{ util_formatterDate(form.deductTime)}}
</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">
......
attendance-performance-manager-ui/admin/src/views/perform/other/record/drawershow.vue
View file @ 71bc4695
...@@ -137,7 +137,7 @@ ...@@ -137,7 +137,7 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="22"> <el-col :span="22">
<el-form-item label="扣分分值："> <el-form-item label="加分/扣分分值：">
<p>{{ form.score }}</p> <p>{{ form.score }}</p>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -228,7 +228,7 @@ ...@@ -228,7 +228,7 @@
placeholder="请输入评分标准" placeholder="请输入评分标准"
/> />
<Field <Field
label="扣分方式" label="加分/扣分方式"
prop="subMethod" prop="subMethod"
v-model="form.subMethod" v-model="form.subMethod"
type="select" type="select"
...@@ -236,13 +236,13 @@ ...@@ -236,13 +236,13 @@
placeholder="请选择扣分方式" placeholder="请选择扣分方式"
/> />
<Field <Field
label="扣分人员" label="加分/扣分人员"
prop="deductPerson" prop="deductPerson"
v-model="form.deductPerson" v-model="form.deductPerson"
placeholder="请输入扣分人员" placeholder="请输入扣分人员"
/> />
<Field <Field
label="扣分时间" label="加分/扣分时间"
prop="deductTime" prop="deductTime"
v-model="form.deductTime" v-model="form.deductTime"
type="date" type="date"
...@@ -448,7 +448,13 @@ export default { ...@@ -448,7 +448,13 @@ export default {
this.form.snapPath ? "" : (this.form.snapPath = ""); this.form.snapPath ? "" : (this.form.snapPath = "");
this.form.view = "核查"; this.form.view = "核查";
this.staffChange(this.form.staffId); this.staffChange(this.form.staffId);
this.$post("/perform/rules/list", {
page: 1,
size: -1,
categoryId: this.form.categoryId,
}).then((res) => {
this.ruleArr = res.data.data;
});
this.open = true; this.open = true;
}); });
this.pageInfo.type = "edit"; this.pageInfo.type = "edit";
......
attendance-performance-manager-ui/admin/src/views/perform/other/record/list.vue
View file @ 71bc4695
...@@ -228,17 +228,17 @@ export default { ...@@ -228,17 +228,17 @@ export default {
}, },
{ label: "绩效规则", prop: "ruleName" }, { label: "绩效规则", prop: "ruleName" },
{ label: "扣分方式", prop: "subMethod", formatter: this.formatter }, { label: "加分/扣分方式", prop: "subMethod", formatter: this.formatter },
{ {
label: "扣分时间", label: "加分/扣分时间",
prop: "deductTime", prop: "deductTime",
formatter: this.formatterDate, formatter: this.formatterDate,
}, },
{ label: "扣分人员", prop: "deductPerson" }, { label: "加分/扣分人员", prop: "deductPerson" },
{ label: "扣分分值", prop: "score", formatter: this.formatter }, { label: "分值", prop: "score", formatter: this.formatter },
{ {
label: "处理状态", label: "处理状态",
...@@ -253,9 +253,6 @@ export default { ...@@ -253,9 +253,6 @@ export default {
return row.processStatus == 1 ? ( return row.processStatus == 1 ? (
<table-buttons <table-buttons
noAdd noAdd
noView
noEdit
reCheck
row={row} row={row}
onEdit={this.toEdit} onEdit={this.toEdit}
onView={this.toView} onView={this.toView}
......
attendance-performance-manager-ui/admin/src/views/perform/other/record/list（原其他绩效管理）.vue
View file @ 71bc4695
...@@ -200,12 +200,12 @@ export default { ...@@ -200,12 +200,12 @@ export default {
{ label: "评分标准", prop: "ruleDesc" }, { label: "评分标准", prop: "ruleDesc" },
{ label: "扣分方式", prop: "subMethod", formatter: this.formatter }, { label: "加分/扣分方式", prop: "subMethod", formatter: this.formatter },
{ label: "扣分人员", prop: "deductPerson" }, { label: "加分/扣分人员", prop: "deductPerson" },
{ {
label: "扣分时间", label: "加分/扣分时间",
prop: "deductTime", prop: "deductTime",
formatter: this.formatterDate, formatter: this.formatterDate,
}, },
......
attendance-performance-manager-ui/admin/src/views/perform/other/record/view.vue
View file @ 71bc4695
...@@ -44,13 +44,13 @@ ...@@ -44,13 +44,13 @@
<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.ruleDesc}} {{form.ruleDesc}}
</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">
{{ util_formatters("subMethod", form.subMethod) }} {{ util_formatters("subMethod", form.subMethod) }}
</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">
{{form.deductPerson}} {{form.deductPerson}}
</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">
{{ util_formatterDate(form.deductTime)}} {{ util_formatterDate(form.deductTime)}}
</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">
......
attendance-performance-manager-ui/admin/src/views/perform/review/record/drawershow.vue
View file @ 71bc4695
...@@ -190,7 +190,7 @@ ...@@ -190,7 +190,7 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="22"> <el-col :span="22">
<el-form-item label="扣分分值："> <el-form-item label="加分/扣分分值：">
<p>{{ form.score }}</p> <p>{{ form.score }}</p>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -282,7 +282,7 @@ ...@@ -282,7 +282,7 @@
placeholder="请输入规则名称" placeholder="请输入规则名称"
/> />
<Field <Field
label="扣分方式" label="加分/扣分方式"
prop="subMethod" prop="subMethod"
v-model="form.subMethod" v-model="form.subMethod"
type="select" type="select"
...@@ -290,13 +290,13 @@ ...@@ -290,13 +290,13 @@
placeholder="请选择扣分方式" placeholder="请选择扣分方式"
/> />
<Field <Field
label="扣分人员" label="加分/扣分人员"
prop="deductPerson" prop="deductPerson"
v-model="form.deductPerson" v-model="form.deductPerson"
placeholder="请输入扣分人员" placeholder="请输入扣分人员"
/> />
<Field <Field
label="扣分时间" label="加分/扣分时间"
prop="deductTime" prop="deductTime"
v-model="form.deductTime" v-model="form.deductTime"
type="date" type="date"
...@@ -501,7 +501,13 @@ export default { ...@@ -501,7 +501,13 @@ export default {
this.form.processStatus = 2; this.form.processStatus = 2;
this.form.view = "核查"; this.form.view = "核查";
this.staffChange(this.form.staffId); this.staffChange(this.form.staffId);
this.$post("/perform/rules/list", {
page: 1,
size: -1,
categoryId: this.form.categoryId,
}).then((res) => {
this.ruleArr = res.data.data;
});
this.open = true; this.open = true;
}); });
this.pageInfo.type = "edit"; this.pageInfo.type = "edit";
......
attendance-performance-manager-ui/admin/src/views/perform/review/record/list.vue
View file @ 71bc4695
...@@ -230,17 +230,17 @@ export default { ...@@ -230,17 +230,17 @@ export default {
{ label: "绩效规则", prop: "ruleNme" }, { label: "绩效规则", prop: "ruleNme" },
{ label: "扣分方式", prop: "subMethod", formatter: this.formatter }, { label: "加分/扣分方式", prop: "subMethod", formatter: this.formatter },
{ {
label: "扣分时间", label: "加分/扣分时间",
prop: "deductTime", prop: "deductTime",
formatter: this.formatterDate, formatter: this.formatterDate,
}, },
{ label: "扣分人员", prop: "deductPerson" }, { label: "加分/扣分人员", prop: "deductPerson" },
{ label: "扣分分值", prop: "score", formatter: this.formatter }, { label: "分值", prop: "score", formatter: this.formatter },
{ {
label: "处理状态", label: "处理状态",
...@@ -255,9 +255,6 @@ export default { ...@@ -255,9 +255,6 @@ export default {
return row.processStatus == 1 ? ( return row.processStatus == 1 ? (
<table-buttons <table-buttons
noAdd noAdd
noView
noEdit
reCheck
row={row} row={row}
onEdit={this.toEdit} onEdit={this.toEdit}
onView={this.toView} onView={this.toView}
......
attendance-performance-manager-ui/admin/src/views/perform/review/record/list（原差评绩效管理）.vue
View file @ 71bc4695
...@@ -194,10 +194,10 @@ export default { ...@@ -194,10 +194,10 @@ export default {
{ label: "规则名称", prop: "ruleName" }, { label: "规则名称", prop: "ruleName" },
{ label: "扣分方式", prop: "subMethod", formatter: this.formatter }, { label: "加分/扣分方式", prop: "subMethod", formatter: this.formatter },
{ {
label: "扣分时间", label: "加分/扣分时间",
prop: "deductTime", prop: "deductTime",
formatter: this.formatterDate, formatter: this.formatterDate,
}, },
......
attendance-performance-manager-ui/admin/src/views/perform/review/record/view.vue
View file @ 71bc4695
...@@ -44,13 +44,13 @@ ...@@ -44,13 +44,13 @@
<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.ruleName}} {{form.ruleName}}
</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">
{{ util_formatters("subMethod", form.subMethod) }} {{ util_formatters("subMethod", form.subMethod) }}
</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">
{{form.deductPerson}} {{form.deductPerson}}
</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">
{{ util_formatterDate(form.deductTime)}} {{ util_formatterDate(form.deductTime)}}
</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">
......
attendance-performance-manager-ui/admin/src/views/staff/perform/stat/list.vue
View file @ 71bc4695
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
:title="'部门扣分排名TOP10'" :title="'部门扣分排名TOP10'"
:id="'koufen_10'" :id="'koufen_10'"
:parameter="depStatObj.totalSubScore" :parameter="depStatObj.totalSubScore"
:legendName="'部门扣分分值'" :legendName="'部门分值'"
:styleObj="{ width: '100%', height: '300px' }" :styleObj="{ width: '100%', height: '300px' }"
/> />
</div> </div>
......
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