From 06a6e937a69abf4c8c806b5494b66a3412c92b84 Mon Sep 17 00:00:00 2001
From: ysn <2126564605@qq.com>
Date: Tue, 28 Apr 2026 10:35:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE-=E7=8F=AD?=
 =?UTF-8?q?=E6=AC=A1=E7=AE=A1=E7=90=86-=E6=96=B0=E5=A2=9E=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basicData/shiftManagement.vue | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/views/basicData/shiftManagement.vue b/src/views/basicData/shiftManagement.vue
index b4b36a75..85184008 100644
--- a/src/views/basicData/shiftManagement.vue
+++ b/src/views/basicData/shiftManagement.vue
@@ -56,8 +56,8 @@ export default {
         selection: false,
         viewBtn: false,
         delBtn: false,
+        editBtn: true,
         editBtnText: '修改',
-        editBtnIcon: ' ',
         viewBtnText: '详情',
         labelWidth: 120,
         menuWidth: 120,
@@ -85,7 +85,7 @@ export default {
             label: '班次',
             prop: 'name',
             search: true,
-            sortable: true,
+            sortable: 'custom',
             filter: true,
             addDisplay: true,
             editDisplay: true,
@@ -196,17 +196,14 @@ export default {
     },
     // 排序
     sortChange({ prop, order }) {
-      if (!prop) {
-        // 如果取消排序，清空排序参数
-        this.query.orderByField = undefined;
-        this.query.isAsc = undefined;
-      } else {
-        const orderByField = prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase();
-        this.query.orderByField = orderByField;
-        this.query.isAsc = order === 'ascending' ? true : false;
-      }
-      // 重新加载数据
-      this.onLoad();
+      this.query.descs = undefined;
+      this.query.ascs = undefined;
+      let orderByFieldKey = order === 'descending' ? 'descs' : 'ascs';
+      this.query[orderByFieldKey] = !prop
+        ? undefined
+        : prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase();
+      // // 重新加载数据
+      this.onLoad(this.page, this.query);
     },
     onLoad() {
       this.loading = true;