优化小程序报销模块

uniapp/pages/tools/schedule/edit.vue

@@ -7,20 +7,18 @@
 
 		<view class="form-card" :class="{ 'is-disabled': isCompleted }">
 			<view class="field">
-				<text class="field-label">日程内容 <text class="required">*</text></text>
-				<u-textarea
-					v-model="form.content"
-					placeholder="输入日程内容，支持多行"
-					:maxlength="1000"
-					count
-					height="120"
+				<text class="field-label">标题 <text class="required">*</text></text>
+				<u-input
+					v-model="form.title"
+					placeholder="输入日程标题"
+					:maxlength="80"
 					border="none"
 					:disabled="isCompleted"
 				/>
 			</view>
 
 			<view class="field">
-				<text class="field-label">发生日期 <text class="required">*</text></text>
+				<text class="field-label">日期 <text class="required">*</text></text>
 				<picker mode="date" :value="form.date" @change="onDateChange" :disabled="isCompleted">
 					<view class="picker-value">
 						<text>{{ form.date || '选择日期' }}</text>
@@ -29,65 +27,60 @@
 				</picker>
 			</view>
 
-			<view class="field">
-				<text class="field-label">发生时间 <text class="required">*</text></text>
-				<picker mode="time" :value="form.time" @change="onTimeChange" :disabled="isCompleted">
+			<view class="field switch-field">
+				<view class="switch-info">
+					<text class="field-label">全天</text>
+					<text class="form-tip">开启后无需填写起止时间</text>
+				</view>
+				<u-switch
+					v-model="form.allDay"
+					active-color="#2563eb"
+					size="22"
+					:disabled="isCompleted"
+				/>
+			</view>
+
+			<view v-if="!form.allDay" class="field">
+				<text class="field-label">开始时间 <text class="required">*</text></text>
+				<picker mode="time" :value="form.startTime" @change="onStartTimeChange" :disabled="isCompleted">
 					<view class="picker-value">
-						<text>{{ form.time || '选择时间' }}</text>
+						<text>{{ form.startTime || '选择开始时间' }}</text>
 						<FaIcon name="clock" color="#909399" :size="16" />
 					</view>
 				</picker>
 			</view>
 
-			<view class="field">
-				<text class="field-label">提醒渠道</text>
-				<text class="field-hint">可多选，接入接口后按渠道下发提醒</text>
-				<view class="channel-grid">
-					<u-tag
-						v-for="channel in channelOptions"
-						:key="channel.value"
-						:text="channel.label"
-						:name="channel.value"
-						:type="isChannelActive(channel.value) ? 'primary' : 'info'"
-						:plain="!isChannelActive(channel.value)"
-						size="medium"
-						@click="onChannelTap"
-					/>
-				</view>
+			<view v-if="!form.allDay" class="field">
+				<text class="field-label">结束时间</text>
+				<picker mode="time" :value="form.endTime" @change="onEndTimeChange" :disabled="isCompleted">
+					<view class="picker-value">
+						<text>{{ form.endTime || '选填，不填则只记开始时间' }}</text>
+						<FaIcon name="clock" color="#909399" :size="16" />
+					</view>
+				</picker>
 			</view>
 
 			<view class="field picker-field">
-				<text class="field-label">提前提醒时间</text>
-				<picker :range="remindLabels" :value="remindIndex" @change="onRemindChange" :disabled="isCompleted">
+				<text class="field-label">优先级</text>
+				<picker :range="priorityLabels" :value="priorityIndex" @change="onPriorityChange" :disabled="isCompleted">
 					<view class="picker-value">
-						<text>{{ remindLabels[remindIndex] }}</text>
-						<FaIcon name="bell" color="#909399" :size="16" />
+						<text>{{ priorityLabels[priorityIndex] }}</text>
+						<FaIcon name="flag" color="#909399" :size="16" />
 					</view>
 				</picker>
 			</view>
 
 			<view class="field">
-				<text class="field-label">重复提醒间隔（分钟）</text>
-				<u-number-box
-					v-model="form.repeatIntervalMinutes"
-					:min="0"
-					:max="1440"
-					integer
+				<text class="field-label">内容</text>
+				<u-textarea
+					v-model="form.content"
+					placeholder="补充日程详细内容（选填）"
+					:maxlength="1000"
+					count
+					height="120"
+					border="none"
 					:disabled="isCompleted"
 				/>
