更新

components/VNavigationBar.vue

@@ -165,6 +165,6 @@
 
 	.page-top {
 		padding-top: var(--status-bar-height); //给组件加个上边距
-		// background-color: white;
+		background-color: white;
 	}
 </style>

components/orderCard.vue

@@ -26,7 +26,7 @@
 			<view class="un_finished_projects cont_title" v-if="order.nodeNames && order.nodeNames.length > 0">
 				<view class="project-left">
 					<view class="c_t_title">
-						未完成项目：
+						未完成工时项目：
 					</view>
 					<view class="project c_t_size" v-for="(item,index) in order.nodeNames">
 						{{index + 1}}、{{item}}

pages-business/businessManage/businessManage.vue

@@ -149,6 +149,10 @@
 						label: "本月",
 						value: "month",
 					},
+					{
+						label: "本年",
+						value: "year",
+					},
 					{
 						label: "全部",
 						value: "all",

pages-business/staffStatistics/staffStatistics.vue

@@ -158,6 +158,10 @@
 						label: "本月",
 						value: "month",
 					},
+					{
+						label: "本年",
+						value: "year",
+					},
 					{
 						label: "全部",
 						value: "all",
@@ -353,7 +357,7 @@
 
 	.tabs {
 		display: flex;
-		gap: 24rpx;
+		gap: 20rpx;
 		margin-bottom: 20rpx;
 	}
 
@@ -549,7 +553,7 @@
 		justify-content: space-between;
 		padding: 0px 30rpx;
 
-		width: 386rpx;
+		width: 356rpx;
 		height: 56rpx;
 		background: #FFFFFF;
 		border-radius: 36rpx;

pages-business/statistics/statistics.vue

@@ -273,6 +273,10 @@
 						label: "本月",
 						value: "month",
 					},
+					{
+						label: "本年",
+						value: "year",
+					},
 					{
 						label: "全部",
 						value: "all",

pages-detail/detail/detail.vue

@@ -136,6 +136,10 @@
 						label: "本月",
 						value: "month",
 					},
+					{
+						label: "本年",
+						value: "year",
+					},
 					{
 						label: "全部",
 						value: "all",
@@ -532,7 +536,7 @@
 		justify-content: space-between;
 		padding: 0px 30rpx;
 
-		width: 386rpx;
+		width: 356rpx;
 		height: 56rpx;
 		background: #FFFFFF;
 		border-radius: 36rpx;

pages-home/home/home.vue

@@ -1145,7 +1145,7 @@
 
 	.topt_ {
 		width: 100%;
-		// height: 408rpx;
+		height: 408rpx;
 		background: linear-gradient(180deg, #2D3BFF 0%, #1463FF 100%);
 		border-radius: 0rpx 0rpx 12rpx 12rpx;
 		box-sizing: border-box;

pages-order/addOrder/addOrder.vue

@@ -684,7 +684,6 @@
 			onBusiAndCuschange(e) {
 				this.formData.busiFrom = e.detail.value[0].value
 				this.formData.cusFrom = e.detail.value[1].value
-				console.log('选择渠道和来源', this.formData);
 			},
 			buildRepairType() {
 				if (this.pageData.repairType) {

utils/utils.js

@@ -491,6 +491,12 @@ export function getDateRange(type) {
 
 		end = new Date(now)
 		end.setHours(23, 59, 59, 999)
+	} else if (type === 'year') {
+		// 获取本年的开始和结束
+		start = new Date(now.getFullYear(), 0, 1); // 本年1月1日
+		end = new Date(now.getFullYear(), 11, 31); // 本年12月31日
+		start.setHours(0, 0, 0, 0)
+		end.setHours(23, 59, 59, 999)
 	} else {
 		return []
 	}