diff --git a/src/api/business/schedule.ts b/src/api/business/schedule.ts new file mode 100644 index 0000000..f5b4569 --- /dev/null +++ b/src/api/business/schedule.ts @@ -0,0 +1,89 @@ +/** + * 设备收发接口 +*/ +import request from '../index' +import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface' +const prefix = '/meter' + +// 列表查询 +export function getInterChangeList(data: IListQuery) { + return request({ + url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} + +// 导出列表 +export function exportInterchangeList(data: Omit) { + return request({ + url: `${prefix}/schedule/interChange/listExport`, + method: 'post', + responseType: 'blob', + data, + }) +} + +// 根据样品id收入 +export function interchangeListTake(data: { id: string; type: string }) { + return request({ + url: `${prefix}/schedule/interChange/take`, + method: 'post', + data, + }) +} + +// 根据样品id删除 +export function interchangeListDelete(data: { id: string; type: string }) { + return request({ + url: `${prefix}/schedule/interChange/delete`, + method: 'post', + data, + }) +} + +// 根据样品id完成 +export function interchangeListComplete(data: { id: string; type: string }) { + return request({ + url: `${prefix}/schedule/interChange/complete`, + method: 'post', + data, + }) +} + +// 根据样品id回退 +export function interchangeListBack(data: { id: string; type: string }) { + return request({ + url: `${prefix}/schedule/interChange/back`, + method: 'post', + data, + }) +} + +// 根据样品id归还 +export function interchangeListReturn(data: { id: string; type: string }) { + return request({ + url: `${prefix}/schedule/interChange/return`, + method: 'post', + data, + }) +} + +// 根据样品id催办 +export function interchangeListUrge(data: { id: string; type: string }) { + return request({ + url: `${prefix}/schedule/interChange/urge`, + method: 'post', + data, + }) +} + +// 根据样品id终止 +export function interchangeListTerminate(data: { id: string; type: string }) { + return request({ + url: `${prefix}/schedule/interChange/terminate`, + method: 'post', + data, + }) +} + diff --git a/src/api/business/schedule.ts b/src/api/business/schedule.ts new file mode 100644 index 0000000..f5b4569 --- /dev/null +++ b/src/api/business/schedule.ts @@ -0,0 +1,89 @@ +/** + * 设备收发接口 +*/ +import request from '../index' +import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface' +const prefix = '/meter' + +// 列表查询 +export function getInterChangeList(data: IListQuery) { + return request({ + url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} + +// 导出列表 +export function exportInterchangeList(data: Omit) { + return request({ + url: `${prefix}/schedule/interChange/listExport`, + method: 'post', + responseType: 'blob', + data, + }) +} + +// 根据样品id收入 +export function interchangeListTake(data: { id: string; type: string }) { + return request({ + url: `${prefix}/schedule/interChange/take`, + method: 'post', + data, + }) +} + +// 根据样品id删除 +export function interchangeListDelete(data: { id: string; type: string }) { + return request({ + url: `${prefix}/schedule/interChange/delete`, + method: 'post', + data, + }) +} + +// 根据样品id完成 +export function interchangeListComplete(data: { id: string; type: string }) { + return request({ + url: `${prefix}/schedule/interChange/complete`, + method: 'post', + data, + }) +} + +// 根据样品id回退 +export function interchangeListBack(data: { id: string; type: string }) { + return request({ + url: `${prefix}/schedule/interChange/back`, + method: 'post', + data, + }) +} + +// 根据样品id归还 +export function interchangeListReturn(data: { id: string; type: string }) { + return request({ + url: `${prefix}/schedule/interChange/return`, + method: 'post', + data, + }) +} + +// 根据样品id催办 +export function interchangeListUrge(data: { id: string; type: string }) { + return request({ + url: `${prefix}/schedule/interChange/urge`, + method: 'post', + data, + }) +} + +// 根据样品id终止 +export function interchangeListTerminate(data: { id: string; type: string }) { + return request({ + url: `${prefix}/schedule/interChange/terminate`, + method: 'post', + data, + }) +} + diff --git a/src/views/business/schedule/interchange/buttonBox.vue b/src/views/business/schedule/interchange/buttonBox.vue new file mode 100644 index 0000000..dc864bd --- /dev/null +++ b/src/views/business/schedule/interchange/buttonBox.vue @@ -0,0 +1,45 @@ + + + + + + diff --git a/src/api/business/schedule.ts b/src/api/business/schedule.ts new file mode 100644 index 0000000..f5b4569 --- /dev/null +++ b/src/api/business/schedule.ts @@ -0,0 +1,89 @@ +/** + * 设备收发接口 +*/ +import request from '../index' +import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface' +const prefix = '/meter' + +// 列表查询 +export function getInterChangeList(data: IListQuery) { + return request({ + url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} + +// 导出列表 +export function exportInterchangeList(data: Omit) { + return request({ + url: `${prefix}/schedule/interChange/listExport`, + method: 'post', + responseType: 'blob', + data, + }) +} + +// 根据样品id收入 +export function interchangeListTake(data: { id: string; type: string }) { + return request({ + url: `${prefix}/schedule/interChange/take`, + method: 'post', + data, + }) +} + +// 根据样品id删除 +export function interchangeListDelete(data: { id: string; type: string }) { + return request({ + url: `${prefix}/schedule/interChange/delete`, + method: 'post', + data, + }) +} + +// 根据样品id完成 +export function interchangeListComplete(data: { id: string; type: string }) { + return request({ + url: `${prefix}/schedule/interChange/complete`, + method: 'post', + data, + }) +} + +// 根据样品id回退 +export function interchangeListBack(data: { id: string; type: string }) { + return request({ + url: `${prefix}/schedule/interChange/back`, + method: 'post', + data, + }) +} + +// 根据样品id归还 +export function interchangeListReturn(data: { id: string; type: string }) { + return request({ + url: `${prefix}/schedule/interChange/return`, + method: 'post', + data, + }) +} + +// 根据样品id催办 +export function interchangeListUrge(data: { id: string; type: string }) { + return request({ + url: `${prefix}/schedule/interChange/urge`, + method: 'post', + data, + }) +} + +// 根据样品id终止 +export function interchangeListTerminate(data: { id: string; type: string }) { + return request({ + url: `${prefix}/schedule/interChange/terminate`, + method: 'post', + data, + }) +} + diff --git a/src/views/business/schedule/interchange/buttonBox.vue b/src/views/business/schedule/interchange/buttonBox.vue new file mode 100644 index 0000000..dc864bd --- /dev/null +++ b/src/views/business/schedule/interchange/buttonBox.vue @@ -0,0 +1,45 @@ + + + + + + diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue index 8c9b87c..67066a8 100644 --- a/src/views/business/schedule/interchange/interchangeEdit.vue +++ b/src/views/business/schedule/interchange/interchangeEdit.vue @@ -1,13 +1,712 @@ + + diff --git a/src/api/business/schedule.ts b/src/api/business/schedule.ts new file mode 100644 index 0000000..f5b4569 --- /dev/null +++ b/src/api/business/schedule.ts @@ -0,0 +1,89 @@ +/** + * 设备收发接口 +*/ +import request from '../index' +import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface' +const prefix = '/meter' + +// 列表查询 +export function getInterChangeList(data: IListQuery) { + return request({ + url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} + +// 导出列表 +export function exportInterchangeList(data: Omit) { + return request({ + url: `${prefix}/schedule/interChange/listExport`, + method: 'post', + responseType: 'blob', + data, + }) +} + +// 根据样品id收入 +export function interchangeListTake(data: { id: string; type: string }) { + return request({ + url: `${prefix}/schedule/interChange/take`, + method: 'post', + data, + }) +} + +// 根据样品id删除 +export function interchangeListDelete(data: { id: string; type: string }) { + return request({ + url: `${prefix}/schedule/interChange/delete`, + method: 'post', + data, + }) +} + +// 根据样品id完成 +export function interchangeListComplete(data: { id: string; type: string }) { + return request({ + url: `${prefix}/schedule/interChange/complete`, + method: 'post', + data, + }) +} + +// 根据样品id回退 +export function interchangeListBack(data: { id: string; type: string }) { + return request({ + url: `${prefix}/schedule/interChange/back`, + method: 'post', + data, + }) +} + +// 根据样品id归还 +export function interchangeListReturn(data: { id: string; type: string }) { + return request({ + url: `${prefix}/schedule/interChange/return`, + method: 'post', + data, + }) +} + +// 根据样品id催办 +export function interchangeListUrge(data: { id: string; type: string }) { + return request({ + url: `${prefix}/schedule/interChange/urge`, + method: 'post', + data, + }) +} + +// 根据样品id终止 +export function interchangeListTerminate(data: { id: string; type: string }) { + return request({ + url: `${prefix}/schedule/interChange/terminate`, + method: 'post', + data, + }) +} + diff --git a/src/views/business/schedule/interchange/buttonBox.vue b/src/views/business/schedule/interchange/buttonBox.vue new file mode 100644 index 0000000..dc864bd --- /dev/null +++ b/src/views/business/schedule/interchange/buttonBox.vue @@ -0,0 +1,45 @@ + + + + + + diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue index 8c9b87c..67066a8 100644 --- a/src/views/business/schedule/interchange/interchangeEdit.vue +++ b/src/views/business/schedule/interchange/interchangeEdit.vue @@ -1,13 +1,712 @@ + + diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue index f65137f..5bb8865 100644 --- a/src/views/business/schedule/interchange/interchangeList.vue +++ b/src/views/business/schedule/interchange/interchangeList.vue @@ -1,13 +1,557 @@ diff --git a/src/api/business/schedule.ts b/src/api/business/schedule.ts new file mode 100644 index 0000000..f5b4569 --- /dev/null +++ b/src/api/business/schedule.ts @@ -0,0 +1,89 @@ +/** + * 设备收发接口 +*/ +import request from '../index' +import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface' +const prefix = '/meter' + +// 列表查询 +export function getInterChangeList(data: IListQuery) { + return request({ + url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} + +// 导出列表 +export function exportInterchangeList(data: Omit) { + return request({ + url: `${prefix}/schedule/interChange/listExport`, + method: 'post', + responseType: 'blob', + data, + }) +} + +// 根据样品id收入 +export function interchangeListTake(data: { id: string; type: string }) { + return request({ + url: `${prefix}/schedule/interChange/take`, + method: 'post', + data, + }) +} + +// 根据样品id删除 +export function interchangeListDelete(data: { id: string; type: string }) { + return request({ + url: `${prefix}/schedule/interChange/delete`, + method: 'post', + data, + }) +} + +// 根据样品id完成 +export function interchangeListComplete(data: { id: string; type: string }) { + return request({ + url: `${prefix}/schedule/interChange/complete`, + method: 'post', + data, + }) +} + +// 根据样品id回退 +export function interchangeListBack(data: { id: string; type: string }) { + return request({ + url: `${prefix}/schedule/interChange/back`, + method: 'post', + data, + }) +} + +// 根据样品id归还 +export function interchangeListReturn(data: { id: string; type: string }) { + return request({ + url: `${prefix}/schedule/interChange/return`, + method: 'post', + data, + }) +} + +// 根据样品id催办 +export function interchangeListUrge(data: { id: string; type: string }) { + return request({ + url: `${prefix}/schedule/interChange/urge`, + method: 'post', + data, + }) +} + +// 根据样品id终止 +export function interchangeListTerminate(data: { id: string; type: string }) { + return request({ + url: `${prefix}/schedule/interChange/terminate`, + method: 'post', + data, + }) +} + diff --git a/src/views/business/schedule/interchange/buttonBox.vue b/src/views/business/schedule/interchange/buttonBox.vue new file mode 100644 index 0000000..dc864bd --- /dev/null +++ b/src/views/business/schedule/interchange/buttonBox.vue @@ -0,0 +1,45 @@ + + + + + + diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue index 8c9b87c..67066a8 100644 --- a/src/views/business/schedule/interchange/interchangeEdit.vue +++ b/src/views/business/schedule/interchange/interchangeEdit.vue @@ -1,13 +1,712 @@ + + diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue index f65137f..5bb8865 100644 --- a/src/views/business/schedule/interchange/interchangeList.vue +++ b/src/views/business/schedule/interchange/interchangeList.vue @@ -1,13 +1,557 @@ diff --git a/src/views/business/schedule/interchange/interchange_interface.ts b/src/views/business/schedule/interchange/interchange_interface.ts new file mode 100644 index 0000000..a7df4fd --- /dev/null +++ b/src/views/business/schedule/interchange/interchange_interface.ts @@ -0,0 +1,95 @@ +import type { TableColumn } from '@/components/NormalTable/table_interface' + +export interface IListQuery { + sampleNo: string // 样品编号 + sampleName: string // 样品名称 + orderCode: string // 委托书编号 + customerId: string // 委托方代码 + startTime: string // 预计送达开始时间 + endTime: string // 预计送达结束时间 + isUrgent: string // 是否加急 + sampleAttr: string // 样品属性 + type: string // 类型(buttonBox) + offset: number + limit: number +} + +export interface IinterchangeList { + id: string + sampleNo: string // 样品编号 + sampleName: string // 样品名称 + sampleModel: string // 型号 + evaluationName: string // 出厂编号 + orderCode: string // 委托书编号 + customerId: string // 委托方代码 + customerName: string // 委托方名称 + deliverer: string // 送检人 + isUrgent: string // 是否加急 + sampleAttr: string // 样品属性 + planDeliverTime: string // 预计送达时间 + deliverTime: string // 实际送达时间 + requireOverTime: string // 要求检完时间 + currentCertifications: string | number // 已出具证书总数 + requireCertifications: string | number // 应出具证书总数 + currentDeliver: 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 // 证书有效期 +} + +export interface Menu { + name: string + columns: TableColumn[] + pagination: boolean + list: 'measureRecords' | 'certificationRecords' + searchFunc: Function +} + +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 // 检定结果 +} + diff --git a/src/api/business/schedule.ts b/src/api/business/schedule.ts new file mode 100644 index 0000000..f5b4569 --- /dev/null +++ b/src/api/business/schedule.ts @@ -0,0 +1,89 @@ +/** + * 设备收发接口 +*/ +import request from '../index' +import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface' +const prefix = '/meter' + +// 列表查询 +export function getInterChangeList(data: IListQuery) { + return request({ + url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} + +// 导出列表 +export function exportInterchangeList(data: Omit) { + return request({ + url: `${prefix}/schedule/interChange/listExport`, + method: 'post', + responseType: 'blob', + data, + }) +} + +// 根据样品id收入 +export function interchangeListTake(data: { id: string; type: string }) { + return request({ + url: `${prefix}/schedule/interChange/take`, + method: 'post', + data, + }) +} + +// 根据样品id删除 +export function interchangeListDelete(data: { id: string; type: string }) { + return request({ + url: `${prefix}/schedule/interChange/delete`, + method: 'post', + data, + }) +} + +// 根据样品id完成 +export function interchangeListComplete(data: { id: string; type: string }) { + return request({ + url: `${prefix}/schedule/interChange/complete`, + method: 'post', + data, + }) +} + +// 根据样品id回退 +export function interchangeListBack(data: { id: string; type: string }) { + return request({ + url: `${prefix}/schedule/interChange/back`, + method: 'post', + data, + }) +} + +// 根据样品id归还 +export function interchangeListReturn(data: { id: string; type: string }) { + return request({ + url: `${prefix}/schedule/interChange/return`, + method: 'post', + data, + }) +} + +// 根据样品id催办 +export function interchangeListUrge(data: { id: string; type: string }) { + return request({ + url: `${prefix}/schedule/interChange/urge`, + method: 'post', + data, + }) +} + +// 根据样品id终止 +export function interchangeListTerminate(data: { id: string; type: string }) { + return request({ + url: `${prefix}/schedule/interChange/terminate`, + method: 'post', + data, + }) +} + diff --git a/src/views/business/schedule/interchange/buttonBox.vue b/src/views/business/schedule/interchange/buttonBox.vue new file mode 100644 index 0000000..dc864bd --- /dev/null +++ b/src/views/business/schedule/interchange/buttonBox.vue @@ -0,0 +1,45 @@ + + + + + + diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue index 8c9b87c..67066a8 100644 --- a/src/views/business/schedule/interchange/interchangeEdit.vue +++ b/src/views/business/schedule/interchange/interchangeEdit.vue @@ -1,13 +1,712 @@ + + diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue index f65137f..5bb8865 100644 --- a/src/views/business/schedule/interchange/interchangeList.vue +++ b/src/views/business/schedule/interchange/interchangeList.vue @@ -1,13 +1,557 @@ diff --git a/src/views/business/schedule/interchange/interchange_interface.ts b/src/views/business/schedule/interchange/interchange_interface.ts new file mode 100644 index 0000000..a7df4fd --- /dev/null +++ b/src/views/business/schedule/interchange/interchange_interface.ts @@ -0,0 +1,95 @@ +import type { TableColumn } from '@/components/NormalTable/table_interface' + +export interface IListQuery { + sampleNo: string // 样品编号 + sampleName: string // 样品名称 + orderCode: string // 委托书编号 + customerId: string // 委托方代码 + startTime: string // 预计送达开始时间 + endTime: string // 预计送达结束时间 + isUrgent: string // 是否加急 + sampleAttr: string // 样品属性 + type: string // 类型(buttonBox) + offset: number + limit: number +} + +export interface IinterchangeList { + id: string + sampleNo: string // 样品编号 + sampleName: string // 样品名称 + sampleModel: string // 型号 + evaluationName: string // 出厂编号 + orderCode: string // 委托书编号 + customerId: string // 委托方代码 + customerName: string // 委托方名称 + deliverer: string // 送检人 + isUrgent: string // 是否加急 + sampleAttr: string // 样品属性 + planDeliverTime: string // 预计送达时间 + deliverTime: string // 实际送达时间 + requireOverTime: string // 要求检完时间 + currentCertifications: string | number // 已出具证书总数 + requireCertifications: string | number // 应出具证书总数 + currentDeliver: 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 // 证书有效期 +} + +export interface Menu { + name: string + columns: TableColumn[] + pagination: boolean + list: 'measureRecords' | 'certificationRecords' + searchFunc: Function +} + +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 // 检定结果 +} + diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue index 4086b48..ac83279 100644 --- a/src/views/customer/sample/list/list.vue +++ b/src/views/customer/sample/list/list.vue @@ -98,7 +98,7 @@ $router.push(`/sample/${pageType}/${row.id}`) } // 点击删除 -const handleDelete = (index: string, row: ISampleList) => { +const handleDelete = (row: ISampleList) => { ElMessageBox.confirm( `确认删除${row.customerName}吗?`, '提示', @@ -137,6 +137,7 @@ offset: 1, limit: 20, } + timeRange.value = ['', ''] } // 上传文件/批量导入 @@ -330,7 +331,7 @@ size="small" link type="danger" - @click="handleDelete(row.$index, row)" + @click="handleDelete(row)" > 删除 diff --git a/src/api/business/schedule.ts b/src/api/business/schedule.ts new file mode 100644 index 0000000..f5b4569 --- /dev/null +++ b/src/api/business/schedule.ts @@ -0,0 +1,89 @@ +/** + * 设备收发接口 +*/ +import request from '../index' +import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface' +const prefix = '/meter' + +// 列表查询 +export function getInterChangeList(data: IListQuery) { + return request({ + url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} + +// 导出列表 +export function exportInterchangeList(data: Omit) { + return request({ + url: `${prefix}/schedule/interChange/listExport`, + method: 'post', + responseType: 'blob', + data, + }) +} + +// 根据样品id收入 +export function interchangeListTake(data: { id: string; type: string }) { + return request({ + url: `${prefix}/schedule/interChange/take`, + method: 'post', + data, + }) +} + +// 根据样品id删除 +export function interchangeListDelete(data: { id: string; type: string }) { + return request({ + url: `${prefix}/schedule/interChange/delete`, + method: 'post', + data, + }) +} + +// 根据样品id完成 +export function interchangeListComplete(data: { id: string; type: string }) { + return request({ + url: `${prefix}/schedule/interChange/complete`, + method: 'post', + data, + }) +} + +// 根据样品id回退 +export function interchangeListBack(data: { id: string; type: string }) { + return request({ + url: `${prefix}/schedule/interChange/back`, + method: 'post', + data, + }) +} + +// 根据样品id归还 +export function interchangeListReturn(data: { id: string; type: string }) { + return request({ + url: `${prefix}/schedule/interChange/return`, + method: 'post', + data, + }) +} + +// 根据样品id催办 +export function interchangeListUrge(data: { id: string; type: string }) { + return request({ + url: `${prefix}/schedule/interChange/urge`, + method: 'post', + data, + }) +} + +// 根据样品id终止 +export function interchangeListTerminate(data: { id: string; type: string }) { + return request({ + url: `${prefix}/schedule/interChange/terminate`, + method: 'post', + data, + }) +} + diff --git a/src/views/business/schedule/interchange/buttonBox.vue b/src/views/business/schedule/interchange/buttonBox.vue new file mode 100644 index 0000000..dc864bd --- /dev/null +++ b/src/views/business/schedule/interchange/buttonBox.vue @@ -0,0 +1,45 @@ + + + + + + diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue index 8c9b87c..67066a8 100644 --- a/src/views/business/schedule/interchange/interchangeEdit.vue +++ b/src/views/business/schedule/interchange/interchangeEdit.vue @@ -1,13 +1,712 @@ + + diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue index f65137f..5bb8865 100644 --- a/src/views/business/schedule/interchange/interchangeList.vue +++ b/src/views/business/schedule/interchange/interchangeList.vue @@ -1,13 +1,557 @@ diff --git a/src/views/business/schedule/interchange/interchange_interface.ts b/src/views/business/schedule/interchange/interchange_interface.ts new file mode 100644 index 0000000..a7df4fd --- /dev/null +++ b/src/views/business/schedule/interchange/interchange_interface.ts @@ -0,0 +1,95 @@ +import type { TableColumn } from '@/components/NormalTable/table_interface' + +export interface IListQuery { + sampleNo: string // 样品编号 + sampleName: string // 样品名称 + orderCode: string // 委托书编号 + customerId: string // 委托方代码 + startTime: string // 预计送达开始时间 + endTime: string // 预计送达结束时间 + isUrgent: string // 是否加急 + sampleAttr: string // 样品属性 + type: string // 类型(buttonBox) + offset: number + limit: number +} + +export interface IinterchangeList { + id: string + sampleNo: string // 样品编号 + sampleName: string // 样品名称 + sampleModel: string // 型号 + evaluationName: string // 出厂编号 + orderCode: string // 委托书编号 + customerId: string // 委托方代码 + customerName: string // 委托方名称 + deliverer: string // 送检人 + isUrgent: string // 是否加急 + sampleAttr: string // 样品属性 + planDeliverTime: string // 预计送达时间 + deliverTime: string // 实际送达时间 + requireOverTime: string // 要求检完时间 + currentCertifications: string | number // 已出具证书总数 + requireCertifications: string | number // 应出具证书总数 + currentDeliver: 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 // 证书有效期 +} + +export interface Menu { + name: string + columns: TableColumn[] + pagination: boolean + list: 'measureRecords' | 'certificationRecords' + searchFunc: Function +} + +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 // 检定结果 +} + diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue index 4086b48..ac83279 100644 --- a/src/views/customer/sample/list/list.vue +++ b/src/views/customer/sample/list/list.vue @@ -98,7 +98,7 @@ $router.push(`/sample/${pageType}/${row.id}`) } // 点击删除 -const handleDelete = (index: string, row: ISampleList) => { +const handleDelete = (row: ISampleList) => { ElMessageBox.confirm( `确认删除${row.customerName}吗?`, '提示', @@ -137,6 +137,7 @@ offset: 1, limit: 20, } + timeRange.value = ['', ''] } // 上传文件/批量导入 @@ -330,7 +331,7 @@ size="small" link type="danger" - @click="handleDelete(row.$index, row)" + @click="handleDelete(row)" > 删除 diff --git a/src/views/customer/sample/overTime/detail.vue b/src/views/customer/sample/overTime/detail.vue index 3541675..a16196c 100644 --- a/src/views/customer/sample/overTime/detail.vue +++ b/src/views/customer/sample/overTime/detail.vue @@ -1,17 +1,13 @@ + + + + + diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue index 8c9b87c..67066a8 100644 --- a/src/views/business/schedule/interchange/interchangeEdit.vue +++ b/src/views/business/schedule/interchange/interchangeEdit.vue @@ -1,13 +1,712 @@ + + diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue index f65137f..5bb8865 100644 --- a/src/views/business/schedule/interchange/interchangeList.vue +++ b/src/views/business/schedule/interchange/interchangeList.vue @@ -1,13 +1,557 @@ diff --git a/src/views/business/schedule/interchange/interchange_interface.ts b/src/views/business/schedule/interchange/interchange_interface.ts new file mode 100644 index 0000000..a7df4fd --- /dev/null +++ b/src/views/business/schedule/interchange/interchange_interface.ts @@ -0,0 +1,95 @@ +import type { TableColumn } from '@/components/NormalTable/table_interface' + +export interface IListQuery { + sampleNo: string // 样品编号 + sampleName: string // 样品名称 + orderCode: string // 委托书编号 + customerId: string // 委托方代码 + startTime: string // 预计送达开始时间 + endTime: string // 预计送达结束时间 + isUrgent: string // 是否加急 + sampleAttr: string // 样品属性 + type: string // 类型(buttonBox) + offset: number + limit: number +} + +export interface IinterchangeList { + id: string + sampleNo: string // 样品编号 + sampleName: string // 样品名称 + sampleModel: string // 型号 + evaluationName: string // 出厂编号 + orderCode: string // 委托书编号 + customerId: string // 委托方代码 + customerName: string // 委托方名称 + deliverer: string // 送检人 + isUrgent: string // 是否加急 + sampleAttr: string // 样品属性 + planDeliverTime: string // 预计送达时间 + deliverTime: string // 实际送达时间 + requireOverTime: string // 要求检完时间 + currentCertifications: string | number // 已出具证书总数 + requireCertifications: string | number // 应出具证书总数 + currentDeliver: 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 // 证书有效期 +} + +export interface Menu { + name: string + columns: TableColumn[] + pagination: boolean + list: 'measureRecords' | 'certificationRecords' + searchFunc: Function +} + +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 // 检定结果 +} + diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue index 4086b48..ac83279 100644 --- a/src/views/customer/sample/list/list.vue +++ b/src/views/customer/sample/list/list.vue @@ -98,7 +98,7 @@ $router.push(`/sample/${pageType}/${row.id}`) } // 点击删除 -const handleDelete = (index: string, row: ISampleList) => { +const handleDelete = (row: ISampleList) => { ElMessageBox.confirm( `确认删除${row.customerName}吗?`, '提示', @@ -137,6 +137,7 @@ offset: 1, limit: 20, } + timeRange.value = ['', ''] } // 上传文件/批量导入 @@ -330,7 +331,7 @@ size="small" link type="danger" - @click="handleDelete(row.$index, row)" + @click="handleDelete(row)" > 删除 diff --git a/src/views/customer/sample/overTime/detail.vue b/src/views/customer/sample/overTime/detail.vue index 3541675..a16196c 100644 --- a/src/views/customer/sample/overTime/detail.vue +++ b/src/views/customer/sample/overTime/detail.vue @@ -1,17 +1,13 @@ + + + + + diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue index 8c9b87c..67066a8 100644 --- a/src/views/business/schedule/interchange/interchangeEdit.vue +++ b/src/views/business/schedule/interchange/interchangeEdit.vue @@ -1,13 +1,712 @@ + + diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue index f65137f..5bb8865 100644 --- a/src/views/business/schedule/interchange/interchangeList.vue +++ b/src/views/business/schedule/interchange/interchangeList.vue @@ -1,13 +1,557 @@ diff --git a/src/views/business/schedule/interchange/interchange_interface.ts b/src/views/business/schedule/interchange/interchange_interface.ts new file mode 100644 index 0000000..a7df4fd --- /dev/null +++ b/src/views/business/schedule/interchange/interchange_interface.ts @@ -0,0 +1,95 @@ +import type { TableColumn } from '@/components/NormalTable/table_interface' + +export interface IListQuery { + sampleNo: string // 样品编号 + sampleName: string // 样品名称 + orderCode: string // 委托书编号 + customerId: string // 委托方代码 + startTime: string // 预计送达开始时间 + endTime: string // 预计送达结束时间 + isUrgent: string // 是否加急 + sampleAttr: string // 样品属性 + type: string // 类型(buttonBox) + offset: number + limit: number +} + +export interface IinterchangeList { + id: string + sampleNo: string // 样品编号 + sampleName: string // 样品名称 + sampleModel: string // 型号 + evaluationName: string // 出厂编号 + orderCode: string // 委托书编号 + customerId: string // 委托方代码 + customerName: string // 委托方名称 + deliverer: string // 送检人 + isUrgent: string // 是否加急 + sampleAttr: string // 样品属性 + planDeliverTime: string // 预计送达时间 + deliverTime: string // 实际送达时间 + requireOverTime: string // 要求检完时间 + currentCertifications: string | number // 已出具证书总数 + requireCertifications: string | number // 应出具证书总数 + currentDeliver: 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 // 证书有效期 +} + +export interface Menu { + name: string + columns: TableColumn[] + pagination: boolean + list: 'measureRecords' | 'certificationRecords' + searchFunc: Function +} + +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 // 检定结果 +} + diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue index 4086b48..ac83279 100644 --- a/src/views/customer/sample/list/list.vue +++ b/src/views/customer/sample/list/list.vue @@ -98,7 +98,7 @@ $router.push(`/sample/${pageType}/${row.id}`) } // 点击删除 -const handleDelete = (index: string, row: ISampleList) => { +const handleDelete = (row: ISampleList) => { ElMessageBox.confirm( `确认删除${row.customerName}吗?`, '提示', @@ -137,6 +137,7 @@ offset: 1, limit: 20, } + timeRange.value = ['', ''] } // 上传文件/批量导入 @@ -330,7 +331,7 @@ size="small" link type="danger" - @click="handleDelete(row.$index, row)" + @click="handleDelete(row)" > 删除 diff --git a/src/views/customer/sample/overTime/detail.vue b/src/views/customer/sample/overTime/detail.vue index 3541675..a16196c 100644 --- a/src/views/customer/sample/overTime/detail.vue +++ b/src/views/customer/sample/overTime/detail.vue @@ -1,17 +1,13 @@ + + + + + diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue index 8c9b87c..67066a8 100644 --- a/src/views/business/schedule/interchange/interchangeEdit.vue +++ b/src/views/business/schedule/interchange/interchangeEdit.vue @@ -1,13 +1,712 @@ + + diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue index f65137f..5bb8865 100644 --- a/src/views/business/schedule/interchange/interchangeList.vue +++ b/src/views/business/schedule/interchange/interchangeList.vue @@ -1,13 +1,557 @@ diff --git a/src/views/business/schedule/interchange/interchange_interface.ts b/src/views/business/schedule/interchange/interchange_interface.ts new file mode 100644 index 0000000..a7df4fd --- /dev/null +++ b/src/views/business/schedule/interchange/interchange_interface.ts @@ -0,0 +1,95 @@ +import type { TableColumn } from '@/components/NormalTable/table_interface' + +export interface IListQuery { + sampleNo: string // 样品编号 + sampleName: string // 样品名称 + orderCode: string // 委托书编号 + customerId: string // 委托方代码 + startTime: string // 预计送达开始时间 + endTime: string // 预计送达结束时间 + isUrgent: string // 是否加急 + sampleAttr: string // 样品属性 + type: string // 类型(buttonBox) + offset: number + limit: number +} + +export interface IinterchangeList { + id: string + sampleNo: string // 样品编号 + sampleName: string // 样品名称 + sampleModel: string // 型号 + evaluationName: string // 出厂编号 + orderCode: string // 委托书编号 + customerId: string // 委托方代码 + customerName: string // 委托方名称 + deliverer: string // 送检人 + isUrgent: string // 是否加急 + sampleAttr: string // 样品属性 + planDeliverTime: string // 预计送达时间 + deliverTime: string // 实际送达时间 + requireOverTime: string // 要求检完时间 + currentCertifications: string | number // 已出具证书总数 + requireCertifications: string | number // 应出具证书总数 + currentDeliver: 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 // 证书有效期 +} + +export interface Menu { + name: string + columns: TableColumn[] + pagination: boolean + list: 'measureRecords' | 'certificationRecords' + searchFunc: Function +} + +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 // 检定结果 +} + diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue index 4086b48..ac83279 100644 --- a/src/views/customer/sample/list/list.vue +++ b/src/views/customer/sample/list/list.vue @@ -98,7 +98,7 @@ $router.push(`/sample/${pageType}/${row.id}`) } // 点击删除 -const handleDelete = (index: string, row: ISampleList) => { +const handleDelete = (row: ISampleList) => { ElMessageBox.confirm( `确认删除${row.customerName}吗?`, '提示', @@ -137,6 +137,7 @@ offset: 1, limit: 20, } + timeRange.value = ['', ''] } // 上传文件/批量导入 @@ -330,7 +331,7 @@ size="small" link type="danger" - @click="handleDelete(row.$index, row)" + @click="handleDelete(row)" > 删除 diff --git a/src/views/customer/sample/overTime/detail.vue b/src/views/customer/sample/overTime/detail.vue index 3541675..a16196c 100644 --- a/src/views/customer/sample/overTime/detail.vue +++ b/src/views/customer/sample/overTime/detail.vue @@ -1,17 +1,13 @@ + + + + + diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue index 8c9b87c..67066a8 100644 --- a/src/views/business/schedule/interchange/interchangeEdit.vue +++ b/src/views/business/schedule/interchange/interchangeEdit.vue @@ -1,13 +1,712 @@ + + diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue index f65137f..5bb8865 100644 --- a/src/views/business/schedule/interchange/interchangeList.vue +++ b/src/views/business/schedule/interchange/interchangeList.vue @@ -1,13 +1,557 @@ diff --git a/src/views/business/schedule/interchange/interchange_interface.ts b/src/views/business/schedule/interchange/interchange_interface.ts new file mode 100644 index 0000000..a7df4fd --- /dev/null +++ b/src/views/business/schedule/interchange/interchange_interface.ts @@ -0,0 +1,95 @@ +import type { TableColumn } from '@/components/NormalTable/table_interface' + +export interface IListQuery { + sampleNo: string // 样品编号 + sampleName: string // 样品名称 + orderCode: string // 委托书编号 + customerId: string // 委托方代码 + startTime: string // 预计送达开始时间 + endTime: string // 预计送达结束时间 + isUrgent: string // 是否加急 + sampleAttr: string // 样品属性 + type: string // 类型(buttonBox) + offset: number + limit: number +} + +export interface IinterchangeList { + id: string + sampleNo: string // 样品编号 + sampleName: string // 样品名称 + sampleModel: string // 型号 + evaluationName: string // 出厂编号 + orderCode: string // 委托书编号 + customerId: string // 委托方代码 + customerName: string // 委托方名称 + deliverer: string // 送检人 + isUrgent: string // 是否加急 + sampleAttr: string // 样品属性 + planDeliverTime: string // 预计送达时间 + deliverTime: string // 实际送达时间 + requireOverTime: string // 要求检完时间 + currentCertifications: string | number // 已出具证书总数 + requireCertifications: string | number // 应出具证书总数 + currentDeliver: 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 // 证书有效期 +} + +export interface Menu { + name: string + columns: TableColumn[] + pagination: boolean + list: 'measureRecords' | 'certificationRecords' + searchFunc: Function +} + +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 // 检定结果 +} + diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue index 4086b48..ac83279 100644 --- a/src/views/customer/sample/list/list.vue +++ b/src/views/customer/sample/list/list.vue @@ -98,7 +98,7 @@ $router.push(`/sample/${pageType}/${row.id}`) } // 点击删除 -const handleDelete = (index: string, row: ISampleList) => { +const handleDelete = (row: ISampleList) => { ElMessageBox.confirm( `确认删除${row.customerName}吗?`, '提示', @@ -137,6 +137,7 @@ offset: 1, limit: 20, } + timeRange.value = ['', ''] } // 上传文件/批量导入 @@ -330,7 +331,7 @@ size="small" link type="danger" - @click="handleDelete(row.$index, row)" + @click="handleDelete(row)" > 删除 diff --git a/src/views/customer/sample/overTime/detail.vue b/src/views/customer/sample/overTime/detail.vue index 3541675..a16196c 100644 --- a/src/views/customer/sample/overTime/detail.vue +++ b/src/views/customer/sample/overTime/detail.vue @@ -1,17 +1,13 @@