-				<text class="form-tip">0表示不重复，仅发送一次</text>
-			</view>
-
-			<view class="field">
-				<text class="field-label">最多提醒次数</text>
-				<u-number-box
-					v-model="form.maxSendCount"
-					:min="1"
-					:max="100"
-					integer
-					:disabled="isCompleted"
-				/>
-				<text class="form-tip">最多发送的提醒次数</text>
 			</view>
 		</view>
 
@@ -109,40 +102,36 @@
 import { ref, reactive, computed } from 'vue'
 import { onLoad } from '@dcloudio/uni-app'
 import {
-	getSchedule,
-	createSchedule,
-	updateSchedule,
-	REMIND_CHANNEL_OPTIONS,
-	REMIND_MINUTES_OPTIONS
-} from '@/api/schedule.js'
-import { formatDate, pad } from '@/utils/date.js'
+	getOaSchedule,
+	createOaSchedule,
+	updateOaSchedule,
+	OA_SCHEDULE_PRIORITY_OPTIONS
+} from '@/api/oaSchedule.js'
+import { formatDate } from '@/utils/date.js'
 
 const scheduleId = ref('')
 const saving = ref(false)
 const isCompleted = ref(false)
-const channelOptions = REMIND_CHANNEL_OPTIONS
-const remindOptions = REMIND_MINUTES_OPTIONS
-const remindLabels = remindOptions.map(item => item.label)
+const priorityOptions = OA_SCHEDULE_PRIORITY_OPTIONS
+const priorityLabels = priorityOptions.map(item => item.label)
 
 const form = reactive({
+	title: '',
 	content: '',
 	date: '',
-	time: '',
-	remindChannels: ['app'],
-	remindMinutes: 0,
-	repeatIntervalMinutes: 0,
-	maxSendCount: 1
+	allDay: true,
+	startTime: '09:00',
+	endTime: '',
+	priority: 0
 })
 
