diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 0f03d5e..153d4e0 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -152,13 +152,13 @@
{
path: 'cert/detail/:id?',
name: 'taskDetail',
- component: () => import('@/views/business/schedule/task/taskEdit.vue'),
+ component: () => import('@/views/business/schedule/certPrint/certDetail.vue'),
meta: {
title: '证书详情',
icon: 'ep:key',
sidebar: false,
breadcrumb: true,
- activeMenu: '/schedule/certPrintList\'',
+ activeMenu: '/schedule/certPrintList',
},
},
],
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 0f03d5e..153d4e0 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -152,13 +152,13 @@
{
path: 'cert/detail/:id?',
name: 'taskDetail',
- component: () => import('@/views/business/schedule/task/taskEdit.vue'),
+ component: () => import('@/views/business/schedule/certPrint/certDetail.vue'),
meta: {
title: '证书详情',
icon: 'ep:key',
sidebar: false,
breadcrumb: true,
- activeMenu: '/schedule/certPrintList\'',
+ activeMenu: '/schedule/certPrintList',
},
},
],
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index 67eec54..df0ba5c 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -33,7 +33,54 @@
crateUserName: string // 检定人员
printNum: string | number// 打印状态-打印次数
printStatus: string // 可打印状态 0不可打印1可打印
+ printStatusName: string // 可打印状态 0不可打印1可打印
createTime: string // 生成时间
approvalStatus?: string // 审批状态
approvalStatusName?: string // 审批状态
}
+
+// 证书详情
+export interface ICertification {
+ certificationId: string // 证书id
+ certificationReportCode: string // 证书编号
+ certificationReportName: string // 证书名称
+ certificateReportType: string // 证书类型
+ certificateReportTypeName: string // 证书类型
+ sampleId: string // 样品id
+ sampleNo: string // 样品编号
+ sampleName: string // 样品名称
+ sampleModel: string // 型号
+ manufacturingNo: string // 出厂编号
+ orderId: string // 委托书id
+ orderNo: string // 委托书编号
+ customerNo: string // 客户编号
+ customerName: string // 客户名称
+ measureCatogory: string // 检校类别
+ measureCatogoryName: string // 检校类别
+ createUser: string // 检定人员
+ createUserName: string // 检定人员
+ printNum: string | number// 打印状态-打印次数
+ printStatus: string // 可打印状态 0不可打印1可打印
+ createTime: string // 生成时间
+ calibrationMajor: string // 检校专业
+ issuanceDate: string // 出具日期
+ signId: string // 电子签章
+ signName: string // 电子签章
+ approvalSignId: string // 认可标志专用章
+ approvalSignName: string // 认可标志专用章
+ certificateReportFile: string // 证书报告附件
+ originalRecordId: string // 原始记录id
+ originalRecordCode: string // 原始记录编号
+ roomNumber: string // 检校地点
+ temperature: string // 温度
+ humidity: string // 相对湿度
+ manufacturer: string // 生产厂家
+ customerPhone: string // 委托方电话
+ customerAddress: string // 委托方地址
+ deliverer: string // 送检人
+ delivererTel: string // 联系方式
+ planDeliverTime: string // 预计送达时间
+ requireOverTime: string // 预计检完时间
+ mesureContent: string // 检定项目
+ remark: string // 备注
+}
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 0f03d5e..153d4e0 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -152,13 +152,13 @@
{
path: 'cert/detail/:id?',
name: 'taskDetail',
- component: () => import('@/views/business/schedule/task/taskEdit.vue'),
+ component: () => import('@/views/business/schedule/certPrint/certDetail.vue'),
meta: {
title: '证书详情',
icon: 'ep:key',
sidebar: false,
breadcrumb: true,
- activeMenu: '/schedule/certPrintList\'',
+ activeMenu: '/schedule/certPrintList',
},
},
],
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index 67eec54..df0ba5c 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -33,7 +33,54 @@
crateUserName: string // 检定人员
printNum: string | number// 打印状态-打印次数
printStatus: string // 可打印状态 0不可打印1可打印
+ printStatusName: string // 可打印状态 0不可打印1可打印
createTime: string // 生成时间
approvalStatus?: string // 审批状态
approvalStatusName?: string // 审批状态
}
+
+// 证书详情
+export interface ICertification {
+ certificationId: string // 证书id
+ certificationReportCode: string // 证书编号
+ certificationReportName: string // 证书名称
+ certificateReportType: string // 证书类型
+ certificateReportTypeName: string // 证书类型
+ sampleId: string // 样品id
+ sampleNo: string // 样品编号
+ sampleName: string // 样品名称
+ sampleModel: string // 型号
+ manufacturingNo: string // 出厂编号
+ orderId: string // 委托书id
+ orderNo: string // 委托书编号
+ customerNo: string // 客户编号
+ customerName: string // 客户名称
+ measureCatogory: string // 检校类别
+ measureCatogoryName: string // 检校类别
+ createUser: string // 检定人员
+ createUserName: string // 检定人员
+ printNum: string | number// 打印状态-打印次数
+ printStatus: string // 可打印状态 0不可打印1可打印
+ createTime: string // 生成时间
+ calibrationMajor: string // 检校专业
+ issuanceDate: string // 出具日期
+ signId: string // 电子签章
+ signName: string // 电子签章
+ approvalSignId: string // 认可标志专用章
+ approvalSignName: string // 认可标志专用章
+ certificateReportFile: string // 证书报告附件
+ originalRecordId: string // 原始记录id
+ originalRecordCode: string // 原始记录编号
+ roomNumber: string // 检校地点
+ temperature: string // 温度
+ humidity: string // 相对湿度
+ manufacturer: string // 生产厂家
+ customerPhone: string // 委托方电话
+ customerAddress: string // 委托方地址
+ deliverer: string // 送检人
+ delivererTel: string // 联系方式
+ planDeliverTime: string // 预计送达时间
+ requireOverTime: string // 预计检完时间
+ mesureContent: string // 检定项目
+ remark: string // 备注
+}
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
new file mode 100644
index 0000000..f25fb24
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -0,0 +1,614 @@
+
+
+
+
+
+
+
+ 打印
+
+
+ 预览
+
+
+ 关闭
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 无附件
+
+
+
+
+
+
+
+
+
+ 查看
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 0f03d5e..153d4e0 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -152,13 +152,13 @@
{
path: 'cert/detail/:id?',
name: 'taskDetail',
- component: () => import('@/views/business/schedule/task/taskEdit.vue'),
+ component: () => import('@/views/business/schedule/certPrint/certDetail.vue'),
meta: {
title: '证书详情',
icon: 'ep:key',
sidebar: false,
breadcrumb: true,
- activeMenu: '/schedule/certPrintList\'',
+ activeMenu: '/schedule/certPrintList',
},
},
],
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index 67eec54..df0ba5c 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -33,7 +33,54 @@
crateUserName: string // 检定人员
printNum: string | number// 打印状态-打印次数
printStatus: string // 可打印状态 0不可打印1可打印
+ printStatusName: string // 可打印状态 0不可打印1可打印
createTime: string // 生成时间
approvalStatus?: string // 审批状态
approvalStatusName?: string // 审批状态
}
+
+// 证书详情
+export interface ICertification {
+ certificationId: string // 证书id
+ certificationReportCode: string // 证书编号
+ certificationReportName: string // 证书名称
+ certificateReportType: string // 证书类型
+ certificateReportTypeName: string // 证书类型
+ sampleId: string // 样品id
+ sampleNo: string // 样品编号
+ sampleName: string // 样品名称
+ sampleModel: string // 型号
+ manufacturingNo: string // 出厂编号
+ orderId: string // 委托书id
+ orderNo: string // 委托书编号
+ customerNo: string // 客户编号
+ customerName: string // 客户名称
+ measureCatogory: string // 检校类别
+ measureCatogoryName: string // 检校类别
+ createUser: string // 检定人员
+ createUserName: string // 检定人员
+ printNum: string | number// 打印状态-打印次数
+ printStatus: string // 可打印状态 0不可打印1可打印
+ createTime: string // 生成时间
+ calibrationMajor: string // 检校专业
+ issuanceDate: string // 出具日期
+ signId: string // 电子签章
+ signName: string // 电子签章
+ approvalSignId: string // 认可标志专用章
+ approvalSignName: string // 认可标志专用章
+ certificateReportFile: string // 证书报告附件
+ originalRecordId: string // 原始记录id
+ originalRecordCode: string // 原始记录编号
+ roomNumber: string // 检校地点
+ temperature: string // 温度
+ humidity: string // 相对湿度
+ manufacturer: string // 生产厂家
+ customerPhone: string // 委托方电话
+ customerAddress: string // 委托方地址
+ deliverer: string // 送检人
+ delivererTel: string // 联系方式
+ planDeliverTime: string // 预计送达时间
+ requireOverTime: string // 预计检完时间
+ mesureContent: string // 检定项目
+ remark: string // 备注
+}
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
new file mode 100644
index 0000000..f25fb24
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -0,0 +1,614 @@
+
+
+
+
+
+
+
+ 打印
+
+
+ 预览
+
+
+ 关闭
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 无附件
+
+
+
+
+
+
+
+
+
+ 查看
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 90d9936..c6e9db4 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -111,8 +111,8 @@
}
// 模拟数据
list.value = [
- { certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '未打印', certificateReportTypeName: '自检', approvalStatusName: '待审批' },
- { certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '未打印', certificateReportTypeName: '自检', approvalStatusName: '待审批' },
+ { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '0', printStatusName: '未打印', certificateReportTypeName: '自检', approvalStatusName: '待审批' },
+ { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '1', printStatusName: '已打印', certificateReportTypeName: '自检', approvalStatusName: '待审批' },
]
loadingTable.value = false
console.log(listQuery.value)
@@ -149,7 +149,7 @@
}
// 点击详情
const handleDetail = (row: ICerPrintList) => {
- // $router.push(`/schedule/task/distribute/${row.sampleId}`)
+ $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}`)
}
// 点击分发， 弹窗