diff --git a/attendance-performance-manager-ui/admin/src/components/SearchForm.vue b/attendance-performance-manager-ui/admin/src/components/SearchForm.vue
index fb7b443d6a0338a5e432a246d896368e2bcac991..8605ccebf8d1197e62ec92833f3aa49ea32afa27 100644
--- a/attendance-performance-manager-ui/admin/src/components/SearchForm.vue
+++ b/attendance-performance-manager-ui/admin/src/components/SearchForm.vue
@@ -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";
diff --git a/attendance-performance-manager-ui/admin/src/views/perform/attend/record/drawershow.vue b/attendance-performance-manager-ui/admin/src/views/perform/attend/record/drawershow.vue
index 84aafa35227d84f69e54eb7b975ae47804c47dec..5a92b08312de10ad9d8b99a93239c7eacc209768 100644
--- a/attendance-performance-manager-ui/admin/src/views/perform/attend/record/drawershow.vue
+++ b/attendance-performance-manager-ui/admin/src/views/perform/attend/record/drawershow.vue
@@ -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>
diff --git a/attendance-performance-manager-ui/admin/src/views/perform/complain/record/drawershow.vue b/attendance-performance-manager-ui/admin/src/views/perform/complain/record/drawershow.vue
index 8623f8900747c62241dc6d667f99fbca963317fb..f01bc9c6662ad458b8a684eb6e629f03cbd146a2 100644
--- a/attendance-performance-manager-ui/admin/src/views/perform/complain/record/drawershow.vue
+++ b/attendance-performance-manager-ui/admin/src/views/perform/complain/record/drawershow.vue
@@ -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>
diff --git a/attendance-performance-manager-ui/admin/src/views/perform/effect/record/drawershow.vue b/attendance-performance-manager-ui/admin/src/views/perform/effect/record/drawershow.vue
index efefefdbacf14d6db7df86b8ee1336c32364ba50..94ee4679a4e7439582601cd6138f4495daf79d99 100644
--- a/attendance-performance-manager-ui/admin/src/views/perform/effect/record/drawershow.vue
+++ b/attendance-performance-manager-ui/admin/src/views/perform/effect/record/drawershow.vue
@@ -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>
diff --git a/attendance-performance-manager-ui/admin/src/views/perform/gowork/record/drawershow.vue b/attendance-performance-manager-ui/admin/src/views/perform/gowork/record/drawershow.vue
index 07034c4616b12c5e59930c47489bd7d289532aed..b117f75fea96c3b75f628b2f83fd2bce556e4f7a 100644
--- a/attendance-performance-manager-ui/admin/src/views/perform/gowork/record/drawershow.vue
+++ b/attendance-performance-manager-ui/admin/src/views/perform/gowork/record/drawershow.vue
@@ -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>
diff --git a/attendance-performance-manager-ui/admin/src/views/perform/other/record/drawershow.vue b/attendance-performance-manager-ui/admin/src/views/perform/other/record/drawershow.vue
index e1999990537f593bb3320a58f06835ff2940d9dd..8c63d785754774873dc3b82bea9eeee436736278 100644
--- a/attendance-performance-manager-ui/admin/src/views/perform/other/record/drawershow.vue
+++ b/attendance-performance-manager-ui/admin/src/views/perform/other/record/drawershow.vue
@@ -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>
diff --git a/attendance-performance-manager-ui/admin/src/views/perform/review/record/drawershow.vue b/attendance-performance-manager-ui/admin/src/views/perform/review/record/drawershow.vue
index ca5dd31fa5495f9e0260d8ebafb020b79275c62e..5817c8290ca8d3f4f5bbd6bf1526f74dd4e48b79 100644
--- a/attendance-performance-manager-ui/admin/src/views/perform/review/record/drawershow.vue
+++ b/attendance-performance-manager-ui/admin/src/views/perform/review/record/drawershow.vue
@@ -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>
diff --git a/attendance-performance-manager-ui/admin/src/views/staff/perform/summary/list.vue b/attendance-performance-manager-ui/admin/src/views/staff/perform/summary/list.vue
index 04c601a7ef1cdce61c5e8cd8185fb988fe3e8524..c9334f0370a1894bc1fea5e5cf73b90fe5cce5c1 100644
--- a/attendance-performance-manager-ui/admin/src/views/staff/perform/summary/list.vue
+++ b/attendance-performance-manager-ui/admin/src/views/staff/perform/summary/list.vue
@@ -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 },