From b99d776016b22c5e1a0d20e983390ff40defd061 Mon Sep 17 00:00:00 2001
From: admin <>
Date: Sat, 20 Jul 2024 16:34:44 +0800
Subject: [PATCH] =?UTF-8?q?=20fix=20=E6=97=B6=E9=97=B4=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/PagesStatistics/customerRanking.vue  |  5 +++--
 src/PagesStatistics/shipmentPanel.vue    | 14 ++++++++++----
 src/PagesStatistics/supplierRanking.vue  |  6 +++---
 src/pagesApp/incomeDetail.vue            | 10 +++++++---
 src/pagesApp/paymentDetail.vue           |  6 +++---
 src/pagesApp/receiveDetail.vue           |  5 +++--
 src/pagesApp/shipmentDetail.vue          |  5 +++--
 src/pagesReceive/payList.vue             |  5 +++--
 src/pagesReceive/payReview.vue           |  4 ++--
 src/pagesShipment/receivedPayment.vue    |  7 ++++---
 src/pagesShipment/shipmentSettlement.vue |  8 ++++----
 src/utils/index.ts                       | 15 +++++++++++++++
 12 files changed, 60 insertions(+), 30 deletions(-)

diff --git a/src/PagesStatistics/customerRanking.vue b/src/PagesStatistics/customerRanking.vue
index 2e8d4f1..1ad34f5 100644
--- a/src/PagesStatistics/customerRanking.vue
+++ b/src/PagesStatistics/customerRanking.vue
@@ -66,6 +66,7 @@ import ProductDialog from "./components/ProductDialog.vue";
 import { formatDate, getCurrentMonthStartAndEnd } from "@/utils";
 import { ShipmentApi } from "@/services";
 import _ from "underscore";
