diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 7005697..af31676 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -353,6 +353,7 @@
processId: data.processId,
row: JSON.stringify(data),
originalRecordId: row.originalRecordId,
+ flag: 'myMeasureList',
// processId: data.processId,
},
})
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 7005697..af31676 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -353,6 +353,7 @@
processId: data.processId,
row: JSON.stringify(data),
originalRecordId: row.originalRecordId,
+ flag: 'myMeasureList',
// processId: data.processId,
},
})
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 61dffe9..e645014 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -132,7 +132,10 @@
if ($route.params && $route.params.type) {
pageType.value = $route.params.type as string
infoId.value = $route.params.id as string
- if (pageType.value === 'add') {
+ if ($route.query.flag) {
+ buttonArray.value = ['提交', '保存']
+ }
+ else if (pageType.value === 'add') {
buttonArray.value = ['提交', '保存']
}
else if (pageType.value === 'edit') {
@@ -367,7 +370,9 @@
failUpdateReport(formInline.value).then((res) => {
if (res.code === 200) {
ElMessage.success('保存成功')
- close()
+ if (!$route.query.flag) {
+ close()
+ }
}
})
}
@@ -375,7 +380,12 @@
draftUpdateReport(formInline.value).then((res) => {
if (res.code === 200) {
ElMessage.success('保存成功')
- close()
+ if (!$route.query.flag) {
+ close()
+ }
+ else {
+ addId.value = formInline.value.id
+ }
}
})
}
@@ -423,16 +433,16 @@
const approvalRecordData = ref([]) // 审批流程数据
const approvalDialog = ref() // 审批对话ref
// 查询审批记录
-function getApprovalRecord(processId: string) {
- if (processId) {
- fetchApproval(processId).then((res) => {
- approvalRecordData.value = res.data
- })
- }
- else {
- ElMessage.warning('流程实例id为空')
- }
-}
+// function getApprovalRecord(processId: string) {
+// if (processId) {
+// fetchApproval(processId).then((res) => {
+// approvalRecordData.value = res.data
+// })
+// }
+// else {
+// ElMessage.warning('流程实例id为空')
+// }
+// }
// 审批结束回调
const approvalSuccess = () => {
close() // 返回上一页
@@ -608,9 +618,9 @@
formInline.value.processId = JSON.parse($route.query?.row as string).processId // 流程实例id
formInline.value.processInstanceId = JSON.parse($route.query?.row as string).processInstanceId // 流程实例id(取消操作使用)
approvalStatusName.value = JSON.parse($route.query?.row as string).approvalStatusName
- if (approvalStatusName.value !== '草稿箱') {
- getApprovalRecord(formInline.value.processId) // 查询审批记录
- }
+ // if (approvalStatusName.value !== '草稿箱') {
+ // getApprovalRecord(formInline.value.processId) // 查询审批记录
+ // }
console.log('000000', formInline.value.taskId)
}
else {
@@ -1155,7 +1165,7 @@
-
+