-const remindIndex = computed(() => {
-	const index = remindOptions.findIndex(item => item.value === form.remindMinutes)
-	return index >= 0 ? index : 3
+const priorityIndex = computed(() => {
+	const index = priorityOptions.findIndex(item => item.value === Number(form.priority))
+	return index >= 0 ? index : 0
 })
 
 onLoad(async (query) => {
-	const now = new Date()
-	form.date = formatDate(now)
-	form.time = `${pad(now.getHours())}:${pad(now.getMinutes())}`
+	form.date = formatDate(new Date())
 
 	if (query?.id) {
 		scheduleId.value = query.id
@@ -155,105 +144,86 @@ onLoad(async (query) => {
 
 async function loadSchedule(id) {
 	try {
-		const item = await getSchedule(id)
+		const item = await getOaSchedule(id)
 		if (!item) {
 			uni.showToast({ title: '日程不存在', icon: 'none' })
 			setTimeout(() => uni.navigateBack(), 800)
 			return
 		}
-		const d = new Date(item.datetime)
+		form.title = item.title || ''
 		form.content = item.content || ''
-		form.date = formatDate(d)
-		form.time = `${pad(d.getHours())}:${pad(d.getMinutes())}`
-		form.remindChannels = [...(item.remindChannels || [])]
-		form.remindMinutes = item.remindMinutes ?? 0
-		form.repeatIntervalMinutes = item.repeatIntervalMinutes ?? 0
-		form.maxSendCount = item.maxSendCount ?? 1
+		form.date = item.schedule_date || formatDate(new Date())
+		form.allDay = !!item.allDay
+		form.startTime = item.start_time || '09:00'
+		form.endTime = item.end_time || ''
+		form.priority = Number(item.priority) || 0
 		isCompleted.value = !!item.completed
 	} catch (e) {
 		uni.showToast({ title: '加载失败', icon: 'none' })
 	}
 }
 
-/** 渠道是否已选中 */
-function isChannelActive(value) {
-	return form.remindChannels.includes(value)
-}
-
-function onChannelTap(name) {
-	if (isCompleted.value) return
-	const index = form.remindChannels.indexOf(name)
-	if (index >= 0) {
-		form.remindChannels.splice(index, 1)
-	} else {
-		form.remindChannels.push(name)
-	}
-}
-
 function onDateChange(e) {
 	form.date = e.detail.value
 }
 
-function onTimeChange(e) {
-	form.time = e.detail.value
+function onStartTimeChange(e) {
+	form.startTime = e.detail.value
 }
 
-function onRemindChange(e) {
+function onEndTimeChange(e) {
+	form.endTime = e.detail.value
+}
+
+function onPriorityChange(e) {
 	const index = Number(e.detail.value)
-	form.remindMinutes = remindOptions[index].value
-}
-
-function buildDatetime() {
-	const [year, month, day] = form.date.split('-').map(Number)
-	const [hour, minute] = form.time.split(':').map(Number)
-	return new Date(year, month - 1, day, hour, minute).getTime()
+	form.priority = priorityOptions[index].value
 }
 
 async function onSave() {
 	if (saving.value) return
-	if (!form.content.trim()) {
-		uni.showToast({ title: '请输入日程内容', icon: 'none' })
+	if (!form.title.trim()) {
+		uni.showToast({ title: '请输入日程标题', icon: 'none' })
 		return
 	}
-	if (!form.date || !form.time) {
-		uni.showToast({ title: '请选择发生时间', icon: 'none' })
+	if (!form.date) {
+		uni.showToast({ title: '请选择日期', icon: 'none' })
 		return
 	}
-
-	const datetime = buildDatetime()
-	if (datetime < Date.now() - 60000 && !scheduleId.value) {
-		uni.showModal({
-			title: '时间提示',
-			content: '发生时间已过去，仍要保存吗？',
-			success: async (res) => {
-				if (res.confirm) await saveData(datetime)
-			}
-		})
-		return
+	if (!form.allDay) {
+		if (!form.startTime) {
+			uni.showToast({ title: '请选择开始时间', icon: 'none' })
+			return
+		}
+		if (form.endTime && form.endTime <= form.startTime) {
+			uni.showToast({ title: '结束时间需晚于开始时间', icon: 'none' })
+			return
+		}
 	}
-	await saveData(datetime)
+	await saveData()
 }
 
-async function saveData(datetime) {
+async function saveData() {
 	saving.value = true
 	const payload = {
+		title: form.title.trim(),
 		content: form.content,
-		datetime,
-		remindChannels: [...form.remindChannels],
-		remindMinutes: form.remindMinutes,
-		repeatIntervalMinutes: form.repeatIntervalMinutes,
-		maxSendCount: form.maxSendCount
+		scheduleDate: form.date,
+		allDay: form.allDay,
+		startTime: form.startTime,
+		endTime: form.endTime,
+		priority: form.priority
 	}
 	try {
 		if (scheduleId.value) {
-			await updateSchedule(scheduleId.value, payload)
+			await updateOaSchedule(scheduleId.value, payload)
 		} else {
-			await createSchedule(payload)
+			await createOaSchedule(payload)
 		}
 		uni.showToast({ title: '保存成功', icon: 'success' })
 		setTimeout(() => uni.navigateBack(), 400)
 	} catch (e) {
-		uni.showToast({ title: '保存失败', icon: 'none' })
+		// request 封装已弹出服务端错误提示
 	} finally {
 		saving.value = false
 	}
@@ -308,17 +278,28 @@ async function saveData(datetime) {
 	margin-bottom: 12rpx;
 }
 
-.field-hint {
-	display: block;
-	font-size: 22rpx;
-	color: $color-text-muted;
-	margin-bottom: 16rpx;
-}
-
 .required {
 	color: #f56c6c;
 }
 
+.switch-field {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+
+	.switch-info {
+		flex: 1;
+	}
+
+	.field-label {
+		margin-bottom: 4rpx;
+	}
+
+	.form-tip {
+		margin-top: 0;
+	}
+}
+
 .picker-value {
 	display: flex;
 	align-items: center;
@@ -331,12 +312,6 @@ async function saveData(datetime) {
 	color: $color-text;
 }
 
-.channel-grid {
-	display: flex;
-	flex-wrap: wrap;
-	gap: 16rpx;
-}
-
 .form-tip {
 	display: block;
 	font-size: 22rpx;