From e19d2dbab19b749b725573fb39358868fcc04a11 Mon Sep 17 00:00:00 2001
From: zccbbg <zccbbg@qq.com>
Date: Thu, 16 May 2024 17:54:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=A1=B5=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/oms/order/index.vue | 58 ++++++++++++++++-------------------
 1 file changed, 27 insertions(+), 31 deletions(-)

diff --git a/src/views/oms/order/index.vue b/src/views/oms/order/index.vue
index cc9cc09..218c4d6 100644
--- a/src/views/oms/order/index.vue
+++ b/src/views/oms/order/index.vue
@@ -130,13 +130,6 @@
             <el-tag :type="getOrderStatusTag(scope.row.status)" style="margin-right: 10px">
               {{ getOrderStatusText(scope.row.status) }}
             </el-tag>
-            <el-button
-              size="mini"
-              type="text"
-              @click="handleDelivery(scope.row)"
-              :disabled="scope.row.status !== 1 && scope.row.status !== 2 && scope.row.status !== 3"
-            >编辑
-            </el-button>
           </div>
           <div v-if="scope.row.deliverySn">物流单号：{{ scope.row.deliverySn }}
             <el-link @click="copy(scope.row.deliverySn)" :underline="false"><i
@@ -145,9 +138,9 @@
           <div v-if="scope.row.deliveryTime">发货时间：{{ parseTime(scope.row.deliveryTime, '') }}</div>
         </template>
       </el-table-column>
-      <el-table-column label="订单编号/操作" class-name="small-padding fixed-width" width="220" fixed="right">
-        <template slot-scope="scope">
-          <div>
+      <el-table-column label="订单编号/操作" class-name="small-padding fixed-width" width="220" fixed="right" >
+        <template slot-scope="scope" >
+          <div style="float: right">
             {{ scope.row.orderSn }}
             <!--            <el-link-->
             <!--              size="mini"-->
@@ -157,27 +150,30 @@
             <el-link @click="copy(scope.row.orderSn)" :underline="false"><i
               class="el-icon-document-copy el-icon--right"></i></el-link>
           </div>
-          <el-button
-            size="mini"
-            type="text"
-            @click="goDetail(scope.row)"
-            v-hasPermi="['oms:order:query']"
-          >详情
-          </el-button>
-          <el-button
-            size="mini"
-            type="text"
-            @click="showLog(scope.row.id)"
-            v-hasPermi="['oms:order:log']"
-          >日志
-          </el-button>
-          <el-button
-            size="mini"
-            type="text"
-            @click="handleDelivery(scope.row)"
-            :disabled="scope.row.status !== 1 && scope.row.status !== 2 && scope.row.status !== 3"
-          >发货
-          </el-button>
+          <div style="float: right">
+            <el-button
+              size="mini"
+              type="text"
+              @click="goDetail(scope.row)"
+              v-hasPermi="['oms:order:query']"
+            >详情
+            </el-button>
+            <el-button
+              size="mini"
+              type="text"
+              @click="showLog(scope.row.id)"
+              v-hasPermi="['oms:order:log']"
+            >日志
+            </el-button>
+            <el-button
+              size="mini"
+              type="text"
+              @click="handleDelivery(scope.row)"
+              :disabled="scope.row.status !== 1 && scope.row.status !== 2 && scope.row.status !== 3"
+            >发货
+            </el-button>
+          </div>
+
         </template>
       </el-table-column>
     </el-table>