diff --git a/src/views/quality/correct/handle/components/edit.vue b/src/views/quality/correct/handle/components/edit.vue index 0a5527d..d9ce889 100644 --- a/src/views/quality/correct/handle/components/edit.vue +++ b/src/views/quality/correct/handle/components/edit.vue @@ -235,7 +235,7 @@ assignees: data, }).then(() => { ElMessage.success('提交成功') - $router.go(-1) + close() }) } // // 点击提交 @@ -265,27 +265,32 @@ if (approvalStatusName === '草稿箱') { draftDelete({ id: ruleForm.value.id }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } else if (approvalStatusName === '已取消') { approvalDelete({ id: ruleForm.value.id, taskId: ruleForm.value.taskId }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } else if (approvalStatusName === '全部') { // 全部的删除 delteQualityCorrect({ id: ruleForm.value.id }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } } // 关闭页面 function close() { - $router.push({ - path: '/correct/correcthandle', - }) + if ($route.query.data) { + $router.go(-1) + } + else { + $router.push({ + path: '/correct/correcthandle', + }) + } } const showMenu = ref('基本信息') defineExpose({ diff --git a/src/views/quality/correct/handle/components/edit.vue b/src/views/quality/correct/handle/components/edit.vue index 0a5527d..d9ce889 100644 --- a/src/views/quality/correct/handle/components/edit.vue +++ b/src/views/quality/correct/handle/components/edit.vue @@ -235,7 +235,7 @@ assignees: data, }).then(() => { ElMessage.success('提交成功') - $router.go(-1) + close() }) } // // 点击提交 @@ -265,27 +265,32 @@ if (approvalStatusName === '草稿箱') { draftDelete({ id: ruleForm.value.id }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } else if (approvalStatusName === '已取消') { approvalDelete({ id: ruleForm.value.id, taskId: ruleForm.value.taskId }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } else if (approvalStatusName === '全部') { // 全部的删除 delteQualityCorrect({ id: ruleForm.value.id }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } } // 关闭页面 function close() { - $router.push({ - path: '/correct/correcthandle', - }) + if ($route.query.data) { + $router.go(-1) + } + else { + $router.push({ + path: '/correct/correcthandle', + }) + } } const showMenu = ref('基本信息') defineExpose({ diff --git a/src/views/quality/internal/inspect/components/edit.vue b/src/views/quality/internal/inspect/components/edit.vue index eaf4488..1495395 100644 --- a/src/views/quality/internal/inspect/components/edit.vue +++ b/src/views/quality/internal/inspect/components/edit.vue @@ -46,6 +46,14 @@ ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm') // 记录时间 ruleForm.value.creator = userStore.id ruleForm.value.creatorName = userStore.name + // 自动填充数据 + if ($route.query.data) { + const data = JSON.parse($route.query.data as string) + console.log(data, 'data') + ruleForm.value.yearNum = data.yearNum + ruleForm.value.yearTime = data.yearTime + ruleForm.value.bizLabCode = data.bizLabCode + } } else { detailQualityInspect({ id: $route.query.id as string }).then((res) => { @@ -289,27 +297,32 @@ if (approvalStatusName === '草稿箱') { draftDelete({ id: ruleForm.value.id }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } else if (approvalStatusName === '已取消') { approvalDelete({ id: ruleForm.value.id, taskId: ruleForm.value.taskId }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } else if (approvalStatusName === '全部') { // 全部的删除 delteQualityInspect({ id: ruleForm.value.id }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } } // 关闭页面 function close() { - $router.push({ - path: '/internal/internalinspect', - }) + if ($route.query.data) { + $router.go(-1) + } + else { + $router.push({ + path: '/internal/internalinspect', + }) + } } const showMenu = ref('基本信息') defineExpose({ diff --git a/src/views/quality/correct/handle/components/edit.vue b/src/views/quality/correct/handle/components/edit.vue index 0a5527d..d9ce889 100644 --- a/src/views/quality/correct/handle/components/edit.vue +++ b/src/views/quality/correct/handle/components/edit.vue @@ -235,7 +235,7 @@ assignees: data, }).then(() => { ElMessage.success('提交成功') - $router.go(-1) + close() }) } // // 点击提交 @@ -265,27 +265,32 @@ if (approvalStatusName === '草稿箱') { draftDelete({ id: ruleForm.value.id }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } else if (approvalStatusName === '已取消') { approvalDelete({ id: ruleForm.value.id, taskId: ruleForm.value.taskId }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } else if (approvalStatusName === '全部') { // 全部的删除 delteQualityCorrect({ id: ruleForm.value.id }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } } // 关闭页面 function close() { - $router.push({ - path: '/correct/correcthandle', - }) + if ($route.query.data) { + $router.go(-1) + } + else { + $router.push({ + path: '/correct/correcthandle', + }) + } } const showMenu = ref('基本信息') defineExpose({ diff --git a/src/views/quality/internal/inspect/components/edit.vue b/src/views/quality/internal/inspect/components/edit.vue index eaf4488..1495395 100644 --- a/src/views/quality/internal/inspect/components/edit.vue +++ b/src/views/quality/internal/inspect/components/edit.vue @@ -46,6 +46,14 @@ ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm') // 记录时间 ruleForm.value.creator = userStore.id ruleForm.value.creatorName = userStore.name + // 自动填充数据 + if ($route.query.data) { + const data = JSON.parse($route.query.data as string) + console.log(data, 'data') + ruleForm.value.yearNum = data.yearNum + ruleForm.value.yearTime = data.yearTime + ruleForm.value.bizLabCode = data.bizLabCode + } } else { detailQualityInspect({ id: $route.query.id as string }).then((res) => { @@ -289,27 +297,32 @@ if (approvalStatusName === '草稿箱') { draftDelete({ id: ruleForm.value.id }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } else if (approvalStatusName === '已取消') { approvalDelete({ id: ruleForm.value.id, taskId: ruleForm.value.taskId }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } else if (approvalStatusName === '全部') { // 全部的删除 delteQualityInspect({ id: ruleForm.value.id }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } } // 关闭页面 function close() { - $router.push({ - path: '/internal/internalinspect', - }) + if ($route.query.data) { + $router.go(-1) + } + else { + $router.push({ + path: '/internal/internalinspect', + }) + } } const showMenu = ref('基本信息') defineExpose({ diff --git a/src/views/quality/internal/registration/components/edit.vue b/src/views/quality/internal/registration/components/edit.vue index 612deeb..f8ebe39 100644 --- a/src/views/quality/internal/registration/components/edit.vue +++ b/src/views/quality/internal/registration/components/edit.vue @@ -149,6 +149,14 @@ ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm') ruleForm.value.creatorId = userStore.id ruleForm.value.creatorName = userStore.name + // 自动填充数据 + if ($route.query.data) { + const data = JSON.parse($route.query.data as string) + console.log(data, 'data') + ruleForm.value.yearNum = data.yearNum + ruleForm.value.yearTime = data.yearTime + ruleForm.value.bizLabCode = data.bizLabCode + } } else { // 获取详情 @@ -366,27 +374,32 @@ if (approvalStatusName === '草稿箱') { draftDelete({ id: ruleForm.value.id }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } else if (approvalStatusName === '已取消') { approvalDelete({ id: ruleForm.value.id, taskId: ruleForm.value.taskId }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } else if (approvalStatusName === '全部') { // 全部的删除 delteQualityRegistration({ id: ruleForm.value.id }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } } // 关闭页面 function close() { - $router.push({ - path: '/internal/internalregistration', - }) + if ($route.query.data) { + $router.go(-1) + } + else { + $router.push({ + path: '/internal/internalregistration', + }) + } } const showMenu = ref('基本信息') defineExpose({ diff --git a/src/views/quality/correct/handle/components/edit.vue b/src/views/quality/correct/handle/components/edit.vue index 0a5527d..d9ce889 100644 --- a/src/views/quality/correct/handle/components/edit.vue +++ b/src/views/quality/correct/handle/components/edit.vue @@ -235,7 +235,7 @@ assignees: data, }).then(() => { ElMessage.success('提交成功') - $router.go(-1) + close() }) } // // 点击提交 @@ -265,27 +265,32 @@ if (approvalStatusName === '草稿箱') { draftDelete({ id: ruleForm.value.id }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } else if (approvalStatusName === '已取消') { approvalDelete({ id: ruleForm.value.id, taskId: ruleForm.value.taskId }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } else if (approvalStatusName === '全部') { // 全部的删除 delteQualityCorrect({ id: ruleForm.value.id }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } } // 关闭页面 function close() { - $router.push({ - path: '/correct/correcthandle', - }) + if ($route.query.data) { + $router.go(-1) + } + else { + $router.push({ + path: '/correct/correcthandle', + }) + } } const showMenu = ref('基本信息') defineExpose({ diff --git a/src/views/quality/internal/inspect/components/edit.vue b/src/views/quality/internal/inspect/components/edit.vue index eaf4488..1495395 100644 --- a/src/views/quality/internal/inspect/components/edit.vue +++ b/src/views/quality/internal/inspect/components/edit.vue @@ -46,6 +46,14 @@ ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm') // 记录时间 ruleForm.value.creator = userStore.id ruleForm.value.creatorName = userStore.name + // 自动填充数据 + if ($route.query.data) { + const data = JSON.parse($route.query.data as string) + console.log(data, 'data') + ruleForm.value.yearNum = data.yearNum + ruleForm.value.yearTime = data.yearTime + ruleForm.value.bizLabCode = data.bizLabCode + } } else { detailQualityInspect({ id: $route.query.id as string }).then((res) => { @@ -289,27 +297,32 @@ if (approvalStatusName === '草稿箱') { draftDelete({ id: ruleForm.value.id }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } else if (approvalStatusName === '已取消') { approvalDelete({ id: ruleForm.value.id, taskId: ruleForm.value.taskId }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } else if (approvalStatusName === '全部') { // 全部的删除 delteQualityInspect({ id: ruleForm.value.id }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } } // 关闭页面 function close() { - $router.push({ - path: '/internal/internalinspect', - }) + if ($route.query.data) { + $router.go(-1) + } + else { + $router.push({ + path: '/internal/internalinspect', + }) + } } const showMenu = ref('基本信息') defineExpose({ diff --git a/src/views/quality/internal/registration/components/edit.vue b/src/views/quality/internal/registration/components/edit.vue index 612deeb..f8ebe39 100644 --- a/src/views/quality/internal/registration/components/edit.vue +++ b/src/views/quality/internal/registration/components/edit.vue @@ -149,6 +149,14 @@ ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm') ruleForm.value.creatorId = userStore.id ruleForm.value.creatorName = userStore.name + // 自动填充数据 + if ($route.query.data) { + const data = JSON.parse($route.query.data as string) + console.log(data, 'data') + ruleForm.value.yearNum = data.yearNum + ruleForm.value.yearTime = data.yearTime + ruleForm.value.bizLabCode = data.bizLabCode + } } else { // 获取详情 @@ -366,27 +374,32 @@ if (approvalStatusName === '草稿箱') { draftDelete({ id: ruleForm.value.id }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } else if (approvalStatusName === '已取消') { approvalDelete({ id: ruleForm.value.id, taskId: ruleForm.value.taskId }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } else if (approvalStatusName === '全部') { // 全部的删除 delteQualityRegistration({ id: ruleForm.value.id }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } } // 关闭页面 function close() { - $router.push({ - path: '/internal/internalregistration', - }) + if ($route.query.data) { + $router.go(-1) + } + else { + $router.push({ + path: '/internal/internalregistration', + }) + } } const showMenu = ref('基本信息') defineExpose({ diff --git a/src/views/quality/internal/report/components/edit.vue b/src/views/quality/internal/report/components/edit.vue index 0519727..cd5eeda 100644 --- a/src/views/quality/internal/report/components/edit.vue +++ b/src/views/quality/internal/report/components/edit.vue @@ -62,6 +62,14 @@ // ruleForm.value.beginTime = dayjs().format('YYYY-MM-DD') ruleForm.value.creator = userStore.id ruleForm.value.creatorName = userStore.name + // 自动填充数据 + if ($route.query.data) { + const data = JSON.parse($route.query.data as string) + console.log(data, 'data') + ruleForm.value.yearNum = data.yearNum + ruleForm.value.yearTime = data.yearTime + ruleForm.value.bizLabCode = data.bizLabCode + } } else { detailQualityReport({ id: $route.query.id as string }).then((res) => { @@ -306,27 +314,32 @@ if (approvalStatusName === '草稿箱') { draftDelete({ id: ruleForm.value.id }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } else if (approvalStatusName === '已取消') { approvalDelete({ id: ruleForm.value.id, taskId: ruleForm.value.taskId }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } else if (approvalStatusName === '全部') { // 全部的删除 delteQualityReport({ id: ruleForm.value.id }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } } // 关闭页面 function close() { - $router.push({ - path: '/internal/internalreport', - }) + if ($route.query.data) { + $router.go(-1) + } + else { + $router.push({ + path: '/internal/internalreport', + }) + } } const showMenu = ref('基本信息') defineExpose({ diff --git a/src/views/quality/correct/handle/components/edit.vue b/src/views/quality/correct/handle/components/edit.vue index 0a5527d..d9ce889 100644 --- a/src/views/quality/correct/handle/components/edit.vue +++ b/src/views/quality/correct/handle/components/edit.vue @@ -235,7 +235,7 @@ assignees: data, }).then(() => { ElMessage.success('提交成功') - $router.go(-1) + close() }) } // // 点击提交 @@ -265,27 +265,32 @@ if (approvalStatusName === '草稿箱') { draftDelete({ id: ruleForm.value.id }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } else if (approvalStatusName === '已取消') { approvalDelete({ id: ruleForm.value.id, taskId: ruleForm.value.taskId }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } else if (approvalStatusName === '全部') { // 全部的删除 delteQualityCorrect({ id: ruleForm.value.id }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } } // 关闭页面 function close() { - $router.push({ - path: '/correct/correcthandle', - }) + if ($route.query.data) { + $router.go(-1) + } + else { + $router.push({ + path: '/correct/correcthandle', + }) + } } const showMenu = ref('基本信息') defineExpose({ diff --git a/src/views/quality/internal/inspect/components/edit.vue b/src/views/quality/internal/inspect/components/edit.vue index eaf4488..1495395 100644 --- a/src/views/quality/internal/inspect/components/edit.vue +++ b/src/views/quality/internal/inspect/components/edit.vue @@ -46,6 +46,14 @@ ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm') // 记录时间 ruleForm.value.creator = userStore.id ruleForm.value.creatorName = userStore.name + // 自动填充数据 + if ($route.query.data) { + const data = JSON.parse($route.query.data as string) + console.log(data, 'data') + ruleForm.value.yearNum = data.yearNum + ruleForm.value.yearTime = data.yearTime + ruleForm.value.bizLabCode = data.bizLabCode + } } else { detailQualityInspect({ id: $route.query.id as string }).then((res) => { @@ -289,27 +297,32 @@ if (approvalStatusName === '草稿箱') { draftDelete({ id: ruleForm.value.id }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } else if (approvalStatusName === '已取消') { approvalDelete({ id: ruleForm.value.id, taskId: ruleForm.value.taskId }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } else if (approvalStatusName === '全部') { // 全部的删除 delteQualityInspect({ id: ruleForm.value.id }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } } // 关闭页面 function close() { - $router.push({ - path: '/internal/internalinspect', - }) + if ($route.query.data) { + $router.go(-1) + } + else { + $router.push({ + path: '/internal/internalinspect', + }) + } } const showMenu = ref('基本信息') defineExpose({ diff --git a/src/views/quality/internal/registration/components/edit.vue b/src/views/quality/internal/registration/components/edit.vue index 612deeb..f8ebe39 100644 --- a/src/views/quality/internal/registration/components/edit.vue +++ b/src/views/quality/internal/registration/components/edit.vue @@ -149,6 +149,14 @@ ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm') ruleForm.value.creatorId = userStore.id ruleForm.value.creatorName = userStore.name + // 自动填充数据 + if ($route.query.data) { + const data = JSON.parse($route.query.data as string) + console.log(data, 'data') + ruleForm.value.yearNum = data.yearNum + ruleForm.value.yearTime = data.yearTime + ruleForm.value.bizLabCode = data.bizLabCode + } } else { // 获取详情 @@ -366,27 +374,32 @@ if (approvalStatusName === '草稿箱') { draftDelete({ id: ruleForm.value.id }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } else if (approvalStatusName === '已取消') { approvalDelete({ id: ruleForm.value.id, taskId: ruleForm.value.taskId }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } else if (approvalStatusName === '全部') { // 全部的删除 delteQualityRegistration({ id: ruleForm.value.id }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } } // 关闭页面 function close() { - $router.push({ - path: '/internal/internalregistration', - }) + if ($route.query.data) { + $router.go(-1) + } + else { + $router.push({ + path: '/internal/internalregistration', + }) + } } const showMenu = ref('基本信息') defineExpose({ diff --git a/src/views/quality/internal/report/components/edit.vue b/src/views/quality/internal/report/components/edit.vue index 0519727..cd5eeda 100644 --- a/src/views/quality/internal/report/components/edit.vue +++ b/src/views/quality/internal/report/components/edit.vue @@ -62,6 +62,14 @@ // ruleForm.value.beginTime = dayjs().format('YYYY-MM-DD') ruleForm.value.creator = userStore.id ruleForm.value.creatorName = userStore.name + // 自动填充数据 + if ($route.query.data) { + const data = JSON.parse($route.query.data as string) + console.log(data, 'data') + ruleForm.value.yearNum = data.yearNum + ruleForm.value.yearTime = data.yearTime + ruleForm.value.bizLabCode = data.bizLabCode + } } else { detailQualityReport({ id: $route.query.id as string }).then((res) => { @@ -306,27 +314,32 @@ if (approvalStatusName === '草稿箱') { draftDelete({ id: ruleForm.value.id }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } else if (approvalStatusName === '已取消') { approvalDelete({ id: ruleForm.value.id, taskId: ruleForm.value.taskId }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } else if (approvalStatusName === '全部') { // 全部的删除 delteQualityReport({ id: ruleForm.value.id }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } } // 关闭页面 function close() { - $router.push({ - path: '/internal/internalreport', - }) + if ($route.query.data) { + $router.go(-1) + } + else { + $router.push({ + path: '/internal/internalreport', + }) + } } const showMenu = ref('基本信息') defineExpose({ diff --git a/src/views/quality/internal/scene/components/edit.vue b/src/views/quality/internal/scene/components/edit.vue index ed0ab13..a44350c 100644 --- a/src/views/quality/internal/scene/components/edit.vue +++ b/src/views/quality/internal/scene/components/edit.vue @@ -48,6 +48,17 @@ ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm') // 创建时间 ruleForm.value.commanderId = userStore.id ruleForm.value.commanderName = userStore.name + + // 自动填充数据 + if ($route.query.data) { + const data = JSON.parse($route.query.data as string) + console.log(data, 'data') + ruleForm.value.yearNum = data.yearNum + ruleForm.value.yearTime = data.yearTime + ruleForm.value.bizLabCode = data.bizLabCode + ruleForm.value.groupLeader = data.groupLeader + ruleForm.value.sceneUsers = data.teamMembers + } } else { detailQualityScene({ id: $route.params.id as string }).then((res) => { @@ -247,27 +258,32 @@ if (approvalStatusName === '草稿箱') { draftDelete({ id: ruleForm.value.id }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } else if (approvalStatusName === '已取消') { approvalDelete({ id: ruleForm.value.id, taskId: ruleForm.value.taskId }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } else if (approvalStatusName === '全部') { // 全部的删除 delteQualityScene({ id: ruleForm.value.id }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } } // 关闭页面 function close() { - $router.push({ - path: '/internal/internalscene', - }) + if ($route.query.data) { + $router.go(-1) + } + else { + $router.push({ + path: '/internal/internalscene', + }) + } } const showMenu = ref('基本信息') defineExpose({ @@ -428,7 +444,7 @@ :content="`${ruleForm.sceneUsers ? ruleForm.sceneUsers?.join() : ''}`" placement="bottom" > - + {{ item.name }} {{ item.deptName }} diff --git a/src/views/quality/correct/handle/components/edit.vue b/src/views/quality/correct/handle/components/edit.vue index 0a5527d..d9ce889 100644 --- a/src/views/quality/correct/handle/components/edit.vue +++ b/src/views/quality/correct/handle/components/edit.vue @@ -235,7 +235,7 @@ assignees: data, }).then(() => { ElMessage.success('提交成功') - $router.go(-1) + close() }) } // // 点击提交 @@ -265,27 +265,32 @@ if (approvalStatusName === '草稿箱') { draftDelete({ id: ruleForm.value.id }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } else if (approvalStatusName === '已取消') { approvalDelete({ id: ruleForm.value.id, taskId: ruleForm.value.taskId }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } else if (approvalStatusName === '全部') { // 全部的删除 delteQualityCorrect({ id: ruleForm.value.id }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } } // 关闭页面 function close() { - $router.push({ - path: '/correct/correcthandle', - }) + if ($route.query.data) { + $router.go(-1) + } + else { + $router.push({ + path: '/correct/correcthandle', + }) + } } const showMenu = ref('基本信息') defineExpose({ diff --git a/src/views/quality/internal/inspect/components/edit.vue b/src/views/quality/internal/inspect/components/edit.vue index eaf4488..1495395 100644 --- a/src/views/quality/internal/inspect/components/edit.vue +++ b/src/views/quality/internal/inspect/components/edit.vue @@ -46,6 +46,14 @@ ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm') // 记录时间 ruleForm.value.creator = userStore.id ruleForm.value.creatorName = userStore.name + // 自动填充数据 + if ($route.query.data) { + const data = JSON.parse($route.query.data as string) + console.log(data, 'data') + ruleForm.value.yearNum = data.yearNum + ruleForm.value.yearTime = data.yearTime + ruleForm.value.bizLabCode = data.bizLabCode + } } else { detailQualityInspect({ id: $route.query.id as string }).then((res) => { @@ -289,27 +297,32 @@ if (approvalStatusName === '草稿箱') { draftDelete({ id: ruleForm.value.id }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } else if (approvalStatusName === '已取消') { approvalDelete({ id: ruleForm.value.id, taskId: ruleForm.value.taskId }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } else if (approvalStatusName === '全部') { // 全部的删除 delteQualityInspect({ id: ruleForm.value.id }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } } // 关闭页面 function close() { - $router.push({ - path: '/internal/internalinspect', - }) + if ($route.query.data) { + $router.go(-1) + } + else { + $router.push({ + path: '/internal/internalinspect', + }) + } } const showMenu = ref('基本信息') defineExpose({ diff --git a/src/views/quality/internal/registration/components/edit.vue b/src/views/quality/internal/registration/components/edit.vue index 612deeb..f8ebe39 100644 --- a/src/views/quality/internal/registration/components/edit.vue +++ b/src/views/quality/internal/registration/components/edit.vue @@ -149,6 +149,14 @@ ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm') ruleForm.value.creatorId = userStore.id ruleForm.value.creatorName = userStore.name + // 自动填充数据 + if ($route.query.data) { + const data = JSON.parse($route.query.data as string) + console.log(data, 'data') + ruleForm.value.yearNum = data.yearNum + ruleForm.value.yearTime = data.yearTime + ruleForm.value.bizLabCode = data.bizLabCode + } } else { // 获取详情 @@ -366,27 +374,32 @@ if (approvalStatusName === '草稿箱') { draftDelete({ id: ruleForm.value.id }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } else if (approvalStatusName === '已取消') { approvalDelete({ id: ruleForm.value.id, taskId: ruleForm.value.taskId }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } else if (approvalStatusName === '全部') { // 全部的删除 delteQualityRegistration({ id: ruleForm.value.id }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } } // 关闭页面 function close() { - $router.push({ - path: '/internal/internalregistration', - }) + if ($route.query.data) { + $router.go(-1) + } + else { + $router.push({ + path: '/internal/internalregistration', + }) + } } const showMenu = ref('基本信息') defineExpose({ diff --git a/src/views/quality/internal/report/components/edit.vue b/src/views/quality/internal/report/components/edit.vue index 0519727..cd5eeda 100644 --- a/src/views/quality/internal/report/components/edit.vue +++ b/src/views/quality/internal/report/components/edit.vue @@ -62,6 +62,14 @@ // ruleForm.value.beginTime = dayjs().format('YYYY-MM-DD') ruleForm.value.creator = userStore.id ruleForm.value.creatorName = userStore.name + // 自动填充数据 + if ($route.query.data) { + const data = JSON.parse($route.query.data as string) + console.log(data, 'data') + ruleForm.value.yearNum = data.yearNum + ruleForm.value.yearTime = data.yearTime + ruleForm.value.bizLabCode = data.bizLabCode + } } else { detailQualityReport({ id: $route.query.id as string }).then((res) => { @@ -306,27 +314,32 @@ if (approvalStatusName === '草稿箱') { draftDelete({ id: ruleForm.value.id }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } else if (approvalStatusName === '已取消') { approvalDelete({ id: ruleForm.value.id, taskId: ruleForm.value.taskId }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } else if (approvalStatusName === '全部') { // 全部的删除 delteQualityReport({ id: ruleForm.value.id }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } } // 关闭页面 function close() { - $router.push({ - path: '/internal/internalreport', - }) + if ($route.query.data) { + $router.go(-1) + } + else { + $router.push({ + path: '/internal/internalreport', + }) + } } const showMenu = ref('基本信息') defineExpose({ diff --git a/src/views/quality/internal/scene/components/edit.vue b/src/views/quality/internal/scene/components/edit.vue index ed0ab13..a44350c 100644 --- a/src/views/quality/internal/scene/components/edit.vue +++ b/src/views/quality/internal/scene/components/edit.vue @@ -48,6 +48,17 @@ ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm') // 创建时间 ruleForm.value.commanderId = userStore.id ruleForm.value.commanderName = userStore.name + + // 自动填充数据 + if ($route.query.data) { + const data = JSON.parse($route.query.data as string) + console.log(data, 'data') + ruleForm.value.yearNum = data.yearNum + ruleForm.value.yearTime = data.yearTime + ruleForm.value.bizLabCode = data.bizLabCode + ruleForm.value.groupLeader = data.groupLeader + ruleForm.value.sceneUsers = data.teamMembers + } } else { detailQualityScene({ id: $route.params.id as string }).then((res) => { @@ -247,27 +258,32 @@ if (approvalStatusName === '草稿箱') { draftDelete({ id: ruleForm.value.id }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } else if (approvalStatusName === '已取消') { approvalDelete({ id: ruleForm.value.id, taskId: ruleForm.value.taskId }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } else if (approvalStatusName === '全部') { // 全部的删除 delteQualityScene({ id: ruleForm.value.id }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } } // 关闭页面 function close() { - $router.push({ - path: '/internal/internalscene', - }) + if ($route.query.data) { + $router.go(-1) + } + else { + $router.push({ + path: '/internal/internalscene', + }) + } } const showMenu = ref('基本信息') defineExpose({ @@ -428,7 +444,7 @@ :content="`${ruleForm.sceneUsers ? ruleForm.sceneUsers?.join() : ''}`" placement="bottom" > - + {{ item.name }} {{ item.deptName }} diff --git a/src/views/quality/internal/workManage/components/edit.vue b/src/views/quality/internal/workManage/components/edit.vue index b293593..bfda859 100644 --- a/src/views/quality/internal/workManage/components/edit.vue +++ b/src/views/quality/internal/workManage/components/edit.vue @@ -118,7 +118,7 @@ } ruleForm.value = res.data if (res.data.teamMembers) { - ruleForm.value.teamMembers = res.data.teamMembers.split() + ruleForm.value.teamMembers = res.data.teamMembers.split(',') } else { ruleForm.value.teamMembers = [] @@ -164,6 +164,9 @@ const shortcut = (url: string) => { $router.push({ path: url, + query: { + data: JSON.stringify(ruleForm.value), + }, }) } diff --git a/src/views/quality/correct/handle/components/edit.vue b/src/views/quality/correct/handle/components/edit.vue index 0a5527d..d9ce889 100644 --- a/src/views/quality/correct/handle/components/edit.vue +++ b/src/views/quality/correct/handle/components/edit.vue @@ -235,7 +235,7 @@ assignees: data, }).then(() => { ElMessage.success('提交成功') - $router.go(-1) + close() }) } // // 点击提交 @@ -265,27 +265,32 @@ if (approvalStatusName === '草稿箱') { draftDelete({ id: ruleForm.value.id }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } else if (approvalStatusName === '已取消') { approvalDelete({ id: ruleForm.value.id, taskId: ruleForm.value.taskId }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } else if (approvalStatusName === '全部') { // 全部的删除 delteQualityCorrect({ id: ruleForm.value.id }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } } // 关闭页面 function close() { - $router.push({ - path: '/correct/correcthandle', - }) + if ($route.query.data) { + $router.go(-1) + } + else { + $router.push({ + path: '/correct/correcthandle', + }) + } } const showMenu = ref('基本信息') defineExpose({ diff --git a/src/views/quality/internal/inspect/components/edit.vue b/src/views/quality/internal/inspect/components/edit.vue index eaf4488..1495395 100644 --- a/src/views/quality/internal/inspect/components/edit.vue +++ b/src/views/quality/internal/inspect/components/edit.vue @@ -46,6 +46,14 @@ ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm') // 记录时间 ruleForm.value.creator = userStore.id ruleForm.value.creatorName = userStore.name + // 自动填充数据 + if ($route.query.data) { + const data = JSON.parse($route.query.data as string) + console.log(data, 'data') + ruleForm.value.yearNum = data.yearNum + ruleForm.value.yearTime = data.yearTime + ruleForm.value.bizLabCode = data.bizLabCode + } } else { detailQualityInspect({ id: $route.query.id as string }).then((res) => { @@ -289,27 +297,32 @@ if (approvalStatusName === '草稿箱') { draftDelete({ id: ruleForm.value.id }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } else if (approvalStatusName === '已取消') { approvalDelete({ id: ruleForm.value.id, taskId: ruleForm.value.taskId }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } else if (approvalStatusName === '全部') { // 全部的删除 delteQualityInspect({ id: ruleForm.value.id }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } } // 关闭页面 function close() { - $router.push({ - path: '/internal/internalinspect', - }) + if ($route.query.data) { + $router.go(-1) + } + else { + $router.push({ + path: '/internal/internalinspect', + }) + } } const showMenu = ref('基本信息') defineExpose({ diff --git a/src/views/quality/internal/registration/components/edit.vue b/src/views/quality/internal/registration/components/edit.vue index 612deeb..f8ebe39 100644 --- a/src/views/quality/internal/registration/components/edit.vue +++ b/src/views/quality/internal/registration/components/edit.vue @@ -149,6 +149,14 @@ ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm') ruleForm.value.creatorId = userStore.id ruleForm.value.creatorName = userStore.name + // 自动填充数据 + if ($route.query.data) { + const data = JSON.parse($route.query.data as string) + console.log(data, 'data') + ruleForm.value.yearNum = data.yearNum + ruleForm.value.yearTime = data.yearTime + ruleForm.value.bizLabCode = data.bizLabCode + } } else { // 获取详情 @@ -366,27 +374,32 @@ if (approvalStatusName === '草稿箱') { draftDelete({ id: ruleForm.value.id }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } else if (approvalStatusName === '已取消') { approvalDelete({ id: ruleForm.value.id, taskId: ruleForm.value.taskId }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } else if (approvalStatusName === '全部') { // 全部的删除 delteQualityRegistration({ id: ruleForm.value.id }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } } // 关闭页面 function close() { - $router.push({ - path: '/internal/internalregistration', - }) + if ($route.query.data) { + $router.go(-1) + } + else { + $router.push({ + path: '/internal/internalregistration', + }) + } } const showMenu = ref('基本信息') defineExpose({ diff --git a/src/views/quality/internal/report/components/edit.vue b/src/views/quality/internal/report/components/edit.vue index 0519727..cd5eeda 100644 --- a/src/views/quality/internal/report/components/edit.vue +++ b/src/views/quality/internal/report/components/edit.vue @@ -62,6 +62,14 @@ // ruleForm.value.beginTime = dayjs().format('YYYY-MM-DD') ruleForm.value.creator = userStore.id ruleForm.value.creatorName = userStore.name + // 自动填充数据 + if ($route.query.data) { + const data = JSON.parse($route.query.data as string) + console.log(data, 'data') + ruleForm.value.yearNum = data.yearNum + ruleForm.value.yearTime = data.yearTime + ruleForm.value.bizLabCode = data.bizLabCode + } } else { detailQualityReport({ id: $route.query.id as string }).then((res) => { @@ -306,27 +314,32 @@ if (approvalStatusName === '草稿箱') { draftDelete({ id: ruleForm.value.id }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } else if (approvalStatusName === '已取消') { approvalDelete({ id: ruleForm.value.id, taskId: ruleForm.value.taskId }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } else if (approvalStatusName === '全部') { // 全部的删除 delteQualityReport({ id: ruleForm.value.id }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } } // 关闭页面 function close() { - $router.push({ - path: '/internal/internalreport', - }) + if ($route.query.data) { + $router.go(-1) + } + else { + $router.push({ + path: '/internal/internalreport', + }) + } } const showMenu = ref('基本信息') defineExpose({ diff --git a/src/views/quality/internal/scene/components/edit.vue b/src/views/quality/internal/scene/components/edit.vue index ed0ab13..a44350c 100644 --- a/src/views/quality/internal/scene/components/edit.vue +++ b/src/views/quality/internal/scene/components/edit.vue @@ -48,6 +48,17 @@ ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm') // 创建时间 ruleForm.value.commanderId = userStore.id ruleForm.value.commanderName = userStore.name + + // 自动填充数据 + if ($route.query.data) { + const data = JSON.parse($route.query.data as string) + console.log(data, 'data') + ruleForm.value.yearNum = data.yearNum + ruleForm.value.yearTime = data.yearTime + ruleForm.value.bizLabCode = data.bizLabCode + ruleForm.value.groupLeader = data.groupLeader + ruleForm.value.sceneUsers = data.teamMembers + } } else { detailQualityScene({ id: $route.params.id as string }).then((res) => { @@ -247,27 +258,32 @@ if (approvalStatusName === '草稿箱') { draftDelete({ id: ruleForm.value.id }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } else if (approvalStatusName === '已取消') { approvalDelete({ id: ruleForm.value.id, taskId: ruleForm.value.taskId }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } else if (approvalStatusName === '全部') { // 全部的删除 delteQualityScene({ id: ruleForm.value.id }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } } // 关闭页面 function close() { - $router.push({ - path: '/internal/internalscene', - }) + if ($route.query.data) { + $router.go(-1) + } + else { + $router.push({ + path: '/internal/internalscene', + }) + } } const showMenu = ref('基本信息') defineExpose({ @@ -428,7 +444,7 @@ :content="`${ruleForm.sceneUsers ? ruleForm.sceneUsers?.join() : ''}`" placement="bottom" > - + {{ item.name }} {{ item.deptName }} diff --git a/src/views/quality/internal/workManage/components/edit.vue b/src/views/quality/internal/workManage/components/edit.vue index b293593..bfda859 100644 --- a/src/views/quality/internal/workManage/components/edit.vue +++ b/src/views/quality/internal/workManage/components/edit.vue @@ -118,7 +118,7 @@ } ruleForm.value = res.data if (res.data.teamMembers) { - ruleForm.value.teamMembers = res.data.teamMembers.split() + ruleForm.value.teamMembers = res.data.teamMembers.split(',') } else { ruleForm.value.teamMembers = [] @@ -164,6 +164,9 @@ const shortcut = (url: string) => { $router.push({ path: url, + query: { + data: JSON.stringify(ruleForm.value), + }, }) } diff --git a/src/views/quality/meeting/components/edit.vue b/src/views/quality/meeting/components/edit.vue index fd77201..02087e2 100644 --- a/src/views/quality/meeting/components/edit.vue +++ b/src/views/quality/meeting/components/edit.vue @@ -43,9 +43,22 @@ }) // 表单验证规则 onMounted(async () => { if ($route.path.includes('create')) { - // flag.value = false + flag.value = false ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm') // 创建时间 - fetchDict() + await fetchDict() + // 自动填充数据 + if ($route.query.data) { + const data = JSON.parse($route.query.data as string) + console.log(data, 'data') + if (data.workName.includes('内部')) { + // 内部评审 + ruleForm.value.relType = '1' + ruleForm.value.targetId = data.id + setTimeout(() => { + flag.value = true + }) + } + } } else { // 获取详情 @@ -70,6 +83,17 @@ ruleForm.value.createName = userStore.name } }) +// 关闭 +const close = () => { + if ($route.query.data) { + $router.go(-1) + } + else { + $router.push({ + path: '/meeting/meetinglist', + }) + } +} // 保存 const saveForm = async (formEl: FormInstance | undefined) => { if (!formEl) { return } @@ -93,7 +117,7 @@ handlerMeeting($route.params.type as string, ruleForm.value)?.then((res) => { isSave.value = true ElMessage.success('操作成功') - $router.go(-1) + close() }) }) } @@ -209,7 +233,7 @@ 保存 - + 关闭 diff --git a/src/views/quality/correct/handle/components/edit.vue b/src/views/quality/correct/handle/components/edit.vue index 0a5527d..d9ce889 100644 --- a/src/views/quality/correct/handle/components/edit.vue +++ b/src/views/quality/correct/handle/components/edit.vue @@ -235,7 +235,7 @@ assignees: data, }).then(() => { ElMessage.success('提交成功') - $router.go(-1) + close() }) } // // 点击提交 @@ -265,27 +265,32 @@ if (approvalStatusName === '草稿箱') { draftDelete({ id: ruleForm.value.id }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } else if (approvalStatusName === '已取消') { approvalDelete({ id: ruleForm.value.id, taskId: ruleForm.value.taskId }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } else if (approvalStatusName === '全部') { // 全部的删除 delteQualityCorrect({ id: ruleForm.value.id }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } } // 关闭页面 function close() { - $router.push({ - path: '/correct/correcthandle', - }) + if ($route.query.data) { + $router.go(-1) + } + else { + $router.push({ + path: '/correct/correcthandle', + }) + } } const showMenu = ref('基本信息') defineExpose({ diff --git a/src/views/quality/internal/inspect/components/edit.vue b/src/views/quality/internal/inspect/components/edit.vue index eaf4488..1495395 100644 --- a/src/views/quality/internal/inspect/components/edit.vue +++ b/src/views/quality/internal/inspect/components/edit.vue @@ -46,6 +46,14 @@ ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm') // 记录时间 ruleForm.value.creator = userStore.id ruleForm.value.creatorName = userStore.name + // 自动填充数据 + if ($route.query.data) { + const data = JSON.parse($route.query.data as string) + console.log(data, 'data') + ruleForm.value.yearNum = data.yearNum + ruleForm.value.yearTime = data.yearTime + ruleForm.value.bizLabCode = data.bizLabCode + } } else { detailQualityInspect({ id: $route.query.id as string }).then((res) => { @@ -289,27 +297,32 @@ if (approvalStatusName === '草稿箱') { draftDelete({ id: ruleForm.value.id }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } else if (approvalStatusName === '已取消') { approvalDelete({ id: ruleForm.value.id, taskId: ruleForm.value.taskId }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } else if (approvalStatusName === '全部') { // 全部的删除 delteQualityInspect({ id: ruleForm.value.id }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } } // 关闭页面 function close() { - $router.push({ - path: '/internal/internalinspect', - }) + if ($route.query.data) { + $router.go(-1) + } + else { + $router.push({ + path: '/internal/internalinspect', + }) + } } const showMenu = ref('基本信息') defineExpose({ diff --git a/src/views/quality/internal/registration/components/edit.vue b/src/views/quality/internal/registration/components/edit.vue index 612deeb..f8ebe39 100644 --- a/src/views/quality/internal/registration/components/edit.vue +++ b/src/views/quality/internal/registration/components/edit.vue @@ -149,6 +149,14 @@ ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm') ruleForm.value.creatorId = userStore.id ruleForm.value.creatorName = userStore.name + // 自动填充数据 + if ($route.query.data) { + const data = JSON.parse($route.query.data as string) + console.log(data, 'data') + ruleForm.value.yearNum = data.yearNum + ruleForm.value.yearTime = data.yearTime + ruleForm.value.bizLabCode = data.bizLabCode + } } else { // 获取详情 @@ -366,27 +374,32 @@ if (approvalStatusName === '草稿箱') { draftDelete({ id: ruleForm.value.id }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } else if (approvalStatusName === '已取消') { approvalDelete({ id: ruleForm.value.id, taskId: ruleForm.value.taskId }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } else if (approvalStatusName === '全部') { // 全部的删除 delteQualityRegistration({ id: ruleForm.value.id }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } } // 关闭页面 function close() { - $router.push({ - path: '/internal/internalregistration', - }) + if ($route.query.data) { + $router.go(-1) + } + else { + $router.push({ + path: '/internal/internalregistration', + }) + } } const showMenu = ref('基本信息') defineExpose({ diff --git a/src/views/quality/internal/report/components/edit.vue b/src/views/quality/internal/report/components/edit.vue index 0519727..cd5eeda 100644 --- a/src/views/quality/internal/report/components/edit.vue +++ b/src/views/quality/internal/report/components/edit.vue @@ -62,6 +62,14 @@ // ruleForm.value.beginTime = dayjs().format('YYYY-MM-DD') ruleForm.value.creator = userStore.id ruleForm.value.creatorName = userStore.name + // 自动填充数据 + if ($route.query.data) { + const data = JSON.parse($route.query.data as string) + console.log(data, 'data') + ruleForm.value.yearNum = data.yearNum + ruleForm.value.yearTime = data.yearTime + ruleForm.value.bizLabCode = data.bizLabCode + } } else { detailQualityReport({ id: $route.query.id as string }).then((res) => { @@ -306,27 +314,32 @@ if (approvalStatusName === '草稿箱') { draftDelete({ id: ruleForm.value.id }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } else if (approvalStatusName === '已取消') { approvalDelete({ id: ruleForm.value.id, taskId: ruleForm.value.taskId }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } else if (approvalStatusName === '全部') { // 全部的删除 delteQualityReport({ id: ruleForm.value.id }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } } // 关闭页面 function close() { - $router.push({ - path: '/internal/internalreport', - }) + if ($route.query.data) { + $router.go(-1) + } + else { + $router.push({ + path: '/internal/internalreport', + }) + } } const showMenu = ref('基本信息') defineExpose({ diff --git a/src/views/quality/internal/scene/components/edit.vue b/src/views/quality/internal/scene/components/edit.vue index ed0ab13..a44350c 100644 --- a/src/views/quality/internal/scene/components/edit.vue +++ b/src/views/quality/internal/scene/components/edit.vue @@ -48,6 +48,17 @@ ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm') // 创建时间 ruleForm.value.commanderId = userStore.id ruleForm.value.commanderName = userStore.name + + // 自动填充数据 + if ($route.query.data) { + const data = JSON.parse($route.query.data as string) + console.log(data, 'data') + ruleForm.value.yearNum = data.yearNum + ruleForm.value.yearTime = data.yearTime + ruleForm.value.bizLabCode = data.bizLabCode + ruleForm.value.groupLeader = data.groupLeader + ruleForm.value.sceneUsers = data.teamMembers + } } else { detailQualityScene({ id: $route.params.id as string }).then((res) => { @@ -247,27 +258,32 @@ if (approvalStatusName === '草稿箱') { draftDelete({ id: ruleForm.value.id }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } else if (approvalStatusName === '已取消') { approvalDelete({ id: ruleForm.value.id, taskId: ruleForm.value.taskId }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } else if (approvalStatusName === '全部') { // 全部的删除 delteQualityScene({ id: ruleForm.value.id }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } } // 关闭页面 function close() { - $router.push({ - path: '/internal/internalscene', - }) + if ($route.query.data) { + $router.go(-1) + } + else { + $router.push({ + path: '/internal/internalscene', + }) + } } const showMenu = ref('基本信息') defineExpose({ @@ -428,7 +444,7 @@ :content="`${ruleForm.sceneUsers ? ruleForm.sceneUsers?.join() : ''}`" placement="bottom" > - + {{ item.name }} {{ item.deptName }} diff --git a/src/views/quality/internal/workManage/components/edit.vue b/src/views/quality/internal/workManage/components/edit.vue index b293593..bfda859 100644 --- a/src/views/quality/internal/workManage/components/edit.vue +++ b/src/views/quality/internal/workManage/components/edit.vue @@ -118,7 +118,7 @@ } ruleForm.value = res.data if (res.data.teamMembers) { - ruleForm.value.teamMembers = res.data.teamMembers.split() + ruleForm.value.teamMembers = res.data.teamMembers.split(',') } else { ruleForm.value.teamMembers = [] @@ -164,6 +164,9 @@ const shortcut = (url: string) => { $router.push({ path: url, + query: { + data: JSON.stringify(ruleForm.value), + }, }) } diff --git a/src/views/quality/meeting/components/edit.vue b/src/views/quality/meeting/components/edit.vue index fd77201..02087e2 100644 --- a/src/views/quality/meeting/components/edit.vue +++ b/src/views/quality/meeting/components/edit.vue @@ -43,9 +43,22 @@ }) // 表单验证规则 onMounted(async () => { if ($route.path.includes('create')) { - // flag.value = false + flag.value = false ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm') // 创建时间 - fetchDict() + await fetchDict() + // 自动填充数据 + if ($route.query.data) { + const data = JSON.parse($route.query.data as string) + console.log(data, 'data') + if (data.workName.includes('内部')) { + // 内部评审 + ruleForm.value.relType = '1' + ruleForm.value.targetId = data.id + setTimeout(() => { + flag.value = true + }) + } + } } else { // 获取详情 @@ -70,6 +83,17 @@ ruleForm.value.createName = userStore.name } }) +// 关闭 +const close = () => { + if ($route.query.data) { + $router.go(-1) + } + else { + $router.push({ + path: '/meeting/meetinglist', + }) + } +} // 保存 const saveForm = async (formEl: FormInstance | undefined) => { if (!formEl) { return } @@ -93,7 +117,7 @@ handlerMeeting($route.params.type as string, ruleForm.value)?.then((res) => { isSave.value = true ElMessage.success('操作成功') - $router.go(-1) + close() }) }) } @@ -209,7 +233,7 @@ 保存 - + 关闭 diff --git a/src/views/quality/prevent/handle/components/edit.vue b/src/views/quality/prevent/handle/components/edit.vue index b83feda..905bf2e 100644 --- a/src/views/quality/prevent/handle/components/edit.vue +++ b/src/views/quality/prevent/handle/components/edit.vue @@ -261,27 +261,32 @@ if (approvalStatusName === '草稿箱') { draftDelete({ id: ruleForm.value.id }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } else if (approvalStatusName === '已取消') { approvalDelete({ id: ruleForm.value.id, taskId: ruleForm.value.taskId }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } else if (approvalStatusName === '全部') { // 全部的删除 delteQualityPrevent({ id: ruleForm.value.id }).then(() => { ElMessage.success('已删除') - $router.go(-1) + close() }) } } // 关闭页面 function close() { - $router.push({ - path: '/prevent/preventhandle', - }) + if ($route.query.data) { + $router.go(-1) + } + else { + $router.push({ + path: '/prevent/preventhandle', + }) + } } const showMenu = ref('基本信息') defineExpose({