From 3959c73344b0a8ee0bffba9c8cb4fa57e449328e Mon Sep 17 00:00:00 2001
From: lijingjia <lijj_xl@163.com>
Date: Thu, 13 Jun 2024 08:51:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E5=8D=95=E9=97=B4=E8=B7=9D=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Form/src/BasicForm.vue         |  2 +-
 src/components/Print/index.vue                | 32 ++++++++++++-------
 src/styles/common.scss                        |  2 +-
 .../detail/modules/operationArea.vue          |  2 +-
 4 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/src/components/Form/src/BasicForm.vue b/src/components/Form/src/BasicForm.vue
index 87466d7b..9769f1a5 100644
--- a/src/components/Form/src/BasicForm.vue
+++ b/src/components/Form/src/BasicForm.vue
@@ -332,7 +332,7 @@
       }
 
       &:not(.ant-form-item-with-help) {
-        margin-bottom: 15px;
+        margin-bottom: 10px;
       }
 
       &.suffix-item {
diff --git a/src/components/Print/index.vue b/src/components/Print/index.vue
index a1534246..77bf6123 100644
--- a/src/components/Print/index.vue
+++ b/src/components/Print/index.vue
@@ -30,17 +30,20 @@
             </a-radio-group>
             <p class="message">默认打印格式为pdf,如需其他格式请选择</p>
           </a-form-item>
-          <a-form-item
-            label="点击选择模版将跳转打印预览页"
-          >
-            <a-row :gutter="15">
-              <a-col :span="12" v-for="item in modelData" :key="item.id" @click="toPrint(item.id)">
-                <div class="model-card">
-                  {{ item.templateName }}
-                </div>
-              </a-col>
-            </a-row>
-          </a-form-item>
+          <a-spin :spinning="loading">
+            <a-form-item
+              label="点击选择模版将跳转打印预览页"
+            >
+              <a-row :gutter="15">
+                <a-col :span="12" v-for="item in modelData" :key="item.id" @click="toPrint(item.id)">
+                  <div class="model-card">
+                    <span class="iconfont icon-printing" :style="{ fontSize: '13px' }"></span>
+                    {{ item.templateName }}
+                  </div>
+                </a-col>
+              </a-row>
+            </a-form-item>
+          </a-spin>
         </a-form>
       </a-spin>
       <template #footer>
@@ -74,7 +77,9 @@
   const init = (v) => {
     visible.value = true
     jsonDataStr.value = JSON.stringify(v)
+    loading.value = true
     GetOpenPrintModuleList().then(res => {
+      loading.value = false
       const { data } = res
       let modelId = null
       data.forEach(item => {
@@ -87,6 +92,8 @@
           modelData.value = r.data
         })
       }
+    }).catch(() => {
+      loading.value = false
     })
   }
 
@@ -134,5 +141,8 @@
     .ant-modal-footer {
       display: none;
     }
+    .model-card:hover {
+      color: #4A54FF;
+    }
   }
 </style>
diff --git a/src/styles/common.scss b/src/styles/common.scss
index b82eb774..04a00c4b 100644
--- a/src/styles/common.scss
+++ b/src/styles/common.scss
@@ -35,7 +35,7 @@ h5 {
 // 表单详情样式
 .ds-form-detail {
   .ant-form-item {
-    margin-bottom: 15px;
+    margin-bottom: 10px;
   }
   .ant-form-item-control-input-content {
     white-space: nowrap;
diff --git a/src/views/operation/seaexport/detail/modules/operationArea.vue b/src/views/operation/seaexport/detail/modules/operationArea.vue
index d7f4d558..fd23eb74 100644
--- a/src/views/operation/seaexport/detail/modules/operationArea.vue
+++ b/src/views/operation/seaexport/detail/modules/operationArea.vue
@@ -62,7 +62,7 @@
           @visibleChange="handleVisibleChange"
           @confirm="openPreOrderFun"
         >
-          <button> <span class="iconfont icon-yunshu1" style="font-size: 14px"></span>舱单 </button>
+          <button> <span class="iconfont icon-yunshu1" style="font-size: 14px"></span> 舱单 </button>
         </a-popconfirm>
         <!-- <button @click="openModel('paper')">
           <span class="iconfont icon-zhizhishu" style="font-size: 18px"></span>下货纸