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/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 c61171a..0da6140 100644 --- a/src/views/business/schedule/interchange/interchangeList.vue +++ b/src/views/business/schedule/interchange/interchangeList.vue @@ -54,7 +54,7 @@ }) const timeRange = ref<[DateModelType, DateModelType]>(['', '']) -// 表头 +// 表头待收入 const columnsTaking = ref([ { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' }, { text: '样品名称', value: 'sampleName', width: '120', align: 'center' }, 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 c61171a..0da6140 100644 --- a/src/views/business/schedule/interchange/interchangeList.vue +++ b/src/views/business/schedule/interchange/interchangeList.vue @@ -54,7 +54,7 @@ }) const timeRange = ref<[DateModelType, DateModelType]>(['', '']) -// 表头 +// 表头待收入 const columnsTaking = ref([ { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' }, { text: '样品名称', value: 'sampleName', width: '120', align: 'center' }, diff --git a/src/views/business/schedule/interchange/interchange_interface.ts b/src/views/business/schedule/interchange/interchange_interface.ts index b2fdef0..a7df4fd 100644 --- a/src/views/business/schedule/interchange/interchange_interface.ts +++ b/src/views/business/schedule/interchange/interchange_interface.ts @@ -1,3 +1,5 @@ +import type { TableColumn } from '@/components/NormalTable/table_interface' + export interface IListQuery { sampleNo: string // 样品编号 sampleName: string // 样品名称 @@ -12,7 +14,7 @@ limit: number } -export interface IinterchangeListTaking { +export interface IinterchangeList { id: string sampleNo: string // 样品编号 sampleName: string // 样品名称 @@ -32,3 +34,62 @@ 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 // 检定结果 +} +