From e399049f469632fd33bae1bca7297f3cdcc5266e Mon Sep 17 00:00:00 2001
From: jinna <jn517618@163.com>
Date: Wed, 29 Apr 2026 18:39:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=90=E6=9C=AC=E7=BB=9F=E8=AE=A1=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/costStatistics/index.vue            |  1 +
 .../schedulingException/index.vue             | 66 ++++++++++++-------
 2 files changed, 42 insertions(+), 25 deletions(-)

diff --git a/src/views/costStatistics/index.vue b/src/views/costStatistics/index.vue
index a401cba5..ff0b883e 100644
--- a/src/views/costStatistics/index.vue
+++ b/src/views/costStatistics/index.vue
@@ -680,6 +680,7 @@ export default {
   // 新增：可点击单元格的样式
   ::v-deep .high_row {
     cursor: pointer !important;
+    color: #284c89 !important; /* Element UI 主题蓝，你可以改为 blue 或其他颜色 */
     
     // 可选：增加悬停时的下划线效果，增强交互感
     &:hover {
diff --git a/src/views/productionSchedulingPlan/schedulingException/index.vue b/src/views/productionSchedulingPlan/schedulingException/index.vue
index 9e4fdbb4..bb2abb96 100644
--- a/src/views/productionSchedulingPlan/schedulingException/index.vue
+++ b/src/views/productionSchedulingPlan/schedulingException/index.vue
@@ -15,19 +15,20 @@
       @size-change="sizeChange"
       @refresh-change="refreshChange"
       @on-load="onLoad"
+      @sort-change="sortChange"
     >
       <template #menu="scope">
         <el-button
           v-if="
             $route.path == '/productionSchedulingPlan/schedulingException/index' &&
-            scope.row.errorInfo.indexOf('设备资源') > -1
+            scope.row.errorInfo.indexOf('设备资源') > -1 &&
+            permission.schedulingException_dispose
           "
           type="text"
-          size="mini"
           @click="handleFn(scope.row)"
           >处理</el-button
         >
-        <el-button type="text" size="mini" @click="recoveryFn(scope.row)">恢复</el-button>
+        <el-button type="text" @click="recoveryFn(scope.row)" v-if="permission.schedulingException_recover">恢复</el-button>
       </template>
        <template #demandDate="{ row }">
         {{ row.demandDate ? row.demandDate.substring(0, 10) : '' }}
@@ -38,7 +39,7 @@
 
 <script>
 import { getYieldOrderList,recoveryUpdate } from '@/api/productionSchedulingPlan/scheduling';
-
+import { mapGetters } from 'vuex';
 export default {
   components: {},
   data() {
@@ -107,7 +108,7 @@ export default {
         searchLabelPosition: 'left',
         searchGutter: 24,
         searchSpan: 6,
-        menuAlign: 'left',
+        menuAlign: 'center',
         gridBtn: false,
         searchMenuPosition: 'right',
         align: 'center',
@@ -117,7 +118,7 @@ export default {
             label: '时间',
             prop: 'cycledate',
             search: true,
-            sortable: true,
+            sortable: 'custom',
             span: 12,
             hide: true,
             type: 'date',
@@ -131,7 +132,7 @@ export default {
             label: '异常原因',
             prop: 'errorInfo',
             search: false,
-            sortable: true,
+            sortable: 'custom',
             width: 300,
             span: 12,
           },
@@ -139,7 +140,7 @@ export default {
           //     label: '处理方式',
           //     prop: 'partName',
           //     search: false,
-          //     sortable: true,
+          //     sortable: 'custom',
           //     width: 150,
           //     span: 12,
           //   },
@@ -147,7 +148,7 @@ export default {
             label: '调度员',
             prop: 'dispatcher',
             search: false,
-            sortable: true,
+            // sortable: 'custom',
             width: 150,
             span: 12,
           },
@@ -155,7 +156,7 @@ export default {
             label: '生产单号',
             prop: 'yoCode',
             search: true,
-            sortable: true,
+            sortable: 'custom',
             width: 150,
             span: 12,
             display: false,
@@ -164,7 +165,7 @@ export default {
             label: '计划单号',
             prop: 'ypCode',
             search: false,
-            sortable: true,
+            sortable: 'custom',
             width: 150,
             span: 12,
             display: false,
@@ -173,7 +174,7 @@ export default {
             label: '订单优先级',
             prop: 'priorityApsStr',
             search: false,
-            sortable: true,
+            sortable: 'custom',
             width: 150,
             span: 12,
             display: false,
@@ -182,7 +183,7 @@ export default {
             label: '零件号',
             prop: 'partCode',
             search: true,
-            sortable: true,
+            sortable: 'custom',
             width: 150,
             span: 12,
           },
@@ -190,7 +191,7 @@ export default {
             label: '零件名称',
             prop: 'partName',
             search: false,
-            sortable: true,
+            sortable: 'custom',
             width: 150,
             span: 12,
           },
@@ -198,7 +199,7 @@ export default {
           //   label: '产品型号',
           //   prop: 'productType',
           //   search: false,
-          //   sortable: true,
+          //   sortable: 'custom',
           //   width: 150,
           //   span: 12,
           // },
@@ -206,7 +207,7 @@ export default {
             label: '批次号',
             prop: 'batchNo',
             search: true,
-            sortable: true,
+            sortable: 'custom',
             width: 150,
             span: 12,
           },
@@ -214,7 +215,7 @@ export default {
             label: '流程卡号',
             prop: 'cardNo',
             search: true,
-            sortable: true,
+            sortable: 'custom',
             width: 150,
             span: 12,
             display: false,
@@ -223,7 +224,7 @@ export default {
             label: '流转编码',
             prop: 'roamNo',
             search: true,
-            sortable: true,
+            sortable: 'custom',
             width: 150,
             span: 12,
           },
@@ -231,7 +232,7 @@ export default {
             label: '镀种',
             prop: 'plate',
             search: false,
-            sortable: true,
+            sortable: 'custom',
             width: 150,
             span: 12,
           },
@@ -239,7 +240,7 @@ export default {
             label: '生产标识',
             prop: 'productIdent',
             search: false,
-            sortable: true,
+            sortable: 'custom',
             width: 150,
             span: 12,
           },
@@ -247,7 +248,7 @@ export default {
             label: '生产数量',
             prop: 'ypQty',
             search: false,
-            sortable: true,
+            sortable: 'custom',
             width: 150,
             span: 12,
           },
@@ -255,7 +256,7 @@ export default {
             label: '面积(d㎡)',
             prop: 'ypArea',
             search: false,
-            sortable: true,
+            sortable: 'custom',
             width: 150,
             span: 12,
           },
@@ -263,7 +264,7 @@ export default {
             label: '需求交期',
             prop: 'demandDate',
             search: false,
-            sortable: true,
+            sortable: 'custom',
             width: 150,
             span: 12,
           },
@@ -272,7 +273,7 @@ export default {
             label: '计划下达时间',
             prop: 'releaseDate',
             search: false,
-            sortable: true,
+            sortable: 'custom',
             width: 150,
             span: 12,
           },
@@ -281,7 +282,7 @@ export default {
             label: '备注',
             prop: 'memo',
             search: false,
-            sortable: true,
+            sortable: 'custom',
             width: 150,
             span: 12,
           },
@@ -293,7 +294,22 @@ export default {
       isBatchOpen: false, //分批处理
     };
   },
+  computed:{
+    ...mapGetters(['permission']),
+  },
   methods: {
+    // 表格排序
+    sortChange({ prop, order }) {
+      console.log('prop----------',prop)
+      console.log('order----------',order)
+      this.query.ascs = undefined;
+      this.query.descs = undefined;
+      const orderByFieldKey = order === 'ascending' ? 'ascs' : 'descs';
+      const orderByField = prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase();
+      this.query[orderByFieldKey] = orderByField;
+      // // 重新加载数据
+      this.onLoad(this.page, this.query);
+    },
     handleFn(row) {
       if (row.errorInfo.indexOf('设备资源') > -1) {
         this.$router.push({ path: '/productionSchedulingPlan/basic/equipmentCapacity' });