diff --git a/src/views/equipement/info/book/components/certificate.vue b/src/views/equipement/info/book/components/certificate.vue
index a4da51c..71e49b1 100644
--- a/src/views/equipement/info/book/components/certificate.vue
+++ b/src/views/equipement/info/book/components/certificate.vue
@@ -72,7 +72,7 @@
// 点击证书编号
const handleClickFollowLink = (row: any, title: string) => {
$router.push({
- path: `/source/resultConfirmDoc/detail/${row.equipmentId}`,
+ path: `/source/resultConfirmDoc/detail/${row.confirmId}`,
query: {
approvalStatusName: '全部', // 审批状态名称
},
diff --git a/src/views/equipement/info/book/components/certificate.vue b/src/views/equipement/info/book/components/certificate.vue
index a4da51c..71e49b1 100644
--- a/src/views/equipement/info/book/components/certificate.vue
+++ b/src/views/equipement/info/book/components/certificate.vue
@@ -72,7 +72,7 @@
// 点击证书编号
const handleClickFollowLink = (row: any, title: string) => {
$router.push({
- path: `/source/resultConfirmDoc/detail/${row.equipmentId}`,
+ path: `/source/resultConfirmDoc/detail/${row.confirmId}`,
query: {
approvalStatusName: '全部', // 审批状态名称
},
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index a416411..c64d28d 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -832,7 +832,7 @@
*{{ item.text }}
-
+
测试
@@ -843,7 +843,7 @@
检定
-
+
是
@@ -863,7 +863,6 @@
{{ scope.row.certificateFile === '' ? '上传' : '更换附件' }}
- {{ scope.row[item.value] }}
diff --git a/src/views/equipement/info/book/components/certificate.vue b/src/views/equipement/info/book/components/certificate.vue
index a4da51c..71e49b1 100644
--- a/src/views/equipement/info/book/components/certificate.vue
+++ b/src/views/equipement/info/book/components/certificate.vue
@@ -72,7 +72,7 @@
// 点击证书编号
const handleClickFollowLink = (row: any, title: string) => {
$router.push({
- path: `/source/resultConfirmDoc/detail/${row.equipmentId}`,
+ path: `/source/resultConfirmDoc/detail/${row.confirmId}`,
query: {
approvalStatusName: '全部', // 审批状态名称
},
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index a416411..c64d28d 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -832,7 +832,7 @@
*{{ item.text }}
-
+
测试
@@ -843,7 +843,7 @@
检定
-
+
是
@@ -863,7 +863,6 @@
{{ scope.row.certificateFile === '' ? '上传' : '更换附件' }}
- {{ scope.row[item.value] }}
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index b89c20b..8287ea4 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -572,14 +572,14 @@
}
// ------------------------------------------钩子------------------------------------------------
-watch(dateRange, (val) => {
+watch(dateRange, (val) => { // 检定有效期
if (val) {
- listQuery.value.createTimeStart = `${val[0]}`
- listQuery.value.createTimeEnd = `${val[1]}`
+ listQuery.value.measureValidDateStart = `${val[0]}`
+ listQuery.value.measureValidDateEnd = `${val[1]}`
}
else {
- listQuery.value.createTimeStart = ''
- listQuery.value.createTimeEnd = ''
+ listQuery.value.measureValidDateStart = ''
+ listQuery.value.measureValidDateEnd = ''
}
})
watch(planTraceTimeDateRange, (val) => {
@@ -760,7 +760,7 @@
diff --git a/src/views/equipement/info/book/components/certificate.vue b/src/views/equipement/info/book/components/certificate.vue
index a4da51c..71e49b1 100644
--- a/src/views/equipement/info/book/components/certificate.vue
+++ b/src/views/equipement/info/book/components/certificate.vue
@@ -72,7 +72,7 @@
// 点击证书编号
const handleClickFollowLink = (row: any, title: string) => {
$router.push({
- path: `/source/resultConfirmDoc/detail/${row.equipmentId}`,
+ path: `/source/resultConfirmDoc/detail/${row.confirmId}`,
query: {
approvalStatusName: '全部', // 审批状态名称
},
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index a416411..c64d28d 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -832,7 +832,7 @@
*{{ item.text }}
-
+
测试
@@ -843,7 +843,7 @@
检定
-
+
是
@@ -863,7 +863,6 @@
{{ scope.row.certificateFile === '' ? '上传' : '更换附件' }}
- {{ scope.row[item.value] }}
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index b89c20b..8287ea4 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -572,14 +572,14 @@
}
// ------------------------------------------钩子------------------------------------------------
-watch(dateRange, (val) => {
+watch(dateRange, (val) => { // 检定有效期
if (val) {
- listQuery.value.createTimeStart = `${val[0]}`
- listQuery.value.createTimeEnd = `${val[1]}`
+ listQuery.value.measureValidDateStart = `${val[0]}`
+ listQuery.value.measureValidDateEnd = `${val[1]}`
}
else {
- listQuery.value.createTimeStart = ''
- listQuery.value.createTimeEnd = ''
+ listQuery.value.measureValidDateStart = ''
+ listQuery.value.measureValidDateEnd = ''
}
})
watch(planTraceTimeDateRange, (val) => {
@@ -760,7 +760,7 @@
diff --git a/src/views/resource/file/approval/detail.vue b/src/views/resource/file/approval/detail.vue
index 30db4bc..bc911df 100644
--- a/src/views/resource/file/approval/detail.vue
+++ b/src/views/resource/file/approval/detail.vue
@@ -380,7 +380,6 @@
approvalStatusName.value = params.approvalStatusName
processId.value = params.processId// 流程实例id
taskId.value = params.taskId// 任务id
-
switch (params.type) {
case 'add' :
approvalForm.value.createUserId = userInfo.id
@@ -444,7 +443,7 @@
编辑
-
+
保存
@@ -491,7 +490,7 @@
-
+
选择
diff --git a/src/views/equipement/info/book/components/certificate.vue b/src/views/equipement/info/book/components/certificate.vue
index a4da51c..71e49b1 100644
--- a/src/views/equipement/info/book/components/certificate.vue
+++ b/src/views/equipement/info/book/components/certificate.vue
@@ -72,7 +72,7 @@
// 点击证书编号
const handleClickFollowLink = (row: any, title: string) => {
$router.push({
- path: `/source/resultConfirmDoc/detail/${row.equipmentId}`,
+ path: `/source/resultConfirmDoc/detail/${row.confirmId}`,
query: {
approvalStatusName: '全部', // 审批状态名称
},
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index a416411..c64d28d 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -832,7 +832,7 @@
*{{ item.text }}
-
+
测试
@@ -843,7 +843,7 @@
检定
-
+
是
@@ -863,7 +863,6 @@
{{ scope.row.certificateFile === '' ? '上传' : '更换附件' }}
- {{ scope.row[item.value] }}
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index b89c20b..8287ea4 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -572,14 +572,14 @@
}
// ------------------------------------------钩子------------------------------------------------
-watch(dateRange, (val) => {
+watch(dateRange, (val) => { // 检定有效期
if (val) {
- listQuery.value.createTimeStart = `${val[0]}`
- listQuery.value.createTimeEnd = `${val[1]}`
+ listQuery.value.measureValidDateStart = `${val[0]}`
+ listQuery.value.measureValidDateEnd = `${val[1]}`
}
else {
- listQuery.value.createTimeStart = ''
- listQuery.value.createTimeEnd = ''
+ listQuery.value.measureValidDateStart = ''
+ listQuery.value.measureValidDateEnd = ''
}
})
watch(planTraceTimeDateRange, (val) => {
@@ -760,7 +760,7 @@
diff --git a/src/views/resource/file/approval/detail.vue b/src/views/resource/file/approval/detail.vue
index 30db4bc..bc911df 100644
--- a/src/views/resource/file/approval/detail.vue
+++ b/src/views/resource/file/approval/detail.vue
@@ -380,7 +380,6 @@
approvalStatusName.value = params.approvalStatusName
processId.value = params.processId// 流程实例id
taskId.value = params.taskId// 任务id
-
switch (params.type) {
case 'add' :
approvalForm.value.createUserId = userInfo.id
@@ -444,7 +443,7 @@
编辑
-
+
保存
@@ -491,7 +490,7 @@
-
+
选择
diff --git a/src/views/resource/file/approval/list.vue b/src/views/resource/file/approval/list.vue
index cf6ad61..ca2d678 100644
--- a/src/views/resource/file/approval/list.vue
+++ b/src/views/resource/file/approval/list.vue
@@ -529,7 +529,7 @@
-
+
diff --git a/src/views/equipement/info/book/components/certificate.vue b/src/views/equipement/info/book/components/certificate.vue
index a4da51c..71e49b1 100644
--- a/src/views/equipement/info/book/components/certificate.vue
+++ b/src/views/equipement/info/book/components/certificate.vue
@@ -72,7 +72,7 @@
// 点击证书编号
const handleClickFollowLink = (row: any, title: string) => {
$router.push({
- path: `/source/resultConfirmDoc/detail/${row.equipmentId}`,
+ path: `/source/resultConfirmDoc/detail/${row.confirmId}`,
query: {
approvalStatusName: '全部', // 审批状态名称
},
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index a416411..c64d28d 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -832,7 +832,7 @@
*{{ item.text }}
-
+
测试
@@ -843,7 +843,7 @@
检定
-
+
是
@@ -863,7 +863,6 @@
{{ scope.row.certificateFile === '' ? '上传' : '更换附件' }}
- {{ scope.row[item.value] }}
diff --git a/src/views/equipement/source/resultConfirm/list.vue b/src/views/equipement/source/resultConfirm/list.vue
index b89c20b..8287ea4 100644
--- a/src/views/equipement/source/resultConfirm/list.vue
+++ b/src/views/equipement/source/resultConfirm/list.vue
@@ -572,14 +572,14 @@
}
// ------------------------------------------钩子------------------------------------------------
-watch(dateRange, (val) => {
+watch(dateRange, (val) => { // 检定有效期
if (val) {
- listQuery.value.createTimeStart = `${val[0]}`
- listQuery.value.createTimeEnd = `${val[1]}`
+ listQuery.value.measureValidDateStart = `${val[0]}`
+ listQuery.value.measureValidDateEnd = `${val[1]}`
}
else {
- listQuery.value.createTimeStart = ''
- listQuery.value.createTimeEnd = ''
+ listQuery.value.measureValidDateStart = ''
+ listQuery.value.measureValidDateEnd = ''
}
})
watch(planTraceTimeDateRange, (val) => {
@@ -760,7 +760,7 @@
diff --git a/src/views/resource/file/approval/detail.vue b/src/views/resource/file/approval/detail.vue
index 30db4bc..bc911df 100644
--- a/src/views/resource/file/approval/detail.vue
+++ b/src/views/resource/file/approval/detail.vue
@@ -380,7 +380,6 @@
approvalStatusName.value = params.approvalStatusName
processId.value = params.processId// 流程实例id
taskId.value = params.taskId// 任务id
-
switch (params.type) {
case 'add' :
approvalForm.value.createUserId = userInfo.id
@@ -444,7 +443,7 @@
编辑
-
+
保存
@@ -491,7 +490,7 @@
-
+
选择
diff --git a/src/views/resource/file/approval/list.vue b/src/views/resource/file/approval/list.vue
index cf6ad61..ca2d678 100644
--- a/src/views/resource/file/approval/list.vue
+++ b/src/views/resource/file/approval/list.vue
@@ -529,7 +529,7 @@
-
+
diff --git a/src/views/resource/person/trainSign/detail.vue b/src/views/resource/person/trainSign/detail.vue
index da66e14..7ff6346 100644
--- a/src/views/resource/person/trainSign/detail.vue
+++ b/src/views/resource/person/trainSign/detail.vue
@@ -453,7 +453,10 @@
initDialog(route.query)
// 从工作台跳转过来需要调签到接口
- confirm()
+ const lastPage = `${router.options.history.state.back}` // 上一页的路径
+ if (lastPage.includes('workbench') && route.query.fromWorkBench === 'work') { // 从工作台来跳转过来显示编辑标准库按钮
+ confirm()
+ }
})