+import {formatStartAndEndTime} from "@/utils";
 const getOptions = (x: Array<any>, y: Array<any>) => {
   return {
     tooltip: {
@@ -158,8 +159,8 @@ const handleDialog = (key: string, v: boolean) => {
 };
 const getList = () => {
   let params: any = {
-    startTime: state.startTime + " 00:00:00",
-    endTime: state.endTime + " 23:59:59",
+    startTime: formatStartAndEndTime(state.startTime, 's'),
+    endTime: formatStartAndEndTime(state.endTime, 'e'),
   };
   if (state.scaleStatus > -1) {
     params.scaleStatus = state.scaleStatus;
diff --git a/src/PagesStatistics/shipmentPanel.vue b/src/PagesStatistics/shipmentPanel.vue
index b83a682..a451fa4 100644
--- a/src/PagesStatistics/shipmentPanel.vue
+++ b/src/PagesStatistics/shipmentPanel.vue
@@ -185,8 +185,14 @@ const state = reactive<{
     averagePrice: 0, // 平均单价
     rankings: [],
   },
-  startTime: formatDate(getCurrentMonthStartAndEnd().start, "{y}-{m}-{d} {h}:{i}:{s}"),
-  endTime: formatDate(getCurrentMonthStartAndEnd().end, "{y}-{m}-{d} {h}:{i}:{s}"),
+  startTime: formatDate(
+    getCurrentMonthStartAndEnd().start,
+    "{y}-{m}-{d} {h}:{i}:{s}"
+  ),
+  endTime: formatDate(
+    getCurrentMonthStartAndEnd().end,
+    "{y}-{m}-{d} {h}:{i}:{s}"
+  ),
   scaleStatus: -1,
   userId: -1,
   productId: -1,
@@ -210,8 +216,8 @@ const handleDialog = (key: string, v: boolean) => {
 
 const getList = () => {
   let params: any = {
-    startTime: state.startTime + " 00:00:00",
-    endTime: state.endTime + " 23:59:59",
+    startTime: state.startTime,
+    endTime: state.endTime,
   };
   if (state.scaleStatus > -1) {
     params.scaleStatus = state.scaleStatus;
diff --git a/src/PagesStatistics/supplierRanking.vue b/src/PagesStatistics/supplierRanking.vue
index 4ec7983..d283ed0 100644
--- a/src/PagesStatistics/supplierRanking.vue
+++ b/src/PagesStatistics/supplierRanking.vue
@@ -61,7 +61,7 @@ import TimeDialog from "@/components/Dialog/TimeDialog.vue";
 import CEcharts from "./Echarts/echarts.vue";
 import ProductDialog from "./components/ProductDialog.vue";
 import { ReceiveApi } from "@/services";
-import { formatDate, getCurrentMonthStartAndEnd } from "@/utils";
+import { formatDate, getCurrentMonthStartAndEnd, formatStartAndEndTime } from "@/utils";
 import _ from "underscore";
 const getOptions = (x: Array<any>, y: Array<any>) => {
   return {
@@ -156,8 +156,8 @@ const changeTime = (obj: any) => {
 
 const getList = () => {
   let params: any = {
-    startTime: state.startTime + " 00:00:00",
-    endTime: state.endTime + " 23:59:59",
+    startTime: formatStartAndEndTime(state.startTime, 's'),
+    endTime: formatStartAndEndTime(state.endTime, 's'),
   };
   if (state.scaleStatus > -1) {
     params.scaleStatus = state.scaleStatus;
diff --git a/src/pagesApp/incomeDetail.vue b/src/pagesApp/incomeDetail.vue
index 2e869be..804d299 100644
--- a/src/pagesApp/incomeDetail.vue
+++ b/src/pagesApp/incomeDetail.vue
@@ -112,7 +112,11 @@
 <script setup lang="ts">
 import { FinanceApi } from "@/services";
 import PageView from "@/components/PageView/index.vue";
-import { formatDate, getCurrentMonthStartAndEnd } from "@/utils";
+import {
+  formatDate,
+  getCurrentMonthStartAndEnd,
+  formatStartAndEndTime,
+} from "@/utils";
 import TimeDialog from "@/components/Dialog/TimeDialog.vue";
 import FilterDialog from "./components/CustomFilterDialog.vue";
 import { onShow } from "@dcloudio/uni-app";
@@ -238,8 +242,8 @@ const getList = (v?: boolean) => {
   let params: any = {
     pageSize: pageList.pageSize,
     pageNumber: pageList.pageNum,
-    startTime: state.startTime + " 00:00:00",
-    endTime: state.endTime + " 23:59:59",
+    startTime: formatStartAndEndTime(state.startTime, 's'),
+    endTime: formatStartAndEndTime(state.endTime, 'e'),
     oddNumbers: keyword.value,
   };
   if (state.currentPaymentType > -1) {
diff --git a/src/pagesApp/paymentDetail.vue b/src/pagesApp/paymentDetail.vue
index d1cba4b..19b0f00 100644
--- a/src/pagesApp/paymentDetail.vue
+++ b/src/pagesApp/paymentDetail.vue
@@ -107,7 +107,7 @@
 <script setup lang="ts">
 import { FinanceApi } from "@/services";
 import PageView from "@/components/PageView/index.vue";
-import { formatDate, getCurrentMonthStartAndEnd } from "@/utils";
+import { formatDate, getCurrentMonthStartAndEnd, formatStartAndEndTime } from "@/utils";
 import TimeDialog from "@/components/Dialog/TimeDialog.vue";
 import FilterDialog from "./components/CustomFilterDialog.vue";
 import { onShow } from "@dcloudio/uni-app";
@@ -242,8 +242,8 @@ const getList = (v?: boolean) => {
   let params: any = {
     pageSize: pageList.pageSize,
     pageNumber: pageList.pageNum,
-    startTime: state.startTime + " 00:00:00",
-    endTime: state.endTime + " 23:59:59",
+    startTime: formatStartAndEndTime(state.startTime, 's'),
+    endTime: formatStartAndEndTime(state.endTime, 'e'),
     oddNumbers: keyword.value,
   };
   if (state.currentPaymentType > -1) {
diff --git a/src/pagesApp/receiveDetail.vue b/src/pagesApp/receiveDetail.vue
index e24c6ce..740738e 100644
--- a/src/pagesApp/receiveDetail.vue
+++ b/src/pagesApp/receiveDetail.vue
@@ -158,6 +158,7 @@ import {
   formatDate,
   getCurrentMonthStartAndEnd,
   filterNullUndefined,
+  formatStartAndEndTime
 } from "@/utils";
 import TimeDialog from "@/components/Dialog/TimeDialog.vue";
 import FilterDialog from "./components/FilterDialog.vue";
@@ -375,8 +376,8 @@ const getList = (v?: boolean) => {
   let params: any = {
     pageSize: pageList.pageSize,
     pageNumber: pageList.pageNum,
-    startTime: state.startTime + " 00:00:00",
-    endTime: state.endTime + " 23:59:59",
+    startTime: formatStartAndEndTime(state.startTime, 's'),
+    endTime: formatStartAndEndTime(state.endTime, 'e'),
   };
   if (state.currentScaleStatus > -1) {
     params.scaleStatus = state.currentScaleStatus;
diff --git a/src/pagesApp/shipmentDetail.vue b/src/pagesApp/shipmentDetail.vue
index cc3b772..f59da72 100644
--- a/src/pagesApp/shipmentDetail.vue
+++ b/src/pagesApp/shipmentDetail.vue
@@ -173,6 +173,7 @@ import {
   formatDate,
   getCurrentMonthStartAndEnd,
   filterNullUndefined,
+  formatStartAndEndTime
 } from "@/utils";
 import TimeDialog from "@/components/Dialog/TimeDialog.vue";
 import FilterDialog from "./components/FilterDialog.vue";
@@ -408,8 +409,8 @@ const getList = (v?: boolean) => {
   let params: any = {
     pageSize: pageList.pageSize,
     pageNumber: pageList.pageNum,
-    startTime: state.startTime + " 00:00:00",
-    endTime: state.endTime + " 23:59:59",
+    startTime: formatStartAndEndTime(state.startTime, 's'),
+    endTime: formatStartAndEndTime(state.endTime, 'e'),
   };
   if (state.currentScaleStatus > -1) {
     params.scaleStatus = state.currentScaleStatus;
diff --git a/src/pagesReceive/payList.vue b/src/pagesReceive/payList.vue
index ff6aae3..9c427a3 100644
--- a/src/pagesReceive/payList.vue
+++ b/src/pagesReceive/payList.vue
@@ -62,6 +62,7 @@ import PageView from "@/components/PageView/index.vue";
 import { ScaleStatus } from "@/utils/enum";
 import TimeDialog from "@/components/Dialog/TimeDialog.vue";
 import Detail from "./components/detail.vue";
+import {formatStartAndEndTime} from "@/utils";
 // 筛选条件
 const filterState = reactive({
   showTime: false,
@@ -117,8 +118,8 @@ const getList = (v?: boolean) => {
     pageNumber: pageList.pageNum,
     scaleStatus: ScaleStatus.Paid,
     userName: keyword.value,
-    startTime: filterState.startTime ? `${filterState.startTime} 00:00:00` : "",
-    endTime: filterState.startTime ? `${filterState.endTime} 00:00:00` : "",
+    startTime: formatStartAndEndTime(filterState.startTime, 's'),
+    endTime: formatStartAndEndTime(filterState.endTime, 'e'),
   }).then((res: any) => {
     if (res.code === 200) {
       pageList.isLoading = false;
diff --git a/src/pagesReceive/payReview.vue b/src/pagesReceive/payReview.vue
index 0eca12d..5bbf4b1 100644
--- a/src/pagesReceive/payReview.vue
+++ b/src/pagesReceive/payReview.vue
@@ -320,8 +320,8 @@ const getList = (v?: boolean) => {
     pageNumber: pageList.pageNum,
     scaleStatus: currentTab.value,
     userName: keyword.value,
-    startTime: filterState.startTime ? `${filterState.startTime} 00:00:00` : '',
-    endTime: filterState.startTime ? `${filterState.endTime} 00:00:00` : '',
+    startTime: filterState.startTime ? `${filterState.startTime}` : '',
+    endTime: filterState.startTime ? `${filterState.endTime}` : '',
   }).then((res: any) => {
     if (res.code === 200) {
       pageList.isLoading = false;
diff --git a/src/pagesShipment/receivedPayment.vue b/src/pagesShipment/receivedPayment.vue
index ab0a97e..a59c10b 100644
--- a/src/pagesShipment/receivedPayment.vue
+++ b/src/pagesShipment/receivedPayment.vue
@@ -57,11 +57,12 @@
 </template>
 <script setup lang="ts">
 import { ShipmentApi } from "@/services/index";
-import { ScaleStatus, ScaleStatusBtnType } from "@/utils/enum";
+import { ScaleStatus } from "@/utils/enum";
 import { onShow } from "@dcloudio/uni-app";
 import PageView from "@/components/PageView/index.vue";
 import TimeDialog from "@/components/Dialog/TimeDialog.vue";
 import ReceivedDetail from "./components/receivedDetail.vue";
+import {formatStartAndEndTime} from "@/utils";
 // 筛选条件
 const filterState = reactive({
   showTime: false,
@@ -115,8 +116,8 @@ const getList = (v?: boolean) => {
     pageNumber: pageList.pageNum,
     scaleStatus: ScaleStatus.ToBeShipmentReview,
     userName: keyword.value,
-    startTime: filterState.startTime ? `${filterState.startTime} 00:00:00` : "",
-    endTime: filterState.startTime ? `${filterState.endTime} 00:00:00` : "",
+    startTime: formatStartAndEndTime(filterState.startTime, 's'),
+    endTime: formatStartAndEndTime(filterState.endTime, 'e'),
   }).then((res) => {
     if (res.code === 200) {
       pageList.isLoading = false;
diff --git a/src/pagesShipment/shipmentSettlement.vue b/src/pagesShipment/shipmentSettlement.vue
index 562c050..be13699 100644
--- a/src/pagesShipment/shipmentSettlement.vue
+++ b/src/pagesShipment/shipmentSettlement.vue
@@ -135,11 +135,11 @@
 <script setup lang="ts">
 import { ShipmentApi } from "@/services/index";
 import { ScaleStatus, ScaleStatusBtnType } from "@/utils/enum";
-import { onLoad } from "@dcloudio/uni-app";
-import { onShow } from "@dcloudio/uni-app";
+import { onLoad, onShow } from "@dcloudio/uni-app";
 import PageView from "@/components/PageView/index.vue";
 import type { ComType } from "@/types/global";
 import TimeDialog from "@/components/Dialog/TimeDialog.vue";
+import {formatStartAndEndTime} from "@/utils";
 // 筛选条件
 const filterState = reactive({
   showTime: false,
@@ -292,8 +292,8 @@ const getList = (v?: boolean) => {
     pageNumber: pageList.pageNum,
     scaleStatus: ScaleStatus.ToBeShipmentReview,
     userName: keyword.value,
-    startTime: filterState.startTime ? `${filterState.startTime} 00:00:00` : "",
-    endTime: filterState.startTime ? `${filterState.endTime} 00:00:00` : "",
+    startTime: formatStartAndEndTime(filterState.startTime, 's'),
+    endTime: formatStartAndEndTime(filterState.endTime, 'e'),
   }).then((res) => {
     if (res.code === 200) {
       pageList.isLoading = false;
diff --git a/src/utils/index.ts b/src/utils/index.ts
index cb46c22..b394627 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -307,3 +307,18 @@ export function getScaleStatus(type: number, value: number) {
     }
   }
 }
+
+// 判断是否是时间格式
+export function isDateTimePicker(str: any) {
+  return str.split(' ').length === 2
+}
+
+// 格式化开始时间和结束时间
+export function formatStartAndEndTime(str:string, type:string) {
+  if (type === 's') {
+    return str ? isDateTimePicker(str) ? str : (str + " 00:00:00") : ''
+  }else if (type === 'e') {
+    return str ? isDateTimePicker(str) ? str : (str + " 23:59:59") : ''
+  }
+}
+