装货时间配置

snowy-admin-web/src/views/biz/bizloadpoint/timeAddForm.vue

@@ -0,0 +1,99 @@
+<template>
+	<xn-form-container
+		title="增加装货时间配置"
+		:width="700"
+		v-model:open="open"
+		:destroy-on-close="true"
+		@close="onClose"
+	>
+		<a-form ref="formRef" :model="formData" :rules="formRules" :wrapper-col="wrapperCol" :label-col="labelCol">
+			<a-form-item label="装货时间段：" name="loadStartEndTime">
+				<a-range-picker v-model:value="formData.loadStartEndTime" value-format="YYYY-MM-DD HH:mm" show-time :disabled-date="disabledDate" style="width: 100%" />
+			</a-form-item>
+			<a-form-item label="可约次数：" name="availableNumber">
+				<a-input v-model:value="formData.availableNumber" placeholder="请输入可约次数" allow-clear />
+			</a-form-item>
+		</a-form>
+		<template #footer>
+			<a-button style="margin-right: 8px" @click="onClose">关闭</a-button>
+			<a-button type="primary" @click="onSubmit" :loading="submitLoading">保存</a-button>
+		</template>
+	</xn-form-container>
+</template>
+
+<script setup name="bizLoadTimeForm">
+	import { cloneDeep } from 'lodash-es'
+	import { message } from 'ant-design-vue'
+	import { required } from '@/utils/formRules'
+	import bizLoadTimeApi from '@/api/biz/bizLoadTimeApi'
+	import dayjs from 'dayjs'
+
+	// 抽屉状态
+	const open = ref(false)
+	const emit = defineEmits({ successful: null })
+	const formRef = ref()
+	// 表单数据
+	const formData = ref({})
+	const submitLoading = ref(false)
+
+	//设置表单样式
+	const labelCol = ref({ span: 4})
+	const wrapperCol = ref({ span: 16})
+
+	// 当前时间
+	const nowTime = ref(new Date())
+	// 禁用时间范围
+	const disabledDate = (current) => {
+		return (
+			(current && current < dayjs(nowTime.value).startOf('time'))
+		)
+	}
+
+	// 打开抽屉
+	const onOpen = (recordData) => {
+		open.value = true
+		formData.value = {
+			confStartEndTime: '',
+			goodsJson: []
+		}
+		if (recordData) {
+			formData.value.pointId = recordData.id
+		}
+	}
+	// 关闭抽屉
+	const onClose = () => {
+		formRef.value.resetFields()
+		formData.value = {}
+		open.value = false
+	}
+	// 默认要校验的
+	const formRules = {
+		loadStartEndTime: [required('请选择装货时间段')],
+		availableNumber: [required('请输入可预约次数')],
+	}
+	// 验证并提交数据
+	const onSubmit = () => {
+		formRef.value
+			.validate()
+			.then(() => {
+				submitLoading.value = true
+				const formDataParam = cloneDeep(formData.value)
+				formDataParam.beginTime = formDataParam.loadStartEndTime[0]+":00"
+				formDataParam.endTime = formDataParam.loadStartEndTime[1]+":00"
+				bizLoadTimeApi
+					.bizLoadTimeSubmitForm(formDataParam, formDataParam.id)
+					.then(() => {
+						onClose()
+						emit('successful')
+					})
+					.finally(() => {
+						submitLoading.value = false
+					})
+			})
+			.catch(() => {})
+	}
+	// 抛出函数
+	defineExpose({
+		onOpen
+	})
+</script>

snowy-admin-web/src/views/biz/bizloadpoint/timeEditForm.vue

@@ -0,0 +1,97 @@
+<template>
+	<xn-form-container
+		title="编辑装货时间配置"
+		:width="700"
+		v-model:open="open"
+		:destroy-on-close="true"
+		@close="onClose"
+	>
+		<a-form ref="formRef" :model="formData" :rules="formRules" :wrapper-col="wrapperCol" :label-col="labelCol">
+			<a-form-item label="开始时间：" name="beginTime">
+				<a-date-picker v-model:value="formData.beginTime" value-format="YYYY-MM-DD HH:mm" show-time placeholder="请选择开始时间" :disabled-date="disabledDate" style="width: 100%" />
+			</a-form-item>
+			<a-form-item label="结束时间：" name="endTime">
+				<a-date-picker v-model:value="formData.endTime" value-format="YYYY-MM-DD HH:mm" show-time placeholder="请选择结束时间" :disabled-date="disabledDate" style="width: 100%" />
+			</a-form-item>
+			<a-form-item label="可约次数：" name="availableNumber">
+				<a-input v-model:value="formData.availableNumber" placeholder="请输入可约次数" allow-clear />
+			</a-form-item>
+		</a-form>
+		<template #footer>
+			<a-button style="margin-right: 8px" @click="onClose">关闭</a-button>
+			<a-button type="primary" @click="onSubmit" :loading="submitLoading">保存</a-button>
+		</template>
+	</xn-form-container>
+</template>
+
+<script setup name="bizLoadTimeForm">
+	import { cloneDeep } from 'lodash-es'
+	import { required } from '@/utils/formRules'
+	import bizLoadTimeApi from '@/api/biz/bizLoadTimeApi'
+	import dayjs from 'dayjs'
+
+	// 抽屉状态
+	const open = ref(false)
+	const emit = defineEmits({ successful: null })
+	const formRef = ref()
+	// 表单数据
+	const formData = ref({})
+	const submitLoading = ref(false)
+
+	//设置表单样式
+	const labelCol = ref({ span: 4})
+	const wrapperCol = ref({ span: 16})
+
+	// 当前时间
+	const nowTime = ref(new Date())
+	// 禁用时间范围
+	const disabledDate = (current) => {
+		return (
+			(current && current < dayjs(nowTime.value).startOf('time'))
+		)
+	}
+
+	// 打开抽屉
+	const onOpen = (record) => {
+		open.value = true
+		if (record) {
+			let recordData = cloneDeep(record)
+			formData.value = Object.assign({}, recordData)
+		}
+	}
+	// 关闭抽屉
+	const onClose = () => {
+		formRef.value.resetFields()
+		formData.value = {}
+		open.value = false
+	}
+	// 默认要校验的
+	const formRules = {
+		beginTime: [required('请选择提货开始时间')],
+		endTime: [required('请选择提货结束时间')],
+		availableNumber: [required('请输入可预约次数')],
+	}
+	// 验证并提交数据
+	const onSubmit = () => {
+		formRef.value
+			.validate()
+			.then(() => {
+				submitLoading.value = true
+				const formDataParam = cloneDeep(formData.value)
+				bizLoadTimeApi
+					.bizLoadTimeSubmitForm(formDataParam, formDataParam.id)
+					.then(() => {
+						onClose()
+						emit('successful')
+					})
+					.finally(() => {
+						submitLoading.value = false
+					})
+			})
+			.catch(() => {})
+	}
+	// 抛出函数
+	defineExpose({
+		onOpen
+	})
+</script>

