表单间距调整

src/components/Form/src/BasicForm.vue

@@ -332,7 +332,7 @@
       }
 
       &:not(.ant-form-item-with-help) {
-        margin-bottom: 15px;
+        margin-bottom: 10px;
       }
 
       &.suffix-item {

src/components/Print/index.vue

@@ -30,17 +30,20 @@
             </a-radio-group>
             <p class="message">默认打印格式为pdf,如需其他格式请选择</p>
           </a-form-item>
-          <a-form-item
+          <a-spin :spinning="loading">
-            label="点击选择模版将跳转打印预览页"
+            <a-form-item
-          >
+              label="点击选择模版将跳转打印预览页"
-            <a-row :gutter="15">
+            >
-              <a-col :span="12" v-for="item in modelData" :key="item.id" @click="toPrint(item.id)">
+              <a-row :gutter="15">
-                <div class="model-card">
+                <a-col :span="12" v-for="item in modelData" :key="item.id" @click="toPrint(item.id)">
-                  {{ item.templateName }}
+                  <div class="model-card">
-                </div>
+                    <span class="iconfont icon-printing" :style="{ fontSize: '13px' }"></span>
-              </a-col>
+                    {{ item.templateName }}
-            </a-row>
+                  </div>
-          </a-form-item>
+                </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>

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;

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>下货纸