diff --git a/src/api/qms/sampleCode/index.ts b/src/api/qms/sampleCode/index.ts index 9f7f9f13e..871035867 100644 --- a/src/api/qms/sampleCode/index.ts +++ b/src/api/qms/sampleCode/index.ts @@ -48,7 +48,13 @@ export const deleteSampleCode = async (id: number) => { // 导出样本字码 Excel export const exportSampleCode = async (params) => { - return await request.download({ url: `/qms/sample-code/export-excel`, params }) + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return request.downloadPost({ url: '/qms/sample-code/export-excel-senior', data }) + } else { + return await request.download({ url: `/qms/sample-code/export-excel`, params }) + } } // 下载用户导入模板 diff --git a/src/api/qms/samplingScheme/index.ts b/src/api/qms/samplingScheme/index.ts index fdf76e455..8512eeaec 100644 --- a/src/api/qms/samplingScheme/index.ts +++ b/src/api/qms/samplingScheme/index.ts @@ -40,7 +40,13 @@ export const deleteSamplingScheme = async (id: number) => { // 导出采样方案 Excel export const exportSamplingScheme = async (params) => { - return await request.download({ url: `/qms/sampling-scheme/export-excel`, params }) + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return request.downloadPost({ url: '/qms/sampling-scheme/export-excel-senior', data }) + } else { + return await request.download({ url: `/qms/sampling-scheme/export-excel`, params }) + } } // 下载用户导入模板 diff --git a/src/views/qms/sampleCode/sampleCode.data.ts b/src/views/qms/sampleCode/sampleCode.data.ts index 44795cfe0..a8baaf580 100644 --- a/src/views/qms/sampleCode/sampleCode.data.ts +++ b/src/views/qms/sampleCode/sampleCode.data.ts @@ -165,7 +165,7 @@ export const SampleCode = useCrudSchemas( sort: 'custom', isDetail: true, isForm: false, - isTable: false, + isTable: true, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -188,7 +188,7 @@ export const SampleCode = useCrudSchemas( field: 'updater', isDetail: true, isForm: false, - isTable: false, + isTable: true, table: { width: 150 } diff --git a/src/views/qms/samplingScheme/samplingScheme.data.ts b/src/views/qms/samplingScheme/samplingScheme.data.ts index 30edb172f..af0d71b9f 100644 --- a/src/views/qms/samplingScheme/samplingScheme.data.ts +++ b/src/views/qms/samplingScheme/samplingScheme.data.ts @@ -92,7 +92,7 @@ export const SamplingScheme = useCrudSchemas( sort: 'custom', isDetail: true, isForm: false, - isTable: false, + isTable: true, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -115,7 +115,7 @@ export const SamplingScheme = useCrudSchemas( field: 'updater', isDetail: true, isForm: false, - isTable: false, + isTable: true, table: { width: 150 } diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts index 1395ba2ee..8df92cf66 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts @@ -391,7 +391,7 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive( component: 'DatePicker', componentProps: { valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', + type: 'datetimerange', defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } },