diff --git a/src/PagesStatistics/billDetail.vue b/src/PagesStatistics/billDetail.vue
new file mode 100644
index 0000000..d955da5
--- /dev/null
+++ b/src/PagesStatistics/billDetail.vue
@@ -0,0 +1,153 @@
+<template>
+  <view class="c-card">
+    <page-view
+      @loadList="
+        (v) => {
+          getList(v);
+        }
+      "
+      :noMoreData="pageList.noMoreData"
+      :list="pageList.list"
+      :height="0"
+      :isLoading="pageList.isLoading"
+    >
+      <view
+        v-for="(item, index) in pageList.list"
+        :key="index"
+        @click="getDetail(item)"
+        class="box"
+      >
+        <view class="bill">
+          <view
+            >{{ state.type === "1" ? "收货" : "出货" }}单号：{{
+              state.type === "1" ? item.receiptNumber : item.orderNumber
+            }}</view
+          >
+          <view
+            >{{ state.type === "1" ? "应付" : "应收" }}金额：<text class="num"
+              >¥{{
+                state.type === "1" ? item.balanceTotalPrice : item.totalPrice
+              }}</text
+            ></view
+          >
+        </view>
+        <view class="time"> {{ item.createTime }} </view>
+      </view>
+    </page-view>
+  </view>
+</template>
+<script setup lang="ts">
+import PageView from "@/components/PageView/index.vue";
+import { ReceiveApi, ShipmentApi } from "@/services";
+import { ScaleStatus } from "@/utils/enum";
+import { onLoad } from "@dcloudio/uni-app";
+const pageList: PageResult<Order> = reactive({
+  isLoading: false,
+  noMoreData: false,
+  total: 0,
+  list: [],
+  pageNum: 1,
+  pageSize: 10,
+});
+const state = reactive({
+  id: "",
+  type: "",
+  name: "",
+});
+const getDetail = (item: Order | Shipment) => {
+  uni.navigateTo({
+    url: `/pagesStatistics/${
+      state.type === "1" ? "supplier" : "customer"
+    }/detail?name=${state.name}&obj=${JSON.stringify(item)}`, // 要跳转到的页面路径
+  });
+};
+const getList = (v?: boolean) => {
+  if (v) {
+    if (Math.ceil(pageList.total / pageList.pageSize) > pageList.pageNum) {
+      pageList.pageNum++;
+    } else {
+      pageList.noMoreData = true;
+      return;
+    }
+  }
+  pageList.isLoading = true;
+  let params: any = {
+    pageSize: pageList.pageSize,
+    pageNumber: pageList.pageNum,
+    scaleStatus: ScaleStatus.ToBePay,
+  };
+  if (state.id) {
+    params.userId = state.id;
+  }
+
+  if (state.type === "1") {
+    ReceiveApi.getOrderPage(params).then((res) => {
+      if (res.code === 200) {
+        (pageList as any).list = (res.data.list as any).map((item: any) => {
+          return { ...item, isChecked: false };
+        });
+        pageList.total = (res.data as any).total;
+        pageList.isLoading = false;
+      }
+    });
+  } else if (state.type === "2") {
+    ShipmentApi.getOrderPage(params).then((res) => {
+      if (res.code === 200) {
+        (pageList as any).list = (res.data.list as any).map((item: any) => {
+          return { ...item, isChecked: false };
+        });
+        pageList.total = (res.data as any).total;
+        pageList.isLoading = false;
+      }
+    });
+  }
+};
+
+onLoad((option: any) => {
+  const id = option.id;
+  state.type = option.type;
+  state.id = id;
+  state.name = option.name;
+  getList();
+  // 设置页面标题
+  uni.setNavigationBarTitle({
+    title: state.name,
+  });
+});
+</script>
+<style lang="scss" scoped>
+.c-card {
+  margin: 30rpx 25rpx;
+  background: #ffffff;
+  box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(5, 68, 37, 0.12);
+  border-radius: 13rpx;
+  padding: 20rpx;
+  font-family: Source Han Sans CN;
+  font-weight: 400;
+  font-size: 26rpx;
+  color: #000000;
+  .box {
+    display: flex;
+    align-items: baseline;
+    justify-content: space-between;
+    padding: 15rpx 0rpx;
+    .num {
+      color: rgba(236, 15, 62, 1);
+    }
+    .bill {
+      view {
+        line-height: 60rpx;
+      }
+    }
+    .time {
+      font-family: Source Han Sans CN;
+      font-weight: 400;
+      font-size: 22rpx;
+      color: #999999;
+    }
+  }
+  .box + .box {
+    border-top: 1px solid rgba(233, 233, 233, 0.76);
+  }
+}
+</style>
diff --git a/src/PagesStatistics/businessOverview.vue b/src/PagesStatistics/businessOverview.vue
index aafd79d..8102581 100644
--- a/src/PagesStatistics/businessOverview.vue
+++ b/src/PagesStatistics/businessOverview.vue
@@ -1,13 +1,13 @@
 <template>
   <view class="c-layout">
     <StatisticCard :list="list" />
-
+    <!-- {{ list }} -->
     <view class="card-box">
       <view class="c-tab">
         <text
           v-for="(item, index) in tabList"
           :key="index"
-          :class="{ active: currentTab === item.name }"
+          :class="{ active: currentTab === item.id }"
           @click="handleTab(item)"
         >
           {{ item.name }}
@@ -16,119 +16,172 @@
       <view class="c-grid">
         <view class="box">
           <view v-for="(item, index) in gridList1" :key="index">
-            <text>{{ item.name }}：</text><text>{{ item.isBefore ? item.unit : ''}} {{ randomNum(index)}} {{ item.isBefore ? '' : item.unit }} </text>
+            <text v-if="item.name">{{ item.name }}：</text
+            ><text
+              >{{ item.isBefore ? item.unit : "" }} {{ item.num }}
+              {{ item.isBefore ? "" : item.unit }}
+            </text>
           </view>
         </view>
 
-        <view class="box">  
+        <view class="box">
           <view v-for="(item, index) in gridList2" :key="index">
-            <text v-if="item.name">{{ item.name }}：</text><text v-if="item.num">{{ item.isBefore ? item.unit : ''}} {{ randomNum(index) }} {{ item.isBefore ? '' : item.unit }} </text>
+            <text v-if="item.name">{{ item.name }}：</text
+            ><text
+              >{{ item.isBefore ? item.unit : "" }} {{ item.num }}
+              {{ item.isBefore ? "" : item.unit }}
+            </text>
           </view>
         </view>
 
         <view class="box">
           <view v-for="(item, index) in gridList3" :key="index">
-            <text>{{ item.name }}：</text><text>{{ item.isBefore ? item.unit : ''}} {{ randomNum(index) }} {{ item.isBefore ? '' : item.unit }} </text>
+            <text>{{ item.name }}：</text
+            ><text
+              >{{ item.isBefore ? item.unit : "" }} {{ item.num }}
+              {{ item.isBefore ? "" : item.unit }}
+            </text>
           </view>
         </view>
       </view>
     </view>
   </view>
