diff --git a/src/PagesStatistics/components/FilterDialog.vue b/src/PagesStatistics/components/FilterDialog.vue index 93b65ac..7516fbb 100644 --- a/src/PagesStatistics/components/FilterDialog.vue +++ b/src/PagesStatistics/components/FilterDialog.vue @@ -2,22 +2,24 @@ 筛选 - + - + - - + @@ -29,9 +31,18 @@ - + - + \ No newline at end of file + diff --git a/src/PagesStatistics/components/TimeRangeFilter.vue b/src/PagesStatistics/components/TimeRangeFilter.vue index f92b1e8..2100619 100644 --- a/src/PagesStatistics/components/TimeRangeFilter.vue +++ b/src/PagesStatistics/components/TimeRangeFilter.vue @@ -1,5 +1,5 @@ diff --git a/src/services/receive.ts b/src/services/receive.ts index 6fa6a28..acb5a52 100644 --- a/src/services/receive.ts +++ b/src/services/receive.ts @@ -82,10 +82,11 @@ export const updateOne = (data: any) => { }; // 收货汇总 -export const OrderInReceipt = () => { - return http({ +export const OrderInReceipt = (data:any) => { + return http({ method: "GET", - url: "/api/orderIn/OrderInReceipt" + url: "/api/orderIn/OrderInReceipt", + data }); }; diff --git a/src/services/receiveProduct.ts b/src/services/receiveProduct.ts index ddd866d..8bf3588 100644 --- a/src/services/receiveProduct.ts +++ b/src/services/receiveProduct.ts @@ -10,7 +10,7 @@ export const getReceiveProduct = () => { // 查询收货产品列表All export const getAllReProducts = () => { - return http({ + return http({ method: "GET", url: "/api/reproducts/allReProducts" }); diff --git a/src/types/order.d.ts b/src/types/order.d.ts index fd12bee..f84c7aa 100644 --- a/src/types/order.d.ts +++ b/src/types/order.d.ts @@ -48,6 +48,17 @@ interface Order { isChecked?: boolean; [attrName: string]: any; } +interface ReceiveSummaryCount { + totalAmount?: number; // 审核过的收货订单 + totalPaid?: number; // 已支付的收货总量 + totalUnpaid?: number; // 未支付的收货总量 + totalPayment?: number; // 总支付金额 + totalPaidPrice?: number; // 已经支付的金额 + totalUnpaidPrice?: number; // 未支付的金额 + totalReceipt?: number; // 收货单数量已审核的 + averagePrice?: number; // 平均单价 + rankings?: Array; +} // 分页结构 interface OrderPage { total: number; @@ -73,7 +84,7 @@ type PageParams = { productId?: string; // 产品id repairFlag?: boolean; // 是否为补单,true 是未补单，false是补单 scaleStatus?: number; // 磅单状态:0：待定价1：待过皮2：待审核3：已审核待支付4：已支付 - isDeleted?:boolean + isDeleted?: boolean; }; interface Shipment { @@ -116,13 +127,13 @@ interface Shipment { updateUserId?: string; //undefined updateTime?: string; //undefined isDeleted?: string; //删除标识true删除，false未删除 - settlementWeight?: number, // 结算重量 - settlementGross?: number, // 结算毛重 - settlementTare?: number, // 结算皮重 - settlementNet?: number, // 结算净重 - signTime?: string, // 签收时间 + settlementWeight?: number; // 结算重量 + settlementGross?: number; // 结算毛重 + settlementTare?: number; // 结算皮重 + settlementNet?: number; // 结算净重 + signTime?: string; // 签收时间 paymentMethod?: string; //支付方式：0:未支付,1:现金支付，2：银行卡支付，3：线上支付（微信）4：支付宝 - userType?: number;//用户类型0：刷脸1：刷卡 + userType?: number; //用户类型0：刷脸1：刷卡 [attrName: string]: any; } @@ -150,3 +161,29 @@ interface ShipmentTypeCount { averagePrice: number; // 平均单价 rankings: ShipmentRank[]; // 出货产品汇总 } + +// 收货产品 +interface ReceiveProduct { + id?: string; // 收货产品id + + reProductsName?: string; //收货产品名称 + + reCategoryId?: string; //收货分类id + + reCategoryName?: string; + //收货分类名称 + + substationName?: string; + //分站名称 + + minPrice?: string; + //产品的最低价格 + + maxPrice?: string; + //产品的最高价格 + + commonPrice?: string; + //产品的常用价格 + + isDeleted?: boolean; //逻辑删除 TRUE=是 FALSE=否 +} diff --git a/src/utils/index.ts b/src/utils/index.ts index f27d7b1..6edc578 100644 --- a/src/utils/index.ts +++ b/src/utils/index.ts @@ -32,3 +32,26 @@ export function formatDate(time: any, cFormat: string) { }); return time_str; } + +export function getCurrentMonthStartAndEnd() { + let now = new Date(); + let currentMonthStart = new Date(now.getFullYear(), now.getMonth(), 1); + let currentMonthEnd = new Date(now.getFullYear(), now.getMonth() + 1, 0); + + return { + start: currentMonthStart, + end: currentMonthEnd + }; +} + +export function getCurrentYearStartAndEnd() { + let now = new Date(); + let currentYearStart = new Date(now.getFullYear(), 0, 1); // 0 代表一月 + let currentYearEnd = (new Date(now.getFullYear() + 1, 0, 1) as any) - 1; // 下一年的一月一日减一毫秒 + + return { + start: currentYearStart, + end: currentYearEnd + }; +} +