跨日活动时间展示兼容， 拒绝删除理由屏蔽空格

pages-approve/activity/detail.vue

@@ -6,8 +6,14 @@
 			<view class="section white-wrap">
 				<view class="info-item flex">
 					<view class="label">活动时间:</view>
-					<view>{{info.RsCalendarResearcherItem.StartDate}}({{info.RsCalendarResearcherItem.StartWeek}})
-						{{info.RsCalendarResearcherItem.StartTime}}-{{info.RsCalendarResearcherItem.EndTime}}</view>
+					<view v-if="info.RsCalendarResearcherItem.StartDate === info.RsCalendarResearcherItem.EndDate">
+						{{info.RsCalendarResearcherItem.StartDate}}({{info.RsCalendarResearcherItem.StartWeek}})
+							{{info.RsCalendarResearcherItem.StartTime}}~{{info.RsCalendarResearcherItem.EndTime}}
+					</view>
+					<view v-else>
+						{{info.RsCalendarResearcherItem.StartDate}}({{info.RsCalendarResearcherItem.StartWeek}})
+							{{info.RsCalendarResearcherItem.StartTime}}~{{info.RsCalendarResearcherItem.EndDate}}({{info.RsCalendarResearcherItem.EndWeek}}){{info.RsCalendarResearcherItem.EndTime}}
+					</view>
 				</view>
 				<view class="info-item flex" v-if="Role === 'seller'">
 					<view class="label">研究员:</view>
@@ -77,7 +83,7 @@
 			<view class="section white-wrap" v-if="info.RsCalendarResearcherItem.Status==4">
 				<view class="info-item flex">
 					<view class="label">删除时间:</view>
-					<view>{{info.RsCalendarResearcherItem.DeleteTime}}</view>
+					<view>{{info.RsCalendarResearcherItem.DeleteTime|formatTime}}</view>
 				</view>
 				<view class="info-item flex">
 					<view class="label">删除原因:</view>
@@ -89,8 +95,14 @@
 			<view class="section white-wrap">
 				<view class="info-item flex">
 					<view class="label">活动时间:</view>
-					<view>{{info.RsCalendarResearcherItem.StartDate}}({{info.RsCalendarResearcherItem.StartWeek}})
-						{{info.RsCalendarResearcherItem.StartTime}}-{{info.RsCalendarResearcherItem.EndTime}}</view>
+					<view v-if="info.RsCalendarResearcherItem.StartDate === info.RsCalendarResearcherItem.EndDate">
+						{{info.RsCalendarResearcherItem.StartDate}}({{info.RsCalendarResearcherItem.StartWeek}})
+							{{info.RsCalendarResearcherItem.StartTime}}~{{info.RsCalendarResearcherItem.EndTime}}
+					</view>
+					<view v-else>
+						{{info.RsCalendarResearcherItem.StartDate}}({{info.RsCalendarResearcherItem.StartWeek}})
+							{{info.RsCalendarResearcherItem.StartTime}}~{{info.RsCalendarResearcherItem.EndDate}}({{info.RsCalendarResearcherItem.EndWeek}}){{info.RsCalendarResearcherItem.EndTime}}
+					</view>
 				</view>
 				<view class="info-item flex" v-if="Role === 'seller'">
 					<view class="label">研究员:</view>
@@ -145,7 +157,7 @@
 			<view class="section white-wrap" v-if="info.RsCalendarResearcherItem.Status==4">
 				<view class="info-item flex">
 					<view class="label">删除时间:</view>
-					<view>{{info.RsCalendarResearcherItem.DeleteTime}}</view>
+					<view>{{info.RsCalendarResearcherItem.DeleteTime | formatTime}}</view>
 				</view>
 				<view class="info-item flex">
 					<view class="label">删除原因:</view>

pages-approve/activity/list.vue

@@ -38,8 +38,15 @@
 				<!-- 其他 -->
 				<block v-else-if="['内部会议','报告电话会','事项'].includes(activity_type)">
 					<view class="content">
-							<view class="info">{{activity_type==='内部会议' ? '会议' : '活动'}}时间：{{item.StartDate}}({{item.StartWeek}})
-						{{item.StartTime}}-{{item.EndTime}}</view>
+							<view class="info">{{activity_type==='内部会议' ? '会议' : '活动'}}时间：
+								<block v-if="item.StartDate === item.EndDate">
+									{{item.StartDate}}({{item.StartWeek}})
+									{{item.StartTime}}~{{item.EndTime}}
+								</block>
+								<block v-else>
+									{{item.StartDate}}({{item.StartWeek}}){{item.StartTime}}~{{item.EndDate}}({{item.EndWeek}}){{item.EndTime}}
+								</block>
+							</view>
 							<view class="info" v-if="item.ActivityCategory">活动类别：{{item.ActivityCategory}} </view>
 							<view class="info" v-if="item.MatterContent">事项内容：{{item.MatterContent}} </view>
 							<view class="info" v-if="['内部会议','报告电话会'].includes(activity_type)">参会人员：{{ item.ResearcherName }} </view>

pages-approve/activity/reason.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="textarea-wrap white-wrap">
-			<textarea :placeholder="`请输入${type === 'del' ? '删除' : '拒绝'}理由`" v-model="reason" maxlength="-1"></textarea>
+			<textarea :placeholder="`请输入${type === 'del' ? '删除' : '拒绝'}理由`" v-model="reason" maxlength="-1" @input="formatSpace"></textarea>
 		</view>
 		<view class="btns-wrap flex">
 			<button class="cancel-btn" @click="handleCancel">取消</button>
@@ -69,6 +69,11 @@
 				uni.navigateBack({
 					delta:1
 				})
+			},
+			
+			/* 过滤空格 */
+			formatSpace({detail}) {
+				this.reason = detail.value.replace(/\s+/g,'');
 			}
 			
 		},