gdy96 4 лет назад
Родитель
Сommit
a7bfe36f8f
4 измененных файлов с 41 добавлено и 9 удалено
  1. 2 1
      src/api/index.ts
  2. 1 1
      src/types/api.d.ts
  3. 2 2
      src/views/put/put-data-more.vue
  4. 36 5
      src/views/put/put-data.vue

+ 2 - 1
src/api/index.ts

@@ -14,6 +14,7 @@ import {
   ADPlanItem,
   deliveryPlanItem,
   IPlatform,
+  moreStatPlanItem
 } from "@/types/api";
 
 /**
@@ -173,7 +174,7 @@ export const getDeliveryMoreStatList = (
     book_name: string;
     page: number;
   }> = { page: 1 }
-): AxiosPromise<IList<deliveryPlanItem>> => {
+): AxiosPromise<IList<moreStatPlanItem>> => {
   return axios("/delivery/moreStat", { params: query });
 };
 

+ 1 - 1
src/types/api.d.ts

@@ -124,7 +124,7 @@ export interface deliveryPlanItem {
   d30_recovery_rate: string;
 }
 
-export interface deliveryPlanItem {
+export interface moreStatPlanItem {
   date:               string;
   official_id:        number;
   official_name:      string;

+ 2 - 2
src/views/put/put-data-more.vue

@@ -25,7 +25,7 @@ import { TableColumnOfMoreStat } from "../_pageOptions/table-put";
 import { getDeliveryMoreStatList } from "@/api";
 import usePagination from "@/hooks/usePagination";
 
-import { deliveryPlanItem, PageOptions } from "@/types/api";
+import { moreStatPlanItem, PageOptions } from "@/types/api";
 
 const PutData = defineComponent({
   components: {
@@ -34,7 +34,7 @@ const PutData = defineComponent({
   setup() {
     let { loading, meta, tablePageOptions } = usePagination();
     const state = reactive({
-      list: ref<deliveryPlanItem[]>([]),
+      list: ref<moreStatPlanItem[]>([]),
       columns: TableColumnOfMoreStat,
       inSearching: false,
     });

+ 36 - 5
src/views/put/put-data.vue

@@ -18,6 +18,19 @@
         </div>
       </template>
     </a-table>
+    <drawer-wrapper
+      v-model:show="show"
+      title="更多数据"
+      :columns="drawercolumns"
+      :source="drawerlist"
+      :meta="meta"
+      @page-change="onPageChange"
+      width="90%"
+    >
+      <!-- <template #default="{ data }">
+        <p>{{ data.id }}</p>
+      </template>-->
+    </drawer-wrapper>
   </div>
 </template>
 
@@ -25,26 +38,34 @@
 import { defineComponent, reactive, toRefs, ref } from "vue";
 
 import ToolBar from "@/components/tool-bar/index.vue";
+import DrawerWrapper from "@/components/drawer-wrapper/index.vue";
 
-import { TableColumnOfPutData } from "../_pageOptions/table-put";
+import {
+  TableColumnOfPutData,
+  TableColumnOfMoreStat,
+} from "../_pageOptions/table-put";
 
 import { getDeliveryStatList } from "@/api";
 import usePagination from "@/hooks/usePagination";
 
-import { deliveryPlanItem, PageOptions } from "@/types/api";
+import { deliveryPlanItem, PageOptions, moreStatPlanItem } from "@/types/api";
 import useApp from "@/hooks/useApp";
 
 const PutData = defineComponent({
   components: {
     ToolBar,
+    DrawerWrapper,
   },
   setup() {
     const { router } = useApp();
     let { loading, meta, tablePageOptions } = usePagination();
     const state = reactive({
       list: ref<deliveryPlanItem[]>([]),
+      drawerlist: ref<moreStatPlanItem[]>([]),
       columns: TableColumnOfPutData,
+      drawercolumns: TableColumnOfMoreStat,
       inSearching: false,
+      show: false,
     });
     const onSearch = async (fields: Record<string, string>) => {
       try {
@@ -76,10 +97,20 @@ const PutData = defineComponent({
       });
     };
     const more = (data: any) => {
-      console.log(data.date);
-      router.push({ path: "/put/datamore" });
+      // console.log(data.date);
+      // router.push({ path: "/put/datamore" });
+      state.show = true;
+    };
+    const onPageChange = (page: Number) => {};
+
+    return {
+      ...toRefs(state),
+      onSearch,
+      handleTableChange,
+      meta,
+      more,
+      onPageChange,
     };
-    return { ...toRefs(state), onSearch, handleTableChange, meta, more };
   },
 });