diff --git a/src/components/DetailComponent/ApprovalDetail.vue b/src/components/DetailComponent/ApprovalDetail.vue index 71eebe7..07b5b2d 100644 --- a/src/components/DetailComponent/ApprovalDetail.vue +++ b/src/components/DetailComponent/ApprovalDetail.vue @@ -1,32 +1,5 @@ @@ -75,8 +79,9 @@ const auditOpinion = ref('') // const step = ref(route.query.step) route.query.step == '10' && (currentStep.value = 1) route.query.step == '20' && (currentStep.value = 2) -route.query.step == '40' && (currentStep.value = 3) -route.query.step == '50' && (currentStep.value = 4) +route.query.step == '30' && (currentStep.value = 3) +route.query.step == '40' && (currentStep.value = 4) +route.query.step == '50' && (currentStep.value = 5) const showActive = ref() const detailShow = ref(false) const detailData = ref({}) @@ -88,6 +93,8 @@ localStorage.removeItem('projectChargePersonUserList') localStorage.removeItem('projectPersonUserList') localStorage.removeItem('optionalChargeLeadershipList') localStorage.removeItem('originallySelectedList') + + const getAllInfo = async (state) => { const loading = ElLoading.service({fullscreen: true}) detailData.value = { @@ -148,18 +155,28 @@ const changeModel = (active, mode) => { applyTitle.value = 'apply' } else if (active === '40') { applyTitle.value = 'check' - }else if ( active === '50') { + } else if (active === '50') { applyTitle.value = 'filing' } }) } const setDetail = (active) => { showActive.value = active + if (active == '30') { + changeModel(30, 'view') + detailShow.value = true + return; + } getAllInfo(active) } const stepChange = (data) => { showActive.value = data.active + if (data.active == '30') { + changeModel(30, 'view') + detailShow.value = true + return; + } getAllInfo(data.active) } diff --git a/src/views/project-management/implementation/index.vue b/src/views/project-management/implementation/index.vue index c6c43e1..6883efa 100644 --- a/src/views/project-management/implementation/index.vue +++ b/src/views/project-management/implementation/index.vue @@ -297,14 +297,14 @@ const tableConfig = reactive({ btn.push({label: '验收', prem: ['mosr:implementation:check'], func: () => handleCheck(row), type: 'primary'}) } if (buttons.has("edit")) { - btn.push({label: '编辑', prem: ['mosr:implementation:resubmit'], func: () => handleEdit(row), type: 'primary'}) + btn.push({label: '编辑', prem: ['mosr:implementation:resubmit'], func: () => handleEdit(row), type: 'primary'}) } if (buttons.has("standing")) { btn.push({label: '台账', prem: ['project:management:implementation:account'], func: () => handleStandingBook(row), type: 'primary'}) } - if (buttons.has("attachments")) { - btn.push({label: '附件', prem: ['project:management:implementation:attachment'], func: () => handleAttachment(row), type: 'primary'}) - } + // if (buttons.has("attachments")) { + // btn.push({label: '附件', prem: ['project:management:implementation:attachment'], func: () => handleAttachment(row), type: 'primary'}) + // } if (buttons.has("viewAllocation")) { btn.push({label: '查看分摊', prem: ['project:management:implementation:share'], func: () => handleShare(row), type: 'primary'}) } @@ -355,13 +355,19 @@ const search = (val) => { } const handleDetail = (row) => { + let step='' + if(row.state==0){ + step='30' + }else { + step='40' + } router.push({ name: 'Implementation/detail', query: { id: row.requirementId, projectId: row.projectId, state: row.state, - step: '40' + step: step } }) } diff --git a/src/views/project-management/implementation/upload.vue b/src/views/project-management/implementation/upload.vue index a54afe4..5b4d81f 100644 --- a/src/views/project-management/implementation/upload.vue +++ b/src/views/project-management/implementation/upload.vue @@ -483,7 +483,7 @@ const handleSubmit = async (instance) => { id: route.query.id, projectId: route.query.projectId, state: route.query.state, - step: '40' + step: '30' } }) }