From f72535a2ae33505f8b60dc5dc1b09ed98b1800c3 Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Tue, 4 Jun 2024 15:31:52 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=A4=96=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/unplannedissueRecordDetail/index.ts | 3 +++ src/api/wms/unplannedissueRequestDetail/index.ts | 3 +++ .../subject/subjectAccount/subjectAccount.data.ts | 9 +++++++++ .../unplannedissueRecordMain.data.ts | 2 +- 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/api/wms/unplannedissueRecordDetail/index.ts b/src/api/wms/unplannedissueRecordDetail/index.ts index b72dd7835..9e508c4ae 100644 --- a/src/api/wms/unplannedissueRecordDetail/index.ts +++ b/src/api/wms/unplannedissueRecordDetail/index.ts @@ -38,6 +38,9 @@ export const getUnplannedissueRecordDetailPage = async (params) => { 'action':'==', 'value':'1' } + if(!data.filters){ + data.filters = [] + } data.filters.push(dataTypeCondition) return await request.post({ url: '/wms/unplannedissue-record-detail/senior', data }) } else { diff --git a/src/api/wms/unplannedissueRequestDetail/index.ts b/src/api/wms/unplannedissueRequestDetail/index.ts index be5249f00..99adb86f7 100644 --- a/src/api/wms/unplannedissueRequestDetail/index.ts +++ b/src/api/wms/unplannedissueRequestDetail/index.ts @@ -33,6 +33,9 @@ export const getUnplannedissueRequestDetailPage = async (params) => { 'action':'==', 'value':'1' } + if(!data.filters){ + data.filters = []; + } data.filters.push(dataTypeCondition) return await request.post({ url: '/wms/unplannedissue-request-detail/senior', data }) } else { diff --git a/src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts b/src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts index ecbea2fd0..277aafb1d 100644 --- a/src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts +++ b/src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts @@ -152,6 +152,15 @@ export const SubjectAccount = useCrudSchemas(reactive([ defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, isForm: false, }, { diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts index 89167df18..d9bdbbbf8 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts @@ -281,7 +281,7 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive([ field: 'available', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isSearch: true, + isSearch: false, isTable: true, sort: 'custom', table: {