diff --git a/src/api/business/lab/cert.ts b/src/api/business/lab/cert.ts
index 2b0e682..2c99ed0 100644
--- a/src/api/business/lab/cert.ts
+++ b/src/api/business/lab/cert.ts
@@ -51,7 +51,7 @@
}
// 证书详情
-export function detail(data: object) {
+export function certificatePrintDetail(data: object) {
return request({
url: '/business/certificatePrint/detail',
method: 'post',
diff --git a/src/api/business/lab/cert.ts b/src/api/business/lab/cert.ts
index 2b0e682..2c99ed0 100644
--- a/src/api/business/lab/cert.ts
+++ b/src/api/business/lab/cert.ts
@@ -51,7 +51,7 @@
}
// 证书详情
-export function detail(data: object) {
+export function certificatePrintDetail(data: object) {
return request({
url: '/business/certificatePrint/detail',
method: 'post',
diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts
index 420e7b6..ebf033a 100644
--- a/src/api/business/schedule/task.ts
+++ b/src/api/business/schedule/task.ts
@@ -140,3 +140,29 @@
})
}
+// 证书监控
+export function certificateMonitorsById(data: object) {
+ return request({
+ url: '/business/certificateReport/certificateMonitorsById',
+ method: 'post',
+ data,
+ })
+}
+
+// 检定记录
+export function measureRecordsById(data: object) {
+ return request({
+ url: '/customer/sample/measureRecordsById',
+ method: 'post',
+ data,
+ })
+}
+
+// 检定证书
+export function certificateRecordsById(data: object) {
+ return request({
+ url: '/business/certificateReport/certificateRecordsById',
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/api/business/lab/cert.ts b/src/api/business/lab/cert.ts
index 2b0e682..2c99ed0 100644
--- a/src/api/business/lab/cert.ts
+++ b/src/api/business/lab/cert.ts
@@ -51,7 +51,7 @@
}
// 证书详情
-export function detail(data: object) {
+export function certificatePrintDetail(data: object) {
return request({
url: '/business/certificatePrint/detail',
method: 'post',
diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts
index 420e7b6..ebf033a 100644
--- a/src/api/business/schedule/task.ts
+++ b/src/api/business/schedule/task.ts
@@ -140,3 +140,29 @@
})
}
+// 证书监控
+export function certificateMonitorsById(data: object) {
+ return request({
+ url: '/business/certificateReport/certificateMonitorsById',
+ method: 'post',
+ data,
+ })
+}
+
+// 检定记录
+export function measureRecordsById(data: object) {
+ return request({
+ url: '/customer/sample/measureRecordsById',
+ method: 'post',
+ data,
+ })
+}
+
+// 检定证书
+export function certificateRecordsById(data: object) {
+ return request({
+ url: '/business/certificateReport/certificateRecordsById',
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/components/Sample/certificationMonitor.vue b/src/components/Sample/certificationMonitor.vue
index 16c1311..53e8373 100644
--- a/src/components/Sample/certificationMonitor.vue
+++ b/src/components/Sample/certificationMonitor.vue
@@ -1,15 +1,15 @@
@@ -324,19 +324,10 @@
-
+
@@ -349,10 +340,7 @@
@@ -360,10 +348,7 @@
@@ -371,20 +356,12 @@
-
+
-
+
@@ -397,15 +374,9 @@
-
+
-
+
查看
@@ -414,173 +385,95 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
-
+
-
-
-
-
-
@@ -588,22 +481,14 @@
-
+
-
+
@@ -613,7 +498,10 @@
无
-
+
{{ dataForm.certificateReportFile === '' ? '上传' : '更换附件' }}
@@ -624,23 +512,14 @@
-
+
diff --git a/src/api/business/lab/cert.ts b/src/api/business/lab/cert.ts
index 2b0e682..2c99ed0 100644
--- a/src/api/business/lab/cert.ts
+++ b/src/api/business/lab/cert.ts
@@ -51,7 +51,7 @@
}
// 证书详情
-export function detail(data: object) {
+export function certificatePrintDetail(data: object) {
return request({
url: '/business/certificatePrint/detail',
method: 'post',
diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts
index 420e7b6..ebf033a 100644
--- a/src/api/business/schedule/task.ts
+++ b/src/api/business/schedule/task.ts
@@ -140,3 +140,29 @@
})
}
+// 证书监控
+export function certificateMonitorsById(data: object) {
+ return request({
+ url: '/business/certificateReport/certificateMonitorsById',
+ method: 'post',
+ data,
+ })
+}
+
+// 检定记录
+export function measureRecordsById(data: object) {
+ return request({
+ url: '/customer/sample/measureRecordsById',
+ method: 'post',
+ data,
+ })
+}
+
+// 检定证书
+export function certificateRecordsById(data: object) {
+ return request({
+ url: '/business/certificateReport/certificateRecordsById',
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/components/Sample/certificationMonitor.vue b/src/components/Sample/certificationMonitor.vue
index 16c1311..53e8373 100644
--- a/src/components/Sample/certificationMonitor.vue
+++ b/src/components/Sample/certificationMonitor.vue
@@ -1,15 +1,15 @@
@@ -324,19 +324,10 @@
-
+
@@ -349,10 +340,7 @@
@@ -360,10 +348,7 @@
@@ -371,20 +356,12 @@
-
+
-
+
@@ -397,15 +374,9 @@
-
+
-
+
查看
@@ -414,173 +385,95 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
-
+
-
-
-
-
-
@@ -588,22 +481,14 @@
-
+
-
+
@@ -613,7 +498,10 @@
无
-
+
{{ dataForm.certificateReportFile === '' ? '上传' : '更换附件' }}
@@ -624,23 +512,14 @@
-
+
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index a084cc7..662da4e 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -100,9 +100,9 @@
{ text: '型号', value: 'sampleModel', width: '120', align: 'center' },
{ text: '出厂编号', value: 'manufacturingNo', width: '120', align: 'center' },
{ text: '委托书编号', value: 'orderNo', width: '120', align: 'center' },
- { text: '检校类别', value: 'measureType', width: '120', align: 'center' },
+ { text: '检校类别', value: 'measureTypeName', width: '120', align: 'center' },
{ text: '检定人员', value: 'measurePersonId', width: '120', align: 'center' },
- { text: '证书类型', value: 'certificateType', width: '120', align: 'center' },
+ { text: '证书类型', value: 'certificateTypeName', width: '120', align: 'center' },
{ text: '打印状态', value: 'printNum', align: 'center', width: '85px', filter: (row: ICerPrintList) => { var cnum = ['未打印', '一', '二', '三', '四', '五', '六', '七', '八', '九', '十']; return row.printNum == 0 ? '未打印' : `${cnum[parseInt(row.printNum as string)]}次打印` } },
{ text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
])
diff --git a/src/api/business/lab/cert.ts b/src/api/business/lab/cert.ts
index 2b0e682..2c99ed0 100644
--- a/src/api/business/lab/cert.ts
+++ b/src/api/business/lab/cert.ts
@@ -51,7 +51,7 @@
}
// 证书详情
-export function detail(data: object) {
+export function certificatePrintDetail(data: object) {
return request({
url: '/business/certificatePrint/detail',
method: 'post',
diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts
index 420e7b6..ebf033a 100644
--- a/src/api/business/schedule/task.ts
+++ b/src/api/business/schedule/task.ts
@@ -140,3 +140,29 @@
})
}
+// 证书监控
+export function certificateMonitorsById(data: object) {
+ return request({
+ url: '/business/certificateReport/certificateMonitorsById',
+ method: 'post',
+ data,
+ })
+}
+
+// 检定记录
+export function measureRecordsById(data: object) {
+ return request({
+ url: '/customer/sample/measureRecordsById',
+ method: 'post',
+ data,
+ })
+}
+
+// 检定证书
+export function certificateRecordsById(data: object) {
+ return request({
+ url: '/business/certificateReport/certificateRecordsById',
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/components/Sample/certificationMonitor.vue b/src/components/Sample/certificationMonitor.vue
index 16c1311..53e8373 100644
--- a/src/components/Sample/certificationMonitor.vue
+++ b/src/components/Sample/certificationMonitor.vue
@@ -1,15 +1,15 @@
@@ -324,19 +324,10 @@
-
+
@@ -349,10 +340,7 @@
@@ -360,10 +348,7 @@
@@ -371,20 +356,12 @@
-
+
-
+
@@ -397,15 +374,9 @@
-
+
-
+
查看
@@ -414,173 +385,95 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
-
+
-
-
-
-
-
@@ -588,22 +481,14 @@
-
+
-
+
@@ -613,7 +498,10 @@
无
-
+
{{ dataForm.certificateReportFile === '' ? '上传' : '更换附件' }}
@@ -624,23 +512,14 @@
-
+
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index a084cc7..662da4e 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -100,9 +100,9 @@
{ text: '型号', value: 'sampleModel', width: '120', align: 'center' },
{ text: '出厂编号', value: 'manufacturingNo', width: '120', align: 'center' },
{ text: '委托书编号', value: 'orderNo', width: '120', align: 'center' },
- { text: '检校类别', value: 'measureType', width: '120', align: 'center' },
+ { text: '检校类别', value: 'measureTypeName', width: '120', align: 'center' },
{ text: '检定人员', value: 'measurePersonId', width: '120', align: 'center' },
- { text: '证书类型', value: 'certificateType', width: '120', align: 'center' },
+ { text: '证书类型', value: 'certificateTypeName', width: '120', align: 'center' },
{ text: '打印状态', value: 'printNum', align: 'center', width: '85px', filter: (row: ICerPrintList) => { var cnum = ['未打印', '一', '二', '三', '四', '五', '六', '七', '八', '九', '十']; return row.printNum == 0 ? '未打印' : `${cnum[parseInt(row.printNum as string)]}次打印` } },
{ text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
])
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
index d46a204..d342a64 100644
--- a/src/views/business/schedule/task/components/distributeDialog.vue
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -45,7 +45,7 @@
sampleDetail.value.sampleName = res.data.sampleName
sampleDetail.value.mesureContent = res.data.mesureContent
sampleDetail.value.remark = res.data.remark
- sampleDetail.value.certifications = res.data.certifications
+ sampleDetail.value.certifications = res.data.certifications.split(',')
sampleDetail.value.measureProcessList = res.data.measureProcessList
sampleDetail.value.measureSendBackList = res.data.measureSendBackList
getInfoNext(res.data.measureContent)
diff --git a/src/api/business/lab/cert.ts b/src/api/business/lab/cert.ts
index 2b0e682..2c99ed0 100644
--- a/src/api/business/lab/cert.ts
+++ b/src/api/business/lab/cert.ts
@@ -51,7 +51,7 @@
}
// 证书详情
-export function detail(data: object) {
+export function certificatePrintDetail(data: object) {
return request({
url: '/business/certificatePrint/detail',
method: 'post',
diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts
index 420e7b6..ebf033a 100644
--- a/src/api/business/schedule/task.ts
+++ b/src/api/business/schedule/task.ts
@@ -140,3 +140,29 @@
})
}
+// 证书监控
+export function certificateMonitorsById(data: object) {
+ return request({
+ url: '/business/certificateReport/certificateMonitorsById',
+ method: 'post',
+ data,
+ })
+}
+
+// 检定记录
+export function measureRecordsById(data: object) {
+ return request({
+ url: '/customer/sample/measureRecordsById',
+ method: 'post',
+ data,
+ })
+}
+
+// 检定证书
+export function certificateRecordsById(data: object) {
+ return request({
+ url: '/business/certificateReport/certificateRecordsById',
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/components/Sample/certificationMonitor.vue b/src/components/Sample/certificationMonitor.vue
index 16c1311..53e8373 100644
--- a/src/components/Sample/certificationMonitor.vue
+++ b/src/components/Sample/certificationMonitor.vue
@@ -1,15 +1,15 @@
@@ -324,19 +324,10 @@
-
+
@@ -349,10 +340,7 @@
@@ -360,10 +348,7 @@
@@ -371,20 +356,12 @@
-
+
-
+
@@ -397,15 +374,9 @@
-
+
-
+
查看
@@ -414,173 +385,95 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
-
+
-
-
-
-
-
@@ -588,22 +481,14 @@
-
+
-
+
@@ -613,7 +498,10 @@
无
-
+
{{ dataForm.certificateReportFile === '' ? '上传' : '更换附件' }}
@@ -624,23 +512,14 @@
-
+
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index a084cc7..662da4e 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -100,9 +100,9 @@
{ text: '型号', value: 'sampleModel', width: '120', align: 'center' },
{ text: '出厂编号', value: 'manufacturingNo', width: '120', align: 'center' },
{ text: '委托书编号', value: 'orderNo', width: '120', align: 'center' },
- { text: '检校类别', value: 'measureType', width: '120', align: 'center' },
+ { text: '检校类别', value: 'measureTypeName', width: '120', align: 'center' },
{ text: '检定人员', value: 'measurePersonId', width: '120', align: 'center' },
- { text: '证书类型', value: 'certificateType', width: '120', align: 'center' },
+ { text: '证书类型', value: 'certificateTypeName', width: '120', align: 'center' },
{ text: '打印状态', value: 'printNum', align: 'center', width: '85px', filter: (row: ICerPrintList) => { var cnum = ['未打印', '一', '二', '三', '四', '五', '六', '七', '八', '九', '十']; return row.printNum == 0 ? '未打印' : `${cnum[parseInt(row.printNum as string)]}次打印` } },
{ text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
])
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
index d46a204..d342a64 100644
--- a/src/views/business/schedule/task/components/distributeDialog.vue
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -45,7 +45,7 @@
sampleDetail.value.sampleName = res.data.sampleName
sampleDetail.value.mesureContent = res.data.mesureContent
sampleDetail.value.remark = res.data.remark
- sampleDetail.value.certifications = res.data.certifications
+ sampleDetail.value.certifications = res.data.certifications.split(',')
sampleDetail.value.measureProcessList = res.data.measureProcessList
sampleDetail.value.measureSendBackList = res.data.measureSendBackList
getInfoNext(res.data.measureContent)
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 6503a12..50308c7 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -52,6 +52,7 @@
distributeState: string // 分发性质-初次分发、退回分发
handOutProperty: string // 分发性质-初次分发、退回分发
id?: string // 实验室id
+ customerId?: string // 客户id
}
// 实验室检测/我的检测列表
diff --git a/src/api/business/lab/cert.ts b/src/api/business/lab/cert.ts
index 2b0e682..2c99ed0 100644
--- a/src/api/business/lab/cert.ts
+++ b/src/api/business/lab/cert.ts
@@ -51,7 +51,7 @@
}
// 证书详情
-export function detail(data: object) {
+export function certificatePrintDetail(data: object) {
return request({
url: '/business/certificatePrint/detail',
method: 'post',
diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts
index 420e7b6..ebf033a 100644
--- a/src/api/business/schedule/task.ts
+++ b/src/api/business/schedule/task.ts
@@ -140,3 +140,29 @@
})
}
+// 证书监控
+export function certificateMonitorsById(data: object) {
+ return request({
+ url: '/business/certificateReport/certificateMonitorsById',
+ method: 'post',
+ data,
+ })
+}
+
+// 检定记录
+export function measureRecordsById(data: object) {
+ return request({
+ url: '/customer/sample/measureRecordsById',
+ method: 'post',
+ data,
+ })
+}
+
+// 检定证书
+export function certificateRecordsById(data: object) {
+ return request({
+ url: '/business/certificateReport/certificateRecordsById',
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/components/Sample/certificationMonitor.vue b/src/components/Sample/certificationMonitor.vue
index 16c1311..53e8373 100644
--- a/src/components/Sample/certificationMonitor.vue
+++ b/src/components/Sample/certificationMonitor.vue
@@ -1,15 +1,15 @@
@@ -324,19 +324,10 @@
-
+
@@ -349,10 +340,7 @@
@@ -360,10 +348,7 @@
@@ -371,20 +356,12 @@
-
+
-
+
@@ -397,15 +374,9 @@
-
+
-
+
查看
@@ -414,173 +385,95 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
-
+
-
-
-
-
-
@@ -588,22 +481,14 @@
-
+
-
+
@@ -613,7 +498,10 @@
无
-
+
{{ dataForm.certificateReportFile === '' ? '上传' : '更换附件' }}
@@ -624,23 +512,14 @@
-
+
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index a084cc7..662da4e 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -100,9 +100,9 @@
{ text: '型号', value: 'sampleModel', width: '120', align: 'center' },
{ text: '出厂编号', value: 'manufacturingNo', width: '120', align: 'center' },
{ text: '委托书编号', value: 'orderNo', width: '120', align: 'center' },
- { text: '检校类别', value: 'measureType', width: '120', align: 'center' },
+ { text: '检校类别', value: 'measureTypeName', width: '120', align: 'center' },
{ text: '检定人员', value: 'measurePersonId', width: '120', align: 'center' },
- { text: '证书类型', value: 'certificateType', width: '120', align: 'center' },
+ { text: '证书类型', value: 'certificateTypeName', width: '120', align: 'center' },
{ text: '打印状态', value: 'printNum', align: 'center', width: '85px', filter: (row: ICerPrintList) => { var cnum = ['未打印', '一', '二', '三', '四', '五', '六', '七', '八', '九', '十']; return row.printNum == 0 ? '未打印' : `${cnum[parseInt(row.printNum as string)]}次打印` } },
{ text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
])
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
index d46a204..d342a64 100644
--- a/src/views/business/schedule/task/components/distributeDialog.vue
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -45,7 +45,7 @@
sampleDetail.value.sampleName = res.data.sampleName
sampleDetail.value.mesureContent = res.data.mesureContent
sampleDetail.value.remark = res.data.remark
- sampleDetail.value.certifications = res.data.certifications
+ sampleDetail.value.certifications = res.data.certifications.split(',')
sampleDetail.value.measureProcessList = res.data.measureProcessList
sampleDetail.value.measureSendBackList = res.data.measureSendBackList
getInfoNext(res.data.measureContent)
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 6503a12..50308c7 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -52,6 +52,7 @@
distributeState: string // 分发性质-初次分发、退回分发
handOutProperty: string // 分发性质-初次分发、退回分发
id?: string // 实验室id
+ customerId?: string // 客户id
}
// 实验室检测/我的检测列表
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 1d1e04f..d8fc8e3 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -22,6 +22,7 @@
const loading = ref(false) // 表单加载状态
const sampleId = ref('') // 样品详情id
const orderId = ref('') // 委托书id
+const customerId = ref('') // 客户id
const mesureCategoryList = ref([]) // 校检类别
const mesureTypeList = ref([]) // 检定方式
@@ -274,6 +275,7 @@
if ($route.params.id) {
sampleId.value = $route.params.id as string
orderId.value = $route.query.order as string
+ customerId.value = $route.query.customerId as string
// 获取分发详情
getInfo()
// getSampleInfo() // 取消
@@ -530,7 +532,7 @@
:disabled="roleType === 'detail'"
:class="{ 'detail-input': roleType === 'detail' }"
>
-
+
扫描
@@ -583,11 +585,11 @@
-
+
-
+
-
+
diff --git a/src/api/business/lab/cert.ts b/src/api/business/lab/cert.ts
index 2b0e682..2c99ed0 100644
--- a/src/api/business/lab/cert.ts
+++ b/src/api/business/lab/cert.ts
@@ -51,7 +51,7 @@
}
// 证书详情
-export function detail(data: object) {
+export function certificatePrintDetail(data: object) {
return request({
url: '/business/certificatePrint/detail',
method: 'post',
diff --git a/src/api/business/schedule/task.ts b/src/api/business/schedule/task.ts
index 420e7b6..ebf033a 100644
--- a/src/api/business/schedule/task.ts
+++ b/src/api/business/schedule/task.ts
@@ -140,3 +140,29 @@
})
}
+// 证书监控
+export function certificateMonitorsById(data: object) {
+ return request({
+ url: '/business/certificateReport/certificateMonitorsById',
+ method: 'post',
+ data,
+ })
+}
+
+// 检定记录
+export function measureRecordsById(data: object) {
+ return request({
+ url: '/customer/sample/measureRecordsById',
+ method: 'post',
+ data,
+ })
+}
+
+// 检定证书
+export function certificateRecordsById(data: object) {
+ return request({
+ url: '/business/certificateReport/certificateRecordsById',
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/components/Sample/certificationMonitor.vue b/src/components/Sample/certificationMonitor.vue
index 16c1311..53e8373 100644
--- a/src/components/Sample/certificationMonitor.vue
+++ b/src/components/Sample/certificationMonitor.vue
@@ -1,15 +1,15 @@
@@ -324,19 +324,10 @@
-
+
@@ -349,10 +340,7 @@
@@ -360,10 +348,7 @@
@@ -371,20 +356,12 @@
-
+
-
+
@@ -397,15 +374,9 @@
-
+
-
+
查看
@@ -414,173 +385,95 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
-
+
-
-
-
-
-
@@ -588,22 +481,14 @@
-
+
-
+
@@ -613,7 +498,10 @@
无
-
+
{{ dataForm.certificateReportFile === '' ? '上传' : '更换附件' }}
@@ -624,23 +512,14 @@
-
+
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index a084cc7..662da4e 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -100,9 +100,9 @@
{ text: '型号', value: 'sampleModel', width: '120', align: 'center' },
{ text: '出厂编号', value: 'manufacturingNo', width: '120', align: 'center' },
{ text: '委托书编号', value: 'orderNo', width: '120', align: 'center' },
- { text: '检校类别', value: 'measureType', width: '120', align: 'center' },
+ { text: '检校类别', value: 'measureTypeName', width: '120', align: 'center' },
{ text: '检定人员', value: 'measurePersonId', width: '120', align: 'center' },
- { text: '证书类型', value: 'certificateType', width: '120', align: 'center' },
+ { text: '证书类型', value: 'certificateTypeName', width: '120', align: 'center' },
{ text: '打印状态', value: 'printNum', align: 'center', width: '85px', filter: (row: ICerPrintList) => { var cnum = ['未打印', '一', '二', '三', '四', '五', '六', '七', '八', '九', '十']; return row.printNum == 0 ? '未打印' : `${cnum[parseInt(row.printNum as string)]}次打印` } },
{ text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
])
diff --git a/src/views/business/schedule/task/components/distributeDialog.vue b/src/views/business/schedule/task/components/distributeDialog.vue
index d46a204..d342a64 100644
--- a/src/views/business/schedule/task/components/distributeDialog.vue
+++ b/src/views/business/schedule/task/components/distributeDialog.vue
@@ -45,7 +45,7 @@
sampleDetail.value.sampleName = res.data.sampleName
sampleDetail.value.mesureContent = res.data.mesureContent
sampleDetail.value.remark = res.data.remark
- sampleDetail.value.certifications = res.data.certifications
+ sampleDetail.value.certifications = res.data.certifications.split(',')
sampleDetail.value.measureProcessList = res.data.measureProcessList
sampleDetail.value.measureSendBackList = res.data.measureSendBackList
getInfoNext(res.data.measureContent)
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 6503a12..50308c7 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -52,6 +52,7 @@
distributeState: string // 分发性质-初次分发、退回分发
handOutProperty: string // 分发性质-初次分发、退回分发
id?: string // 实验室id
+ customerId?: string // 客户id
}
// 实验室检测/我的检测列表
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 1d1e04f..d8fc8e3 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -22,6 +22,7 @@
const loading = ref(false) // 表单加载状态
const sampleId = ref('') // 样品详情id
const orderId = ref('') // 委托书id
+const customerId = ref('') // 客户id
const mesureCategoryList = ref([]) // 校检类别
const mesureTypeList = ref([]) // 检定方式
@@ -274,6 +275,7 @@
if ($route.params.id) {
sampleId.value = $route.params.id as string
orderId.value = $route.query.order as string
+ customerId.value = $route.query.customerId as string
// 获取分发详情
getInfo()
// getSampleInfo() // 取消
@@ -530,7 +532,7 @@
:disabled="roleType === 'detail'"
:class="{ 'detail-input': roleType === 'detail' }"
>
-
+
扫描
@@ -583,11 +585,11 @@
-
+
-
+
-
+
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index 99a6852..dfbbf6a 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -81,8 +81,7 @@
{ text: '应检完时间', value: 'requireOverTime', align: 'center', width: '165px' },
{ text: '样品属性', value: 'sampleBelongName', width: '100', align: 'center' },
{ text: '当前检定环节', value: 'currentSegment', align: 'center', width: '90' },
- { text: '证书出具', value: 'certificationState', align: 'center', width: '90', filter: (row: ITaskList) => { return row.alreadyCertifications ? `${row.alreadyCertifications}/${row.requireCertifications}` : '0/0' } },
- { text: '分发性质', value: 'handOutProperty', align: 'center', width: '90px' },
+ { text: '证书出具', value: 'certificationState', align: 'center', width: '90', filter: (row: ITaskList) => { return `${row.alreadyCertifications}/${row.requireCertifications}` } },
])
// 表格数据
const list = ref([])
@@ -101,6 +100,7 @@
listQuery.value.offset = 1
}
listQuery.value.sampleStatus = active.value || '2'
+ list.value = []
getTaskList(listQuery.value).then((response) => {
list.value = response.data.rows.map((item: ITaskList) => {
item.isUrgentName = item.isUrgent == 1 ? '是' : '否'
@@ -141,7 +141,8 @@
// 点击详情
const handleDetail = (row: ITaskList) => {
console.log('跳转任务分发详情')
- $router.push(`/schedule/task/distribute/${row.sampleId}?order=${row.orderId}`)
+ // $router.push(`/schedule/task/distribute/${row.sampleId}?order=${row.orderId}&customerId=${row.customerId}`)
+ $router.push(`/schedule/task/detail/${row.sampleId}?order=${row.orderId}&customerId=${row.customerId}`)
}
// 点击分发, 弹窗
@@ -316,6 +317,12 @@
+
+
+
+ {{ row.handOutProperty }}
+
+