diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue index a694ce6..05e8d9d 100644 --- a/src/components/Sample/certificationRecords.vue +++ b/src/components/Sample/certificationRecords.vue @@ -10,7 +10,7 @@ }, }) -// 检定记录 +// 证书列表 interface SimpleCertification { certificationCode: string // 证书编号 certificationName: string // 证书形成 @@ -34,10 +34,6 @@ { text: '证书有效期', value: 'expirationDate' }, ]) -// 应出具证书数 -const requireCertifications = ref(0) -// 当前证书数 -const currentCertifications = ref(0) // 证书列表 const list = ref([]) const total = ref(0) diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue index a694ce6..05e8d9d 100644 --- a/src/components/Sample/certificationRecords.vue +++ b/src/components/Sample/certificationRecords.vue @@ -10,7 +10,7 @@ }, }) -// 检定记录 +// 证书列表 interface SimpleCertification { certificationCode: string // 证书编号 certificationName: string // 证书形成 @@ -34,10 +34,6 @@ { text: '证书有效期', value: 'expirationDate' }, ]) -// 应出具证书数 -const requireCertifications = ref(0) -// 当前证书数 -const currentCertifications = ref(0) // 证书列表 const list = ref([]) const total = ref(0) diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index dc6ab52..21710f8 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -128,17 +128,39 @@ }, }, { - path: 'task/:type/:id?', + path: 'task/:role/:id?', name: 'taskDetail', component: () => import('@/views/business/schedule/task/taskEdit.vue'), meta: { - title: '任务分发详情', + title: '样品详情', icon: 'ep:key', sidebar: false, breadcrumb: true, activeMenu: '/schedule/taskList', }, }, + { + path: 'certPrintList', + name: 'CerPrintList', + component: () => import('@/views/business/schedule/certPrint/certList.vue'), + meta: { + title: '证书打印', + icon: 'ep:key', + auth: '/schedule/certPrint', + }, + }, + { + path: 'cert/detail/:id?', + name: 'taskDetail', + component: () => import('@/views/business/schedule/task/taskEdit.vue'), + meta: { + title: '证书详情', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/schedule/certPrintList\'', + }, + }, ], }, { @@ -163,18 +185,6 @@ }, }, { - path: '/myMesure/:type/:id?', - name: 'MyMeasureDetail', - component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'), - meta: { - title: '检测详情', - icon: 'ep:key', - sidebar: false, - breadcrumb: true, - activeMenu: '/lab/myMeasureList', - }, - }, - { path: 'deptMeasureList', name: 'DeptMeasureList', component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'), @@ -185,18 +195,6 @@ }, }, { - path: 'deptMeasure/:type/:id?', - name: 'DeptMeasureDetail', - component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'), - meta: { - title: '检测详情', - icon: 'ep:key', - sidebar: false, - breadcrumb: true, - activeMenu: '/lab/deptMeasureList', - }, - }, - { path: 'reportOnCredentialsApproval', name: 'ReportOnCredentialsApproval', component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'), diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue index a694ce6..05e8d9d 100644 --- a/src/components/Sample/certificationRecords.vue +++ b/src/components/Sample/certificationRecords.vue @@ -10,7 +10,7 @@ }, }) -// 检定记录 +// 证书列表 interface SimpleCertification { certificationCode: string // 证书编号 certificationName: string // 证书形成 @@ -34,10 +34,6 @@ { text: '证书有效期', value: 'expirationDate' }, ]) -// 应出具证书数 -const requireCertifications = ref(0) -// 当前证书数 -const currentCertifications = ref(0) // 证书列表 const list = ref([]) const total = ref(0) diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index dc6ab52..21710f8 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -128,17 +128,39 @@ }, }, { - path: 'task/:type/:id?', + path: 'task/:role/:id?', name: 'taskDetail', component: () => import('@/views/business/schedule/task/taskEdit.vue'), meta: { - title: '任务分发详情', + title: '样品详情', icon: 'ep:key', sidebar: false, breadcrumb: true, activeMenu: '/schedule/taskList', }, }, + { + path: 'certPrintList', + name: 'CerPrintList', + component: () => import('@/views/business/schedule/certPrint/certList.vue'), + meta: { + title: '证书打印', + icon: 'ep:key', + auth: '/schedule/certPrint', + }, + }, + { + path: 'cert/detail/:id?', + name: 'taskDetail', + component: () => import('@/views/business/schedule/task/taskEdit.vue'), + meta: { + title: '证书详情', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/schedule/certPrintList\'', + }, + }, ], }, { @@ -163,18 +185,6 @@ }, }, { - path: '/myMesure/:type/:id?', - name: 'MyMeasureDetail', - component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'), - meta: { - title: '检测详情', - icon: 'ep:key', - sidebar: false, - breadcrumb: true, - activeMenu: '/lab/myMeasureList', - }, - }, - { path: 'deptMeasureList', name: 'DeptMeasureList', component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'), @@ -185,18 +195,6 @@ }, }, { - path: 'deptMeasure/:type/:id?', - name: 'DeptMeasureDetail', - component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'), - meta: { - title: '检测详情', - icon: 'ep:key', - sidebar: false, - breadcrumb: true, - activeMenu: '/lab/deptMeasureList', - }, - }, - { path: 'reportOnCredentialsApproval', name: 'ReportOnCredentialsApproval', component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'), diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts new file mode 100644 index 0000000..67eec54 --- /dev/null +++ b/src/views/business/schedule/certPrint/cert-interface.ts @@ -0,0 +1,39 @@ +// 证书打印查询 +export interface ICertPrintSearch { + certificationReportCode: string // 证书编号 + orderNo: string // 委托书编号 + customerName: string // 委托方名称 + sampleNo: string // 样品编号 + sampleName: string // 样品名称 + certificateReportType: string // 证书类型 + printNum: number | '' // 打印次数 -未打印和全部用 + approvalStatus: string // 审批状态-审批查询用 + formId: string // 审批用formId + offset: number + limit: number +} + +// 证书打印列表 +export interface ICerPrintList { + certificationId: string // 证书id + certificationReportCode: string // 证书编号 + certificationReportName: string // 证书名称 + certificateReportType: string // 证书类型 + certificateReportTypeName: string // 证书类型 + sampleNo: string // 样品编号 + sampleName: string // 样品名称 + sampleModel: string // 型号 + manufacturingNo: string // 出厂编号 + orderId: string // 委托书id + orderNo: string // 委托书编号 + customerNo: string // 客户编号 + customerName: string // 客户名称 + measureCatogory: string // 检校类别 + measureCatogoryName: string // 检校类别 + crateUserName: string // 检定人员 + printNum: string | number// 打印状态-打印次数 + printStatus: string // 可打印状态 0不可打印1可打印 + createTime: string // 生成时间 + approvalStatus?: string // 审批状态 + approvalStatusName?: string // 审批状态 +} diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue index a694ce6..05e8d9d 100644 --- a/src/components/Sample/certificationRecords.vue +++ b/src/components/Sample/certificationRecords.vue @@ -10,7 +10,7 @@ }, }) -// 检定记录 +// 证书列表 interface SimpleCertification { certificationCode: string // 证书编号 certificationName: string // 证书形成 @@ -34,10 +34,6 @@ { text: '证书有效期', value: 'expirationDate' }, ]) -// 应出具证书数 -const requireCertifications = ref(0) -// 当前证书数 -const currentCertifications = ref(0) // 证书列表 const list = ref([]) const total = ref(0) diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index dc6ab52..21710f8 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -128,17 +128,39 @@ }, }, { - path: 'task/:type/:id?', + path: 'task/:role/:id?', name: 'taskDetail', component: () => import('@/views/business/schedule/task/taskEdit.vue'), meta: { - title: '任务分发详情', + title: '样品详情', icon: 'ep:key', sidebar: false, breadcrumb: true, activeMenu: '/schedule/taskList', }, }, + { + path: 'certPrintList', + name: 'CerPrintList', + component: () => import('@/views/business/schedule/certPrint/certList.vue'), + meta: { + title: '证书打印', + icon: 'ep:key', + auth: '/schedule/certPrint', + }, + }, + { + path: 'cert/detail/:id?', + name: 'taskDetail', + component: () => import('@/views/business/schedule/task/taskEdit.vue'), + meta: { + title: '证书详情', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/schedule/certPrintList\'', + }, + }, ], }, { @@ -163,18 +185,6 @@ }, }, { - path: '/myMesure/:type/:id?', - name: 'MyMeasureDetail', - component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'), - meta: { - title: '检测详情', - icon: 'ep:key', - sidebar: false, - breadcrumb: true, - activeMenu: '/lab/myMeasureList', - }, - }, - { path: 'deptMeasureList', name: 'DeptMeasureList', component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'), @@ -185,18 +195,6 @@ }, }, { - path: 'deptMeasure/:type/:id?', - name: 'DeptMeasureDetail', - component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'), - meta: { - title: '检测详情', - icon: 'ep:key', - sidebar: false, - breadcrumb: true, - activeMenu: '/lab/deptMeasureList', - }, - }, - { path: 'reportOnCredentialsApproval', name: 'ReportOnCredentialsApproval', component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'), diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts new file mode 100644 index 0000000..67eec54 --- /dev/null +++ b/src/views/business/schedule/certPrint/cert-interface.ts @@ -0,0 +1,39 @@ +// 证书打印查询 +export interface ICertPrintSearch { + certificationReportCode: string // 证书编号 + orderNo: string // 委托书编号 + customerName: string // 委托方名称 + sampleNo: string // 样品编号 + sampleName: string // 样品名称 + certificateReportType: string // 证书类型 + printNum: number | '' // 打印次数 -未打印和全部用 + approvalStatus: string // 审批状态-审批查询用 + formId: string // 审批用formId + offset: number + limit: number +} + +// 证书打印列表 +export interface ICerPrintList { + certificationId: string // 证书id + certificationReportCode: string // 证书编号 + certificationReportName: string // 证书名称 + certificateReportType: string // 证书类型 + certificateReportTypeName: string // 证书类型 + sampleNo: string // 样品编号 + sampleName: string // 样品名称 + sampleModel: string // 型号 + manufacturingNo: string // 出厂编号 + orderId: string // 委托书id + orderNo: string // 委托书编号 + customerNo: string // 客户编号 + customerName: string // 客户名称 + measureCatogory: string // 检校类别 + measureCatogoryName: string // 检校类别 + crateUserName: string // 检定人员 + printNum: string | number// 打印状态-打印次数 + printStatus: string // 可打印状态 0不可打印1可打印 + createTime: string // 生成时间 + approvalStatus?: string // 审批状态 + approvalStatusName?: string // 审批状态 +} diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue new file mode 100644 index 0000000..90d9936 --- /dev/null +++ b/src/views/business/schedule/certPrint/certList.vue @@ -0,0 +1,316 @@ + + + + +