diff --git a/src/api/customer/overtime.ts b/src/api/customer/overtime.ts new file mode 100644 index 0000000..9f349d6 --- /dev/null +++ b/src/api/customer/overtime.ts @@ -0,0 +1,25 @@ +/** + * 到期样品接口 + */ +import request from '../index' +import type { IOvertimeListQuery } from '@/views/customer/sample/overTime/overtime_list_interface' +const prefix = '/meter' + +// 列表查询 +export function getOverTimeList(data: IOvertimeListQuery) { + return request({ + url: `${prefix}/sample/overtime/listPage?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} + +// 导出列表 +export function exportOverTimeList(data: Omit) { + return request({ + url: `${prefix}/sample/overtime/listExport`, + method: 'post', + responseType: 'blob', + data, + }) +} diff --git a/src/api/customer/overtime.ts b/src/api/customer/overtime.ts new file mode 100644 index 0000000..9f349d6 --- /dev/null +++ b/src/api/customer/overtime.ts @@ -0,0 +1,25 @@ +/** + * 到期样品接口 + */ +import request from '../index' +import type { IOvertimeListQuery } from '@/views/customer/sample/overTime/overtime_list_interface' +const prefix = '/meter' + +// 列表查询 +export function getOverTimeList(data: IOvertimeListQuery) { + return request({ + url: `${prefix}/sample/overtime/listPage?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} + +// 导出列表 +export function exportOverTimeList(data: Omit) { + return request({ + url: `${prefix}/sample/overtime/listExport`, + method: 'post', + responseType: 'blob', + data, + }) +} diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts index 5ba0a6d..fb50c25 100644 --- a/src/api/customer/sampleList.ts +++ b/src/api/customer/sampleList.ts @@ -58,3 +58,4 @@ data, }) } + diff --git a/src/api/customer/overtime.ts b/src/api/customer/overtime.ts new file mode 100644 index 0000000..9f349d6 --- /dev/null +++ b/src/api/customer/overtime.ts @@ -0,0 +1,25 @@ +/** + * 到期样品接口 + */ +import request from '../index' +import type { IOvertimeListQuery } from '@/views/customer/sample/overTime/overtime_list_interface' +const prefix = '/meter' + +// 列表查询 +export function getOverTimeList(data: IOvertimeListQuery) { + return request({ + url: `${prefix}/sample/overtime/listPage?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} + +// 导出列表 +export function exportOverTimeList(data: Omit) { + return request({ + url: `${prefix}/sample/overtime/listExport`, + method: 'post', + responseType: 'blob', + data, + }) +} diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts index 5ba0a6d..fb50c25 100644 --- a/src/api/customer/sampleList.ts +++ b/src/api/customer/sampleList.ts @@ -58,3 +58,4 @@ data, }) } + diff --git a/src/api/system/process.ts b/src/api/system/process.ts index e459424..c2d4419 100644 --- a/src/api/system/process.ts +++ b/src/api/system/process.ts @@ -112,7 +112,7 @@ beginTime: string endTime: string status: string - // ids: string[] + ids: string[] }) { return request({ url: `${prefix}/listExport`, diff --git a/src/api/customer/overtime.ts b/src/api/customer/overtime.ts new file mode 100644 index 0000000..9f349d6 --- /dev/null +++ b/src/api/customer/overtime.ts @@ -0,0 +1,25 @@ +/** + * 到期样品接口 + */ +import request from '../index' +import type { IOvertimeListQuery } from '@/views/customer/sample/overTime/overtime_list_interface' +const prefix = '/meter' + +// 列表查询 +export function getOverTimeList(data: IOvertimeListQuery) { + return request({ + url: `${prefix}/sample/overtime/listPage?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} + +// 导出列表 +export function exportOverTimeList(data: Omit) { + return request({ + url: `${prefix}/sample/overtime/listExport`, + method: 'post', + responseType: 'blob', + data, + }) +} diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts index 5ba0a6d..fb50c25 100644 --- a/src/api/customer/sampleList.ts +++ b/src/api/customer/sampleList.ts @@ -58,3 +58,4 @@ data, }) } + diff --git a/src/api/system/process.ts b/src/api/system/process.ts index e459424..c2d4419 100644 --- a/src/api/system/process.ts +++ b/src/api/system/process.ts @@ -112,7 +112,7 @@ beginTime: string endTime: string status: string - // ids: string[] + ids: string[] }) { return request({ url: `${prefix}/listExport`, diff --git a/src/css/workflow.css b/src/css/workflow.css index eee3dec..f922b27 100644 --- a/src/css/workflow.css +++ b/src/css/workflow.css @@ -1395,7 +1395,8 @@ justify-content: center; flex-wrap: wrap; min-width: min-content; - background-color: #f5f8ff; + + /* background-color: #f5f8ff; */ transform-origin: 50% 0 0; } diff --git a/src/api/customer/overtime.ts b/src/api/customer/overtime.ts new file mode 100644 index 0000000..9f349d6 --- /dev/null +++ b/src/api/customer/overtime.ts @@ -0,0 +1,25 @@ +/** + * 到期样品接口 + */ +import request from '../index' +import type { IOvertimeListQuery } from '@/views/customer/sample/overTime/overtime_list_interface' +const prefix = '/meter' + +// 列表查询 +export function getOverTimeList(data: IOvertimeListQuery) { + return request({ + url: `${prefix}/sample/overtime/listPage?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} + +// 导出列表 +export function exportOverTimeList(data: Omit) { + return request({ + url: `${prefix}/sample/overtime/listExport`, + method: 'post', + responseType: 'blob', + data, + }) +} diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts index 5ba0a6d..fb50c25 100644 --- a/src/api/customer/sampleList.ts +++ b/src/api/customer/sampleList.ts @@ -58,3 +58,4 @@ data, }) } + diff --git a/src/api/system/process.ts b/src/api/system/process.ts index e459424..c2d4419 100644 --- a/src/api/system/process.ts +++ b/src/api/system/process.ts @@ -112,7 +112,7 @@ beginTime: string endTime: string status: string - // ids: string[] + ids: string[] }) { return request({ url: `${prefix}/listExport`, diff --git a/src/css/workflow.css b/src/css/workflow.css index eee3dec..f922b27 100644 --- a/src/css/workflow.css +++ b/src/css/workflow.css @@ -1395,7 +1395,8 @@ justify-content: center; flex-wrap: wrap; min-width: min-content; - background-color: #f5f8ff; + + /* background-color: #f5f8ff; */ transform-origin: 50% 0 0; } diff --git a/src/router/modules/customer.ts b/src/router/modules/customer.ts index 4d133d0..f5280fa 100644 --- a/src/router/modules/customer.ts +++ b/src/router/modules/customer.ts @@ -71,6 +71,18 @@ auth: '/sample/overtime', }, }, + { + path: 'overtime/:type/:id?', + name: 'OverTimeDetail', + component: () => import('@/views/customer/sample/overTime/detail.vue'), + meta: { + title: '样品详情', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/sample/overtime', + }, + }, ], }, { diff --git a/src/api/customer/overtime.ts b/src/api/customer/overtime.ts new file mode 100644 index 0000000..9f349d6 --- /dev/null +++ b/src/api/customer/overtime.ts @@ -0,0 +1,25 @@ +/** + * 到期样品接口 + */ +import request from '../index' +import type { IOvertimeListQuery } from '@/views/customer/sample/overTime/overtime_list_interface' +const prefix = '/meter' + +// 列表查询 +export function getOverTimeList(data: IOvertimeListQuery) { + return request({ + url: `${prefix}/sample/overtime/listPage?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} + +// 导出列表 +export function exportOverTimeList(data: Omit) { + return request({ + url: `${prefix}/sample/overtime/listExport`, + method: 'post', + responseType: 'blob', + data, + }) +} diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts index 5ba0a6d..fb50c25 100644 --- a/src/api/customer/sampleList.ts +++ b/src/api/customer/sampleList.ts @@ -58,3 +58,4 @@ data, }) } + diff --git a/src/api/system/process.ts b/src/api/system/process.ts index e459424..c2d4419 100644 --- a/src/api/system/process.ts +++ b/src/api/system/process.ts @@ -112,7 +112,7 @@ beginTime: string endTime: string status: string - // ids: string[] + ids: string[] }) { return request({ url: `${prefix}/listExport`, diff --git a/src/css/workflow.css b/src/css/workflow.css index eee3dec..f922b27 100644 --- a/src/css/workflow.css +++ b/src/css/workflow.css @@ -1395,7 +1395,8 @@ justify-content: center; flex-wrap: wrap; min-width: min-content; - background-color: #f5f8ff; + + /* background-color: #f5f8ff; */ transform-origin: 50% 0 0; } diff --git a/src/router/modules/customer.ts b/src/router/modules/customer.ts index 4d133d0..f5280fa 100644 --- a/src/router/modules/customer.ts +++ b/src/router/modules/customer.ts @@ -71,6 +71,18 @@ auth: '/sample/overtime', }, }, + { + path: 'overtime/:type/:id?', + name: 'OverTimeDetail', + component: () => import('@/views/customer/sample/overTime/detail.vue'), + meta: { + title: '样品详情', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/sample/overtime', + }, + }, ], }, { diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue index 5758df9..72dd903 100644 --- a/src/views/customer/sample/list/edit.vue +++ b/src/views/customer/sample/list/edit.vue @@ -456,12 +456,9 @@ @focus="customerNoFocus" > @@ -568,7 +565,47 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -704,7 +649,34 @@ - + + + + + + + + + + + + + + + + 无 diff --git a/src/api/customer/overtime.ts b/src/api/customer/overtime.ts new file mode 100644 index 0000000..9f349d6 --- /dev/null +++ b/src/api/customer/overtime.ts @@ -0,0 +1,25 @@ +/** + * 到期样品接口 + */ +import request from '../index' +import type { IOvertimeListQuery } from '@/views/customer/sample/overTime/overtime_list_interface' +const prefix = '/meter' + +// 列表查询 +export function getOverTimeList(data: IOvertimeListQuery) { + return request({ + url: `${prefix}/sample/overtime/listPage?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} + +// 导出列表 +export function exportOverTimeList(data: Omit) { + return request({ + url: `${prefix}/sample/overtime/listExport`, + method: 'post', + responseType: 'blob', + data, + }) +} diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts index 5ba0a6d..fb50c25 100644 --- a/src/api/customer/sampleList.ts +++ b/src/api/customer/sampleList.ts @@ -58,3 +58,4 @@ data, }) } + diff --git a/src/api/system/process.ts b/src/api/system/process.ts index e459424..c2d4419 100644 --- a/src/api/system/process.ts +++ b/src/api/system/process.ts @@ -112,7 +112,7 @@ beginTime: string endTime: string status: string - // ids: string[] + ids: string[] }) { return request({ url: `${prefix}/listExport`, diff --git a/src/css/workflow.css b/src/css/workflow.css index eee3dec..f922b27 100644 --- a/src/css/workflow.css +++ b/src/css/workflow.css @@ -1395,7 +1395,8 @@ justify-content: center; flex-wrap: wrap; min-width: min-content; - background-color: #f5f8ff; + + /* background-color: #f5f8ff; */ transform-origin: 50% 0 0; } diff --git a/src/router/modules/customer.ts b/src/router/modules/customer.ts index 4d133d0..f5280fa 100644 --- a/src/router/modules/customer.ts +++ b/src/router/modules/customer.ts @@ -71,6 +71,18 @@ auth: '/sample/overtime', }, }, + { + path: 'overtime/:type/:id?', + name: 'OverTimeDetail', + component: () => import('@/views/customer/sample/overTime/detail.vue'), + meta: { + title: '样品详情', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/sample/overtime', + }, + }, ], }, { diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue index 5758df9..72dd903 100644 --- a/src/views/customer/sample/list/edit.vue +++ b/src/views/customer/sample/list/edit.vue @@ -456,12 +456,9 @@ @focus="customerNoFocus" > @@ -568,7 +565,47 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -704,7 +649,34 @@ - + + + + + + + + + + + + + + + + 无 diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue index 08dc008..5a26dc7 100644 --- a/src/views/customer/sample/list/list.vue +++ b/src/views/customer/sample/list/list.vue @@ -132,8 +132,8 @@ sampleModel: '', // 型号 customerId: '', // 委托方代码 customerName: '', // 委托方名称 - startTime: '', // 投诉开始时间 - endTime: '', // 投诉结束时间 + startTime: '', // 检定开始时间 + endTime: '', // 检定结束时间 offset: 1, limit: 20, } diff --git a/src/api/customer/overtime.ts b/src/api/customer/overtime.ts new file mode 100644 index 0000000..9f349d6 --- /dev/null +++ b/src/api/customer/overtime.ts @@ -0,0 +1,25 @@ +/** + * 到期样品接口 + */ +import request from '../index' +import type { IOvertimeListQuery } from '@/views/customer/sample/overTime/overtime_list_interface' +const prefix = '/meter' + +// 列表查询 +export function getOverTimeList(data: IOvertimeListQuery) { + return request({ + url: `${prefix}/sample/overtime/listPage?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} + +// 导出列表 +export function exportOverTimeList(data: Omit) { + return request({ + url: `${prefix}/sample/overtime/listExport`, + method: 'post', + responseType: 'blob', + data, + }) +} diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts index 5ba0a6d..fb50c25 100644 --- a/src/api/customer/sampleList.ts +++ b/src/api/customer/sampleList.ts @@ -58,3 +58,4 @@ data, }) } + diff --git a/src/api/system/process.ts b/src/api/system/process.ts index e459424..c2d4419 100644 --- a/src/api/system/process.ts +++ b/src/api/system/process.ts @@ -112,7 +112,7 @@ beginTime: string endTime: string status: string - // ids: string[] + ids: string[] }) { return request({ url: `${prefix}/listExport`, diff --git a/src/css/workflow.css b/src/css/workflow.css index eee3dec..f922b27 100644 --- a/src/css/workflow.css +++ b/src/css/workflow.css @@ -1395,7 +1395,8 @@ justify-content: center; flex-wrap: wrap; min-width: min-content; - background-color: #f5f8ff; + + /* background-color: #f5f8ff; */ transform-origin: 50% 0 0; } diff --git a/src/router/modules/customer.ts b/src/router/modules/customer.ts index 4d133d0..f5280fa 100644 --- a/src/router/modules/customer.ts +++ b/src/router/modules/customer.ts @@ -71,6 +71,18 @@ auth: '/sample/overtime', }, }, + { + path: 'overtime/:type/:id?', + name: 'OverTimeDetail', + component: () => import('@/views/customer/sample/overTime/detail.vue'), + meta: { + title: '样品详情', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/sample/overtime', + }, + }, ], }, { diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue index 5758df9..72dd903 100644 --- a/src/views/customer/sample/list/edit.vue +++ b/src/views/customer/sample/list/edit.vue @@ -456,12 +456,9 @@ @focus="customerNoFocus" > @@ -568,7 +565,47 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -704,7 +649,34 @@ - + + + + + + + + + + + + + + + + 无 diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue index 08dc008..5a26dc7 100644 --- a/src/views/customer/sample/list/list.vue +++ b/src/views/customer/sample/list/list.vue @@ -132,8 +132,8 @@ sampleModel: '', // 型号 customerId: '', // 委托方代码 customerName: '', // 委托方名称 - startTime: '', // 投诉开始时间 - endTime: '', // 投诉结束时间 + startTime: '', // 检定开始时间 + endTime: '', // 检定结束时间 offset: 1, limit: 20, } diff --git a/src/views/customer/sample/overTime/detail.vue b/src/views/customer/sample/overTime/detail.vue new file mode 100644 index 0000000..925defe --- /dev/null +++ b/src/views/customer/sample/overTime/detail.vue @@ -0,0 +1,594 @@ + + + + + + + diff --git a/src/api/customer/overtime.ts b/src/api/customer/overtime.ts new file mode 100644 index 0000000..9f349d6 --- /dev/null +++ b/src/api/customer/overtime.ts @@ -0,0 +1,25 @@ +/** + * 到期样品接口 + */ +import request from '../index' +import type { IOvertimeListQuery } from '@/views/customer/sample/overTime/overtime_list_interface' +const prefix = '/meter' + +// 列表查询 +export function getOverTimeList(data: IOvertimeListQuery) { + return request({ + url: `${prefix}/sample/overtime/listPage?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} + +// 导出列表 +export function exportOverTimeList(data: Omit) { + return request({ + url: `${prefix}/sample/overtime/listExport`, + method: 'post', + responseType: 'blob', + data, + }) +} diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts index 5ba0a6d..fb50c25 100644 --- a/src/api/customer/sampleList.ts +++ b/src/api/customer/sampleList.ts @@ -58,3 +58,4 @@ data, }) } + diff --git a/src/api/system/process.ts b/src/api/system/process.ts index e459424..c2d4419 100644 --- a/src/api/system/process.ts +++ b/src/api/system/process.ts @@ -112,7 +112,7 @@ beginTime: string endTime: string status: string - // ids: string[] + ids: string[] }) { return request({ url: `${prefix}/listExport`, diff --git a/src/css/workflow.css b/src/css/workflow.css index eee3dec..f922b27 100644 --- a/src/css/workflow.css +++ b/src/css/workflow.css @@ -1395,7 +1395,8 @@ justify-content: center; flex-wrap: wrap; min-width: min-content; - background-color: #f5f8ff; + + /* background-color: #f5f8ff; */ transform-origin: 50% 0 0; } diff --git a/src/router/modules/customer.ts b/src/router/modules/customer.ts index 4d133d0..f5280fa 100644 --- a/src/router/modules/customer.ts +++ b/src/router/modules/customer.ts @@ -71,6 +71,18 @@ auth: '/sample/overtime', }, }, + { + path: 'overtime/:type/:id?', + name: 'OverTimeDetail', + component: () => import('@/views/customer/sample/overTime/detail.vue'), + meta: { + title: '样品详情', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/sample/overtime', + }, + }, ], }, { diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue index 5758df9..72dd903 100644 --- a/src/views/customer/sample/list/edit.vue +++ b/src/views/customer/sample/list/edit.vue @@ -456,12 +456,9 @@ @focus="customerNoFocus" > @@ -568,7 +565,47 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -704,7 +649,34 @@ - + + + + + + + + + + + + + + + + 无 diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue index 08dc008..5a26dc7 100644 --- a/src/views/customer/sample/list/list.vue +++ b/src/views/customer/sample/list/list.vue @@ -132,8 +132,8 @@ sampleModel: '', // 型号 customerId: '', // 委托方代码 customerName: '', // 委托方名称 - startTime: '', // 投诉开始时间 - endTime: '', // 投诉结束时间 + startTime: '', // 检定开始时间 + endTime: '', // 检定结束时间 offset: 1, limit: 20, } diff --git a/src/views/customer/sample/overTime/detail.vue b/src/views/customer/sample/overTime/detail.vue new file mode 100644 index 0000000..925defe --- /dev/null +++ b/src/views/customer/sample/overTime/detail.vue @@ -0,0 +1,594 @@ + + + + + + + diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue index 6578d12..6d3699f 100644 --- a/src/views/customer/sample/overTime/list.vue +++ b/src/views/customer/sample/overTime/list.vue @@ -1,3 +1,288 @@ + + + + + diff --git a/src/api/customer/overtime.ts b/src/api/customer/overtime.ts new file mode 100644 index 0000000..9f349d6 --- /dev/null +++ b/src/api/customer/overtime.ts @@ -0,0 +1,25 @@ +/** + * 到期样品接口 + */ +import request from '../index' +import type { IOvertimeListQuery } from '@/views/customer/sample/overTime/overtime_list_interface' +const prefix = '/meter' + +// 列表查询 +export function getOverTimeList(data: IOvertimeListQuery) { + return request({ + url: `${prefix}/sample/overtime/listPage?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} + +// 导出列表 +export function exportOverTimeList(data: Omit) { + return request({ + url: `${prefix}/sample/overtime/listExport`, + method: 'post', + responseType: 'blob', + data, + }) +} diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts index 5ba0a6d..fb50c25 100644 --- a/src/api/customer/sampleList.ts +++ b/src/api/customer/sampleList.ts @@ -58,3 +58,4 @@ data, }) } + diff --git a/src/api/system/process.ts b/src/api/system/process.ts index e459424..c2d4419 100644 --- a/src/api/system/process.ts +++ b/src/api/system/process.ts @@ -112,7 +112,7 @@ beginTime: string endTime: string status: string - // ids: string[] + ids: string[] }) { return request({ url: `${prefix}/listExport`, diff --git a/src/css/workflow.css b/src/css/workflow.css index eee3dec..f922b27 100644 --- a/src/css/workflow.css +++ b/src/css/workflow.css @@ -1395,7 +1395,8 @@ justify-content: center; flex-wrap: wrap; min-width: min-content; - background-color: #f5f8ff; + + /* background-color: #f5f8ff; */ transform-origin: 50% 0 0; } diff --git a/src/router/modules/customer.ts b/src/router/modules/customer.ts index 4d133d0..f5280fa 100644 --- a/src/router/modules/customer.ts +++ b/src/router/modules/customer.ts @@ -71,6 +71,18 @@ auth: '/sample/overtime', }, }, + { + path: 'overtime/:type/:id?', + name: 'OverTimeDetail', + component: () => import('@/views/customer/sample/overTime/detail.vue'), + meta: { + title: '样品详情', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/sample/overtime', + }, + }, ], }, { diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue index 5758df9..72dd903 100644 --- a/src/views/customer/sample/list/edit.vue +++ b/src/views/customer/sample/list/edit.vue @@ -456,12 +456,9 @@ @focus="customerNoFocus" > @@ -568,7 +565,47 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -704,7 +649,34 @@ - + + + + + + + + + + + + + + + + 无 diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue index 08dc008..5a26dc7 100644 --- a/src/views/customer/sample/list/list.vue +++ b/src/views/customer/sample/list/list.vue @@ -132,8 +132,8 @@ sampleModel: '', // 型号 customerId: '', // 委托方代码 customerName: '', // 委托方名称 - startTime: '', // 投诉开始时间 - endTime: '', // 投诉结束时间 + startTime: '', // 检定开始时间 + endTime: '', // 检定结束时间 offset: 1, limit: 20, } diff --git a/src/views/customer/sample/overTime/detail.vue b/src/views/customer/sample/overTime/detail.vue new file mode 100644 index 0000000..925defe --- /dev/null +++ b/src/views/customer/sample/overTime/detail.vue @@ -0,0 +1,594 @@ + + + + + + + diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue index 6578d12..6d3699f 100644 --- a/src/views/customer/sample/overTime/list.vue +++ b/src/views/customer/sample/overTime/list.vue @@ -1,3 +1,288 @@ + + + + + diff --git a/src/views/customer/sample/overTime/overtime_list_interface.ts b/src/views/customer/sample/overTime/overtime_list_interface.ts new file mode 100644 index 0000000..025719a --- /dev/null +++ b/src/views/customer/sample/overTime/overtime_list_interface.ts @@ -0,0 +1,75 @@ +export interface IOvertimeListQuery { + sampleNo: string // 样品编号 + sampleName: string // 样品名称 + sampleModel: string // 型号 + customerId: string // 委托方代码 + customerName: string // 委托方名称 + startTime: string // 检定开始时间 + endTime: string // 检定结束时间 + offset: number + limit: number +} + +export interface IOvertimeList { + id?: string // 样品唯一标识 + sampleNo: string // 样品编号 + sampleName: string // 样品名称 + sampleModel: string // 型号 + evaluationName: string // 出厂编号 + customerId: string // 委托方代码 + customerName: string // 委托方名称 + mesurePeriod: string // 检定周期 + effectiveDate: string // 上次检定时间 + certificationStatus: string // 证书状况 +} + +export interface ISampleDetail { + id?: string + sampleNo: string // 样品编号 + sampleName: string // 样品名称 + sampleModel: string // 样品型号 + manufacturingNo: string // 出厂编号 + customerNo: string // 委托方代码 + customerName: string // 委托方名称 + phone: string // 委托方电话 + postalCode: string // 委托方邮编 + companyAddress: string // 委托方地址 + mesureCategory: string // 检校类别 + manufacturer: string // 生产厂家 + manufacturerCountry: string // 厂家国别 + manufacturingDate: string // 出厂年月 + ABC: string // ABC + deliverer: string // 送检人 + delivererTel: string // 送检人联系方式 + planDeliverTime: string // 预计送达时间 + requireOverTime: string // 要求检完时间 + mesureContent: string // 检定项目 + mesurePeriod: string // 检定周期 + remark: string // 备注 + minioFileName: string // 说明书 + labelBind: string // 标签绑定 + mesureType: string // 检定方式 + measureDate?: string // 检定日期 + effectiveDate?: string // 有效日期 + measureResultCode?: string // 检定结果代码 + measureResult?: string // 检定结果 +} + +// 检定记录 +export interface SimpleMeasureRecord { + orderCode: string // 委托单编号 + orderTime: string // 委托单日期 + customerCode: string // 委托人代码 + customerName: string // 委托人名称 + deliverer: string // 送检人 + deliverTime: string // 送检日期 +} + +// 检定证书 +export interface SimpleCertification { + certificationCode: string // 证书编号 + certificationName: string // 证书形成 + certificationType: string // 证书类型 + effectiveDate: string // 证书出具日期 + expirationDate: string // 证书有效期 +} diff --git a/src/api/customer/overtime.ts b/src/api/customer/overtime.ts new file mode 100644 index 0000000..9f349d6 --- /dev/null +++ b/src/api/customer/overtime.ts @@ -0,0 +1,25 @@ +/** + * 到期样品接口 + */ +import request from '../index' +import type { IOvertimeListQuery } from '@/views/customer/sample/overTime/overtime_list_interface' +const prefix = '/meter' + +// 列表查询 +export function getOverTimeList(data: IOvertimeListQuery) { + return request({ + url: `${prefix}/sample/overtime/listPage?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} + +// 导出列表 +export function exportOverTimeList(data: Omit) { + return request({ + url: `${prefix}/sample/overtime/listExport`, + method: 'post', + responseType: 'blob', + data, + }) +} diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts index 5ba0a6d..fb50c25 100644 --- a/src/api/customer/sampleList.ts +++ b/src/api/customer/sampleList.ts @@ -58,3 +58,4 @@ data, }) } + diff --git a/src/api/system/process.ts b/src/api/system/process.ts index e459424..c2d4419 100644 --- a/src/api/system/process.ts +++ b/src/api/system/process.ts @@ -112,7 +112,7 @@ beginTime: string endTime: string status: string - // ids: string[] + ids: string[] }) { return request({ url: `${prefix}/listExport`, diff --git a/src/css/workflow.css b/src/css/workflow.css index eee3dec..f922b27 100644 --- a/src/css/workflow.css +++ b/src/css/workflow.css @@ -1395,7 +1395,8 @@ justify-content: center; flex-wrap: wrap; min-width: min-content; - background-color: #f5f8ff; + + /* background-color: #f5f8ff; */ transform-origin: 50% 0 0; } diff --git a/src/router/modules/customer.ts b/src/router/modules/customer.ts index 4d133d0..f5280fa 100644 --- a/src/router/modules/customer.ts +++ b/src/router/modules/customer.ts @@ -71,6 +71,18 @@ auth: '/sample/overtime', }, }, + { + path: 'overtime/:type/:id?', + name: 'OverTimeDetail', + component: () => import('@/views/customer/sample/overTime/detail.vue'), + meta: { + title: '样品详情', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/sample/overtime', + }, + }, ], }, { diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue index 5758df9..72dd903 100644 --- a/src/views/customer/sample/list/edit.vue +++ b/src/views/customer/sample/list/edit.vue @@ -456,12 +456,9 @@ @focus="customerNoFocus" > @@ -568,7 +565,47 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -704,7 +649,34 @@ - + + + + + + + + + + + + + + + + 无 diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue index 08dc008..5a26dc7 100644 --- a/src/views/customer/sample/list/list.vue +++ b/src/views/customer/sample/list/list.vue @@ -132,8 +132,8 @@ sampleModel: '', // 型号 customerId: '', // 委托方代码 customerName: '', // 委托方名称 - startTime: '', // 投诉开始时间 - endTime: '', // 投诉结束时间 + startTime: '', // 检定开始时间 + endTime: '', // 检定结束时间 offset: 1, limit: 20, } diff --git a/src/views/customer/sample/overTime/detail.vue b/src/views/customer/sample/overTime/detail.vue new file mode 100644 index 0000000..925defe --- /dev/null +++ b/src/views/customer/sample/overTime/detail.vue @@ -0,0 +1,594 @@ + + + + + + + diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue index 6578d12..6d3699f 100644 --- a/src/views/customer/sample/overTime/list.vue +++ b/src/views/customer/sample/overTime/list.vue @@ -1,3 +1,288 @@ + + + + + diff --git a/src/views/customer/sample/overTime/overtime_list_interface.ts b/src/views/customer/sample/overTime/overtime_list_interface.ts new file mode 100644 index 0000000..025719a --- /dev/null +++ b/src/views/customer/sample/overTime/overtime_list_interface.ts @@ -0,0 +1,75 @@ +export interface IOvertimeListQuery { + sampleNo: string // 样品编号 + sampleName: string // 样品名称 + sampleModel: string // 型号 + customerId: string // 委托方代码 + customerName: string // 委托方名称 + startTime: string // 检定开始时间 + endTime: string // 检定结束时间 + offset: number + limit: number +} + +export interface IOvertimeList { + id?: string // 样品唯一标识 + sampleNo: string // 样品编号 + sampleName: string // 样品名称 + sampleModel: string // 型号 + evaluationName: string // 出厂编号 + customerId: string // 委托方代码 + customerName: string // 委托方名称 + mesurePeriod: string // 检定周期 + effectiveDate: string // 上次检定时间 + certificationStatus: string // 证书状况 +} + +export interface ISampleDetail { + id?: string + sampleNo: string // 样品编号 + sampleName: string // 样品名称 + sampleModel: string // 样品型号 + manufacturingNo: string // 出厂编号 + customerNo: string // 委托方代码 + customerName: string // 委托方名称 + phone: string // 委托方电话 + postalCode: string // 委托方邮编 + companyAddress: string // 委托方地址 + mesureCategory: string // 检校类别 + manufacturer: string // 生产厂家 + manufacturerCountry: string // 厂家国别 + manufacturingDate: string // 出厂年月 + ABC: string // ABC + deliverer: string // 送检人 + delivererTel: string // 送检人联系方式 + planDeliverTime: string // 预计送达时间 + requireOverTime: string // 要求检完时间 + mesureContent: string // 检定项目 + mesurePeriod: string // 检定周期 + remark: string // 备注 + minioFileName: string // 说明书 + labelBind: string // 标签绑定 + mesureType: string // 检定方式 + measureDate?: string // 检定日期 + effectiveDate?: string // 有效日期 + measureResultCode?: string // 检定结果代码 + measureResult?: string // 检定结果 +} + +// 检定记录 +export interface SimpleMeasureRecord { + orderCode: string // 委托单编号 + orderTime: string // 委托单日期 + customerCode: string // 委托人代码 + customerName: string // 委托人名称 + deliverer: string // 送检人 + deliverTime: string // 送检日期 +} + +// 检定证书 +export interface SimpleCertification { + certificationCode: string // 证书编号 + certificationName: string // 证书形成 + certificationType: string // 证书类型 + effectiveDate: string // 证书出具日期 + expirationDate: string // 证书有效期 +} diff --git a/src/views/system/process/process.vue b/src/views/system/process/process.vue index f6b1b01..d0cd697 100644 --- a/src/views/system/process/process.vue +++ b/src/views/system/process/process.vue @@ -205,7 +205,7 @@ beginTime: '', // 开始时间 endTime: '', // 结束时间 status: '', // 当前流程状态, - // ids: checkoutList.value, + ids: checkoutList.value, } exportProcessList(params).then((res) => { const blob = new Blob([res.data])