Commit 0fb6da5b authored by shirlyn.guo's avatar shirlyn.guo 🤡

refactor: 使用记录&购买记录命名规范

parent 4bab7c9a
......@@ -34,7 +34,7 @@ function getEquityStatus(record: PurchaseRecords): EquityStatus {
}
}
export function PurchaseRecordsTableColumns(): DataTableColumns<PurchaseRecords> {
export function createPurchaseRecordsTableColumns(): DataTableColumns<PurchaseRecords> {
return [
{
title: '商品類型',
......
......@@ -2,7 +2,8 @@
import { ref } from 'vue'
import useTableScrollY from '@/composables/useTableScrollY'
import { PaginationInfo } from '@/components/custom-pagination/custom-pagination.vue'
import { PurchaseRecordsTableColumns, PurchaseRecords, EquityType } from '@/views/purchase-records/columns'
import { createPurchaseRecordsTableColumns } from '@/views/purchase-records/columns'
import type { PurchaseRecords } from '@/views/purchase-records/columns'
import { Left } from '@icon-park/vue-next'
import { router } from '@/router'
import { fetchAwardRecordsList } from '@/apis/records'
......@@ -14,7 +15,7 @@ import { fetchAwardRecordsList } from '@/apis/records'
// 28:分页栏的高度
// 20:分页栏的margin-top
const { pageContentWrapRef, tableContentY } = useTableScrollY(56 + 48 + 23 + 35 + 28 + 20)
const purchaseRecordsTableColumns = PurchaseRecordsTableColumns()
const purchaseRecordsTableColumns = createPurchaseRecordsTableColumns()
const purchaseRecordsTableLoading = ref(false)
const purchaseRecordsData = ref<PurchaseRecords[]>([])
......@@ -40,7 +41,7 @@ function getPurchaseRecordsList() {
purchaseRecordsTableLoading.value = false
purchaseRecordsData.value = res.data.map((record) => ({
equityType: record.equityType as EquityType,
equityType: record.equityType,
keepEquityNum: (record as any).keepedEquityNum,
createdTime: record.createdTime,
equityEndTime: record.equityEndTime,
......
......@@ -8,7 +8,7 @@ export interface UsedRecord {
operationTime: string
}
export function UsedRecordsTableColumns(): DataTableColumns<UsedRecord> {
export function createUsedRecordsTableColumns(): DataTableColumns<UsedRecord> {
return [
{
title: '使用類型',
......
......@@ -2,7 +2,9 @@
import { ref } from 'vue'
import useTableScrollY from '@/composables/useTableScrollY'
import { PaginationInfo } from '@/components/custom-pagination/custom-pagination.vue'
import { UsedRecord, UsedRecordsTableColumns } from '@/views/used-records/columns'
import { createUsedRecordsTableColumns } from '@/views/used-records/columns'
import type { UsedRecord } from '@/views/used-records/columns'
import { Left } from '@icon-park/vue-next'
import { router } from '@/router'
......@@ -15,7 +17,7 @@ import { fetchUsedRecordsList } from '@/apis/records'
// 28:分页栏的高度
// 20:分页栏的margin-top
const { pageContentWrapRef, tableContentY } = useTableScrollY(56 + 48 + 23 + 35 + 28 + 20)
const usedRecordsTableColumns = UsedRecordsTableColumns()
const usedRecordsTableColumns = createUsedRecordsTableColumns()
const usedRecordsTableLoading = ref(false)
const usedRecordsData = ref<UsedRecord[]>([])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment