From 4fa0cbae96cde47e4878e16c87da294903a457ae Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 11 九月 2023 17:41:21 +0800
Subject: [PATCH] 同步素材库商品

---
 minipro_standard/pages/plannedProgress/plannedProgress.vue |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/minipro_standard/pages/plannedProgress/plannedProgress.vue b/minipro_standard/pages/plannedProgress/plannedProgress.vue
index 5b72386..5eb0919 100644
--- a/minipro_standard/pages/plannedProgress/plannedProgress.vue
+++ b/minipro_standard/pages/plannedProgress/plannedProgress.vue
@@ -102,7 +102,9 @@
 			</scroll-view>
 		</view>
 		<!-- 閫夋嫨鏃ユ湡 -->
-		<u-calendar :show="timeShow" mode="range" @confirm="timeConfirm"></u-calendar>
+		<!-- <u-calendar :show="timeShow" mode="range" @confirm="timeConfirm" @close="timeShow = false"></u-calendar> -->
+		<l-calendar :lunar="false" v-model="timeShow" @change="timeConfirm" :isRange="true" activeBgColor="#305ED5"
+			rangeColor="#305ED5" rangeBgColor="rgba(48, 80, 213, 0.1)"></l-calendar>
 	</view>
 </template>
 
@@ -217,8 +219,8 @@
 			},
 			// 鏃ユ湡纭畾
 			timeConfirm(val) {
-				this.listData.startDate = val[0]
-				this.listData.endDate = val[val.length - 1]
+				this.listData.startDate = val.startDate
+				this.listData.endDate = val.endDate
 				this.timeShow = false
 			},
 			// 鍒囨崲宸ュ巶
@@ -247,7 +249,8 @@
 			},
 			// 鐐瑰嚮鏍囩鎼滅储
 			clickTag(ids) {
-				this.listData.cateIds = ids
+				// ids ? ids.split(',') : []
+				this.listData.cateIds = ids ? ids.split(',') : []
 				this.listData.page = 0
 				this.finished = false
 				this.lists = []
@@ -332,7 +335,8 @@
 							endDate: this.listData.endDate,
 							procedureIdList: this.listData.procedureIds ? this.listData.procedureIds : [],
 							factoryId: this.listData.departIds,
-							statusList: this.listData.cateIds ? this.listData.cateIds.split(',') : []
+							statusList: this.listData.cateIds
+							// this.listData.cateIds ? this.listData.cateIds.split(',') : []
 						},
 						page: this.listData.page,
 						sorts: [

--
Gitblit v1.9.3