ts 报错修改

src/api/order.ts

-import { BasePaginationData, BaseRespData } from '@/types/api'
+import { BasePaginationData, BaseRespData, StatisticsData } from '@/types/api'
 import axios from './axios'
 import axios from './axios'
 import {
 import {
   LogListData,
   LogListData,
@@ -9,9 +9,11 @@ import {
   ShipmentForm,
   ShipmentForm,
   ShipmentOrderRes,
   ShipmentOrderRes,
   Tab,
   Tab,
-  InspectionData,
+  InspectionData, CountStatus,
 } from '@/types/api/order'
 } from '@/types/api/order'
 import {
 import {
+  AccountStatementNote,
+  AccountStatementNoteSearchForm,
   DeliveryNoteData,
   DeliveryNoteData,
   DeliveryNoteSearchForm,
   DeliveryNoteSearchForm,
   ProductionOrder,
   ProductionOrder,
@@ -187,11 +189,11 @@ export function getDeliveryNoteList(
   )
   )
 }
 }
 export function customJomallReconciliation(
 export function customJomallReconciliation(
-  data: any,
+  data: AccountStatementNoteSearchForm,
   currentPage: number,
   currentPage: number,
   pageSize: number,
   pageSize: number,
 ) {
 ) {
-  return axios.post<never, BasePaginationData<DeliveryNoteData>>(
+  return axios.post<never, StatisticsData<AccountStatementNote>>(
     'factory/customJomallReconciliation/list_page',
     'factory/customJomallReconciliation/list_page',
     {
     {
       ...data,
       ...data,
@@ -238,7 +240,7 @@ export function getOrderByIdApi(id?: number) {
   )
   )
 }
 }
 export function getReconciliationAmount(id?: number) {
 export function getReconciliationAmount(id?: number) {
-  return axios.get<never, BaseRespData<OrderData>>(
+  return axios.get<never, BaseRespData<CountStatus[]>>(
     'factory/customJomallReconciliation/getReconciliationAmount',
     'factory/customJomallReconciliation/getReconciliationAmount',
     {
     {
       params: {
       params: {
@@ -276,7 +278,7 @@ export function updateReconciliation(
     data,
     data,
   )
   )
 }
 }
-export function getShipmentDetailsById(shipmentId?: number) {
+export function getShipmentDetailsById(shipmentId?: string) {
   return axios.get<never, BaseRespData<any>>(
   return axios.get<never, BaseRespData<any>>(
     'factory/customJomallReconciliation/getShipmentDetailsById',
     'factory/customJomallReconciliation/getShipmentDetailsById',
     {
     {

src/components/splitDiv/splitDiv.vue

@@ -5,8 +5,8 @@ import 'splitpanes/dist/splitpanes.css'
 
 
  defineProps({
  defineProps({
     size: {
     size: {
-        default: 15,
-        type: Number
+        default: '15',
+        type:  String
     }
     }
 })
 })
 </script>
 </script>

src/types/api/deliveryNote.ts

@@ -10,6 +10,12 @@ export interface DeliveryNoteSearchForm {
   namespace?: string
   namespace?: string
   shippingWay?: number
   shippingWay?: number
 }
 }
+export interface AccountStatementNoteSearchForm {
+  status?: string | null | number
+  startTime?: string
+  endTime?: string
+
+}
 
 
 export interface DeliveryNoteData {
 export interface DeliveryNoteData {
   id: number
   id: number
@@ -97,6 +103,7 @@ export interface ProductionOrder {
 }
 }
 export interface AccountStatementNote{
 export interface AccountStatementNote{
   billNumber?:string
   billNumber?:string
+  shipmentId?:string
   shipmentNum?:string
   shipmentNum?:string
   dataVersion?:string
   dataVersion?:string
   carriageName?:string
   carriageName?:string

src/types/api/index.ts

+
 export interface BaseRespData<D> {
 export interface BaseRespData<D> {
   code: number
   code: number
   message?: string
   message?: string
@@ -5,10 +6,25 @@ export interface BaseRespData<D> {
 }
 }
 
 
 export interface PaginationData<D> {
 export interface PaginationData<D> {
+  page?: PaginationData<D>
   total: number
   total: number
   size: number
   size: number
   current: number
   current: number
   records: D[]
   records: D[]
 }
 }
+export interface Statistics<D>  {
+  sumNotPassNum: number
+  sumPassNum: number
+  sumShipmentNum: number
+  sumTotalPrice: number
+  page: {
+    total: number
+    size: number
+    current: number
+    records: D[]
+  }
+}
 
 
 export type BasePaginationData<D> = BaseRespData<PaginationData<D>>
 export type BasePaginationData<D> = BaseRespData<PaginationData<D>>
+
+export type StatisticsData<D> = BaseRespData<Statistics<D>>

src/types/api/order.ts

@@ -12,6 +12,7 @@ export interface SearchForm {
   status?: number
   status?: number
   subOrderNumber: string
   subOrderNumber: string
 }
 }
+
 export interface Tab {
 export interface Tab {
   status: string
   status: string
   statusCode: number
   statusCode: number
@@ -19,6 +20,12 @@ export interface Tab {
   quantity: number
   quantity: number
 }
 }
 
 
+export interface CountStatus {
+  count?: number
+  status?: number
+  totalSum?: number
+}
+
 export interface OrderData {
 export interface OrderData {
   id: number
   id: number
   namespace?: string
   namespace?: string
@@ -64,6 +71,7 @@ export interface OrderData {
   moreable?: boolean
   moreable?: boolean
   manuscriptStatus?: number
   manuscriptStatus?: number
 }
 }
+
 export interface ProductList {
 export interface ProductList {
   id: number
   id: number
   customOrderId?: number
   customOrderId?: number
@@ -101,6 +109,7 @@ export interface MemoList {
   remark?: string
   remark?: string
   operatorTime?: string
   operatorTime?: string
 }
 }
+
 export interface SpanMethodProps {
 export interface SpanMethodProps {
   row: OrderData
   row: OrderData
   column: TableColumnCtx<OrderData>
   column: TableColumnCtx<OrderData>
@@ -216,3 +225,26 @@ export interface InspectionData {
   version: number | string
   version: number | string
   passCount: number | string
   passCount: number | string
 }
 }
+
+export interface Reconciliation {
+  status: string | number | null
+  startTime: string
+  endTime: string,
+  billNumber?:string
+  shipmentId?:string
+  shipmentNum?:string
+  dataVersion?:string
+  carriageName?:string
+  lanshouAddress?:string
+  totalPrice?:string
+  passNum?:string
+  lanshouPost?:string
+  notPassNum?:string
+  lanshouRegion?:string
+  orderNumber?:string
+  lanshouName?:string
+  lanshouPhone?:string
+  logisticsTracking?:string
+  totalAmount?:string
+  id?:number
+}

src/utils/hooks/usePageList.ts

-import { Ref, onMounted, ref, reactive } from 'vue'
+import { Ref, onMounted, ref } from 'vue'
 import { showError } from '../ui'
 import { showError } from '../ui'
 
 
 import type { PaginationData } from '@/types/api'
 import type { PaginationData } from '@/types/api'
@@ -21,7 +21,7 @@ export default function usePageList<T>(options: UsePageListOptions<T>) {
   const total = ref(0)
   const total = ref(0)
   const data = ref<T[]>([]) as Ref<T[]>
   const data = ref<T[]>([]) as Ref<T[]>
   const statistics = ref(options.statistics || false)
   const statistics = ref(options.statistics || false)
-  const totalData = reactive({
+  const totalData = ref({
     sumShipmentNum: 0,
     sumShipmentNum: 0,
     sumPassNum: 0,
     sumPassNum: 0,
     sumTotalPrice: 0,
     sumTotalPrice: 0,
@@ -32,19 +32,20 @@ export default function usePageList<T>(options: UsePageListOptions<T>) {
     try {
     try {
       loading.value = true
       loading.value = true
       // Promise 链式调用
       // Promise 链式调用
-      let res:any = await query(currentPage.value, pageSize.value)
+      const res = await query(currentPage.value, pageSize.value)
       if (statistics.value) {
       if (statistics.value) {
-        totalData.sumNotPassNum = res.sumNotPassNum
-        totalData.sumPassNum = res.sumPassNum
-        totalData.sumShipmentNum = res.sumShipmentNum
-        totalData.sumTotalPrice = res.sumTotalPrice
-        res = res.page
-
+        totalData.value = res as never
+        total.value = res.page!.total
+        currentPage.value = res.page!.current
+        pageSize.value = res.page!.size
+        data.value = res.page!.records
+      }else{
+        total.value = res.total
+        currentPage.value = res.current
+        pageSize.value = res.size
+        data.value = res.records
       }
       }
-      total.value = res.total
-      currentPage.value = res.current
-      pageSize.value = res.size
-      data.value = res.records
+
     } catch (error) {
     } catch (error) {
       showError(error)
       showError(error)
     } finally {
     } finally {