diff --git a/web-admin/src/api/pl/index.ts b/web-admin/src/api/pl/index.ts index 84552fbb1..a1b5f4295 100644 --- a/web-admin/src/api/pl/index.ts +++ b/web-admin/src/api/pl/index.ts @@ -412,6 +412,7 @@ export interface PlanProduct { export interface Plan { id: string planNo: string + createDate: string planDate: string belongsCompany: string planType: string @@ -504,6 +505,7 @@ export interface PlanTransportCreateBlock { export interface PlanCreateFullPayload { contractId: string + createDate: string planDate: string belongsCompany: string planType: string @@ -622,7 +624,13 @@ export const planApi = { updateSiteFeedback: (id: string, linkId: string, data: PlanSiteFeedbackUpdateBody) => request.patch(`/transport/plan/${id}/site-feedback/${linkId}`, data), delete: (id: string) => request.delete(`/transport/plan/${id}`), - createFromContract: (data: { contractId: string; planDate: string; followUserId?: string; followUserName?: string }) => + createFromContract: (data: { + contractId: string + planDate: string + createDate?: string + followUserId?: string + followUserName?: string + }) => request.post('/transport/plan/create-from-contract', data), getInboundSlipTemplate: (id: string) => request.get(`/transport/plan/${id}/inbound-slip-template`), diff --git a/web-admin/src/components/business/pl-plan-form-dialog/index.vue b/web-admin/src/components/business/pl-plan-form-dialog/index.vue index 25ed45f78..04e872d44 100644 --- a/web-admin/src/components/business/pl-plan-form-dialog/index.vue +++ b/web-admin/src/components/business/pl-plan-form-dialog/index.vue @@ -52,6 +52,15 @@

基础信息

+ + + !!props.planId) const dialogTitle = computed(() => (isEdit.value ? '编辑运输计划' : '新增运输计划')) const showSaveAndArrange = computed( @@ -357,7 +370,8 @@ const vehicleBundle = ref(null) const selectedDriverId = ref('') const formData = reactive({ - planDate: new Date().toISOString().split('T')[0], + createDate: todayYmd(), + planDate: todayYmd(), belongsCompany: 'shanxia', planType: '', followUserId: '', @@ -381,12 +395,12 @@ const formData = reactive({ pickupAddress: '', pickupLng: null as number | null, pickupLat: null as number | null, - pickupTime: '', + pickupTime: todayYmd(), pickupNotes: '', destinationAddress: '', destinationLng: null as number | null, destinationLat: null as number | null, - deliveryTime: '', + deliveryTime: todayYmd(), destinationNotes: '', vehicleId: '', carrierId: '', @@ -397,6 +411,7 @@ const formData = reactive({ }) const basicRules = { + createDate: [{ required: true, message: '请选择创建日期', trigger: 'change' }], planDate: [{ required: true, message: '请选择计划日期', trigger: 'change' }], belongsCompany: [{ required: true, message: '请选择归属公司', trigger: 'change' }] } @@ -558,6 +573,7 @@ function buildTransportBlock(options?: { allowClear?: boolean }) { function buildPlanCommonPayload(options?: { allowClearTransport?: boolean }): PlanUpdatePayload { return { + createDate: formData.createDate, planDate: formData.planDate, belongsCompany: formData.belongsCompany, planType: formData.planType || '', @@ -638,8 +654,10 @@ function resetForm() { contractSnapshot.value = null vehicleBundle.value = null selectedDriverId.value = '' + const d = todayYmd() Object.assign(formData, { - planDate: new Date().toISOString().split('T')[0], + createDate: d, + planDate: d, belongsCompany: 'shanxia', planType: '', followUserId: resolveCurrentUserId(), @@ -663,12 +681,12 @@ function resetForm() { pickupAddress: '', pickupLng: null as number | null, pickupLat: null as number | null, - pickupTime: '', + pickupTime: d, pickupNotes: '', destinationAddress: '', destinationLng: null as number | null, destinationLat: null as number | null, - deliveryTime: '', + deliveryTime: d, destinationNotes: '', vehicleId: '', carrierId: '', @@ -698,6 +716,7 @@ async function loadPlanForEdit(planId: string) { const res = await planApi.get(planId) const data = (res.data ?? res) as Plan Object.assign(formData, { + createDate: data.createDate || formatDate(data.createTime) || todayYmd(), planDate: data.planDate, belongsCompany: data.belongsCompany, planType: data.planType, diff --git a/web-admin/src/views/pl/plan/form.vue b/web-admin/src/views/pl/plan/form.vue index 673504a4d..d94af430c 100644 --- a/web-admin/src/views/pl/plan/form.vue +++ b/web-admin/src/views/pl/plan/form.vue @@ -24,6 +24,15 @@ + + + { + const today = new Date().toISOString().split('T')[0] + if (!formData.createDate) { + formData.createDate = today + } if (!formData.planDate) { - formData.planDate = new Date().toISOString().split('T')[0] + formData.planDate = today } fetchDetail() })