From 9dc148400c0ad5b9f94c1ba991e2fde8963e7acf Mon Sep 17 00:00:00 2001
From: Leo <leo@qi-cloud.com>
Date: Tue, 6 Jan 2026 23:00:41 +0800
Subject: [PATCH] 1

---
 src/views/system/jdorder/orderList.vue | 145 +++++++++++--------------
 1 file changed, 63 insertions(+), 82 deletions(-)

diff --git a/src/views/system/jdorder/orderList.vue b/src/views/system/jdorder/orderList.vue
index df3cc23..71290a6 100644
--- a/src/views/system/jdorder/orderList.vue
+++ b/src/views/system/jdorder/orderList.vue
@@ -288,10 +288,9 @@
                 </el-dropdown>
               </div>
               
-              <!-- 桌面端：优化后的按钮布局 -->
+              <!-- 桌面端：所有按钮直接显示 -->
               <div v-else class="desktop-action-buttons-wrapper">
-                <!-- 主要操作按钮（第一行） -->
-                <div class="action-row-primary">
+                <div class="action-row-all">
                   <el-button 
                     type="text" 
                     size="mini" 
@@ -326,6 +325,30 @@
                     title="复制物流链接">
                     物流
                   </el-button>
+                  <el-button 
+                    type="text" 
+                    size="mini"
+                    @click="copyReturnInfo(scope.row)"
+                    title="复制退货信息">
+                    退货复制
+                  </el-button>
+                  <el-button 
+                    type="text" 
+                    size="mini"
+                    icon="el-icon-document-copy"
+                    @click="copySingleOrderExcelText(scope.row)"
+                    :style="isExcelTextCopied(scope.row.id) ? 'color: #67C23A;' : ''"
+                    :title="isExcelTextCopied(scope.row.id) ? '已复制录单格式（Excel可粘贴）' : '复制录单格式（Excel可粘贴）'">
+                    录单格式
+                  </el-button>
+                  <el-button 
+                    type="text" 
+                    size="mini"
+                    icon="el-icon-document-copy"
+                    @click="copyRebateRecordText(scope.row)"
+                    title="复制后返录表格式（Excel可粘贴）">
+                    后返录表
+                  </el-button>
                   <el-button 
                     type="text" 
                     size="mini" 
@@ -334,61 +357,24 @@
                     :title="scope.row.distributionMark">
                     获取物流
                   </el-button>
-                </div>
-                
-                <!-- 次要操作按钮（第二行，使用下拉菜单） -->
-                <div class="action-row-secondary">
-                  <el-dropdown 
-                    trigger="hover" 
-                    placement="bottom-end"
-                    @command="handleActionCommand"
-                    size="small">
-                    <el-button 
-                      type="text" 
-                      size="mini"
-                      icon="el-icon-more"
-                      class="more-action-btn">
-                      更多操作<i class="el-icon-arrow-down el-icon--right"></i>
-                    </el-button>
-                    <el-dropdown-menu slot="dropdown" class="desktop-action-dropdown">
-                      <el-dropdown-item 
-                        :command="{action: 'copyReturn', row: scope.row}"
-                        icon="el-icon-document-copy">
-                        退货复制
-                      </el-dropdown-item>
-                      <el-dropdown-item 
-                        :command="{action: 'copyExcel', row: scope.row}"
-                        icon="el-icon-document-copy"
-                        :class="{'is-copied': isExcelTextCopied(scope.row.id)}">
-                        {{ isExcelTextCopied(scope.row.id) ? '✓ 录单格式（已复制）' : '录单格式' }}
-                      </el-dropdown-item>
-                      <el-dropdown-item 
-                        :command="{action: 'copyRebate', row: scope.row}"
-                        icon="el-icon-document-copy">
-                        后返录表
-                      </el-dropdown-item>
-                      <el-dropdown-item divided>
-                        <div style="display: flex; align-items: center; justify-content: space-between; padding: 0 10px;">
-                          <span>统计</span>
-                          <el-switch
-                            v-model="scope.row.isCountEnabled"
-                            :active-value="1"
-                            :inactive-value="0"
-                            @change="handleCountEnabledChange(scope.row)"
-                            size="mini"
-                            style="margin-left: 10px;">
-                          </el-switch>
-                        </div>
-                      </el-dropdown-item>
-                      <el-dropdown-item 
-                        :command="{action: 'delete', row: scope.row}"
-                        icon="el-icon-delete"
-                        divided
-                        style="color: #f56c6c;">
-                        删除
-                      </el-dropdown-item>
-                    </el-dropdown-menu>
-                  </el-dropdown>
+                  <el-switch
+                    v-model="scope.row.isCountEnabled"
+                    :active-value="1"
+                    :inactive-value="0"
+                    @change="handleCountEnabledChange(scope.row)"
+                    active-text="统计"
+                    inactive-text=""
+                    size="mini"
+                    style="margin-left: 4px;">
+                  </el-switch>
+                  <el-button 
+                    type="text" 
+                    size="mini" 
+                    style="color: #f56c6c;" 
+                    @click="handleDelete(scope.row)"
+                    title="删除订单">
+                    删除
+                  </el-button>
                 </div>
               </div>
             </template>
@@ -1909,18 +1895,19 @@ export default {
   }
 }
 
-/* 桌面端操作按钮优化布局 */
+/* 桌面端操作按钮优化布局 - 所有按钮一行显示 */
 .desktop-action-buttons-wrapper {
   display: flex;
-  flex-direction: column;
-  gap: 3px;
-  align-items: flex-start;
+  flex-direction: row;
+  align-items: center;
   width: 100%;
-  padding: 2px 0;
+  padding: 0;
   box-sizing: border-box;
+  flex-wrap: wrap;
+  gap: 2px;
 }
 
-.desktop-action-buttons-wrapper .action-row-primary {
+.desktop-action-buttons-wrapper .action-row-all {
   display: flex;
   flex-wrap: wrap;
   gap: 2px;
@@ -1928,31 +1915,25 @@ export default {
   align-items: center;
   width: 100%;
   line-height: 1.2;
-  min-height: 24px;
-}
-
-.desktop-action-buttons-wrapper .action-row-secondary {
-  display: flex;
-  justify-content: flex-start;
-  align-items: center;
-  width: 100%;
-  margin-top: 1px;
-  min-height: 24px;
 }
 
 .desktop-action-buttons-wrapper .el-button {
-  padding: 3px 5px !important;
+  padding: 3px 6px !important;
   font-size: 12px !important;
   white-space: nowrap !important;
   margin: 0 !important;
-  height: auto !important;
+  height: 24px !important;
   line-height: 1.2 !important;
-  min-height: 20px !important;
+  min-height: 24px !important;
   border: none !important;
+  flex-shrink: 0;
+  display: inline-flex !important;
+  align-items: center !important;
 }
 
-.desktop-action-buttons-wrapper .more-action-btn {
-  padding: 3px 8px !important;
+.desktop-action-buttons-wrapper .el-switch {
+  margin-left: 4px !important;
+  flex-shrink: 0;
 }
 
 /* 桌面端下拉菜单样式 */
@@ -1972,15 +1953,15 @@ export default {
 /* 桌面端确保操作列正常显示 */
 @media (min-width: 769px) {
   .order-table ::v-deep .action-column {
-    width: 240px !important;
+    width: 380px !important;
   }
   
   .order-table ::v-deep .el-table__fixed-right {
-    width: 240px !important;
+    width: 380px !important;
   }
   
   .order-table ::v-deep .el-table__fixed-right-patch {
-    width: 240px !important;
+    width: 380px !important;
   }
   
   /* 隐藏移动端按钮 */