From b1c4b9509b3b84594bbc9a541f308101d3a17140 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 24 七月 2025 10:20:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/eam/repair/EamRepairOrderList.vue |   29 ++++++++++++++++++-----------
 1 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/views/eam/repair/EamRepairOrderList.vue b/src/views/eam/repair/EamRepairOrderList.vue
index 34f03c0..29f3659 100644
--- a/src/views/eam/repair/EamRepairOrderList.vue
+++ b/src/views/eam/repair/EamRepairOrderList.vue
@@ -35,11 +35,11 @@
 
     <!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
     <div class="table-operator" v-if="isDisplayOperation">
-      <a-dropdown v-if="selectedRowKeys.length > 0">
+      <a-dropdown :disabled="selectedRowKeys.length == 0">
         <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel">
-            <a-icon type="delete"/>
-            鍒犻櫎
+          <a-menu-item key="1" @click="handleBatchSubmit">
+            <a-icon type="form"/>
+            鎻愪氦
           </a-menu-item>
         </a-menu>
         <a-button style="margin-left: 8px"> 鎵归噺鎿嶄綔
@@ -61,13 +61,15 @@
                :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"
                :scroll="{x:'max-content'}">
         <span slot="action" slot-scope="text, record">
-          <a v-if="record.repairStatus === 'PENDING_REPAIR' || record.repairStatus === 'UNDER_MAINTENANCE'" @click="handleFillIn(record)">濉姤</a>
-          <a-divider v-if="record.repairStatus === 'PENDING_REPAIR' || record.repairStatus === 'UNDER_MAINTENANCE'" type="vertical"/>
-          <a-popconfirm v-if="record.repairStatus === 'PENDING_REPAIR' || record.repairStatus === 'UNDER_MAINTENANCE'" title="纭畾鎻愪氦鍚�?" @confirm="() => handleSubmit(record.id)">
-             <a>鎻愪氦</a>
-          </a-popconfirm>
-          <a-divider v-if="record.repairStatus === 'PENDING_REPAIR' || record.repairStatus === 'UNDER_MAINTENANCE'" type="vertical"/>
-          <a @click="handleDetail(record)">璇︽儏</a>
+          <template v-if="record.repairStatus=='PENDING_REPAIR'||record.repairStatus=='UNDER_MAINTENANCE'">
+             <a @click="handleFillIn(record)">濉姤</a>
+             <a-divider type="vertical"/>
+             <a-popconfirm title="纭畾鎻愪氦鍚�?" @confirm="() => handleSubmit(record.id)">
+               <a>鎻愪氦</a>
+             </a-popconfirm>
+          </template>
+
+          <a v-else @click="handleDetail(record)">璇︽儏</a>
         </span>
       </a-table>
     </div>
@@ -261,6 +263,11 @@
           })
       },
 
+      // 鎵归噺鎻愪氦鏃惰Е鍙�
+      handleBatchSubmit() {
+
+      },
+
       /**
        * 鐐瑰嚮璇︽儏瑙﹀彂
        * @param record 琛ㄦ牸琛屼俊鎭�

--
Gitblit v1.9.3