ZaiZai 1 سال پیش
والد
کامیت
5d195eeed9
2فایلهای تغییر یافته به همراه20 افزوده شده و 17 حذف شده
  1. 14 3
      src/global/components/hc-new-card/hc-new-card.vue
  2. 6 14
      src/views/data-fill/query.vue

+ 14 - 3
src/global/components/hc-new-card/hc-new-card.vue

@@ -1,5 +1,5 @@
 <template>
-    <HcCard class="hc-new-card-box">
+    <HcCard class="hc-new-card-box" :class="padding ? 'is-padding' : ''">
         <template v-if="isSlotHeader || titles || isSlotExtra || extraText">
             <div class="hc-card-header-box">
                 <div class="hc-card-header">
@@ -68,6 +68,10 @@ const props = defineProps({
         type: String,
         default: '',
     },
+    padding: {
+        type: Boolean,
+        default: false,
+    },
 })
 
 const titles = ref(props.title)
@@ -125,6 +129,7 @@ const isSlotSearchBar = ref(!!slots.search)
         display: flex;
         align-items: center;
         flex-shrink: 0;
+        margin-bottom: 10px;
     }
     .hc-card-main {
         position: relative;
@@ -137,9 +142,15 @@ const isSlotSearchBar = ref(!!slots.search)
     }
     .hc-card-action {
         position: relative;
-        display: flex;
-        align-items: center;
         flex-shrink: 0;
     }
+    &.is-padding {
+        .hc-card-header-box {
+            padding-bottom: 8px;
+        }
+        .hc-card-action {
+            padding-top: 8px;
+        }
+    }
 }
 </style>

+ 6 - 14
src/views/data-fill/query.vue

@@ -50,7 +50,7 @@
             <div class="horizontal-drag-line" @mousedown="onmousedown" />
         </div>
         <div class="hc-layout-content-box">
-            <HcCard :scrollbar="false" action-size="lg">
+            <HcNewCard :scrollbar="false" padding>
                 <template #header>
                     <HcTooltip keys="query_report">
                         <el-button :disabled="tableCheckedKeys.length <= 0" :loading="reportLoading" hc-btn color="#FF976A" style="color: white;" @click="reportModalClick">
@@ -180,25 +180,17 @@
                     <div class="lr-dialog-footer">
                         <div class="left">
                             <span class="text-success">任务人员中:</span>
-                            <el-tag class="mx-1" effect="dark" type="info">
-                                未签字
-                            </el-tag>
-                            <el-tag class="mx-1" effect="dark" type="success">
-                                已签字
-                            </el-tag>
-                            <el-tag class="mx-1" effect="dark" type="warning">
-                                已废除
-                            </el-tag>
-                            <el-tag class="mx-1" effect="dark" type="danger">
-                                签字异常
-                            </el-tag>
+                            <el-tag class="mx-1" effect="dark" type="info">未签字</el-tag>
+                            <el-tag class="mx-1" effect="dark" type="success">已签字</el-tag>
+                            <el-tag class="mx-1" effect="dark" type="warning">已废除</el-tag>
+                            <el-tag class="mx-1" effect="dark" type="danger">签字异常</el-tag>
                         </div>
                         <div class="right">
                             <HcPages :pages="searchForm" @change="pageChange" />
                         </div>
                     </div>
                 </template>
-            </HcCard>
+            </HcNewCard>
         </div>
 
         <!-- 批量上报审批 -->