Commit 05b6cd81 authored by 赵啸非's avatar 赵啸非

Merge remote-tracking branch 'origin/master'

parents 06c65474 7375e084
......@@ -443,7 +443,7 @@ export default {
delete this.$route.query.yearmonth;
delete this.$route.query.createTimeMonth;
delete this.$route.query.orderColList;
this.form = Object.assign({}, this.form, newData);
this.onSubmit();
},
......@@ -457,6 +457,16 @@ export default {
this.form.year = undefined;
this.form.month = undefined;
}
if (this.form.orderCols1) {
this.form.orderColList = [
{
colName: "totalScore",
sortKind: this.form.orderCols1,
},
];
} else {
this.form.orderColList = "";
}
if (this.form.createTimeMonth) {
// this.form.createTimeStart = this.form.createTimeMonth + "-01";
// this.form.createTimeEnd = this.form.createTimeMonth + "-31";
......
......@@ -211,7 +211,7 @@
</el-row>
<el-row>
<el-col :span="22">
<el-form-item :label="form.subAddType == 1 ? '加分分值' : '扣分分值'">
<el-form-item :label="form.subAddType == 1 ? '加分分值:' : '扣分分值:'">
<p>{{ form.subAddType == 1 ? "+" : "-" }} {{ form.score }}</p>
</el-form-item>
</el-col>
......
......@@ -265,7 +265,7 @@
</el-row>
<el-row>
<el-col :span="22">
<el-form-item :label="form.subAddType == 1 ? '加分分值' : '扣分分值'">
<el-form-item :label="form.subAddType == 1 ? '加分分值:' : '扣分分值:'">
<p>{{ form.subAddType == 1 ? "+" : "-" }} {{ form.score }}</p>
</el-form-item>
</el-col>
......
......@@ -240,7 +240,7 @@
</el-row>
<el-row>
<el-col :span="22">
<el-form-item :label="form.subAddType == 1 ? '加分分值' : '扣分分值'">
<el-form-item :label="form.subAddType == 1 ? '加分分值:' : '扣分分值:'">
<p>{{ form.subAddType == 1 ? "+" : "-" }} {{ form.score }}</p>
</el-form-item>
</el-col>
......
......@@ -217,7 +217,7 @@
</el-row>
<el-row>
<el-col :span="22">
<el-form-item :label="form.subAddType == 1 ? '加分分值' : '扣分分值'">
<el-form-item :label="form.subAddType == 1 ? '加分分值:' : '扣分分值:'">
<p>{{ form.subAddType == 1 ? "+" : "-" }} {{ form.score }}</p>
</el-form-item>
</el-col>
......
......@@ -176,7 +176,7 @@
</el-row>
<el-row>
<el-col :span="22">
<el-form-item :label="form.subAddType == 1 ? '加分分值' : '扣分分值'">
<el-form-item :label="form.subAddType == 1 ? '加分分值:' : '扣分分值:'">
<p>{{ form.subAddType == 1 ? "+" : "-" }} {{ form.score }}</p>
</el-form-item>
</el-col>
......
......@@ -230,7 +230,7 @@
</el-row>
<el-row>
<el-col :span="22">
<el-form-item :label="form.subAddType == 1 ? '加分分值' : '扣分分值'">
<el-form-item :label="form.subAddType == 1 ? '加分分值:' : '扣分分值:'">
<p>{{ form.subAddType == 1 ? "+" : "-" }} {{ form.score }}</p>
</el-form-item>
</el-col>
......
......@@ -29,9 +29,7 @@ export default {
dialogShow,
},
mixins: [table],
created() {
console.log(this.tableData, "123333");
},
created() {},
methods: {
/** 导出Excel */
......@@ -41,7 +39,9 @@ export default {
this.isExport = true;
this.$download(
"/staff/perform/summary/exportExcel",
{
...this.query,
page: 1,
size: -1,
},
......@@ -71,6 +71,10 @@ export default {
this.$refs.dialogform.view(row);
},
afterRender(data) {
data.dict.orderCols1 = {
asc: "正序",
desc: "倒序",
};
console.log(data);
this.config.columns.forEach((v) => {
v.label == "考勤绩效分数"
......@@ -92,6 +96,7 @@ export default {
},
data() {
return {
sortList: "",
isExport: false,
progress: false,
percent: 0,
......@@ -104,7 +109,12 @@ export default {
label: "请选择月份",
fuzzy: false,
},
{
name: "orderCols1",
type: "select",
label: "总分排序方式",
fuzzy: false,
},
{
name: "salaId",
type: "selectSalaId",
......@@ -374,6 +384,8 @@ export default {
{
label: "本月得分数",
prop: "totalScore",
sortable: true,
width: 120,
},
{ label: "", prop: "year", formatter: this.formatter },
{ label: "", prop: "month", formatter: this.formatter },
......
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