Merge remote-tracking branch 'origin/hella_online_20240803' into hella_online_20240803

src/api/qms/sampleCode/index.ts

@@ -48,8 +48,14 @@ export const deleteSampleCode = async (id: number) => {
 
 // 导出样本字码 Excel
 export const exportSampleCode = async (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 })
   }
+}
 
 // 下载用户导入模板
 export const importTemplate = () => {

src/api/qms/samplingScheme/index.ts

@@ -40,8 +40,14 @@ export const deleteSamplingScheme = async (id: number) => {
 
 // 导出采样方案 Excel
 export const exportSamplingScheme = async (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 })
   }
+}
 
 // 下载用户导入模板
 export const importTemplate = () => {

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
       }

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
       }

src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts

@@ -391,7 +391,7 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
       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')]
       }
     },