diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 446106a..b4b96c7 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -115,7 +115,7 @@ const tableConfig = reactive({ align: 'center', showOverflowTooltip: false, currentRender: ({row, index}) => { - if(row.targetState!==null){ + if(row.targetState!==null||row.targetState!==undefined){ return () }else { return '--' @@ -153,8 +153,7 @@ const tableConfig = reactive({ params: {}, }) const handleView = (row) => { - console.log('row', row) - if(row.targetState=='00'&&row.targetId){ + if (row.targetState == '00' && row.targetId) { router.push({ name: 'Requirement/detail', query: { @@ -162,6 +161,43 @@ const handleView = (row) => { } }) } + else if(row.targetState=='10'&&row.targetId){ + router.push({ + name: 'Summary/detail', + query: { + id: row.targetId, + projectId: row.projectId, + state: row.state + } + }) + }else if(row.targetState=='20'&&row.targetId){ + router.push({ + name: 'Initiation/detail', + query: { + id: row.targetId, + projectId: row.projectId, + state: row.state + } + }) + }else if(row.targetState=='40'&&row.targetId){ + router.push({ + name: 'Implementation/detail', + query: { + id: row.targetId, + projectId: row.projectId, + state: row.state + } + }) + }else if(row.targetState=='50'&&row.targetId){ + router.push({ + name: 'Filing/detail', + query: { + id: row.targetId, + projectId: row.projectId, + state: row.state + } + }) + } } diff --git a/src/views/project-demand/requirement/add.vue b/src/views/project-demand/requirement/add.vue index e9f863b..caa2ec4 100644 --- a/src/views/project-demand/requirement/add.vue +++ b/src/views/project-demand/requirement/add.vue @@ -176,10 +176,11 @@ const handleDownload = (row) => { }) } const compositeParam = (item) => { + console.log('router.currentRoute.value.path',router.currentRoute.value.path) let tag = '' - if (!formData.value.collectType && router.currentRoute.value.name === 'Requirement/add') { - tag = '需求征集' - } + // if (!formData.value.collectType && router.currentRoute.value.path === 'Requirement/add') { + // tag = '需求征集' + // } return { fileId: item.id, size: item.size, diff --git a/src/views/project-demand/requirement/index.vue b/src/views/project-demand/requirement/index.vue index da2c3b3..ba4e8de 100644 --- a/src/views/project-demand/requirement/index.vue +++ b/src/views/project-demand/requirement/index.vue @@ -149,7 +149,7 @@ const search = (val) => { const handleAdd = () => { //新增 router.push({ - name: 'Requirement/add', + name:'Requirement/add', query: { isAdd: 1 } @@ -157,7 +157,7 @@ const handleAdd = () => { } const handleEdit = (row) => { router.push({ - name: 'Requirement/edit', + name:'Requirement/edit', query: { id: row.requirementId } @@ -175,7 +175,7 @@ const handleDelete = (row) => { } const handleDetail = (row) => { router.push({ - name: 'Detail', + name:'Requirement/detail', query: { id: row.requirementId } @@ -183,7 +183,7 @@ const handleDetail = (row) => { } const handleReport = (row) => { router.push({ - name: 'Summary/add', + name:'Summary/add', query: { id:row.requirementId } diff --git a/src/views/project-demand/summary/detail.vue b/src/views/project-demand/summary/detail.vue index 3ebeb0d..c7c9e87 100644 --- a/src/views/project-demand/summary/detail.vue +++ b/src/views/project-demand/summary/detail.vue @@ -49,6 +49,7 @@ const getInfo = async (state) => { message: msg, type: code === 1000 ? 'success' : 'error' }) + if(data===undefined)return; if(code===1000){ summaryData.value = data; loading.value = false diff --git a/src/views/project-demand/summary/index.vue b/src/views/project-demand/summary/index.vue index 04a6db5..fad2ccc 100644 --- a/src/views/project-demand/summary/index.vue +++ b/src/views/project-demand/summary/index.vue @@ -175,7 +175,7 @@ const search = (val) => { const handleAdd = (row) => { router.push({ - name: 'Summary/add', + name:'Summary/add', query: { id:row.requirementId } @@ -183,7 +183,7 @@ const handleAdd = (row) => { } const handleEdit = (row) => { router.push({ - name: 'Summary/edit', + name:'Summary/edit', query: { id:row.requirementId, projectId:row.projectId @@ -192,7 +192,7 @@ const handleEdit = (row) => { } const handleDetail = (row) => { router.push({ - name: 'Summary/detail', + name:'Summary/detail', query: { id:row.requirementId, projectId: row.projectId, diff --git a/src/views/project-management/filing/detail.vue b/src/views/project-management/filing/detail.vue index 64ad1b8..b7f1460 100644 --- a/src/views/project-management/filing/detail.vue +++ b/src/views/project-management/filing/detail.vue @@ -71,6 +71,7 @@ const getAllInfo = async (state) => { if(code===1000){ loading.value = false } + if(data===undefined)return; commonForm.value = data processStore.setDesign(data) processStore.runningList.value = data.runningList; diff --git a/src/views/project-management/implementation/detail.vue b/src/views/project-management/implementation/detail.vue index 89e14cf..cec836a 100644 --- a/src/views/project-management/implementation/detail.vue +++ b/src/views/project-management/implementation/detail.vue @@ -76,6 +76,7 @@ const getAllInfo = async (state) => { if(code===1000){ loading.value = false } + if(data===undefined)return; commonForm.value = data processStore.setDesign(data) processStore.runningList.value = data.runningList; diff --git a/src/views/project-management/implementation/index.vue b/src/views/project-management/implementation/index.vue index c7128f9..f5bd960 100644 --- a/src/views/project-management/implementation/index.vue +++ b/src/views/project-management/implementation/index.vue @@ -216,7 +216,7 @@ const search = (val) => { const handleDetail = (row) => { router.push({ - name: 'Implementation/detail', + name:'Implementation/detail', query: { id: row.requirementId, projectId: row.projectId, diff --git a/src/views/project-management/initiation/detail.vue b/src/views/project-management/initiation/detail.vue index da778ab..e6b9776 100644 --- a/src/views/project-management/initiation/detail.vue +++ b/src/views/project-management/initiation/detail.vue @@ -117,6 +117,7 @@ const getAllInfo = async (state) => { loading.value = false } console.log(data, 'data--22'); + if(data===undefined)return; commonForm.value = data processStore.setDesign(data) processStore.runningList.value = data.runningList;