From 1d429dc104d672dd58117a685ea5f6fa6a1fd3a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A3=98=E6=B3=8A=E5=AE=A2?= <1059510186@qq.com>
Date: Mon, 25 Sep 2023 13:53:19 +0800
Subject: [PATCH] 123

---
 .../geopoliticalCustomers/geopoliticalCustomersModal.vue     | 5 +++--
 src/views/qualityInspectionDistribution/inspectionModal.vue  | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/views/geopoliticalCustomers/geopoliticalCustomersModal.vue b/src/views/geopoliticalCustomers/geopoliticalCustomersModal.vue
index 1fac550..1fdc916 100644
--- a/src/views/geopoliticalCustomers/geopoliticalCustomersModal.vue
+++ b/src/views/geopoliticalCustomers/geopoliticalCustomersModal.vue
@@ -383,8 +383,9 @@
       <p>联系方式：{{ formModel.customNid }}</p>
       <div style="overflow-y: auto; max-height: 200px">
         <p v-for="(item, index) in formModel.customStoreEntities" :key="index">
-          {{ `报名的门店${index + 1}为` }}： {{ item.storeName }} --
-          {{ `${item.reservationDate?.toString().split(' ')[0]} ${item.reservationTime}` }}
+          <span>{{ `报名的门店${index + 1}为` }}：{{ item.storeName }}</span>
+          <span>&nbsp;{{ item.reservationDate?.toString().split(' ')[0] }}</span>
+          <span>&nbsp;{{ item.reservationTime }}</span>
         </p>
       </div>
     </a-modal>
diff --git a/src/views/qualityInspectionDistribution/inspectionModal.vue b/src/views/qualityInspectionDistribution/inspectionModal.vue
index 38703b6..4da75ee 100644
--- a/src/views/qualityInspectionDistribution/inspectionModal.vue
+++ b/src/views/qualityInspectionDistribution/inspectionModal.vue
@@ -59,7 +59,7 @@
           </a-col>
           <a-col xs="24" :sm="24" :md="12">
             <a-form-item label="预约时间">
-              <a-input v-model:value="item.reservationTime" placeholder="请输入" readonly />
+              <a-input v-model:value="item.reservationTime" placeholder="未选择" readonly />
             </a-form-item>
           </a-col>
         </a-row>
@@ -186,7 +186,7 @@ defineExpose({
             const targetObj = formModel.customStoreVOList.find(
               (i: any) => i.storeId === item.storeId
             )
-            if (targetObj) {
+            if (targetObj && item.reservationDate) {
               targetObj.reservationTime =
                 item.reservationDate.split(' ')[0] + ' ' + item.reservationTime
             }