diff --git a/src/api/business/cert.ts b/src/api/business/cert.ts deleted file mode 100644 index 9de249a..0000000 --- a/src/api/business/cert.ts +++ /dev/null @@ -1,51 +0,0 @@ -/** - * 证书打印 -*/ -import request from '../index' -import type { ICertApprove, ICertExport, ICertInitiate, ICertPrintSearch } from '@/views/business/schedule/certPrint/cert-interface' - -// 证书打印列表 -export function getCertList(data: ICertPrintSearch) { - return request({ - url: `/business/certificatePrint/listPage?offset=${data.offset}&limit=${data.limit}`, - method: 'post', - data, - }) -} - -// 发起申请 -export function submitApproval(data: ICertInitiate) { - return request({ - url: '/business/certificatePrint/submitApproval', - method: 'post', - data, - }) -} - -// 同意 -export function agreeCert(data: ICertApprove) { - return request({ - url: '/business/certificatePrint/agree', - method: 'post', - data, - }) -} - -// 拒绝 -export function refuseCert(data: ICertApprove) { - return request({ - url: '/business/certificatePrint/refuse', - method: 'post', - data, - }) -} - -// 证书导出 -export function exportCert(data: ICertExport) { - return request({ - url: '/business/certificatePrint/export', - method: 'post', - responseType: 'blob', - data, - }) -} diff --git a/src/api/business/cert.ts b/src/api/business/cert.ts deleted file mode 100644 index 9de249a..0000000 --- a/src/api/business/cert.ts +++ /dev/null @@ -1,51 +0,0 @@ -/** - * 证书打印 -*/ -import request from '../index' -import type { ICertApprove, ICertExport, ICertInitiate, ICertPrintSearch } from '@/views/business/schedule/certPrint/cert-interface' - -// 证书打印列表 -export function getCertList(data: ICertPrintSearch) { - return request({ - url: `/business/certificatePrint/listPage?offset=${data.offset}&limit=${data.limit}`, - method: 'post', - data, - }) -} - -// 发起申请 -export function submitApproval(data: ICertInitiate) { - return request({ - url: '/business/certificatePrint/submitApproval', - method: 'post', - data, - }) -} - -// 同意 -export function agreeCert(data: ICertApprove) { - return request({ - url: '/business/certificatePrint/agree', - method: 'post', - data, - }) -} - -// 拒绝 -export function refuseCert(data: ICertApprove) { - return request({ - url: '/business/certificatePrint/refuse', - method: 'post', - data, - }) -} - -// 证书导出 -export function exportCert(data: ICertExport) { - return request({ - url: '/business/certificatePrint/export', - method: 'post', - responseType: 'blob', - data, - }) -} diff --git a/src/api/business/lab/cert.ts b/src/api/business/lab/cert.ts new file mode 100644 index 0000000..261cad3 --- /dev/null +++ b/src/api/business/lab/cert.ts @@ -0,0 +1,51 @@ +/** + * 证书打印 +*/ +import request from '../../index' +import type { ICertApprove, ICertExport, ICertInitiate, ICertPrintSearch } from '@/views/business/schedule/certPrint/cert-interface' + +// 证书打印列表 +export function getCertList(data: ICertPrintSearch) { + return request({ + url: `/business/certificatePrint/listPage?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} + +// 发起申请 +export function submitApproval(data: ICertInitiate) { + return request({ + url: '/business/certificatePrint/submitApproval', + method: 'post', + data, + }) +} + +// 同意 +export function agreeCert(data: ICertApprove) { + return request({ + url: '/business/certificatePrint/agree', + method: 'post', + data, + }) +} + +// 拒绝 +export function refuseCert(data: ICertApprove) { + return request({ + url: '/business/certificatePrint/refuse', + method: 'post', + data, + }) +} + +// 证书导出 +export function exportCert(data: ICertExport) { + return request({ + url: '/business/certificatePrint/export', + method: 'post', + responseType: 'blob', + data, + }) +} diff --git a/src/api/business/cert.ts b/src/api/business/cert.ts deleted file mode 100644 index 9de249a..0000000 --- a/src/api/business/cert.ts +++ /dev/null @@ -1,51 +0,0 @@ -/** - * 证书打印 -*/ -import request from '../index' -import type { ICertApprove, ICertExport, ICertInitiate, ICertPrintSearch } from '@/views/business/schedule/certPrint/cert-interface' - -// 证书打印列表 -export function getCertList(data: ICertPrintSearch) { - return request({ - url: `/business/certificatePrint/listPage?offset=${data.offset}&limit=${data.limit}`, - method: 'post', - data, - }) -} - -// 发起申请 -export function submitApproval(data: ICertInitiate) { - return request({ - url: '/business/certificatePrint/submitApproval', - method: 'post', - data, - }) -} - -// 同意 -export function agreeCert(data: ICertApprove) { - return request({ - url: '/business/certificatePrint/agree', - method: 'post', - data, - }) -} - -// 拒绝 -export function refuseCert(data: ICertApprove) { - return request({ - url: '/business/certificatePrint/refuse', - method: 'post', - data, - }) -} - -// 证书导出 -export function exportCert(data: ICertExport) { - return request({ - url: '/business/certificatePrint/export', - method: 'post', - responseType: 'blob', - data, - }) -} diff --git a/src/api/business/lab/cert.ts b/src/api/business/lab/cert.ts new file mode 100644 index 0000000..261cad3 --- /dev/null +++ b/src/api/business/lab/cert.ts @@ -0,0 +1,51 @@ +/** + * 证书打印 +*/ +import request from '../../index' +import type { ICertApprove, ICertExport, ICertInitiate, ICertPrintSearch } from '@/views/business/schedule/certPrint/cert-interface' + +// 证书打印列表 +export function getCertList(data: ICertPrintSearch) { + return request({ + url: `/business/certificatePrint/listPage?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} + +// 发起申请 +export function submitApproval(data: ICertInitiate) { + return request({ + url: '/business/certificatePrint/submitApproval', + method: 'post', + data, + }) +} + +// 同意 +export function agreeCert(data: ICertApprove) { + return request({ + url: '/business/certificatePrint/agree', + method: 'post', + data, + }) +} + +// 拒绝 +export function refuseCert(data: ICertApprove) { + return request({ + url: '/business/certificatePrint/refuse', + method: 'post', + data, + }) +} + +// 证书导出 +export function exportCert(data: ICertExport) { + return request({ + url: '/business/certificatePrint/export', + method: 'post', + responseType: 'blob', + data, + }) +} diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts new file mode 100644 index 0000000..4301f6f --- /dev/null +++ b/src/api/business/schedule/task.ts @@ -0,0 +1,106 @@ +/** + * 任务分发,实验室检测 +*/ +import request from '../../index' +import type { ILabQuery, ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface' +const prefix = '/meter' + +// 任务分发列表查询 +export function getTaskList(data: ITaskQuery) { + return request({ + url: `/business/labExecutive/handOut/list?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} + +// 任务分发详情 +export function getTaskDetail(data: { orderId: string; sampleId: string }) { + return request({ + url: '/business/labExecutive/handOut/detail', + method: 'post', + data, + }) +} + +// 导出列表 +export function exportTaskList(data: Omit) { + return request({ + url: '/business/labExecutive/handOut/listExport', + method: 'post', + responseType: 'blob', + data, + }) +} + +// 初始化检定流程 +export function init(data: { measureContent: string; orderId: string; sampleId: string }) { + return request({ + url: '/business/labExecutive/handOut/initList', + method: 'post', + data, + }) +} + +// 收发员任务分发 +export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) { + return request({ + url: '/business/labExecutive/handOut/execute', + method: 'post', + data, + }) +} + +// 实验室编辑实验室检测列表 +export function setMeasureProcessByFfy(data: { orderId: string; sampleId: string; measureProcessList: any[] }) { + return request({ + url: '/business/labExecutive/handOut/updateList', + method: 'post', + data, + }) +} + +// 退回(待检测/检测中->退回) +export function sendBackProcess(data: ISendBack) { + return request({ + url: `${prefix}/schedule/task/setSchedule`, + method: 'post', + data, + }) +} + +// 实验室收入样品 +export function takeInSample(data: { orderId: string; sampleId: string }[]) { + return request({ + url: `${prefix}/schedule/task/setSchedule`, + method: 'post', + data, + }) +} + +// 检完样品-手动/批量 +export function overSample(data: { orderId: string; sampleId: string }[]) { + return request({ + url: `${prefix}/schedule/task/setSchedule`, + method: 'post', + data, + }) +} + +// 我的检测-列表 +export function getMyMeasureList(data: ILabQuery) { + return request({ + url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} + +// 部门检测-列表 +export function getDeptMeasureList(data: ILabQuery) { + return request({ + url: `/business/labExecutive/deptExecutive/List?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} diff --git a/src/api/business/cert.ts b/src/api/business/cert.ts deleted file mode 100644 index 9de249a..0000000 --- a/src/api/business/cert.ts +++ /dev/null @@ -1,51 +0,0 @@ -/** - * 证书打印 -*/ -import request from '../index' -import type { ICertApprove, ICertExport, ICertInitiate, ICertPrintSearch } from '@/views/business/schedule/certPrint/cert-interface' - -// 证书打印列表 -export function getCertList(data: ICertPrintSearch) { - return request({ - url: `/business/certificatePrint/listPage?offset=${data.offset}&limit=${data.limit}`, - method: 'post', - data, - }) -} - -// 发起申请 -export function submitApproval(data: ICertInitiate) { - return request({ - url: '/business/certificatePrint/submitApproval', - method: 'post', - data, - }) -} - -// 同意 -export function agreeCert(data: ICertApprove) { - return request({ - url: '/business/certificatePrint/agree', - method: 'post', - data, - }) -} - -// 拒绝 -export function refuseCert(data: ICertApprove) { - return request({ - url: '/business/certificatePrint/refuse', - method: 'post', - data, - }) -} - -// 证书导出 -export function exportCert(data: ICertExport) { - return request({ - url: '/business/certificatePrint/export', - method: 'post', - responseType: 'blob', - data, - }) -} diff --git a/src/api/business/lab/cert.ts b/src/api/business/lab/cert.ts new file mode 100644 index 0000000..261cad3 --- /dev/null +++ b/src/api/business/lab/cert.ts @@ -0,0 +1,51 @@ +/** + * 证书打印 +*/ +import request from '../../index' +import type { ICertApprove, ICertExport, ICertInitiate, ICertPrintSearch } from '@/views/business/schedule/certPrint/cert-interface' + +// 证书打印列表 +export function getCertList(data: ICertPrintSearch) { + return request({ + url: `/business/certificatePrint/listPage?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} + +// 发起申请 +export function submitApproval(data: ICertInitiate) { + return request({ + url: '/business/certificatePrint/submitApproval', + method: 'post', + data, + }) +} + +// 同意 +export function agreeCert(data: ICertApprove) { + return request({ + url: '/business/certificatePrint/agree', + method: 'post', + data, + }) +} + +// 拒绝 +export function refuseCert(data: ICertApprove) { + return request({ + url: '/business/certificatePrint/refuse', + method: 'post', + data, + }) +} + +// 证书导出 +export function exportCert(data: ICertExport) { + return request({ + url: '/business/certificatePrint/export', + method: 'post', + responseType: 'blob', + data, + }) +} diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts new file mode 100644 index 0000000..4301f6f --- /dev/null +++ b/src/api/business/schedule/task.ts @@ -0,0 +1,106 @@ +/** + * 任务分发,实验室检测 +*/ +import request from '../../index' +import type { ILabQuery, ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface' +const prefix = '/meter' + +// 任务分发列表查询 +export function getTaskList(data: ITaskQuery) { + return request({ + url: `/business/labExecutive/handOut/list?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} + +// 任务分发详情 +export function getTaskDetail(data: { orderId: string; sampleId: string }) { + return request({ + url: '/business/labExecutive/handOut/detail', + method: 'post', + data, + }) +} + +// 导出列表 +export function exportTaskList(data: Omit) { + return request({ + url: '/business/labExecutive/handOut/listExport', + method: 'post', + responseType: 'blob', + data, + }) +} + +// 初始化检定流程 +export function init(data: { measureContent: string; orderId: string; sampleId: string }) { + return request({ + url: '/business/labExecutive/handOut/initList', + method: 'post', + data, + }) +} + +// 收发员任务分发 +export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) { + return request({ + url: '/business/labExecutive/handOut/execute', + method: 'post', + data, + }) +} + +// 实验室编辑实验室检测列表 +export function setMeasureProcessByFfy(data: { orderId: string; sampleId: string; measureProcessList: any[] }) { + return request({ + url: '/business/labExecutive/handOut/updateList', + method: 'post', + data, + }) +} + +// 退回(待检测/检测中->退回) +export function sendBackProcess(data: ISendBack) { + return request({ + url: `${prefix}/schedule/task/setSchedule`, + method: 'post', + data, + }) +} + +// 实验室收入样品 +export function takeInSample(data: { orderId: string; sampleId: string }[]) { + return request({ + url: `${prefix}/schedule/task/setSchedule`, + method: 'post', + data, + }) +} + +// 检完样品-手动/批量 +export function overSample(data: { orderId: string; sampleId: string }[]) { + return request({ + url: `${prefix}/schedule/task/setSchedule`, + method: 'post', + data, + }) +} + +// 我的检测-列表 +export function getMyMeasureList(data: ILabQuery) { + return request({ + url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} + +// 部门检测-列表 +export function getDeptMeasureList(data: ILabQuery) { + return request({ + url: `/business/labExecutive/deptExecutive/List?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} diff --git a/src/api/business/task.ts b/src/api/business/task.ts deleted file mode 100644 index 9c21a82..0000000 --- a/src/api/business/task.ts +++ /dev/null @@ -1,106 +0,0 @@ -/** - * 任务分发,实验室检测 -*/ -import request from '../index' -import type { ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface' -const prefix = '/meter' - -// 任务分发列表查询 -export function getTaskList(data: ITaskQuery) { - return request({ - url: `/business/labExecutive/handOut/list?offset=${data.offset}&limit=${data.limit}`, - method: 'post', - data, - }) -} - -// 任务分发详情 -export function getTaskDetail(data: { orderId: string; sampleId: string }) { - return request({ - url: '/business/labExecutive/handOut/detail', - method: 'post', - data, - }) -} - -// 导出列表 -export function exportTaskList(data: Omit) { - return request({ - url: '/business/labExecutive/handOut/listExport', - method: 'post', - responseType: 'blob', - data, - }) -} - -// 初始化检定流程 -export function init(data: { measureContent: string; orderId: string; sampleId: string }) { - return request({ - url: '/business/labExecutive/handOut/initList', - method: 'post', - data, - }) -} - -// 收发员任务分发 -export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) { - return request({ - url: '/business/labExecutive/handOut/execute', - method: 'post', - data, - }) -} - -// 实验室编辑实验室检测列表 -export function setMeasureProcessByFfy(data: { orderId: string; sampleId: string; measureProcessList: any[] }) { - return request({ - url: '/business/labExecutive/handOut/updateList', - method: 'post', - data, - }) -} - -// 退回(待检测/检测中->退回) -export function sendBackProcess(data: ISendBack) { - return request({ - url: `${prefix}/schedule/task/setSchedule`, - method: 'post', - data, - }) -} - -// 实验室收入样品 -export function takeInSample(data: { orderId: string; sampleId: string }[]) { - return request({ - url: `${prefix}/schedule/task/setSchedule`, - method: 'post', - data, - }) -} - -// 检完样品-手动/批量 -export function overSample(data: { orderId: string; sampleId: string }[]) { - return request({ - url: `${prefix}/schedule/task/setSchedule`, - method: 'post', - data, - }) -} - -// 我的检测-列表 -export function getMyMeasureList(data: ITaskQuery) { - return request({ - url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`, - method: 'post', - data, - }) -} - -// 部门检测-列表 -export function getDeptMeasureList(data: ITaskQuery) { - return request({ - url: `/business/labExecutive/deptExecutive/List?offset=${data.offset}&limit=${data.limit}`, - method: 'post', - data, - }) -} diff --git a/src/api/business/cert.ts b/src/api/business/cert.ts deleted file mode 100644 index 9de249a..0000000 --- a/src/api/business/cert.ts +++ /dev/null @@ -1,51 +0,0 @@ -/** - * 证书打印 -*/ -import request from '../index' -import type { ICertApprove, ICertExport, ICertInitiate, ICertPrintSearch } from '@/views/business/schedule/certPrint/cert-interface' - -// 证书打印列表 -export function getCertList(data: ICertPrintSearch) { - return request({ - url: `/business/certificatePrint/listPage?offset=${data.offset}&limit=${data.limit}`, - method: 'post', - data, - }) -} - -// 发起申请 -export function submitApproval(data: ICertInitiate) { - return request({ - url: '/business/certificatePrint/submitApproval', - method: 'post', - data, - }) -} - -// 同意 -export function agreeCert(data: ICertApprove) { - return request({ - url: '/business/certificatePrint/agree', - method: 'post', - data, - }) -} - -// 拒绝 -export function refuseCert(data: ICertApprove) { - return request({ - url: '/business/certificatePrint/refuse', - method: 'post', - data, - }) -} - -// 证书导出 -export function exportCert(data: ICertExport) { - return request({ - url: '/business/certificatePrint/export', - method: 'post', - responseType: 'blob', - data, - }) -} diff --git a/src/api/business/lab/cert.ts b/src/api/business/lab/cert.ts new file mode 100644 index 0000000..261cad3 --- /dev/null +++ b/src/api/business/lab/cert.ts @@ -0,0 +1,51 @@ +/** + * 证书打印 +*/ +import request from '../../index' +import type { ICertApprove, ICertExport, ICertInitiate, ICertPrintSearch } from '@/views/business/schedule/certPrint/cert-interface' + +// 证书打印列表 +export function getCertList(data: ICertPrintSearch) { + return request({ + url: `/business/certificatePrint/listPage?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} + +// 发起申请 +export function submitApproval(data: ICertInitiate) { + return request({ + url: '/business/certificatePrint/submitApproval', + method: 'post', + data, + }) +} + +// 同意 +export function agreeCert(data: ICertApprove) { + return request({ + url: '/business/certificatePrint/agree', + method: 'post', + data, + }) +} + +// 拒绝 +export function refuseCert(data: ICertApprove) { + return request({ + url: '/business/certificatePrint/refuse', + method: 'post', + data, + }) +} + +// 证书导出 +export function exportCert(data: ICertExport) { + return request({ + url: '/business/certificatePrint/export', + method: 'post', + responseType: 'blob', + data, + }) +} diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts new file mode 100644 index 0000000..4301f6f --- /dev/null +++ b/src/api/business/schedule/task.ts @@ -0,0 +1,106 @@ +/** + * 任务分发,实验室检测 +*/ +import request from '../../index' +import type { ILabQuery, ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface' +const prefix = '/meter' + +// 任务分发列表查询 +export function getTaskList(data: ITaskQuery) { + return request({ + url: `/business/labExecutive/handOut/list?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} + +// 任务分发详情 +export function getTaskDetail(data: { orderId: string; sampleId: string }) { + return request({ + url: '/business/labExecutive/handOut/detail', + method: 'post', + data, + }) +} + +// 导出列表 +export function exportTaskList(data: Omit) { + return request({ + url: '/business/labExecutive/handOut/listExport', + method: 'post', + responseType: 'blob', + data, + }) +} + +// 初始化检定流程 +export function init(data: { measureContent: string; orderId: string; sampleId: string }) { + return request({ + url: '/business/labExecutive/handOut/initList', + method: 'post', + data, + }) +} + +// 收发员任务分发 +export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) { + return request({ + url: '/business/labExecutive/handOut/execute', + method: 'post', + data, + }) +} + +// 实验室编辑实验室检测列表 +export function setMeasureProcessByFfy(data: { orderId: string; sampleId: string; measureProcessList: any[] }) { + return request({ + url: '/business/labExecutive/handOut/updateList', + method: 'post', + data, + }) +} + +// 退回(待检测/检测中->退回) +export function sendBackProcess(data: ISendBack) { + return request({ + url: `${prefix}/schedule/task/setSchedule`, + method: 'post', + data, + }) +} + +// 实验室收入样品 +export function takeInSample(data: { orderId: string; sampleId: string }[]) { + return request({ + url: `${prefix}/schedule/task/setSchedule`, + method: 'post', + data, + }) +} + +// 检完样品-手动/批量 +export function overSample(data: { orderId: string; sampleId: string }[]) { + return request({ + url: `${prefix}/schedule/task/setSchedule`, + method: 'post', + data, + }) +} + +// 我的检测-列表 +export function getMyMeasureList(data: ILabQuery) { + return request({ + url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} + +// 部门检测-列表 +export function getDeptMeasureList(data: ILabQuery) { + return request({ + url: `/business/labExecutive/deptExecutive/List?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} diff --git a/src/api/business/task.ts b/src/api/business/task.ts deleted file mode 100644 index 9c21a82..0000000 --- a/src/api/business/task.ts +++ /dev/null @@ -1,106 +0,0 @@ -/** - * 任务分发,实验室检测 -*/ -import request from '../index' -import type { ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface' -const prefix = '/meter' - -// 任务分发列表查询 -export function getTaskList(data: ITaskQuery) { - return request({ - url: `/business/labExecutive/handOut/list?offset=${data.offset}&limit=${data.limit}`, - method: 'post', - data, - }) -} - -// 任务分发详情 -export function getTaskDetail(data: { orderId: string; sampleId: string }) { - return request({ - url: '/business/labExecutive/handOut/detail', - method: 'post', - data, - }) -} - -// 导出列表 -export function exportTaskList(data: Omit) { - return request({ - url: '/business/labExecutive/handOut/listExport', - method: 'post', - responseType: 'blob', - data, - }) -} - -// 初始化检定流程 -export function init(data: { measureContent: string; orderId: string; sampleId: string }) { - return request({ - url: '/business/labExecutive/handOut/initList', - method: 'post', - data, - }) -} - -// 收发员任务分发 -export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) { - return request({ - url: '/business/labExecutive/handOut/execute', - method: 'post', - data, - }) -} - -// 实验室编辑实验室检测列表 -export function setMeasureProcessByFfy(data: { orderId: string; sampleId: string; measureProcessList: any[] }) { - return request({ - url: '/business/labExecutive/handOut/updateList', - method: 'post', - data, - }) -} - -// 退回(待检测/检测中->退回) -export function sendBackProcess(data: ISendBack) { - return request({ - url: `${prefix}/schedule/task/setSchedule`, - method: 'post', - data, - }) -} - -// 实验室收入样品 -export function takeInSample(data: { orderId: string; sampleId: string }[]) { - return request({ - url: `${prefix}/schedule/task/setSchedule`, - method: 'post', - data, - }) -} - -// 检完样品-手动/批量 -export function overSample(data: { orderId: string; sampleId: string }[]) { - return request({ - url: `${prefix}/schedule/task/setSchedule`, - method: 'post', - data, - }) -} - -// 我的检测-列表 -export function getMyMeasureList(data: ITaskQuery) { - return request({ - url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`, - method: 'post', - data, - }) -} - -// 部门检测-列表 -export function getDeptMeasureList(data: ITaskQuery) { - return request({ - url: `/business/labExecutive/deptExecutive/List?offset=${data.offset}&limit=${data.limit}`, - method: 'post', - data, - }) -} diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue index fc787ff..553d2ec 100644 --- a/src/views/business/lab/components/rollbackDialog.vue +++ b/src/views/business/lab/components/rollbackDialog.vue @@ -4,7 +4,7 @@ import { ElMessage, ElMessageBox } from 'element-plus' import { reactive, ref } from 'vue' import type { ISendBack, IlabMeasureList } from '../../schedule/task/task-interface' -import { sendBackProcess } from '@/api/business/task' +import { sendBackProcess } from '@/api/business/schedule/task' // 对外暴露的方法： 退回成功 const emit = defineEmits(['onSuccess']) diff --git a/src/api/business/cert.ts b/src/api/business/cert.ts deleted file mode 100644 index 9de249a..0000000 --- a/src/api/business/cert.ts +++ /dev/null @@ -1,51 +0,0 @@ -/** - * 证书打印 -*/ -import request from '../index' -import type { ICertApprove, ICertExport, ICertInitiate, ICertPrintSearch } from '@/views/business/schedule/certPrint/cert-interface' - -// 证书打印列表 -export function getCertList(data: ICertPrintSearch) { - return request({ - url: `/business/certificatePrint/listPage?offset=${data.offset}&limit=${data.limit}`, - method: 'post', - data, - }) -} - -// 发起申请 -export function submitApproval(data: ICertInitiate) { - return request({ - url: '/business/certificatePrint/submitApproval', - method: 'post', - data, - }) -} - -// 同意 -export function agreeCert(data: ICertApprove) { - return request({ - url: '/business/certificatePrint/agree', - method: 'post', - data, - }) -} - -// 拒绝 -export function refuseCert(data: ICertApprove) { - return request({ - url: '/business/certificatePrint/refuse', - method: 'post', - data, - }) -} - -// 证书导出 -export function exportCert(data: ICertExport) { - return request({ - url: '/business/certificatePrint/export', - method: 'post', - responseType: 'blob', - data, - }) -} diff --git a/src/api/business/lab/cert.ts b/src/api/business/lab/cert.ts new file mode 100644 index 0000000..261cad3 --- /dev/null +++ b/src/api/business/lab/cert.ts @@ -0,0 +1,51 @@ +/** + * 证书打印 +*/ +import request from '../../index' +import type { ICertApprove, ICertExport, ICertInitiate, ICertPrintSearch } from '@/views/business/schedule/certPrint/cert-interface' + +// 证书打印列表 +export function getCertList(data: ICertPrintSearch) { + return request({ + url: `/business/certificatePrint/listPage?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} + +// 发起申请 +export function submitApproval(data: ICertInitiate) { + return request({ + url: '/business/certificatePrint/submitApproval', + method: 'post', + data, + }) +} + +// 同意 +export function agreeCert(data: ICertApprove) { + return request({ + url: '/business/certificatePrint/agree', + method: 'post', + data, + }) +} + +// 拒绝 +export function refuseCert(data: ICertApprove) { + return request({ + url: '/business/certificatePrint/refuse', + method: 'post', + data, + }) +} + +// 证书导出 +export function exportCert(data: ICertExport) { + return request({ + url: '/business/certificatePrint/export', + method: 'post', + responseType: 'blob', + data, + }) +} diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts new file mode 100644 index 0000000..4301f6f --- /dev/null +++ b/src/api/business/schedule/task.ts @@ -0,0 +1,106 @@ +/** + * 任务分发,实验室检测 +*/ +import request from '../../index' +import type { ILabQuery, ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface' +const prefix = '/meter' + +// 任务分发列表查询 +export function getTaskList(data: ITaskQuery) { + return request({ + url: `/business/labExecutive/handOut/list?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} + +// 任务分发详情 +export function getTaskDetail(data: { orderId: string; sampleId: string }) { + return request({ + url: '/business/labExecutive/handOut/detail', + method: 'post', + data, + }) +} + +// 导出列表 +export function exportTaskList(data: Omit) { + return request({ + url: '/business/labExecutive/handOut/listExport', + method: 'post', + responseType: 'blob', + data, + }) +} + +// 初始化检定流程 +export function init(data: { measureContent: string; orderId: string; sampleId: string }) { + return request({ + url: '/business/labExecutive/handOut/initList', + method: 'post', + data, + }) +} + +// 收发员任务分发 +export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) { + return request({ + url: '/business/labExecutive/handOut/execute', + method: 'post', + data, + }) +} + +// 实验室编辑实验室检测列表 +export function setMeasureProcessByFfy(data: { orderId: string; sampleId: string; measureProcessList: any[] }) { + return request({ + url: '/business/labExecutive/handOut/updateList', + method: 'post', + data, + }) +} + +// 退回(待检测/检测中->退回) +export function sendBackProcess(data: ISendBack) { + return request({ + url: `${prefix}/schedule/task/setSchedule`, + method: 'post', + data, + }) +} + +// 实验室收入样品 +export function takeInSample(data: { orderId: string; sampleId: string }[]) { + return request({ + url: `${prefix}/schedule/task/setSchedule`, + method: 'post', + data, + }) +} + +// 检完样品-手动/批量 +export function overSample(data: { orderId: string; sampleId: string }[]) { + return request({ + url: `${prefix}/schedule/task/setSchedule`, + method: 'post', + data, + }) +} + +// 我的检测-列表 +export function getMyMeasureList(data: ILabQuery) { + return request({ + url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} + +// 部门检测-列表 +export function getDeptMeasureList(data: ILabQuery) { + return request({ + url: `/business/labExecutive/deptExecutive/List?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} diff --git a/src/api/business/task.ts b/src/api/business/task.ts deleted file mode 100644 index 9c21a82..0000000 --- a/src/api/business/task.ts +++ /dev/null @@ -1,106 +0,0 @@ -/** - * 任务分发,实验室检测 -*/ -import request from '../index' -import type { ISendBack, ITaskQuery } from '@/views/business/schedule/task/task-interface' -const prefix = '/meter' - -// 任务分发列表查询 -export function getTaskList(data: ITaskQuery) { - return request({ - url: `/business/labExecutive/handOut/list?offset=${data.offset}&limit=${data.limit}`, - method: 'post', - data, - }) -} - -// 任务分发详情 -export function getTaskDetail(data: { orderId: string; sampleId: string }) { - return request({ - url: '/business/labExecutive/handOut/detail', - method: 'post', - data, - }) -} - -// 导出列表 -export function exportTaskList(data: Omit) { - return request({ - url: '/business/labExecutive/handOut/listExport', - method: 'post', - responseType: 'blob', - data, - }) -} - -// 初始化检定流程 -export function init(data: { measureContent: string; orderId: string; sampleId: string }) { - return request({ - url: '/business/labExecutive/handOut/initList', - method: 'post', - data, - }) -} - -// 收发员任务分发 -export function setMeasureProcess(data: { orderId: string; sampleId: string; measureProcessList: any[] }) { - return request({ - url: '/business/labExecutive/handOut/execute', - method: 'post', - data, - }) -} - -// 实验室编辑实验室检测列表 -export function setMeasureProcessByFfy(data: { orderId: string; sampleId: string; measureProcessList: any[] }) { - return request({ - url: '/business/labExecutive/handOut/updateList', - method: 'post', - data, - }) -} - -// 退回(待检测/检测中->退回) -export function sendBackProcess(data: ISendBack) { - return request({ - url: `${prefix}/schedule/task/setSchedule`, - method: 'post', - data, - }) -} - -// 实验室收入样品 -export function takeInSample(data: { orderId: string; sampleId: string }[]) { - return request({ - url: `${prefix}/schedule/task/setSchedule`, - method: 'post', - data, - }) -} - -// 检完样品-手动/批量 -export function overSample(data: { orderId: string; sampleId: string }[]) { - return request({ - url: `${prefix}/schedule/task/setSchedule`, - method: 'post', - data, - }) -} - -// 我的检测-列表 -export function getMyMeasureList(data: ITaskQuery) { - return request({ - url: `/business/labExecutive/myExecutive/list?offset=${data.offset}&limit=${data.limit}`, - method: 'post', - data, - }) -} - -// 部门检测-列表 -export function getDeptMeasureList(data: ITaskQuery) { - return request({ - url: `/business/labExecutive/deptExecutive/List?offset=${data.offset}&limit=${data.limit}`, - method: 'post', - data, - }) -} diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue index fc787ff..553d2ec 100644 --- a/src/views/business/lab/components/rollbackDialog.vue +++ b/src/views/business/lab/components/rollbackDialog.vue @@ -4,7 +4,7 @@ import { ElMessage, ElMessageBox } from 'element-plus' import { reactive, ref } from 'vue' import type { ISendBack, IlabMeasureList } from '../../schedule/task/task-interface' -import { sendBackProcess } from '@/api/business/task' +import { sendBackProcess } from '@/api/business/schedule/task' // 对外暴露的方法： 退回成功 const emit = defineEmits(['onSuccess']) diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue index 9f8e6fa..89fd82d 100644 --- a/src/views/business/lab/deptMeasure/deptMeasureList.vue +++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue @@ -11,17 +11,15 @@ import { printJSON } from '@/utils/printUtils' import { exportFile } from '@/utils/exportUtils' import { getDictByCode } from '@/api/system/dict' -import { exportTaskList, getDeptMeasureList, getTaskList } from '@/api/business/task' +import { exportTaskList, getDeptMeasureList, getTaskList } from '@/api/business/schedule/task' import type { dictType } from '@/global' +import type { IMenu } from '@/components/buttonBox/buttonBox' + const { proxy } = getCurrentInstance() as any const $router = useRouter() // 右上角按钮 -const menus = [ - { name: '待检测', value: '2' }, - { name: '检测中', value: '3' }, - { name: '检测完', value: '4' }, -] -const currentMenu = ref('2') // 当前选中状态 +const menu = ref([]) // 右上角审批状态按钮组合 +const active = ref('') // 选中的按钮 // 查询条件 const timeRange = ref<[DateModelType, DateModelType]>(['', '']) const listQuery: Ref = ref({ @@ -34,7 +32,7 @@ sampleBelong: '', // 样品属性 startTime: '', // 应检完时间-开始 endTime: '', // 应检完时间-结束 - measureStatus: '2', // 检测状态 + measureStatus: active.value, // 检测状态 offset: 1, limit: 20, }) @@ -45,8 +43,18 @@ getDictByCode('sampleBelong').then((response) => { sampleBelongList.value = response.data }) + // 获取菜单字典 + getDictByCode('measureStatus').then((response) => { + response.data.forEach((item: dictType) => { + if (['待检测', '检测中', '检测完成'].includes(item.name)) { + menu.value.push({ + name: item.name, + id: `${item.value}`, + }) + } + }) + }) } -getDict() // 表头 const columns = ref([ @@ -109,10 +117,12 @@ sampleBelong: '', // 样品属性 startTime: '', // 应检完时间-开始 endTime: '', // 应检完时间-结束 - measureStatus: listQuery.value.measureStatus, // 检测状态 + measureStatus: active.value, // 检测状态 offset: 1, limit: 20, } + timeRange.value = ['', ''] + fetchData(true) } // 点击详情 const handleDetail = (row: ITaskList) => { @@ -221,24 +231,40 @@ } // 选择按钮变更 -watch(currentMenu, (val: string) => { - listQuery.value.measureStatus = val - fetchData(false) +const changeCurrentButton = (val: string) => { + active.value = val + window.sessionStorage.setItem('deptMeasureActive', val) + clearList() +} +// 时间变更 +watch(timeRange, (val) => { + if (val) { + listQuery.value.startTime = `${val[0]}` + listQuery.value.endTime = `${val[1]}` + } + else { + listQuery.value.startTime = '' + listQuery.value.endTime = '' + } }) - -fetchData(false) +onMounted(async () => { + await getDict() + if (window.sessionStorage.getItem('deptMeasureActive') != null) { + active.value = window.sessionStorage.getItem('deptMeasureActive') as string + } + else { + active.value = menu.value.find(item => item.name === '待检测')!.id // 待分发 + } + nextTick(() => { + fetchData(true) // 获取表格数据 + }) +})