fix : 修复前置流程弹窗的提示,首页需求上报跳转位置

This commit is contained in:
2024-10-24 13:13:11 +08:00
parent 5c4f25dc1a
commit c2c1cfd6e1
15 changed files with 111 additions and 602 deletions

View File

@@ -208,7 +208,7 @@ const tableConfig = reactive({
prop: 'projectImpact',
label: '项目影响',
align: 'center',
width: 100,
width: 120,
showOverflowTooltip: false,
currentRender: ({row, index}) => {
if (row.projectImpact !== null) {

View File

@@ -1,5 +1,5 @@
<template>
<steps :active="route.query.id==='-1'?currentStep-1:currentStep" @setDetail="setDetail" @stepChange="stepChange"
<steps :active="route.query.id==='-1'?currentStep-1:currentStep" @setDetail="setDetail" @stepChange="stepChange" @getBasicData="getBasicData"
:reportType="route.query.id==='-1'?'direct':''" :taskId="detailData.taskId" :editShow="editShow" :mode="mode">
<template #content v-if="detailShow">
<collection-detail :formData="detailData.formData"
@@ -22,6 +22,7 @@
:processViewer="commonProvessViewer"
:fileListShow="fileListShow"
:preProcessShow="preProcessShow"
:basicData="basicData"
v-model:value="auditOpinion"/>
<div v-if="showActive == '30'&&!editShow">
<project-attachment/>
@@ -33,6 +34,7 @@
:processViewer="commonProvessViewer"
:fileListShow="fileListShow"
:preProcessShow="preProcessShow"
:basicData="basicData"
v-model:value="auditOpinion"/>
<ApprovalDetail type="archivist"
v-if="showActive == '50'&&!editShow"
@@ -41,6 +43,7 @@
:processViewer="commonProvessViewer"
:fileListShow="fileListShow"
:preProcessShow="preProcessShow"
:basicData="basicData"
v-model:value="auditOpinion"/>
<project-apply :title="applyTitle"
v-if="editShow"
@@ -69,6 +72,7 @@ import Opinion from "@/components/DetailComponent/Opinion.vue";
const route = useRoute()
const editShow = ref(false)
const applyTitle = ref('filing')
const basicData = ref([])
const loading = ref(false)
const processStore = useProcessStore()
const fileListShow = ref('READ')
@@ -179,6 +183,10 @@ const stepChange = (data) => {
}
getAllInfo(data.active)
}
const getBasicData=(data)=>{
console.info("🚀 ~method:data -----", data)
basicData.value=data
}
</script>
<style scoped lang="scss">

View File

@@ -226,7 +226,7 @@ const tableConfig = reactive({
prop: 'projectImpact',
label: '项目影响',
align: 'center',
width: 100,
width: 120,
showOverflowTooltip: false,
currentRender: ({row, index}) => {
if (row.projectImpact && row.projectImpact !== null && row.projectImpact !== undefined) {

View File

@@ -207,7 +207,7 @@ const tableConfig = reactive({
prop: 'projectImpact',
label: '项目影响',
align: 'center',
width: 100,
width: 120,
showOverflowTooltip: false,
currentRender: ({row, index}) => {
if (row.projectImpact !== null) {

View File

@@ -129,13 +129,13 @@ const back = () => {
}
}
break;
case 'Summary/detail':
if (route.query.source === 'home') {
router.push('/home')
} else {
router.push({name: 'Summary'})
}
break;
// case 'Summary/detail':
// if (route.query.source === 'home') {
// router.push('/home')
// } else {
// router.push({name: 'Summary'})
// }
// break;
case 'Requirement/detail':
if (route.query.source === 'home') {
router.push('/home')