From de844a9462ceca91cdc0e7bb3abb23c1eccebf49 Mon Sep 17 00:00:00 2001
From: zhangdongxue <zhangdongxue@uz.cn>
Date: Thu, 24 Aug 2023 10:27:57 +0800
Subject: [PATCH] merge

---
 .DS_Store                              | Bin 12292 -> 12292 bytes
 src/views/sales/Offline.vue            |   5 ++++-
 src/views/sales/widgets/AddOffline.vue |   4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index a27e3c17d372672aeff144958c5f060739f3dcb2..56e951d8e2139cf73de0518f8c440164059d852a 100644
GIT binary patch
delta 20
bcmZokXi3;mrowJwtfOFQV6?ebrJWl9NFD}G

delta 20
bcmZokXi3;mrowJ$qN8AGY`D2rrJWl9NE8N6

diff --git a/src/views/sales/Offline.vue b/src/views/sales/Offline.vue
index caf7e7d..edbf189 100644
--- a/src/views/sales/Offline.vue
+++ b/src/views/sales/Offline.vue
@@ -68,7 +68,10 @@
           {{ record.channel == 'express' ?'快递':'自提' }}
         </div>
         <div slot="express" slot-scope="text, record">
-          {{ record.express.name || '-' }} <div>{{ record.express.express_no || '-' }}</div>
+          <div v-if="record.channel === 'express'">
+            {{ record.express.name || '-' }} <div>{{ record.express.express_no || '-' }}</div>
+          </div>
+          <div v-else>发货时间：{{ record.deliver_at }}</div>
         </div>
       </s-table>
     </a-card>
diff --git a/src/views/sales/widgets/AddOffline.vue b/src/views/sales/widgets/AddOffline.vue
index 818a752..a03f701 100644
--- a/src/views/sales/widgets/AddOffline.vue
+++ b/src/views/sales/widgets/AddOffline.vue
@@ -107,11 +107,11 @@
           'deliver_at',
           {
             rules: [
-              { required: true, message: `请选择自提时间!` },
+              { required: false, message: `请选择发货时间!` },
             ]
           }
         ]"
-        :placeholder="`请选择自提时间!`"
+        :placeholder="`请选择发货时间!`"
         style="width: 100%" />
     </a-form-item>
   </a-form>