From 907e9d35a738e4335e4df6c76680905ff9f744f0 Mon Sep 17 00:00:00 2001
From: lele0521 <lele190626@gmail.com>
Date: Wed, 15 May 2024 17:56:06 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A2=9E=E5=8A=A0=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 seller/src/views/order/order/orderDetail.vue | 1 +
 seller/src/views/order/order/orderList.vue   | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/seller/src/views/order/order/orderDetail.vue b/seller/src/views/order/order/orderDetail.vue
index 714141b0..fbfd09b8 100644
--- a/seller/src/views/order/order/orderDetail.vue
+++ b/seller/src/views/order/order/orderDetail.vue
@@ -640,6 +640,7 @@ export default {
       },
       modal: false, //弹出调整价格框
       printModal: false,//弹出打印发货单
+      sellerRemarkModal: false,//弹出编辑订单备注
       //调整价格表单
       modifyPriceForm: {
         orderPrice: 0,
diff --git a/seller/src/views/order/order/orderList.vue b/seller/src/views/order/order/orderList.vue
index 2755f75a..487ecd98 100644
--- a/seller/src/views/order/order/orderList.vue
+++ b/seller/src/views/order/order/orderList.vue
@@ -143,6 +143,13 @@ export default {
           key: "sn",
           minWidth: 200,
           tooltip: true,
+          render: (h, params) => {
+            if (params.row.sellerRemark) {
+              return h("div", {}, params.row.sellerRemark + " ("+params.row.sn+")");
+            } else {
+              return h("div", {}, params.row.sn);
+            }
+          },
         },
         {
           title: "订单来源",