From 9578d3ccb442f19631735354d2b36a72ea8c9b22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=91=E6=96=87=E5=8F=AF?= <1041367524@qq.com>
Date: Mon, 11 Apr 2022 09:53:19 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=AE=A2=E5=8D=95=E5=8D=95=E7=8B=AC?=
 =?UTF-8?q?=E5=8F=91=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/sales/order.js |  2 +-
 src/views/sales/order/index.vue  | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/store/modules/sales/order.js b/src/store/modules/sales/order.js
index d1fbada..b2f63bd 100644
--- a/src/store/modules/sales/order.js
+++ b/src/store/modules/sales/order.js
@@ -43,7 +43,7 @@ const actions = {
         if (res) {
             commit(
                 'setSummary',
-                ['allCount', 'unpaidCount', 'closeCount', 'waitDeliveryCount', '', 'deliveredCount', 'finishCount'].map(
+                ['allCount', 'unpaidCount', 'closeCount', 'waitDeliveryCount', 'deliveredCount', '', 'finishCount'].map(
                     (prop) => res[prop]
                 )
             );
diff --git a/src/views/sales/order/index.vue b/src/views/sales/order/index.vue
index ef87f8f..b1f94b3 100644
--- a/src/views/sales/order/index.vue
+++ b/src/views/sales/order/index.vue
@@ -148,7 +148,7 @@
             });
             router.push({ name: 'OrderShip' });
         } else {
-            proxy.$message.warning('请选择要删除的数据');
+            proxy.$message.warning('请选择要发货的订单');
         }
     };
 
@@ -175,6 +175,7 @@
                 type: 'selection',
                 fixed: 'left',
                 width: 60,
+                selectable: (row) => row.orderStatus === 3,
             },
             {
                 label: '订单编号',
@@ -200,7 +201,7 @@
             {
                 label: '订单来源',
                 width: 120,
-                prop: 'payTypeDesc',
+                prop: 'orderSourceDesc',
             },
             {
                 label: '订单状态',
@@ -229,6 +230,13 @@
                             ) : (
                                 ''
                             )}
+                            {row.orderStatus === 3 ? (
+                                <ElButton type="text" onClick={() => handleSend([row])}>
+                                    订单发货
+                                </ElButton>
+                            ) : (
+                                ''
+                            )}
                         </div>
                     ),
                 },