Merge pull request 'dj' (#193) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/193
This commit is contained in:
@@ -7,7 +7,8 @@
|
||||
@tab-click="handleClick"
|
||||
>
|
||||
<el-tab-pane label="需求征集" name="first">
|
||||
<CollectionDetail :formData="collectionData.formData" :data="collectionData" :processViewer="processViewer" :companyOption="companyOption" @getInfo="getDemandCollectionInfo"/>
|
||||
<collection-detail :formData="collectionData.formData" :data="collectionData" :processViewer="processViewer"
|
||||
:companyOption="companyOption" @getInfo="getDemandCollectionInfo"/>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="需求上报" name="second"></el-tab-pane>
|
||||
<el-tab-pane label="项目立项" name="third" :disabled="true"></el-tab-pane>
|
||||
@@ -19,6 +20,7 @@
|
||||
import {getInfo} from "@/api/project-demand/index.js";
|
||||
import {getSubCompOpt} from '@/api/user/user.js'
|
||||
import {useProcessStore} from '@/stores/processStore.js';
|
||||
import CollectionDetail from "@/components/DetailComponent/CollectionDetail.vue";
|
||||
|
||||
const route = useRoute()
|
||||
const activeName = ref('first')
|
||||
@@ -32,7 +34,7 @@ const getCompanyOption = async () => {
|
||||
companyOption.value = res.data
|
||||
}
|
||||
|
||||
const getDemandCollectionInfo =async () => {
|
||||
const getDemandCollectionInfo = async () => {
|
||||
if (!route.query.id) return
|
||||
await getCompanyOption()
|
||||
getInfo(route.query.id).then(res => {
|
||||
@@ -82,6 +84,7 @@ getDemandCollectionInfo()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.approval-record {
|
||||
padding-bottom: 30px;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user