-  <TimeRangeFilter :show="isShowTimeDialog" @handleDialog="handleDialog"/>
+  <TimeRangeFilter
+    :show="isShowTimeDialog"
+    @handleDialog="handleDialog"
+    @handleOk="handleOk"
+  />
 </template>
 <script setup lang="ts">
 import StatisticCard from "@/components/StatisticCard/index.vue";
-import TimeRangeFilter from './components/TimeRangeFilter.vue'
+import TimeRangeFilter from "./components/TimeRangeFilter.vue";
+import { FinanceApi, ReceiveApi, ShipmentApi } from "@/services";
+import { timeRange } from "@/utils";
 const list = reactive([
   {
-    num: 8923.0,
+    num: 0,
     name: "客户应收款总额",
   },
   {
-    num: 8923.0,
+    num: 0,
     name: "供应商应付款总额",
   },
 ]);
 
-const currentTab = ref("昨日");
+const currentTab = ref(3);
 const tabList = reactive([
   {
+    id: 2,
     name: "昨日",
   },
   {
+    id: 3,
     name: "本月",
   },
   {
+    id: 4,
     name: "本年",
   },
   {
+    id: 5,
     name: "自定义",
   },
 ]);
 const handleTab = (item: any) => {
-  if (item.name === '自定义') {
-    handleDialog(true)
+  if (item.id === 5) {
+    handleDialog(true);
   } else {
-    currentTab.value = item.name;
+    currentTab.value = item.id;
+    getOverview();
   }
 };
-const randomNum = (index:number) => {
-  return Math.floor(Math.random() * (10000 - 1 + 1)) + 1 + index
-}
+const handleOk = (v: any) => {
+  state.startTime = v.startTime;
+  state.endTime = v.endTime;
+  currentTab.value = 5;
+  getOverview();
+};
+const randomNum = (index: number) => {
+  return Math.floor(Math.random() * (10000 - 1 + 1)) + 1 + index;
+};
 
 const gridList1 = reactive([
   {
-    name: "出货收入",
-    num: "6000.00",
-    unit: '￥',
-    isBefore: true
+    name: "总收入",
+    enName: "totalIncome",
+    num: "",
+    unit: "￥",
+    isBefore: true,
   },
   {
-    name: "实际收入",
-    num: "6000.00",
-    unit: '￥',
-    isBefore: true
+    name: "出货收入",
+    enName: "totalShipment",
+    num: "",
+    unit: "￥",
+    isBefore: true,
+  },
+  {
+    name: "其他收入",
+    enName: "totalOther",
+    num: "",
+    unit: "￥",
+    isBefore: true,
+  },
+  {},
+  {
+    name: "总支出",
+    enName: "totalExpenditure",
+    num: "",
+    unit: "￥",
+    isBefore: true,
   },
   {
     name: "收货支出",
-    num: "6000.00",
-    unit: '￥',
-    isBefore: true
+    enName: "totalReap",
+    num: "",
+    unit: "￥",
+    isBefore: true,
   },
   {
-    name: "实际支出",
-    num: "6000.00",
-    unit: '￥',
-    isBefore: true
+    name: "其他支出",
+    enName: "totalOther",
+    num: "",
+    unit: "￥",
+    isBefore: true,
   },
   {
     name: "杂费支出",
-    num: "6000.00",
-    unit: '￥',
-    isBefore: true
+    enName: "totalIncidentals",
+    num: "",
+    unit: "￥",
+    isBefore: true,
   },
   {
     name: "运费支出",
-    num: "6000.00",
-    unit: '￥',
-    isBefore: true
+    enName: "totalFreight",
+    num: "",
+    unit: "￥",
+    isBefore: true,
   },
 ]);
 const gridList2 = reactive([
-{
+  {
     name: "出货实收金额",
-    num: "6000.00",
-    unit: '￥',
-    isBefore: true
+    enName: "actualReceived",
+    num: "",
+    unit: "￥",
+    isBefore: true,
   },
   {
     name: "出货应收金额",
-    num: "6000.00",
-    unit: '￥',
-    isBefore: true
+    enName: "receivable",
+    num: "",
+    unit: "￥",
+    isBefore: true,
   },
   {
     name: "出货笔数",
+    enName: "orderOutNum",
     num: "2",
   },
   {
@@ -137,96 +190,188 @@ const gridList2 = reactive([
   },
   {
     name: "出货总重量",
-    num: "6000.00",
-    unit: 'KG',
-    isBefore: false
+    enName: "outTotalWeight",
+    num: "",
+    unit: "KG",
+    isBefore: false,
   },
   {
     name: "出货净重（客户）",
-    num: "6000.00",
-    unit: 'KG',
-    isBefore: false
+    enName: "customerTotalWeight",
+    num: "",
+    unit: "KG",
+    isBefore: false,
   },
   {
     name: "出货重量(已结)",
-    num: "6000.00",
-    unit: 'KG',
-    isBefore: false
+    enName: "payOutTotalWeight",
+    num: "",
+    unit: "KG",
+    isBefore: false,
   },
   {
     name: "结算总重量",
-    num: "6000.00",
-    unit: 'KG',
-    isBefore: false
+    enName: "totalSettlement",
+    num: "",
+    unit: "KG",
+    isBefore: false,
   },
   {
     name: "出货重量(未结)",
-    num: "6000.00",
-    unit: 'KG',
-    isBefore: false
+    enName: "unPayOutTotalWeight",
+    num: "",
+    unit: "KG",
+    isBefore: false,
   },
   {
     name: "结算重量(已结)",
-    num: "6000.00",
-    unit: 'KG',
-    isBefore: false
+    enName: "payTotalSettlement",
+    num: "",
+    unit: "KG",
+    isBefore: false,
   },
   {
     name: "净重误差",
-    num: "6000.00",
-    unit: 'KG',
-    isBefore: false
+    enName: "netError",
+    num: "",
+    unit: "KG",
+    isBefore: false,
   },
   {
     name: "结算总量(未结)",
-    num: "6000.00",
-    unit: 'KG',
-    isBefore: false
+    enName: "unPayTotalSettlement",
+    num: "",
+    unit: "KG",
+    isBefore: false,
   },
 ]);
 const gridList3 = reactive([
   {
     name: "收货总重量",
-    num: "6000.00",
-    unit: 'KG',
-    isBefore: false
+    enName: "payTotalWeight",
+    num: "",
+    unit: "KG",
+    isBefore: false,
   },
   {
     name: "收货笔数",
-    num: "2",
-    unit: '',
-    isBefore: false
+    enName: "orderInNum",
+    num: "",
+    unit: "",
+    isBefore: false,
   },
   {
     name: "收货重量(已付)",
-    num: "6000.00",
-    unit: 'KG',
-    isBefore: false
+    enName: "paymentTotalPrice",
+    num: "",
+    unit: "KG",
+    isBefore: false,
   },
   {
     name: "收货实付金额",
-    num: "6000.00",
-    unit: '￥',
-    isBefore: true
+    enName: "totalWeight",
+    num: "",
+    unit: "￥",
+    isBefore: true,
   },
   {
     name: "收货重量(未付)",
-    num: "6000.00",
-    unit: 'KG',
-    isBefore: false
+    enName: "unPayTotalWeight",
+    num: "",
+    unit: "KG",
+    isBefore: false,
   },
   {
     name: "收货应付金额",
-    num: "6000.00",
-    unit: '￥',
-    isBefore: true
+    enName: "unPaymentTotalPrice",
+    num: "",
+    unit: "￥",
+    isBefore: true,
   },
 ]);
 
-const isShowTimeDialog = ref(false)
+const isShowTimeDialog = ref(false);
 const handleDialog = (v: boolean) => {
-  isShowTimeDialog.value = v
-}
+  isShowTimeDialog.value = v;
+};
+const state = reactive({
+  startTime: "",
+  endTime: "",
+});
+
+const getReceiveOverView = () => {
+  ReceiveApi.getOverview({
+    startTime: state.startTime,
+    endTime: state.endTime,
+  }).then((res: any) => {
+    if (res.code === 200) {
+      gridList3.map((item) => {
+        item.num = res.data[item.enName as string];
+      });
+    }
+  });
+};
+
+const getShipmentOverView = () => {
+  ShipmentApi.getOverview({
+    startTime: state.startTime,
+    endTime: state.endTime,
+  }).then((res: any) => {
+    if (res.code === 200) {
+      gridList2.map((item) => {
+        item.num = res.data[item.enName as string];
+      });
+    }
+  });
+};
+
+const getPaymentCount = () => {
+  FinanceApi.getPaymentCount({
+    startTime: state.startTime,
+    endTime: state.endTime,
+  }).then((res: any) => {
+    if (res.code === 200) {
+      gridList1.map((item) => {
+        if (Object.keys(res.data).includes(item.enName + "")) {
+          item.num = res.data[item.enName as string];
+        }
+      });
+    }
+  });
+};
+
+const getRevenueCount = () => {
+  FinanceApi.getRevenueCount({
+    startTime: state.startTime,
+    endTime: state.endTime,
+  }).then((res: any) => {
+    if (res.code === 200) {
+      gridList1.map((item) => {
+        if (Object.keys(res.data).includes(item.enName + "")) {
+          item.num = res.data[item.enName as string];
+        }
+      });
+    }
+  });
+};
+
+const getOverview = () => {
+  if (currentTab.value < 5) {
+    const range = timeRange(currentTab.value);
+    state.startTime = range.startTime + " 00:00:00";
+    state.endTime = range.endTime + " 23:59:59";
+  } else if (currentTab.value === 5) {
+    state.startTime = state.startTime + " 00:00:00";
+    state.endTime = state.endTime + " 23:59:59";
+  }
+  getReceiveOverView();
+  getShipmentOverView();
+  getPaymentCount();
+  getRevenueCount();
+};
+onMounted(() => {
+  getOverview();
+});
 </script>
 <style lang="scss" scoped>
 .card-box {
@@ -237,7 +382,7 @@ const handleDialog = (v: boolean) => {
   .c-tab {
     font-family: Source Han Sans CN;
     font-weight: 400;
-    font-size: 27rpx;
+    font-size: 28rpx;
     color: #999999;
     line-height: 41rpx;
     display: flex;
@@ -256,7 +401,7 @@ const handleDialog = (v: boolean) => {
   .c-grid {
     font-family: Source Han Sans CN;
     font-weight: 400;
-    font-size: 21rpx;
+    font-size: 24rpx;
     color: #000000;
     .box {
       padding: 30rpx;
@@ -268,7 +413,7 @@ const handleDialog = (v: boolean) => {
       }
     }
     .box + .box {
-      border-top: 18rpx solid #F8F8F8;
+      border-top: 18rpx solid #f8f8f8;
     }
   }
 }
diff --git a/src/PagesStatistics/components/TimeDialog.vue b/src/PagesStatistics/components/TimeDialog.vue
index 97807bd..4bf11dc 100644
--- a/src/PagesStatistics/components/TimeDialog.vue
+++ b/src/PagesStatistics/components/TimeDialog.vue
@@ -43,7 +43,7 @@
   </u-popup>
 </template>
 <script setup lang="ts">
-import { formatDate, getCurrentMonthStartAndEnd, getCurrentYearStartAndEnd } from "@/utils";
+import { formatDate, getCurrentMonthStartAndEnd, getCurrentYearStartAndEnd, timeRange } from "@/utils";
 
 const props = defineProps<{
   show: boolean;
@@ -81,23 +81,10 @@ const handleCustom = () => {
 }
 
 const handleSelect = (item: any) => {
-  const today = new Date();
-  const yesterday =  new Date((today as any) - (24 * 60 * 60 * 1000));
   state.currentStates = item.id;
-  console.log(item);
-  if (item.id === 1) {
-    state.startTime = formatDate(today, "{y}-{m}-{d}");
-    state.endTime = formatDate(today, "{y}-{m}-{d}");
-  } else if (item.id === 2) {
-    state.startTime = formatDate(yesterday, "{y}-{m}-{d}");
-    state.endTime = formatDate(yesterday, "{y}-{m}-{d}");
-  } else if (item.id === 3) {
-    state.startTime = formatDate(getCurrentMonthStartAndEnd().start, "{y}-{m}-{d}");
-    state.endTime = formatDate(getCurrentMonthStartAndEnd().end, "{y}-{m}-{d}");
-  } else if (item.id === 4) {
-    state.startTime = formatDate(getCurrentYearStartAndEnd().start, "{y}-{m}-{d}");
-    state.endTime = formatDate(getCurrentYearStartAndEnd().end, "{y}-{m}-{d}");
-  }
+  const range = timeRange(item.id)
+  state.startTime = range.startTime;
+  state.endTime = range.endTime
   emit("changeTime", {startTime: state.startTime, endTime: state.endTime});
   emit("handleDialog", false);
 };
diff --git a/src/PagesStatistics/components/TimeRangeFilter.vue b/src/PagesStatistics/components/TimeRangeFilter.vue
index 2100619..fa753e9 100644
--- a/src/PagesStatistics/components/TimeRangeFilter.vue
+++ b/src/PagesStatistics/components/TimeRangeFilter.vue
@@ -4,7 +4,7 @@
       <view>
         <view class="box">
           <text @click="handleClose">取消</text>
-          <text class="btn" @click="handleClose">完成</text>
+          <text class="btn" @click="handleOk">完成</text>
         </view>
         <uni-calendar
           :insert="true"
@@ -19,17 +19,43 @@
   </u-popup>
 </template>
 <script setup lang="ts">
+import { formatDate } from '@/utils';
+
 const props = defineProps<{
   show: boolean,
 }>()
-const emit = defineEmits(['handleDialog']);
+const emit = defineEmits(['handleDialog', 'handleOk']);
 const handleClose = () => {
   emit('handleDialog', false)
 }
 
+const handleOk = () => {
+  emit('handleOk', {startTime: state.startTime, endTime: state.endTime})
+  emit('handleDialog', false)
+}
+
 const showCalendar = ref(false)
+const state = reactive({
+  startTime: '',
+  endTime: ''
+})
 const handleChangeDate = (v: any) => {
-  console.log(v);
+  const time1 = v.range.before;
+  const time2 = v.range.after;
+  if (time1 && time2) {
+    const date1 = new Date(time1);
+    const date2 = new Date(time2);
+    if (date1 < date2) {
+      state.startTime = formatDate(time1, "{y}-{m}-{d}");
+      state.endTime = formatDate(time2, "{y}-{m}-{d}");
+    } else if (date1 > date2) {
+      state.startTime = formatDate(time2, "{y}-{m}-{d}");
+      state.endTime = formatDate(time1, "{y}-{m}-{d}");
+    } else {
+      state.startTime = formatDate(time1, "{y}-{m}-{d}");
+      state.endTime = formatDate(time2, "{y}-{m}-{d}");
+    }
+  }
 };
 </script>
 <style lang="scss" scoped>
diff --git a/src/PagesStatistics/customer/billDetail.vue b/src/PagesStatistics/customer/billDetail.vue
deleted file mode 100644
index ae4ba37..0000000
--- a/src/PagesStatistics/customer/billDetail.vue
+++ /dev/null
@@ -1,54 +0,0 @@
-<template>
-  <view class="c-card">
-    <view v-for="item in 10" :key="item" @click="getDetail()">
-      <view class="bill">
-        <view>收货单号：CHD2024012212314</view>
-        <view>应收金额：<text class="num">¥1800.00</text></view>
-      </view>
-      <view class="time"> 2024-01-22 14:28:36 </view>
-    </view>
-  </view>
-</template>
-<script setup lang="ts">
-const getDetail = () => {
-  uni.navigateTo({
-    url: "/pagesStatistics/customer/detail", // 要跳转到的页面路径
-  });
-}
-</script>
-<style lang="scss" scoped>
-.c-card {
-  margin: 30rpx 25rpx;
-  background: #ffffff;
-  box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(5, 68, 37, 0.12);
-  border-radius: 13rpx;
-  padding: 20rpx;
-  font-family: Source Han Sans CN;
-  font-weight: 400;
-  font-size: 21rpx;
-  color: #000000;
-  > view {
-    display: flex;
-    align-items: baseline;
-    justify-content: space-between;
-    padding: 15rpx 0rpx;
-    .num {
-      color: rgba(236, 15, 62, 1);
-    }
-    .bill {
-      view {
-        line-height: 40rpx;
-      }
-    }
-    .time {
-      font-family: Source Han Sans CN;
-      font-weight: 400;
-      font-size: 21rpx;
-      color: #999999;
-    }
-  }
-  > view + view {
-    border-top: 1px solid rgba(233, 233, 233, 0.76);
-  }
-}
-</style>
diff --git a/src/PagesStatistics/customer/detail.vue b/src/PagesStatistics/customer/detail.vue
index 7c7d26b..5867759 100644
--- a/src/PagesStatistics/customer/detail.vue
+++ b/src/PagesStatistics/customer/detail.vue
@@ -2,23 +2,27 @@
   <view class="c-card">
     <view class="top">
       <view class="left">
-        <view>上海奉贤两网融合（大磅）</view>
-        <view>重一</view>
+        <view>{{ state.order.deviceName || "-" }}</view>
+        <view>{{ state.order.productName || "" }}</view>
       </view>
       <view>
-        <text class="btn" @click="handleScenePhoto()">现场照片</text>
+        <text class="btn" @click="handleScenePhoto(state.order.id)"
+          >现场照片</text
+        >
       </view>
     </view>
     <view class="content">
       <view class="baseinfo">
-        <view class="time"> 过磅时间：2023-09-01 13:23:33 </view>
         <view class="person">
-          <view>定价人：谭兵</view>
-          <view>审核人：谭兵</view>
+          <view>审核人：{{ state.order.pricingUserName || "-" }}</view>
+          <view class="time"> 过磅时间：{{ state.order.tareTime }} </view>
         </view>
       </view>
       <view style="padding: 30rpx 0rpx">
-        <view> <text>收货单号：</text><text> SHD20230901132333 </text></view>
+        <view>
+          <text>出货单号：</text
+          ><text>{{ state.order.orderNumber }} </text></view
+        >
         <view class="box">
           <view v-for="(item, index) in gridList1" :key="index">
             <text v-if="item.name">{{ item.name }}：</text
@@ -33,7 +37,7 @@
         <view class="moreInfo">
           <view class="baseinfo">
             <view>客户收货</view>
-            <view class="time"> 收货时间：2023-09-01 13:23:33 </view>
+            <view class="time"> 收货时间：{{ state.order.updateTime }} </view>
           </view>
           <view class="box">
             <view v-for="(item, index) in gridList2" :key="index">
@@ -51,24 +55,28 @@
   </view>
 </template>
 <script setup lang="ts">
+import { onLoad } from "@dcloudio/uni-app";
 import { reactive } from "vue";
 
 const gridList1 = reactive([
   {
     name: "毛重",
-    num: "4080.00",
+    enName: "grossWeight",
+    num: "",
     unit: "KG",
     isBefore: false,
   },
   {
     name: "皮重",
-    num: "3450.00",
+    enName: "tare",
+    num: "",
     unit: "KG",
     isBefore: false,
   },
   {
     name: "净重",
-    num: "640.00",
+    enName: "netWeight",
+    num: "",
     unit: "KG",
     isBefore: false,
   },
@@ -76,73 +84,106 @@ const gridList1 = reactive([
 const gridList2 = reactive([
   {
     name: "结算重量",
-    num: "640.00",
+    enName: "settlementWeight",
+    num: "",
     unit: "KG",
     isBefore: false,
   },
   {
     name: "结算单价",
-    num: "2.48",
+    enName: "unitPrice",
+    num: "",
     unit: "元/KG",
     isBefore: false,
   },
   {
     name: "预估总价",
-    num: "1587.00",
+    enName: "estimatePrice",
+    num: "",
     unit: "元",
     isBefore: false,
   },
   {
     name: "货款金额",
-    num: "1587.00",
-    unit: "元",
-    isBefore: false,
-  },
-  {
-    name: "杂费",
-    num: "0",
+    enName: "totalPrice",
+    num: "",
     unit: "元",
     isBefore: false,
   },
   {
     name: "运费",
-    num: "0",
+    enName: "freight",
+    num: "",
+    unit: "元",
+    isBefore: false,
+  },
+  {
+    name: "杂费",
+    enName: "incidentals",
+    num: "",
     unit: "元",
     isBefore: false,
   },
   {
     name: "实际收入",
-    num: "1587.00",
+    enName: "realIncome",
+    num: "",
     unit: "元",
     isBefore: false,
   },
   {},
   {
     name: "净重误差",
-    num: "0.00",
+    enName: "netWeightError",
+    num: "",
     unit: "KG",
     isBefore: false,
   },
   {},
   {
     name: "结算状态",
-    num: "未结算",
+    enName: "scaleStatus",
+    num: "",
     unit: "",
     isBefore: false,
   },
   {
     name: "应收金额",
-    num: "1587.00",
+    enName: "totalPrice",
+    num: "",
     unit: "元",
     isBefore: false,
   },
-  
 ]);
-const handleScenePhoto = () => {
+const handleScenePhoto = (id: string) => {
   uni.navigateTo({
-    url: "/pagesScenePhoto/index", // 要跳转到的页面路径
+    url: "/pagesScenePhoto/index?orderType=1&imagesType=1&id=" + id, // 要跳转到的页面路径
   });
 };
+const state = reactive<any>({
+  order: {},
+});
+onLoad((option: any) => {
+  // 设置页面标题
+  uni.setNavigationBarTitle({
+    title: option.name,
+  });
+  const order = JSON.parse(option.obj);
+  state.order = order;
+  gridList1.map((item: any) => {
+    item.num = order[item.enName as string];
+  });
+  gridList2.map((item: any) => {
+    if (item.name === "结算状态") {
+      item.num =
+        ["待出货", "待过毛", "待审核", "已审未付", "已审已付"][
+          order[item.enName as string]
+        ] || "-";
+    } else {
+      item.num = order[item.enName as string];
+    }
+  });
+});
 </script>
 <style lang="scss" scoped>
 .c-card {
@@ -152,7 +193,7 @@ const handleScenePhoto = () => {
   border-radius: 13rpx;
   font-family: Source Han Sans CN;
   font-weight: 400;
-  font-size: 24rpx;
+  font-size: 26rpx;
   color: #000000;
   .top {
     display: flex;
@@ -166,7 +207,7 @@ const handleScenePhoto = () => {
         &:nth-child(2) {
           color: rgba(236, 15, 62, 1);
           font-weight: 400;
-          font-size: 27rpx;
+          font-size: 28rpx;
         }
       }
     }
@@ -187,7 +228,7 @@ const handleScenePhoto = () => {
       .time {
         font-family: Source Han Sans CN;
         font-weight: 400;
-        font-size: 21rpx;
+        font-size: 24rpx;
         color: #999999;
         line-height: 40rpx;
       }
diff --git a/src/PagesStatistics/customerChecking.vue b/src/PagesStatistics/customerChecking.vue
index 140ee3b..48d0e6b 100644
--- a/src/PagesStatistics/customerChecking.vue
+++ b/src/PagesStatistics/customerChecking.vue
@@ -1,11 +1,11 @@
 <template>
-  <Search :name="'客户名称'" />
+  <Search :name="'客户名称'" @handleSearch="handleSearch"/>
   <view class="c-card">
     <StatisticCard :list="list" />
     <view class="detail">
-      <view v-for="(item, index) in 10" :key="index"  @click="getDetail(item)">
-        <text>张小明{{ item }}</text>
-        <text class="num">¥1800.00 <text class="tip">欠</text></text>
+      <view v-for="(item, index) in billList" :key="index" @click="getDetail(item)">
+        <text>{{ item.supplierName }}</text>
+        <text class="num">¥{{ item.unPayTotalPrice }} <text class="tip">欠</text></text>
       </view>
     </view>
   </view>
@@ -13,21 +13,38 @@
 <script setup lang="ts">
 import Search from "@/components/Search/index.vue";
 import StatisticCard from "@/components/StatisticCard/index.vue";
+import { ShipmentApi } from "@/services";
 const list = reactive([
   {
-    num: 2,
+    num: 0,
     name: "欠款客户",
   },
   {
-    num: 8923,
+    num: 0,
     name: "欠款金额",
   },
 ]);
 const getDetail = (item: any) => {
   uni.navigateTo({
-    url: "/pagesStatistics/customer/billDetail", // 要跳转到的页面路径
+    url: "/pagesStatistics/billDetail?type=2&id=" + item.userId +`&name=${item.supplierName}`, // 要跳转到的页面路径
   });
 };
+const handleSearch = (v:string) => {
+  getList(v)
+}
+const billList = ref<any>([])
+const getList = (v: string) => {
+  ShipmentApi.getReconciliation({userName: v}).then((res:any) => {
+    if (res.code === 200) {
+      list[0].num = res.data.supplierNum
+      list[1].num = res.data.unPayTotalPrice
+      billList.value = res.data.unPaySupplierVos
+    }
+  })
+}
+onMounted(() => {
+  getList('')
+})
 </script>
 <style lang="scss" scoped>
 .c-card {
@@ -41,7 +58,7 @@ const getDetail = (item: any) => {
   padding: 20rpx;
   font-family: Source Han Sans CN;
   font-weight: 400;
-  font-size: 21rpx;
+  font-size: 28rpx;
   color: #000000;
   > view {
     display: flex;
diff --git a/src/PagesStatistics/supplier/billDetail.vue b/src/PagesStatistics/supplier/billDetail.vue
deleted file mode 100644
index a3fd9a4..0000000
--- a/src/PagesStatistics/supplier/billDetail.vue
+++ /dev/null
@@ -1,54 +0,0 @@
-<template>
-  <view class="c-card">
-    <view v-for="item in 10" :key="item" @click="getDetail()">
-      <view class="bill">
-        <view>收货单号：CHD2024012212314</view>
-        <view>应付金额：<text class="num">¥1800.00</text></view>
-      </view>
-      <view class="time"> 2024-01-22 14:28:36 </view>
-    </view>
-  </view>
-</template>
-<script setup lang="ts">
-const getDetail = () => {
-  uni.navigateTo({
-    url: "/pagesStatistics/supplier/detail", // 要跳转到的页面路径
-  });
-}
-</script>
-<style lang="scss" scoped>
-.c-card {
-  margin: 30rpx 25rpx;
-  background: #ffffff;
-  box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(5, 68, 37, 0.12);
-  border-radius: 13rpx;
-  padding: 20rpx;
-  font-family: Source Han Sans CN;
-  font-weight: 400;
-  font-size: 21rpx;
-  color: #000000;
-  > view {
-    display: flex;
-    align-items: baseline;
-    justify-content: space-between;
-    padding: 15rpx 0rpx;
-    .num {
-      color: rgba(236, 15, 62, 1);
-    }
-    .bill {
-      view {
-        line-height: 40rpx;
-      }
-    }
-    .time {
-      font-family: Source Han Sans CN;
-      font-weight: 400;
-      font-size: 21rpx;
-      color: #999999;
-    }
-  }
-  > view + view {
-    border-top: 1px solid rgba(233, 233, 233, 0.76);
-  }
-}
-</style>
diff --git a/src/PagesStatistics/supplier/detail.vue b/src/PagesStatistics/supplier/detail.vue
index e50aaff..762cd1d 100644
--- a/src/PagesStatistics/supplier/detail.vue
+++ b/src/PagesStatistics/supplier/detail.vue
@@ -2,23 +2,28 @@
   <view class="c-card">
     <view class="top">
       <view class="left">
-        <view>上海奉贤两网融合（大磅）</view>
-        <view>重一</view>
+        <view>{{ state.order.deviceName || "-" }}</view>
+        <view>{{ state.order.productName || "" }}</view>
       </view>
       <view>
-        <text class="btn" @click="handleScenePhoto()">现场照片</text>
+        <text class="btn" @click="handleScenePhoto(state.order.id)"
+          >现场照片</text
+        >
       </view>
     </view>
     <view class="content">
       <view class="baseinfo">
-        <view class="time"> 过磅时间：2023-09-01 13:23:33 </view>
+        <view class="time"> 过磅时间：{{ state.order.grossTime }}</view>
         <view class="person">
-          <view>定价人：谭兵</view>
-          <view>审核人：谭兵</view>
+          <view>定价人：{{ state.order.pricingUserName || "-" }}</view>
+          <view>审核人：{{ state.order.reviewerUserName || "-" }}</view>
         </view>
       </view>
       <view style="padding: 30rpx 0rpx">
-        <view> <text>收货单号：</text><text> SHD20230901132333 </text></view>
+        <view>
+          <text>收货单号：</text
+          ><text> {{ state.order.receiptNumber }} </text></view
+        >
         <view class="box">
           <view v-for="(item, index) in gridList1" :key="index">
             <text v-if="item.name">{{ item.name }}：</text
@@ -34,71 +39,110 @@
   </view>
 </template>
 <script setup lang="ts">
-const gridList1 = reactive([
+import { PaymentMethod } from "@/utils/enum";
+import { onLoad } from "@dcloudio/uni-app";
+
+const gridList1 = reactive<any>([
   {
     name: "毛重",
-    num: "4080.00",
+    enName: "grossWeight",
+    num: "",
     unit: "KG",
     isBefore: false,
   },
   {
     name: "皮重",
-    num: "3450.00",
+    enName: "tare",
+    num: "",
     unit: "KG",
     isBefore: false,
   },
   {
     name: "扣杂",
-    num: "0.00",
+    enName: "buckleMiscellaneous",
+    num: "",
     unit: "KG",
     isBefore: false,
   },
-  {
-    name: "",
-    num: "",
-    unit: "",
-  },
+  {},
   {
     name: "净重",
-    num: "640.00",
+    enName: "netWeight",
+    num: "",
     unit: "KG",
     isBefore: false,
   },
   {
     name: "单价",
-    num: "2.48",
-    unit: "元/kg",
+    enName: "price",
+    num: "",
+    unit: "元/KG",
     isBefore: false,
   },
   {
     name: "预估总价",
-    num: "1587.00",
+    enName: "totalPrice",
+    num: "",
     unit: "元",
     isBefore: false,
   },
   {
     name: "货款金额",
-    num: "1587.00",
+    enName: "balanceTotalPrice",
+    num: "",
     unit: "元",
     isBefore: false,
   },
   {
     name: "付款状态",
+    enName: "paymentMethod",
     num: "未支付",
     isBefore: false,
   },
   {
     name: "应付金额",
-    num: "1587.00",
+    enName: "balanceTotalPrice",
+    num: "",
     unit: "元",
     isBefore: false,
   },
 ]);
-const handleScenePhoto = () => {
+const handleScenePhoto = (id: any) => {
   uni.navigateTo({
-    url: "/pagesScenePhoto/index", // 要跳转到的页面路径
+    url: "/pagesScenePhoto/index?orderType=1&imagesType=1&id=" + id, // 要跳转到的页面路径
   });
 };
+const state = reactive<Order>({
+  order: {},
+});
+onLoad((option: any) => {
+  // 设置页面标题
+  uni.setNavigationBarTitle({
+    title: option.name,
+  });
+  const order = JSON.parse(option.obj);
+  state.order = order;
+  gridList1.map((item: any) => {
+    if (item.name === "扣杂" || item.name === "扣点") {
+      if (order.buttonType === 0) {
+        item.name = "扣杂";
+        item.enName = "buckleMiscellaneous";
+        item.unit = "KG";
+      } else if (order.buttonType === 1) {
+        item.name = "扣点";
+        item.enName = "points";
+        item.unit = "%";
+      }
+    } else if (item.name === "付款状态") {
+      item.num =
+        ["未支付", "现金", "银行卡", "微信", "支付宝"][
+          order[item.enName as string]
+        ] || "未支付";
+    } else {
+      item.num = order[item.enName as string];
+    }
+  });
+});
 </script>
 <style lang="scss" scoped>
 .c-card {
@@ -108,7 +152,7 @@ const handleScenePhoto = () => {
   border-radius: 13rpx;
   font-family: Source Han Sans CN;
   font-weight: 400;
-  font-size: 24rpx;
+  font-size: 26rpx;
   color: #000000;
   .top {
     display: flex;
@@ -122,7 +166,7 @@ const handleScenePhoto = () => {
         &:nth-child(2) {
           color: rgba(236, 15, 62, 1);
           font-weight: 400;
-          font-size: 27rpx;
+          font-size: 28rpx;
         }
       }
     }
@@ -143,7 +187,7 @@ const handleScenePhoto = () => {
       .time {
         font-family: Source Han Sans CN;
         font-weight: 400;
-        font-size: 21rpx;
+        font-size: 24rpx;
         color: #999999;
         line-height: 40rpx;
       }
diff --git a/src/PagesStatistics/supplierChecking.vue b/src/PagesStatistics/supplierChecking.vue
index fddbd0d..a4c904a 100644
--- a/src/PagesStatistics/supplierChecking.vue
+++ b/src/PagesStatistics/supplierChecking.vue
@@ -1,11 +1,11 @@
 <template>
-  <Search :name="'供应商名称'" />
+  <Search :name="'供应商名称'" @handleSearch="handleSearch"/>
   <view class="c-card">
     <StatisticCard :list="list" />
     <view class="detail">
-      <view v-for="(item, index) in 10" :key="index" @click="getDetail(item)">
-        <text>华明基地{{ item }}</text>
-        <text class="num">¥1800.00 <text class="tip">付</text></text>
+      <view v-for="(item, index) in billList" :key="index" @click="getDetail(item)">
+        <text>{{ item.supplierName }}</text>
+        <text class="num">¥{{ item.unPayTotalPrice }} <text class="tip">付</text></text>
       </view>
     </view>
   </view>
@@ -13,21 +13,38 @@
 <script setup lang="ts">
 import Search from "@/components/Search/index.vue";
 import StatisticCard from "@/components/StatisticCard/index.vue";
+import { ReceiveApi } from "@/services";
 const list = reactive([
   {
-    num: 2,
+    num: 0,
     name: "应付供应商",
   },
   {
-    num: 8923,
+    num: 0,
     name: "应付金额",
   },
 ]);
+const handleSearch = (v:string) => {
+  getList(v)
+}
+const billList = ref<any>([])
 const getDetail = (item: any) => {
   uni.navigateTo({
-    url: "/pagesStatistics/supplier/billDetail", // 要跳转到的页面路径
+    url: "/pagesStatistics/billDetail?type=1&id="+ item.userId +`&name=${item.supplierName}`, // 要跳转到的页面路径
   });
 };
+const getList = (v: string) => {
+  ReceiveApi.getReconciliation({userName: v}).then((res:any) => {
+    if (res.code === 200) {
+      list[0].num = res.data.supplierNum
+      list[1].num = res.data.unPayTotalPrice
+      billList.value = res.data.unPaySupplierVos
+    }
+  })
+}
+onMounted(() => {
+  getList('')
+})
 </script>
 <style lang="scss" scoped>
 .c-card {
@@ -41,7 +58,7 @@ const getDetail = (item: any) => {
   padding: 20rpx;
   font-family: Source Han Sans CN;
   font-weight: 400;
-  font-size: 21rpx;
+  font-size: 28rpx;
   color: #000000;
   > view {
     display: flex;
diff --git a/src/components/Search/index.vue b/src/components/Search/index.vue
index 201302e..7d69d17 100644
--- a/src/components/Search/index.vue
+++ b/src/components/Search/index.vue
@@ -13,12 +13,13 @@
       :clearabled="true"
       :showAction="false"
       placeholderColor="#C1C1C1"
+      @search="handleSearch()"
     ></u-search>
   </view>
 </template>
 <script setup lang="ts">
 const isShowSearch = ref(false);
-const keyword = ref();
+const keyword = ref('');
 const props = withDefaults(
   defineProps<{
     name: string;
@@ -27,6 +28,11 @@ const props = withDefaults(
     name: '搜索内容',
   }
 );
+const emit = defineEmits(["handleSearch"]);
+
+const handleSearch = () => {
+  emit("handleSearch", keyword.value)
+}
 </script>
 <style lang="scss" scoped>
 .search {
diff --git a/src/components/StatisticCard/index.vue b/src/components/StatisticCard/index.vue
index 269ffd1..6c12ce0 100644
--- a/src/components/StatisticCard/index.vue
+++ b/src/components/StatisticCard/index.vue
@@ -13,7 +13,7 @@
 <script setup lang="ts">
 const props = withDefaults(
   defineProps<{
-    list: Array;
+    list: any;
   }>(),
   {
     list: [],
@@ -29,7 +29,7 @@ const props = withDefaults(
   align-items: center;
   font-family: Source Han Sans CN;
   font-weight: 500;
-  font-size: 24rpx;
+  font-size: 28rpx;
   color: #000000;
   text-align: center;
   background: #ffffff;
@@ -40,12 +40,12 @@ const props = withDefaults(
   text-align: center;
   font-family: Source Han Sans CN;
   font-weight: 400;
-  font-size: 24rpx;
+  font-size: 26rpx;
   color: #000000;
   border-left: 1px solid #e9e9e9;
   .num {
     font-weight: bold;
-    font-size: 27rpx;
+    font-size: 28rpx;
   }
 }
 </style>
diff --git a/src/pages.json b/src/pages.json
index 1e5a198..3a7bd28 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -229,9 +229,9 @@
           }
         },
         {
-          "path": "supplier/billDetail",
+          "path": "billDetail",
           "style": {
-            "navigationBarTitleText": "供应商账单详情"
+            "navigationBarTitleText": "账单详情"
           }
         },
         {
@@ -240,12 +240,6 @@
             "navigationBarTitleText": "供应商详情"
           }
         },
-        {
-          "path": "customer/billDetail",
-          "style": {
-            "navigationBarTitleText": "客户账单详情"
-          }
-        },
         {
           "path": "customer/detail",
           "style": {
diff --git a/src/pagesApp/components/TimeDialog.vue b/src/pagesApp/components/TimeDialog.vue
index 8cfe813..f7f3a7e 100644
--- a/src/pagesApp/components/TimeDialog.vue
+++ b/src/pagesApp/components/TimeDialog.vue
@@ -43,7 +43,7 @@
   </u-popup>
 </template>
 <script setup lang="ts">
-import { formatDate, getCurrentMonthStartAndEnd, getCurrentYearStartAndEnd } from "@/utils";
+import { formatDate, getCurrentMonthStartAndEnd, getCurrentYearStartAndEnd, timeRange } from "@/utils";
 
 const props = defineProps<{
   show: boolean;
@@ -81,23 +81,12 @@ const handleCustom = () => {
 }
 
 const handleSelect = (item: any) => {
-  const today = new Date();
-  const yesterday =  new Date((today as any) - (24 * 60 * 60 * 1000));
+
   state.currentStates = item.id;
-  console.log(item);
-  if (item.id === 1) {
-    state.startTime = formatDate(today, "{y}-{m}-{d}");
-    state.endTime = formatDate(today, "{y}-{m}-{d}");
-  } else if (item.id === 2) {
-    state.startTime = formatDate(yesterday, "{y}-{m}-{d}");
-    state.endTime = formatDate(yesterday, "{y}-{m}-{d}");
-  } else if (item.id === 3) {
-    state.startTime = formatDate(getCurrentMonthStartAndEnd().start, "{y}-{m}-{d}");
-    state.endTime = formatDate(getCurrentMonthStartAndEnd().end, "{y}-{m}-{d}");
-  } else if (item.id === 4) {
-    state.startTime = formatDate(getCurrentYearStartAndEnd().start, "{y}-{m}-{d}");
-    state.endTime = formatDate(getCurrentYearStartAndEnd().end, "{y}-{m}-{d}");
-  }
+  const range = timeRange(item.id)
+  state.startTime = range.startTime;
+  state.endTime = range.endTime
+
   emit("changeTime", {startTime: state.startTime, endTime: state.endTime, name: item.name});
   emit("handleDialog", false);
 };
diff --git a/src/pagesHome/index.vue b/src/pagesHome/index.vue
index 8b6f493..73ab9cb 100644
--- a/src/pagesHome/index.vue
+++ b/src/pagesHome/index.vue
@@ -395,24 +395,6 @@ const appList = reactive([
       });
     },
   },
-  // {
-  //   icon: "12.png",
-  //   title: "支付明细",
-  //   fn: () => {
-  //     // uni.navigateTo({
-  //     //   url: "/pagesApp/shipmentDetail", // 要跳转到的页面路径
-  //     // });
-  //   },
-  // },
-  // {
-  //   icon: "13.png",
-  //   title: "收入明细",
-  //   fn: () => {
-  //     // uni.navigateTo({
-  //     //   url: "/pagesApp/receiveCl", // 要跳转到的页面路径
-  //     // });
-  //   },
-  // },
   {
     icon: "14.png",
     title: "人员管理",
@@ -449,6 +431,24 @@ const appList = reactive([
       });
     },
   },
+  {
+    icon: "12.png",
+    title: "支付明细",
+    fn: () => {
+      uni.navigateTo({
+        url: "/pagesApp/shipmentDetail", // 要跳转到的页面路径
+      });
+    },
+  },
+  {
+    icon: "13.png",
+    title: "收入明细",
+    fn: () => {
+      uni.navigateTo({
+        url: "/pagesApp/receiveCl", // 要跳转到的页面路径
+      });
+    },
+  },
   
   
 ]);
diff --git a/src/pagesReceive/review/index.vue b/src/pagesReceive/review/index.vue
index 86a31dd..e6eb7bf 100644
--- a/src/pagesReceive/review/index.vue
+++ b/src/pagesReceive/review/index.vue
@@ -61,7 +61,7 @@
       </view>
 
       <view class="more">
-        <view v-if="getIsShow()"> 收货单号：SHD20230901132333 </view>
+        <view v-if="getIsShow()"> 收货单号：{{ state.order.receiptNumber }} </view>
         <view v-if="getIsShow()"></view>
         <view v-for="(item, index) in gridList1" :key="index">
           <text v-if="item.name">{{ item.name }}：</text
diff --git a/src/pagesShipment/review/index.vue b/src/pagesShipment/review/index.vue
index fd2169e..39fc895 100644
--- a/src/pagesShipment/review/index.vue
+++ b/src/pagesShipment/review/index.vue
@@ -440,7 +440,7 @@ const gridList3 = reactive([
   },
   {
     name: "实际收入",
-    enName: "incidentals",
+    enName: "realIncome",
     num: "",
     unit: "元",
     isBefore: false,
diff --git a/src/services/finance.ts b/src/services/finance.ts
new file mode 100644
index 0000000..e6bebab
--- /dev/null
+++ b/src/services/finance.ts
@@ -0,0 +1,54 @@
+import { http } from '@/utils/http'
+
+// 经营概况-支付明细
+export const getPaymentCount = (data: any) => {
+  return http({
+    method: 'GET',
+    url: '/api/paymentdtails/getPaymentCount',
+    data,
+  })
+}
+
+// 经营概况-收入明细
+export const getRevenueCount = (data: any) => {
+  return http({
+    method: 'GET',
+    url: '/api/revenuedetails/getRevenueCount',
+    data,
+  })
+}
+
+// 支付明细新增
+export const addPaymentDetails = (data: any) => {
+  return http({
+    method: 'POST',
+    url: '/api/paymentdtails/addPaymentDetails',
+    data,
+  })
+}
+
+// 收入明细新增
+export const addRevenueDes = (data: any) => {
+  return http({
+    method: 'POST',
+    url: '/api/recategory/addRevenueDes',
+    data,
+  })
+}
+
+// 分页查询支付明细
+export const getPaymentDetailsPage = (data: any) => {
+  return http({
+    method: 'GET',
+    url: '/api/paymentdtails/getPaymentDetailsPage',
+    data,
+  })
+}
+// 支付明细-查看详情
+export const getByPaymentId = (data: any) => {
+  return http({
+    method: 'GET',
+    url: '/api/paymentdtails/getByPaymentId',
+    data,
+  })
+}
\ No newline at end of file
diff --git a/src/services/index.ts b/src/services/index.ts
index 39a7170..faef001 100644
--- a/src/services/index.ts
+++ b/src/services/index.ts
@@ -7,4 +7,5 @@ export * as DeviceApi from './device'
 export * as StockCardApi from './stockCard'
 export * as GoodsApi from './goods'
 export * as SupplierApi from './supplier'
-export * as CustomerApi from './customer'
\ No newline at end of file
+export * as CustomerApi from './customer'
+export * as FinanceApi from './finance'
\ No newline at end of file
diff --git a/src/services/receive.ts b/src/services/receive.ts
index 6d035db..201cdc2 100644
--- a/src/services/receive.ts
+++ b/src/services/receive.ts
@@ -108,6 +108,24 @@ export const reTare = (data: any) => {
   });
 };
 
+// 收货单概况
+export const getOverview = (data: any) => {
+  return http({
+    method: "GET",
+    url: "/api/orderIn/getOverview",
+    data
+  });
+};
+
+// 供应商对账
+export const getReconciliation = (data: any) => {
+  return http({
+    method: "GET",
+    url: "/api/orderIn/getReconciliation",
+    data
+  });
+};
+
 
 
 
diff --git a/src/services/shipment.ts b/src/services/shipment.ts
index 656f612..f15d063 100644
--- a/src/services/shipment.ts
+++ b/src/services/shipment.ts
@@ -104,6 +104,24 @@ export const reGrossWeight = (data: any) => {
   });
 };
 
+// 收货单概况
+export const getOverview = (data: any) => {
+  return http({
+    method: "GET",
+    url: "/api/orderOut/getOverview",
+    data
+  });
+};
+
+// 供应商对账
+export const getReconciliation = (data: any) => {
+  return http({
+    method: "GET",
+    url: "/api/orderOut/getReconciliation",
+    data
+  });
+};
+
 
 
 
diff --git a/src/types/order.d.ts b/src/types/order.d.ts
index 529f933..59b9dc3 100644
--- a/src/types/order.d.ts
+++ b/src/types/order.d.ts
@@ -29,7 +29,7 @@ interface Order {
   points?: number; //扣点
   buckleMiscellaneous?: number; //扣杂
   price?: string; //单价
-  balanceTotalPrice?: string; //结算总价 货款金额
+  balanceTotalPrice?: string; //结算总价 货款金额 
   totalPrice?: string; //实际总价 预估价格
   weighingMethod?: number; //称重方式：0：有皮重 1：零皮重
   multiCategory?: number; //多品类：0：单品类 1：多品类
diff --git a/src/utils/enum.ts b/src/utils/enum.ts
index 0e02c99..6592284 100644
--- a/src/utils/enum.ts
+++ b/src/utils/enum.ts
@@ -82,4 +82,13 @@ export enum DeviceType {
 export enum StockCardType {
   Shipment = 1,
   Receive = 2
+}
+
+// 今日 昨日 本月 本年 自定义
+export enum TimeRange {
+  Today = 1,
+  Yesterday = 2,
+  Month = 3,
+  Year = 4,
+  Custom = 5
 }
\ No newline at end of file
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 3a23807..820d8e1 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -1,3 +1,5 @@
+import { TimeRange } from "./enum";
+
 export function formatDate(time: any, cFormat: string) {
   const format = cFormat || "{y}-{m}-{d}";
   const date = new Date(time);
@@ -130,10 +132,31 @@ export function pageListInit() {
 }
 // 过滤掉属性值为null的
 export function filterNullUndefined(obj: Object) {
-  return Object.entries(obj).reduce((acc:any, [key, value]) => {
-    if (value !== null && value !== undefined && value !=='') {
+  return Object.entries(obj).reduce((acc: any, [key, value]) => {
+    if (value !== null && value !== undefined && value !== "") {
       acc[key] = value;
     }
     return acc;
   }, {});
-}
\ No newline at end of file
+}
+
+export function timeRange(id: number) {
+  const today = new Date();
+  const yesterday = new Date((today as any) - 24 * 60 * 60 * 1000);
+  let startTime = "";
+  let endTime = "";
+  if (id === TimeRange.Today) {
+    startTime = formatDate(today, "{y}-{m}-{d}");
+    endTime = formatDate(today, "{y}-{m}-{d}");
+  } else if (id === TimeRange.Yesterday) {
+    startTime = formatDate(yesterday, "{y}-{m}-{d}");
+    endTime = formatDate(yesterday, "{y}-{m}-{d}");
+  } else if (id === TimeRange.Month) {
+    startTime = formatDate(getCurrentMonthStartAndEnd().start, "{y}-{m}-{d}");
+    endTime = formatDate(getCurrentMonthStartAndEnd().end, "{y}-{m}-{d}");
+  } else if (id === TimeRange.Year) {
+    startTime = formatDate(getCurrentYearStartAndEnd().start, "{y}-{m}-{d}");
+    endTime = formatDate(getCurrentYearStartAndEnd().end, "{y}-{m}-{d}");
+  }
+  return { startTime: startTime, endTime: endTime };
+}