odjbin/mosr-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix : 修复详情基本信息显示位置、项目验收、结项操作放在详情页面

Browse Source
This commit is contained in:
odjbin
2024-06-10 15:25:28 +08:00
parent 3483a32d55
commit 07c089ed29
6 changed files with 178 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/views/project-management/implementation/attachment.vue
View File

@@ -51,8 +51,8 @@ const schema = computed(() => {
}
},
{
label: '所属公司',
prop: 'affiliatedCompany',
label: '征集类型',
prop: 'collectType',
colProps: {
span: 12
}
@@ -65,13 +65,12 @@ const schema = computed(() => {
}
},
{
label: '征集类型',
prop: 'collectType',
label: '所属公司',
prop: 'affiliatedCompany',
colProps: {
span: 12
}
},
}
]
})
const baseForm = ref()

58
src/views/project-management/implementation/detail.vue
View File

@@ -7,22 +7,23 @@
:data="commonForm"
:processViewer="commonProvessViewer"
v-show="showActive == '00'"
:loading="loading"
v-model:value="auditOpinion"
/>
<summary-detail v-show="showActive == '10'" :formData="commonForm.formData" :data="commonForm"
:processViewer="commonProvessViewer" :loading="loading" :fileListShow="fileListShow"
:processViewer="commonProvessViewer" :fileListShow="fileListShow"
v-model:value="auditOpinion"/>
<ApprovalDetail type="approval" v-show="showActive == '20'&&!showApply" :formData="commonForm.formData"
:data="commonForm" :processViewer="commonProvessViewer" :loading="loading"
:data="commonForm" :processViewer="commonProvessViewer"
:fileListShow="fileListShow" v-model:value="auditOpinion"/>
<ApprovalDetail type="execute" v-show="showActive == '40'" :formData="commonForm.formData"
:data="commonForm" :processViewer="commonProvessViewer" :loading="loading"
<ApprovalDetail type="execute" v-show="showActive == '40'&&!showCheck" :formData="commonForm.formData"
:data="commonForm" :processViewer="commonProvessViewer"
:fileListShow="fileListShow" v-model:value="auditOpinion"/>
<ApprovalDetail type="archivist" v-show="showActive == '50'" :formData="commonForm.formData" :data="commonForm"
:processViewer="commonProvessViewer" :loading="loading" :fileListShow="fileListShow"
<ApprovalDetail type="archivist" v-show="showActive == '50'&&!showFiling" :formData="commonForm.formData" :data="commonForm"
:processViewer="commonProvessViewer" :fileListShow="fileListShow"
v-model:value="auditOpinion"/>
<project-apply v-if="showApply&&showActive == '20'" :data="commonForm"/>
<project-apply title="项目验收" v-if="showCheck&&showActive == '40'" :data="commonForm"/>
<project-apply title="项目结项" v-if="showFiling&&showActive == '50'" :data="commonForm"/>
</template>
</steps>
<opinion v-if="commonForm.taskId" :formData="commonForm.formData" :taskId="commonForm.taskId"
@@ -40,6 +41,8 @@ import Opinion from "@/components/DetailComponent/Opinion.vue";
const route = useRoute()
const showApply = ref(false)
const showCheck = ref(false)
const showFiling = ref(false)
const loading = ref(false)
const processStore = useProcessStore()
const fileListShow = ref('READ')
@@ -57,11 +60,8 @@ const getAllInfo = async (state) => {
const loading = ElLoading.service({fullscreen: true})
try {
commonProvessViewer.value = false
loading.value = true
const {data, code, msg} = await getMapProjectStateInfo(route.query.projectId, state)
if (code === 1000) {
loading.value = false
} else {
if (code !== 1000) {
ElNotification({
title: '提示',
message: msg,
@@ -92,13 +92,37 @@ const getAllInfo = async (state) => {
}
}
const changeModel = (active) => {
if (route.query.state === '0' && active === '20') {
showApply.value = true
} else if (route.query.state === '3' && active === '20') {
showApply.value = true
getAllInfo(active)
if (route.query.step === '20' && active === '20') {
if (route.query.state === '0') {
showApply.value = true
} else if (route.query.state === '3') {
showApply.value = true
getAllInfo(active)
} else {
showApply.value = false
getAllInfo(active)
}
} else if (route.query.step === '40' && active === '40') {
if (route.query.state === '0') {
showCheck.value = true
} else if (route.query.state === '3') {
showCheck.value = true
getAllInfo(active)
} else {
showCheck.value = false
getAllInfo(active)
}
} else if (route.query.step === '50' && active === '50') {
if (route.query.state === '0') {
showFiling.value = true
} else if (route.query.state === '3') {
showFiling.value = true
getAllInfo(active)
} else {
showFiling.value = false
getAllInfo(active)
}
} else {
showApply.value = false
getAllInfo(active)
}
}

11
src/views/project-management/implementation/share.vue
View File

@@ -26,8 +26,8 @@ const schema = computed(() => {
}
},
{
label: '所属公司',
prop: 'affiliatedCompany',
label: '征集类型',
prop: 'collectType',
colProps: {
span: 12
}
@@ -40,13 +40,12 @@ const schema = computed(() => {
}
},
{
label: '征集类型',
prop: 'collectType',
label: '所属公司',
prop: 'affiliatedCompany',
colProps: {
span: 12
}
},
}
]
})
const baseForm = ref()

11
src/views/project-management/implementation/uploadFee.vue
View File

@@ -103,8 +103,8 @@ const schema = computed(() => {
}
},
{
label: '所属公司',
prop: 'affiliatedCompany',
label: '征集类型',
prop: 'collectType',
colProps: {
span: 12
}
@@ -117,13 +117,12 @@ const schema = computed(() => {
}
},
{
label: '征集类型',
prop: 'collectType',
label: '所属公司',
prop: 'affiliatedCompany',
colProps: {
span: 12
}
},
}
]
})
const baseForm = ref()