li.shaoyi před 3 roky
rodič
revize
5101b0b25d

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 278 - 278
src/assets/styles/mixin.less


+ 40 - 48
src/common/components/description/index.vue

@@ -1,15 +1,9 @@
 <template>
   <!-- 明细 公共组件 -->
-  <a-drawer placement="bottom"
-            :closable="false"
-            :visible="show"
-            :get-container="false"
-            :wrap-style="{ position: 'absolute' }"
-            @close="close">
+  <a-drawer placement="bottom" :closable="false" :visible="show" :get-container="false" :wrap-style="{ position: 'absolute' }" @close="close" style="font-size:0">
     <div class="bottomTable">
       <slot></slot>
-      <ThridMenu :list="tabList"
-                 @selectMenu="changeTab" />
+      <ThridMenu :list="tabList" @selectMenu="changeTab" />
     </div>
   </a-drawer>
 </template>
@@ -21,44 +15,44 @@ import { TabList } from './interface';
 import { ColumnType } from '@/common/methods/table/interface';
 
 export default defineComponent({
-    name: 'description',
-    components: {
-        ThridMenu,
+  name: 'description',
+  components: {
+    ThridMenu,
+  },
+  props: {
+    tabList: {
+      // 按钮列表
+      default: [],
+      type: Array as PropType<TabList[]>,
     },
-    props: {
-        tabList: {
-            // 按钮列表
-            default: [],
-            type: Array as PropType<TabList[]>,
-        },
-        tableList: {
-            // 表格数据
-            default: [],
-            type: Array as PropType<any[]>,
-        },
-        columns: {
-            // 表头数据
-            default: [],
-            type: Array as PropType<ColumnType[]>,
-        },
-        visible: {
-            // 是否显示
-            default: false,
-            type: Boolean,
-        },
+    tableList: {
+      // 表格数据
+      default: [],
+      type: Array as PropType<any[]>,
     },
-    setup(props, context) {
-        const show = ref<boolean>(true);
-        // 切换明细
-        function changeTab(index: number, current: TabList) {
-            context.emit('changeTab', index, current);
-        }
-        function close() {
-            show.value = false;
-            context.emit('close');
-        }
-        return { changeTab, show, close };
+    columns: {
+      // 表头数据
+      default: [],
+      type: Array as PropType<ColumnType[]>,
     },
+    visible: {
+      // 是否显示
+      default: false,
+      type: Boolean,
+    },
+  },
+  setup(props, context) {
+    const show = ref<boolean>(true);
+    // 切换明细
+    function changeTab(index: number, current: TabList) {
+      context.emit('changeTab', index, current);
+    }
+    function close() {
+      show.value = false;
+      context.emit('close');
+    }
+    return { changeTab, show, close };
+  },
 });
 </script>
 
@@ -67,11 +61,9 @@ export default defineComponent({
     width: 100%;
     .flex;
     flex-direction: column;
-    .topTable {
-        height: calc(100% - 46px);
-        .ant-table {
-            background-color: transparent;
-        }
+    .mtp-table-scroll {
+        flex: 1;
+        overflow-y: auto;
     }
 }
 </style>;

+ 1 - 2
src/layout/components/main.vue

@@ -48,13 +48,12 @@ export default defineComponent({
 }
 .first-menu {
     width: 100%;
-    height: 35px;
     border-bottom: 1px solid @m-blue0 !important;
     background-color: @m-black1;
     .flex;
     justify-content: space-between;
     .a-menu_container {
-        padding-top: 2px;
+        margin-top: 2px;
         .flex();
         height: 32px;
         line-height: 32px;

+ 14 - 10
src/views/account-manager/account-manager-agency/account-manager-agency-sub/index.vue

@@ -25,17 +25,21 @@
   </mtp-table-scroll>
   <!-- 明细 -->
   <Description v-if="visible" @changeTab="changeTab" @close="closeDrawer" :tabList="tabList">
-    <a-table :columns="detailColumns" class="topTable" :pagination="false" rowKey="key" :data-source="detailList" :scroll="{ x: '100%', y: 'calc(100% - 36px)' }">
-      <template #updatetime="{ text }">
-        <span>{{ formatTime(text) }}</span>
+    <mtp-table-scroll>
+      <template #default="{ scroll }">
+        <a-table :columns="detailColumns" class="srcollYTable" :pagination="false" rowKey="key" :data-source="detailList" :scroll="scroll">
+          <template #updatetime="{ text }">
+            <span>{{ formatTime(text) }}</span>
+          </template>
+          <template #certificatephotourl="{ text, record }">
+            <a @click="previewImg(text)">{{handleUrl(text, record)}}</a>
+          </template>
+          <template #applystatus="{ text }">
+            <span>{{ getAccountInOutApplyStatus(text) }}</span>
+          </template>
+        </a-table>
       </template>
-      <template #certificatephotourl="{ text, record }">
-        <a @click="previewImg(text)">{{handleUrl(text, record)}}</a>
-      </template>
-      <template #applystatus="{ text }">
-        <span>{{ getAccountInOutApplyStatus(text) }}</span>
-      </template>
-    </a-table>
+    </mtp-table-scroll>
   </Description>
   <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" @cancel="closeComponent"></component>
   <a-modal :visible="previewVisible" :footer="null" @cancel="cancelImg">

Některé soubory nejsou zobrazeny, neboť je v těchto rozdílových datech změněno mnoho souborů