From 336476017d6801507c071977fad1703a2c06743f Mon Sep 17 00:00:00 2001 From: "YEJIAXING-PC\\lenovo" <591141169@qq.com> Date: Fri, 17 Jan 2025 13:42:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E6=97=A5=E5=8E=86?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../receivedCalendar/receivedCalendar.data.ts | 31 ++++++++++++------- .../supplierDeliDetails/index.vue | 2 +- .../supplierDeliDetails.data.ts | 8 +++++ .../supplierShiftDeli.data.ts | 3 +- 4 files changed, 31 insertions(+), 13 deletions(-) diff --git a/src/views/wms/basicDataManage/supplierManage/receivedCalendar/receivedCalendar.data.ts b/src/views/wms/basicDataManage/supplierManage/receivedCalendar/receivedCalendar.data.ts index 7f4f60285..111c72c49 100644 --- a/src/views/wms/basicDataManage/supplierManage/receivedCalendar/receivedCalendar.data.ts +++ b/src/views/wms/basicDataManage/supplierManage/receivedCalendar/receivedCalendar.data.ts @@ -1,9 +1,10 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' // 表单校验 export const ReceivedCalendarRules = reactive({ receivedNumber: [required], + shift: [required], calendarDate: [required], }) @@ -14,12 +15,24 @@ export const ReceivedCalendar = useCrudSchemas(reactive([ sort: 'custom', isSearch: true, }, + { + label: '班次', + field: 'shift', + sort: 'custom', + isSearch: true, + }, { label: '日期', field: 'calendarDate', + formatter: dateFormatter2, + isSearch:true, + detail: { + dateFormat: 'YYYY-MM-DD' + }, sort: 'custom', - formatter: dateFormatter, - isSearch: true, + table: { + width: 180 + }, search: { component: 'DatePicker', componentProps: { @@ -31,17 +44,13 @@ export const ReceivedCalendar = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { - type: 'daterange', - defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + style: {width: '100%'}, + type: 'date', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x', } }, }, - { - label: '班次', - field: 'shift', - sort: 'custom', - isSearch: true, - }, { label: '创建时间', field: 'createTime', diff --git a/src/views/wms/basicDataManage/supplierManage/supplierDeliDetails/index.vue b/src/views/wms/basicDataManage/supplierManage/supplierDeliDetails/index.vue index bd8b0d409..8c19e84ca 100644 --- a/src/views/wms/basicDataManage/supplierManage/supplierDeliDetails/index.vue +++ b/src/views/wms/basicDataManage/supplierManage/supplierDeliDetails/index.vue @@ -111,7 +111,7 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ // defaultButtons.defaultAddBtn({hasPermi:'basic:supplier-deli-details:create'}), // 新增 - // defaultButtons.defaultImportBtn({hasPermi:'basic:supplier-deli-details:import'}), // 导入 + defaultButtons.defaultImportBtn({hasPermi:'basic:supplier-deli-details:import'}), // 导入 defaultButtons.defaultExportBtn({hasPermi:'basic:supplier-deli-details:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 diff --git a/src/views/wms/basicDataManage/supplierManage/supplierDeliDetails/supplierDeliDetails.data.ts b/src/views/wms/basicDataManage/supplierManage/supplierDeliDetails/supplierDeliDetails.data.ts index b209f2587..55675e247 100644 --- a/src/views/wms/basicDataManage/supplierManage/supplierDeliDetails/supplierDeliDetails.data.ts +++ b/src/views/wms/basicDataManage/supplierManage/supplierDeliDetails/supplierDeliDetails.data.ts @@ -25,6 +25,7 @@ export const SupplierDeliDetails = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch: true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择供应商代码', // 输入框占位文本 @@ -77,6 +78,7 @@ export const SupplierDeliDetails = useCrudSchemas(reactive([ search: { component: 'DatePicker', componentProps: { + valueFormat: 'YYYY-MM-DD', type: 'daterange', defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] @@ -85,6 +87,7 @@ export const SupplierDeliDetails = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + disabled: true, type: 'date', valueFormat: 'x', dateFormat:'YYYY-MM-DD' @@ -99,6 +102,11 @@ export const SupplierDeliDetails = useCrudSchemas(reactive([ field: 'shift', sort: 'custom', isSearch: true, + form: { + componentProps: { + disabled: true, + } + }, }, // { // label: '受入号', diff --git a/src/views/wms/basicDataManage/supplierManage/supplierShiftDeli/supplierShiftDeli.data.ts b/src/views/wms/basicDataManage/supplierManage/supplierShiftDeli/supplierShiftDeli.data.ts index 5902d6bf6..5aa3cff4e 100644 --- a/src/views/wms/basicDataManage/supplierManage/supplierShiftDeli/supplierShiftDeli.data.ts +++ b/src/views/wms/basicDataManage/supplierManage/supplierShiftDeli/supplierShiftDeli.data.ts @@ -6,6 +6,7 @@ import { dateFormatter, dateFormatterYM } from '@/utils/formatTime' // 表单校验 export const SupplierShiftDeliRules = reactive({ supplierCode: [required], + supplierName: [required], shiftDeliDate: [required], shift: [required], deli: [required] @@ -27,7 +28,7 @@ export const SupplierShiftDeli = useCrudSchemas( componentProps: { enterSearch: true, isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择供应商代码', // 输入框占位文本 + searchListPlaceholder: '请选择供应商代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 searchTitle: '供应商信息', // 查询弹窗标题 searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类