snowy-admin-web/src/views/biz/bizloadpoint/timeIndex.vue

@@ -9,7 +9,7 @@
 				:row-key="(record) => record.id"
 			>
 				<template #operator `class="table-operator">
-					<a-button type="primary" v-if="hasPerm('bizLoadTimeAdd')" @click="timeFormRef.onOpen(recordData)">
+					<a-button type="primary" v-if="hasPerm('bizLoadTimeAdd')" @click="addFormRef.onOpen(recordData)">
 						<template #icon>
 							<plus-outlined />
 						</template>
@@ -25,9 +25,12 @@
 					</template>
 					<template v-if="column.dataIndex === 'action'">
 						<a-space>
-							<a @click="formRef.onOpen(record)" v-if="hasPerm('bizLoadTimeEdit')">编辑</a>
-							<a-divider type="vertical" v-if="hasPerm(['bizLoadTimeEdit', 'bizLoadTimeDelete'], 'and')" />
-							<a-button type="link" danger size="small" v-if="hasPerm('bizLoadTimeDelete')" @click="deleteConfig(record)">删除</a-button>
+							<a @click="editFormRef.onOpen(record)" v-if="hasPerm('bizLoadTimeEdit') && Number(record.alreadyNumber) == 0">编辑</a>
+
+							<a-divider type="vertical" v-if="hasPerm(['bizLoadTimeEdit', 'bizLoadTimeDelete'], 'and') && Number(record.alreadyNumber) == 0" />
+							<a-button type="link" danger size="small" v-if="hasPerm('bizLoadTimeDelete') && Number(record.alreadyNumber) == 0" @click="deleteConfig(record)">删除</a-button>
+						
+							<a @click="alreadyFormRef.onOpen(record)" v-if="hasPerm('bizLoadTimeAlready') && Number(record.alreadyNumber) != 0">次数</a>
 						</a-space>
 					</template>
 				</template>
@@ -35,12 +38,16 @@
 		</a-card>
 	</a-drawer>
 	
-	<TimeForm ref="timeFormRef" @successful="tableRef.refresh()" />
+	<TimeAddForm ref="addFormRef" @successful="tableRef.refresh()" />
+	<TimeEditForm ref="editFormRef" @successful="tableRef.refresh()" />
+	<TimeAlreadyForm ref="alreadyFormRef" @successful="tableRef.refresh()" />
 </template>
 
 <script setup name="bizloadtime">
 	import { cloneDeep } from 'lodash-es'
-	import Form from './timeform.vue'
+	import TimeAddForm from './timeAddForm.vue'
+	import TimeEditForm from './timeEditForm.vue'
+	import TimeAlreadyForm from './timeAlreadyForm.vue'
 	import bizLoadTimeApi from '@/api/biz/bizLoadTimeApi'
 
 	const submitLoading = ref(false)
@@ -50,7 +57,9 @@
 	const searchFormState = ref({})
 	const searchFormRef = ref()
 	const tableRef = ref()
-	const timeFormRef = ref()
+	const addFormRef = ref()
+	const editFormRef = ref()
+	const alreadyFormRef = ref()
 	const recordData = ref()
 	const title = ref()
 
@@ -71,11 +80,6 @@
 			dataIndex: 'availableNumber',
 			align:'center'
 		},
-		{
-			title: '已预约日期',
-			dataIndex: 'alreadyDate',
-			align:'center'
-		},
 		{
 			title: '已预约次数',
 			dataIndex: 'alreadyNumber',

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizloadtime/service/impl/BizLoadTimeServiceImpl.java

@@ -134,4 +134,9 @@ public class BizLoadTimeServiceImpl extends ServiceImpl<BizLoadTimeMapper, BizLo
         }
         return bizLoadTime;
     }
+
+    // 校验同一个点位的时间段是否有交集
+
+
+
 }