Merge pull request 'master' (#670) from master into prod

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/670
This commit is contained in:
2024-08-05 12:57:23 +00:00
28 changed files with 2927 additions and 460 deletions

View File

@@ -21,9 +21,9 @@ export const getUserAccount = () => {
method: 'get'
})
}
export const judgeIsSameRole = () => {
export const judgeIsSameRole = (userId) => {
return request({
url: '/admin/mosr/user/company/same',
url: `/admin/mosr/user/company/same/${userId}`,
method: 'get'
})
}

View File

@@ -304,7 +304,7 @@ const schema = computed(() => {
component: () => (
<div>
{
props.formData.optionalChargeLeadership ? props.formData.optionalChargeLeadership.map(item => {
props.formData.optionalChargeLeadership?.length>0 ? props.formData.optionalChargeLeadership.map(item => {
return <span>{item.name} </span>
}) : <span>{'--'}</span>
}
@@ -377,7 +377,7 @@ const schema = computed(() => {
component: () => (
<div>
{
props.formData.optionalChargeLeadership ? props.formData.optionalChargeLeadership.map(item => {
props.formData.optionalChargeLeadership?.length>0 ? props.formData.optionalChargeLeadership.map(item => {
return <span>{item.name} </span>
}) : <span>{'--'}</span>
}

View File

@@ -1,9 +1,10 @@
<template>
<div v-loading="loading">
<baseTitle title="需求征集信息" v-if="type!=='singleDetail'"></baseTitle>
<el-form :model="formData">
<el-row>
<el-col :span="6" v-if="type==='singleDetail'">
<el-form :model="formData" >
<el-row gutter="20">
<!-- v-if="type==='singleDetail'"-->
<el-col :span="6">
<el-form-item label="征集名称">
<span>{{ formData.requirementName }}</span>
</el-form-item>

View File

@@ -2,29 +2,50 @@
<!-- <baseTitle title="审核意见"></baseTitle>-->
<!-- <fvForm :schema="schema" @getInstance="(e)=>form = e"></fvForm>-->
<div class="oper-page-btn" style="display: flex">
<el-select v-if="taskUserOptionList?.length>0" v-model="backNode" placeholder="请选择退回节点" clearable style="width: 150px;margin-right: 10px">
<el-option
v-for="item in taskUserOptionList"
:key="item.nodeId"
:label="item.nodeName + (item.userInfo ? ':' + item.userInfo.name : '')"
:value="item.nodeId">
</el-option>
</el-select>
<el-button type="danger" @click="rollbackHandler">驳回</el-button>
<el-button type="danger" @click="handleReject">驳回</el-button>
<el-button color="#DED0B2" @click="handleAgree">同意</el-button>
</div>
<!-- <el-dialog v-model="showBackNode" title="选择退回节点" width="400">-->
<!-- <el-select v-model="backNode" placeholder="请选择退回节点" clearable filterable>-->
<!-- <el-option-->
<!-- v-for="item in taskUserOptionList"-->
<!-- :key="item.nodeId"-->
<!-- :label="item.nodeName + ':' + item.userInfo.name"-->
<!-- :value="item.nodeId">-->
<!--&lt;!&ndash; {{item.nodeName }} : {{item.userInfo.name}}&ndash;&gt;-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- <el-button type="danger" @click="rollbackHandler">确认</el-button>-->
<!-- </el-dialog>-->
<div class="opinion-dialog">
<el-dialog v-model="showBackNode" title="请选择退回节点" width="400">
<el-table :data="taskUserOptionList" style="width: 100%"
:header-cell-style="{background:'#f5f7fa'}">
<el-table-column width="55">
<template #default="scope">
<el-radio
class="radio"
:label="scope.row"
v-model="backNode"
>&emsp;&emsp;&emsp;
</el-radio>
</template>
</el-table-column>
<el-table-column
prop="nodeName"
label="节点名称">
</el-table-column>
<el-table-column
prop="name"
label="操作者">
<template #default="scope">
<el-tag v-if="scope.row.userInfo" type="success">{{ scope.row.userInfo.name }}</el-tag>
</template>
</el-table-column>
</el-table>
<div class="oper" style="display: flex;justify-content: flex-end;margin-top: 10px">
<el-button type="danger" @click="rollbackHandler">确定</el-button>
<el-button @click="showBackNode=false">取消</el-button>
</div>
<!-- <el-select v-if="taskUserOptionList?.length>0" v-model="backNode" placeholder="请选择退回节点" clearable>-->
<!-- <el-option-->
<!-- v-for="item in taskUserOptionList"-->
<!-- :key="item.nodeId"-->
<!-- :label="item.nodeName + (item.userInfo ? ':' + item.userInfo.name : '')"-->
<!-- :value="item.nodeId">-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- <el-button type="danger" @click="rollbackHandler">确认</el-button>-->
</el-dialog>
</div>
</template>
<script setup lang="jsx">
@@ -56,7 +77,7 @@ const props = defineProps({
})
const form = ref()
const backNode = ref('')
const backNode = ref({})
const showBackNode = ref(false)
const schema = computed(() => {
return [
@@ -147,32 +168,8 @@ const back = () => {
}
// 驳回
const handleReject = async () => {
// const values = form.value.getValues()
showBackNode.value = true
// if (!_value.value) {
// ElNotification({
// title: '提示',
// message: '请填写审核意见',
// type: 'warning'
// })
// return
// }
// const params = {
// taskId: props.taskId,
// // ...values
// auditOpinion: _value.value
// }
// // console.log('params', params)
// const res = await rejectTask(params)
// ElNotification({
// title: '提示',
// message: res.msg,
// type: res.code === 1000 ? 'success' : 'error'
// })
// if (res.code === 1000){
// tagsViewStore.delVisitedViews(router.currentRoute.value.path)
// back()
// }
backNode.value = {}
}
//回退节点
const rollbackHandler = async () => {
@@ -189,7 +186,7 @@ const rollbackHandler = async () => {
taskId: props.taskId,
// ...values
auditOpinion: _value.value,
rollBackId: backNode.value
rollBackId: backNode.value.nodeId
}
// console.log('params', params)
const res = await rejectTask(params)
@@ -224,6 +221,10 @@ const handleAgree = async () => {
}
</script>
<style lang="scss" scoped>
<style lang="scss">
.opinion-dialog {
.el-dialog__body {
padding: 0 !important;
}
}
</style>

View File

@@ -2,7 +2,7 @@
<div class="detail-block" v-loading="loading">
<baseTitle title="需求上报信息"></baseTitle>
<el-form :model="localFormData" ref="summaryForm" :rules="rules">
<el-row gutter="14" style="margin-bottom: -18px">
<el-row gutter="20" style="margin-bottom: -18px">
<el-col :span="6">
<el-form-item label="项目名称" prop="projectName">
<span>{{ localFormData.projectName }}</span>
@@ -40,7 +40,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="预期技术标准制定" prop="technicalStandard">
<el-form-item label="标准制定" prop="technicalStandard">
<span>{{ filterDict(cacheStore.getDict('technical_standard'), localFormData.technicalStandard) }}</span>
</el-form-item>
</el-col>
@@ -50,7 +50,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="经预算(元)" prop="economicEstimate">
<el-form-item label="经预算(元)" prop="economicEstimate">
<span>{{ toThousands(localFormData.economicEstimate) }}</span>
</el-form-item>
</el-col>
@@ -69,24 +69,24 @@
</el-form-item>
</el-col>
<el-col :span="6" v-if="localFormData.isSpecialFund">
<el-form-item label="专项资金名称" prop="specialFund">
<el-form-item label="所属专项资金项目" prop="specialFund">
<span>{{
localFormData.specialFundId === 0 ? localFormData.specialFund : changeName(fundOption, localFormData.specialFundId)
}}</span>
</el-form-item>
</el-col>
<el-col :span="6" v-if="localFormData.isSpecialFund">
<el-form-item label="其中申请公司总部科技创新专项资金(元)" prop="specialFundAmount">
<el-form-item label="申请总部专项资金(元)" prop="specialFundAmount">
<span>{{ toThousands(localFormData.specialFundAmount) }}</span>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="部门分管领导" prop="optionalChargeLeadership">
<span>{{ localFormData.optionalChargeLeadership?.map(item=>item.name).join() }}</span>
<span>{{ localFormData.optionalChargeLeadership?.map(item=>item.name).join()||'--' }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row gutter="14" style="margin-bottom: -18px">
<el-row gutter="20" style="margin-bottom: -18px">
<el-col :span="24">
<baseTitle title="预期知识产权"></baseTitle>
</el-col>
@@ -128,7 +128,7 @@
</el-form-item>
</el-col>
</el-row>
<el-row gutter="14" >
<el-row gutter="20" >
<el-col :span="24">
<baseTitle title="项目描述"></baseTitle>
</el-col>

View File

@@ -1,6 +1,6 @@
<template>
<baseTitle title="项目基本信息"></baseTitle>
<fvForm :schema="schema" @getInstance="(e)=>baseForm = e"></fvForm>
<fvForm :schema="schema" @getInstance="(e)=>baseForm = e" label-position="left" label-width="left"></fvForm>
<div class="steps-box">
<el-steps v-if="stepsShow" :active="localActive" finish-status="success">
<el-step
@@ -34,10 +34,11 @@
<script setup lang="jsx">
import {ElLoading, ElNotification} from 'element-plus';
import {computed, onMounted, reactive, ref, watchEffect} from 'vue';
import {useRoute} from 'vue-router';
import {getBaseInfoApi} from './api';
import {useCacheStore} from '@/stores/cache.js'
import {toThousands} from '@/utils/changePrice.js'
const props = defineProps({
// 步骤对应内容list
stepList: {
@@ -60,17 +61,12 @@ const props = defineProps({
default: ''
}
})
const route = useRoute()
const cacheStore = useCacheStore()
const emits = defineEmits(['stepChange', 'setDetail'])
const localData = reactive({})
const localActive = ref(0) // 当前激活步骤
const stepsShow = ref(false)
const localSteps = ref([
{
title: '需求征集',
@@ -99,37 +95,232 @@ const localSteps = ref([
])
const baseForm = ref()
const baseFormData = ref([])
const schema = computed(() => {
return [
// {
// label: '征集公司',
// prop: 'affiliatedCompany',
// colProps: {
// span: 6
// }
// },
// {
// label: '征集名称',
// prop: 'requirementName',
// colProps: {
// span: 6
// }
// },
// {
// label: '征集说明',
// prop: 'collectExplain',
// colProps: {
// span: 24
// }
// },
{
label: '承办单位',
prop: 'affiliatedCompany',
colProps: {
span: 6
}
},
{
label: '项目名称',
prop: 'projectName',
colProps: {
span: 8
span: 6
}
},
{
label: '开始时间',
prop: 'startTime',
colProps: {
span: 6
}
},
{
label: '征集公司',
prop: 'affiliatedCompany',
label: '结束时间',
prop: 'endTime',
colProps: {
span: 8
span: 6
}
},
{
label: '征集名称',
prop: 'requirementName',
label: '项目类型',
prop: 'projectType',
colProps: {
span: 8
span: 6
},
component: () => (
<div>
{
baseFormData.value?.projectType ?
<span>{filterDict(cacheStore.getDict('project_type'), baseFormData.value?.projectType)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '研发主体',
prop: 'rdSubject',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.rdSubject ?
<span>{filterDict(cacheStore.getDict('rd_subject'), baseFormData.value?.rdSubject)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '出资类型',
prop: 'investmentType',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.investmentType ?
<span>{filterDict(cacheStore.getDict('invest_type'), baseFormData.value?.investmentType)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '所属业务板块',
prop: 'businessSegment',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.businessSegment ?
<span>{filterDict(cacheStore.getDict('business_segment'), baseFormData.value?.businessSegment)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '标准制定',
prop: 'technicalStandard',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.technicalStandard ?
<span>{filterDict(cacheStore.getDict('technical_standard'), baseFormData.value?.technicalStandard)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '项目影响',
prop: 'projectImpact',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.projectImpact ?
<span>{filterDict(cacheStore.getDict('project_impact'), baseFormData.value?.projectImpact)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '经费预算(元)',
prop: 'economicEstimate',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.economicEstimate ?
<span>{ toThousands(baseFormData.value?.economicEstimate )}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '产学研联合',
prop: 'industryUniversityResearch',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.industryUniversityResearch ?
<span>{filterDict(cacheStore.getDict('industry_university'), baseFormData.value?.industryUniversityResearch)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '开展政府申报',
prop: 'governmentDeclaration',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.governmentDeclaration ?
<span>{filterDict(cacheStore.getDict('government_declaration'), baseFormData.value?.governmentDeclaration)}</span>
: <span>{'--'}</span>
}
</div>
)
},
// {
// label: '是否专项资金项目',
// prop: 'isSpecialFund',
// colProps: {
// span: 6
// }
// },
{
label: '所属专项资金项目',
prop: 'specialFund',
colProps: {
span: 6
}
},
{
label: '征集说明',
prop: 'collectExplain',
label: '申请总部专项资金(元)',
prop: 'specialFundAmount',
colProps: {
span: 24
span: 6
}
},
{
label: '部门分管领导',
prop: 'optionalChargeLeadership',
colProps: {
span: 6
}
}
]
})
@@ -179,7 +370,31 @@ const formatProcedure = (data) => {
}
return arr
}
//匹配字典值,返回对应值的字典标签
const filterDict = (data, value) => {
if (data === undefined || value === undefined) return;
let label = ''
let result = []
if (value instanceof Array) {
value.forEach(item1 => {
data.find(item => {
if (item.value == item1) {
result.push(item.label)
}
})
})
label = result.map(item => item).join('')
} else {
if (data instanceof Array) {
data.find(item => {
if (item.value == value) {
label = item.label
}
})
}
}
return label
}
// 反向格式化
const formatReProcedure = (data) => {
let arr = []
@@ -297,6 +512,7 @@ const getBaseInfo = async () => {
}
localStepSuccess.value = formatProcedure(data.procedure)
baseForm.value.setValues(data)
baseFormData.value = data
emits('setDetail', formatActive(localActive.value))
loading.close()
nextTick(() => {
@@ -322,7 +538,7 @@ watchEffect(() => {
if (props.reportType === 'direct') {
let steps = []
for (const step of localSteps.value) {
if (step.key !== 'collect'){
if (step.key !== 'collect') {
steps.push(step)
}
}

View File

@@ -130,7 +130,7 @@
<div v-else>--</div>
</template>
</el-table-column>
<el-table-column prop="intellectualProperty" label="经预算(元)" align="center">
<el-table-column prop="intellectualProperty" label="经预算(元)" align="center">
<template #default="scope">
<span>{{ toThousands(scope.row.economicEstimate) }}</span>
</template>

View File

@@ -137,12 +137,7 @@ const tableConfig = reactive({
align: 'center',
// width: 200
},
{
prop: 'approveName',
label: '审批人',
align: 'center',
// width: 100,
},
{
prop: 'deadline',
label: '需求上报截止时间',
@@ -150,11 +145,25 @@ const tableConfig = reactive({
// width: 150,
},
{
prop: 'taskNode',
label: '当前节点',
prop: 'approveName',
label: '当前审批节点',
align: 'center',
// width: 300
// width: 100,
currentRender: ({row, index}) => {
if(row.state=='1'){
return <span>{row.approveName}</span>
}else {
return <span>{row.taskNode}</span>
}
}
},
// {
// prop: 'taskNode',
// label: '当前审批节点',
// align: 'center',
// // width: 300
//
// },
{
prop: 'state',
label: '状态',

View File

@@ -120,7 +120,7 @@
<!-- <el-col :span="route.query.id && formData.isSpecialFund?8:!formData.isSpecialFund?!route.query.id?6:8:6">-->
<el-col :span="6">
<el-form-item label="经费预算" prop="economicEstimate" :label-width="route.query.id && formData.isSpecialFund?135:120">
<el-input-number v-model="formData.economicEstimate" placeholder="请输入经预算数量" :controls="false"/>
<el-input-number v-model="formData.economicEstimate" placeholder="请输入经预算数量" :controls="false"/>
</el-form-item>
</el-col>
<el-col :span="6">
@@ -374,7 +374,7 @@ const rules = reactive({
softwareCopyright: [{required: true, message: '请输入软件著作权', trigger: 'blur'}],
copyright: [{required: true, message: '请输入著作权', trigger: 'blur'}],
other: [{required: true, message: '请输入其他', trigger: 'blur'}],
economicEstimate: [{required: true, message: '请输入经预算', trigger: 'blur'}],
economicEstimate: [{required: true, message: '请输入经预算', trigger: 'blur'}],
specialFundAmount: [{required: true, message: '请输入专项资金', trigger: 'blur'}],
serviceDescription: [{required: true, message: '请输入现有业务描述', trigger: 'blur'}],
contentDescription: [{required: true, message: '请输入研发项目关键内容描述', trigger: 'blur'}]

View File

@@ -1,6 +1,6 @@
<template>
<baseTitle title="基础信息"></baseTitle>
<fvForm :schema="schema" @getInstance="(e)=>baseForm = e"></fvForm>
<baseTitle title="项目基本信息"></baseTitle>
<fvForm :schema="schema" @getInstance="(e)=>baseForm = e" label-position="left" label-width="left"></fvForm>
<el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
<el-tab-pane v-for="item in paneList" :label="item.label" :name="item.name">
<search-files-by-tag @search="search" @upload="upload" :type="item.name==='40'?'40':''"
@@ -15,6 +15,11 @@ import {ElNotification} from "element-plus";
import {computed, ref} from "vue";
import {getBaseInfoApi} from "@/components/steps/api";
import {useCacheStore} from '@/stores/cache.js'
import {toThousands} from '@/utils/changePrice.js'
const cacheStore = useCacheStore()
const route = useRoute()
const router = useRouter()
const activeName = ref('50')
@@ -24,38 +29,206 @@ const uploadState = ref(false)
const fileList = ref([])
const projectId = ref(route.query.id)
const requirementId = ref(route.query.requirementId)
const baseFormData = ref([])
const schema = computed(() => {
return [
{
label: '承办单位',
prop: 'affiliatedCompany',
colProps: {
span: 6
}
},
{
label: '项目名称',
prop: 'projectName',
colProps: {
span: 8
span: 6
}
},
{
label: '开始时间',
prop: 'startTime',
colProps: {
span: 6
}
},
{
label: '征集公司',
prop: 'affiliatedCompany',
label: '结束时间',
prop: 'endTime',
colProps: {
span: 8
span: 6
}
},
{
label: '征集名称',
prop: 'requirementName',
label: '项目类型',
prop: 'projectType',
colProps: {
span: 8
span: 6
},
component: () => (
<div>
{
baseFormData.value?.projectType ?
<span>{filterDict(cacheStore.getDict('project_type'), baseFormData.value?.projectType)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '研发主体',
prop: 'rdSubject',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.rdSubject ?
<span>{filterDict(cacheStore.getDict('rd_subject'), baseFormData.value?.rdSubject)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '出资类型',
prop: 'investmentType',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.investmentType ?
<span>{filterDict(cacheStore.getDict('invest_type'), baseFormData.value?.investmentType)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '所属业务板块',
prop: 'businessSegment',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.businessSegment ?
<span>{filterDict(cacheStore.getDict('business_segment'), baseFormData.value?.businessSegment)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '标准制定',
prop: 'technicalStandard',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.technicalStandard ?
<span>{filterDict(cacheStore.getDict('technical_standard'), baseFormData.value?.technicalStandard)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '项目影响',
prop: 'projectImpact',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.projectImpact ?
<span>{filterDict(cacheStore.getDict('project_impact'), baseFormData.value?.projectImpact)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '经费预算(元)',
prop: 'economicEstimate',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.economicEstimate ?
<span>{ toThousands(baseFormData.value?.economicEstimate )}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '产学研联合',
prop: 'industryUniversityResearch',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.industryUniversityResearch ?
<span>{filterDict(cacheStore.getDict('industry_university'), baseFormData.value?.industryUniversityResearch)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '开展政府申报',
prop: 'governmentDeclaration',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.governmentDeclaration ?
<span>{filterDict(cacheStore.getDict('government_declaration'), baseFormData.value?.governmentDeclaration)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '所属专项资金项目',
prop: 'specialFund',
colProps: {
span: 6
}
},
{
label: '征集描述',
prop: 'collectExplain',
label: '申请总部专项资金(元)',
prop: 'specialFundAmount',
colProps: {
span: 24
span: 6
}
},
{
label: '部门分管领导',
prop: 'optionalChargeLeadership',
colProps: {
span: 6
}
}
]
})
const baseForm = ref()
const paneList = ref([
{
@@ -79,10 +252,36 @@ const paneList = ref([
name: '50'
}
])
//匹配字典值,返回对应值的字典标签
const filterDict = (data, value) => {
if (data === undefined || value === undefined) return;
let label = ''
let result = []
if (value instanceof Array) {
value.forEach(item1 => {
data.find(item => {
if (item.value == item1) {
result.push(item.label)
}
})
})
label = result.map(item => item).join('')
} else {
if (data instanceof Array) {
data.find(item => {
if (item.value == value) {
label = item.label
}
})
}
}
return label
}
const getBaseInfo = async () => {
try {
const {code, data} = await getBaseInfoApi(route.query.id)
baseForm.value.setValues(data)
baseFormData.value = data
} catch {
}
}

View File

@@ -167,11 +167,6 @@ const tableConfig = reactive({
label: '项目名称',
align: 'center'
},
{
prop: 'approveName',
label: '审批人',
align: 'center'
},
{
prop: 'projectType',
label: '项目类型',
@@ -213,7 +208,7 @@ const tableConfig = reactive({
},
{
prop: 'economicEstimate',
label: '经预算(元)',
label: '经预算(元)',
align: 'center',
currentRender:({row})=>{
return <span>{toThousands(row.economicEstimate)}</span>
@@ -228,9 +223,18 @@ const tableConfig = reactive({
}
},
{
prop: 'taskNode',
label: '当前节点',
align: 'center'
prop: 'approveName',
label: '当前审批节点',
align: 'center',
currentRender: ({row, index}) => {
if(row.state=='3'||row.state=='4'){
return <span>{row.taskNode}</span>
}else if(row.state=='1'){
return <span>{row.approveName}</span>
}else {
return <span>--</span>
}
}
},
{
prop: 'state',

View File

@@ -1,6 +1,6 @@
<template>
<baseTitle title="基础信息"></baseTitle>
<fvForm :schema="schema" @getInstance="(e)=>baseForm = e"></fvForm>
<baseTitle title="项目基本信息"></baseTitle>
<fvForm :schema="schema" @getInstance="(e)=>baseForm = e" label-position="left" label-width="left"></fvForm>
<baseTitle :title="getName()+'-上传附件'"></baseTitle>
<el-card style="width: 100%;margin: 15px 0">
<file-upload @getFile="getFile" />
@@ -23,6 +23,10 @@ import {uploadFileList} from "@/api/project-manage/attachment";
import {computed, ref} from "vue";
import {getBaseInfoApi} from "@/components/steps/api";
import {useCacheStore} from '@/stores/cache.js'
import {toThousands} from '@/utils/changePrice.js'
const cacheStore = useCacheStore()
const tagsViewStore = useTagsView()
const route = useRoute()
const router = useRouter()
@@ -30,38 +34,206 @@ const fileList = ref([])
const formData = ref({
tagName:''
})
const baseFormData = ref([])
const schema = computed(() => {
return [
{
label: '承办单位',
prop: 'affiliatedCompany',
colProps: {
span: 6
}
},
{
label: '项目名称',
prop: 'projectName',
colProps: {
span: 8
span: 6
}
},
{
label: '开始时间',
prop: 'startTime',
colProps: {
span: 6
}
},
{
label: '征集公司',
prop: 'affiliatedCompany',
label: '结束时间',
prop: 'endTime',
colProps: {
span: 8
span: 6
}
},
{
label: '征集名称',
prop: 'requirementName',
label: '项目类型',
prop: 'projectType',
colProps: {
span: 8
span: 6
},
component: () => (
<div>
{
baseFormData.value?.projectType ?
<span>{filterDict(cacheStore.getDict('project_type'), baseFormData.value?.projectType)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '研发主体',
prop: 'rdSubject',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.rdSubject ?
<span>{filterDict(cacheStore.getDict('rd_subject'), baseFormData.value?.rdSubject)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '出资类型',
prop: 'investmentType',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.investmentType ?
<span>{filterDict(cacheStore.getDict('invest_type'), baseFormData.value?.investmentType)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '所属业务板块',
prop: 'businessSegment',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.businessSegment ?
<span>{filterDict(cacheStore.getDict('business_segment'), baseFormData.value?.businessSegment)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '标准制定',
prop: 'technicalStandard',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.technicalStandard ?
<span>{filterDict(cacheStore.getDict('technical_standard'), baseFormData.value?.technicalStandard)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '项目影响',
prop: 'projectImpact',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.projectImpact ?
<span>{filterDict(cacheStore.getDict('project_impact'), baseFormData.value?.projectImpact)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '经费预算(元)',
prop: 'economicEstimate',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.economicEstimate ?
<span>{ toThousands(baseFormData.value?.economicEstimate )}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '产学研联合',
prop: 'industryUniversityResearch',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.industryUniversityResearch ?
<span>{filterDict(cacheStore.getDict('industry_university'), baseFormData.value?.industryUniversityResearch)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '开展政府申报',
prop: 'governmentDeclaration',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.governmentDeclaration ?
<span>{filterDict(cacheStore.getDict('government_declaration'), baseFormData.value?.governmentDeclaration)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '所属专项资金项目',
prop: 'specialFund',
colProps: {
span: 6
}
},
{
label: '征集描述',
prop: 'collectExplain',
label: '申请总部专项资金(元)',
prop: 'specialFundAmount',
colProps: {
span: 24
span: 6
}
},
{
label: '部门分管领导',
prop: 'optionalChargeLeadership',
colProps: {
span: 6
}
}
]
})
const baseForm = ref()
const tableConfig = reactive({
columns: [
@@ -107,10 +279,37 @@ const name = ref(router.currentRoute.value.name)
const rules = reactive({
tagName: [{required: true, message: '请输入标签名称', trigger: 'blur'}],
})
//匹配字典值,返回对应值的字典标签
const filterDict = (data, value) => {
if (data === undefined || value === undefined) return;
let label = ''
let result = []
if (value instanceof Array) {
value.forEach(item1 => {
data.find(item => {
if (item.value == item1) {
result.push(item.label)
}
})
})
label = result.map(item => item).join('')
} else {
if (data instanceof Array) {
data.find(item => {
if (item.value == value) {
label = item.label
}
})
}
}
return label
}
const getBaseInfo = async () => {
try {
const {code, data} = await getBaseInfoApi(route.query.id)
baseForm.value.setValues(data)
baseFormData.value = data
} catch {
}
}

View File

@@ -1,21 +1,9 @@
<template>
<view style="overflow-y: scroll">
<baseTitle title="基础信息"></baseTitle>
<el-form :model="basicData">
<el-row>
<el-col :span="8">
<el-form-item prop="requirementName" label="征集名称">
<span>{{ basicData.requirementName ||'--'}}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item prop="projectName" label="项目名称" label-width="75">
<span>{{ basicData.projectName }}</span>
</el-form-item>
</el-col>
</el-row>
</el-form>
<fvForm :schema="schema" @getInstance="(e)=>baseForm = e"></fvForm>
<baseTitle title="项目基本信息"></baseTitle>
<fvForm :schema="schema" @getInstance="(e)=>baseForm = e" label-position="left" label-width="left"></fvForm>
<baseTitle title="表格更新数据" style="margin-top: -10px"></baseTitle>
<fvForm :schema="tableUpdateData" @getInstance="(e)=>tableUpdateFormData = e"></fvForm>
<fvSearchForm :searchConfig="searchConfig" @search="search"></fvSearchForm>
<div style="display: flex">
<el-button color="#DED0B2" @click="exportExcelHandler">导出</el-button>
@@ -38,77 +26,277 @@ import fvSelect from '@/fvcomponents/fvSelect/index.vue'
import {toThousands} from '@/utils/changePrice.js'
import {getBaseInfoApi} from "@/components/steps/api";
import {searchUpdateLedgerData, exportExcel,ledgerTemplateDownload} from "@/api/project-manage";
// import ImportExcel from "../../../components/ImportExcel";
import {useCacheStore} from '@/stores/cache.js'
const cacheStore = useCacheStore()
const router = useRouter()
const route = useRoute()
const projectId = ref(route.query.id)
const basicData = ref({})
const tableData = ref({})
const formDataArray = ref([
{
label: '项目负责人',
prop: 'projectChargePersonName',
colProps: {
span: 8
},
labelWidth:'left'
},
{
label: '项目开始时间',
prop: 'startTime',
colProps: {
span: 8
},
labelWidth:'left'
},
{
label: '项目预计持续时间',
prop: 'endTime',
colProps: {
span: 8
},
labelWidth:'left'
},
{
label: '项目开展方式',
prop: 'projectDevelopmentWay',
colProps: {
span: 24
},
labelWidth:'left'
},
{
label: '项目预算',
prop: 'projectBudgetDescription',
colProps: {
span: 24
},
labelWidth:'left'
},
{
label: '项目总体完成率',
prop: 'projectCompletionRate',
colProps: {
span: 8
},
labelWidth:'left',
component: () => <span>{tableData.value.projectCompletionRate}%</span>
},
{
label: '已完成工作量',
prop: 'completeWork',
colProps: {
span: 16
},
labelWidth:'left'
}
])
const buttonShow = ref(false)
const schema = computed(() => {
return formDataArray.value
return [
{
label: '承办单位',
prop: 'affiliatedCompany',
colProps: {
span: 6
}
},
{
label: '项目名称',
prop: 'projectName',
colProps: {
span: 6
}
},
{
label: '开始时间',
prop: 'startTime',
colProps: {
span: 6
}
},
{
label: '结束时间',
prop: 'endTime',
colProps: {
span: 6
}
},
{
label: '项目类型',
prop: 'projectType',
colProps: {
span: 6
},
component: () => (
<div>
{
basicData.value?.projectType ?
<span>{filterDict(cacheStore.getDict('project_type'), basicData.value?.projectType)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '研发主体',
prop: 'rdSubject',
colProps: {
span: 6
},
component: () => (
<div>
{
basicData.value?.rdSubject ?
<span>{filterDict(cacheStore.getDict('rd_subject'), basicData.value?.rdSubject)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '出资类型',
prop: 'investmentType',
colProps: {
span: 6
},
component: () => (
<div>
{
basicData.value?.investmentType ?
<span>{filterDict(cacheStore.getDict('invest_type'), basicData.value?.investmentType)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '所属业务板块',
prop: 'businessSegment',
colProps: {
span: 6
},
component: () => (
<div>
{
basicData.value?.businessSegment ?
<span>{filterDict(cacheStore.getDict('business_segment'), basicData.value?.businessSegment)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '标准制定',
prop: 'technicalStandard',
colProps: {
span: 6
},
component: () => (
<div>
{
basicData.value?.technicalStandard ?
<span>{filterDict(cacheStore.getDict('technical_standard'), basicData.value?.technicalStandard)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '项目影响',
prop: 'projectImpact',
colProps: {
span: 6
},
component: () => (
<div>
{
basicData.value?.projectImpact ?
<span>{filterDict(cacheStore.getDict('project_impact'), basicData.value?.projectImpact)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '经费预算(元)',
prop: 'economicEstimate',
colProps: {
span: 6
},
component: () => (
<div>
{
basicData.value?.economicEstimate ?
<span>{ toThousands(basicData.value?.economicEstimate )}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '产学研联合',
prop: 'industryUniversityResearch',
colProps: {
span: 6
},
component: () => (
<div>
{
basicData.value?.industryUniversityResearch ?
<span>{filterDict(cacheStore.getDict('industry_university'), basicData.value?.industryUniversityResearch)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '开展政府申报',
prop: 'governmentDeclaration',
colProps: {
span: 6
},
component: () => (
<div>
{
basicData.value?.governmentDeclaration ?
<span>{filterDict(cacheStore.getDict('government_declaration'), basicData.value?.governmentDeclaration)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '所属专项资金项目',
prop: 'specialFund',
colProps: {
span: 6
}
},
{
label: '申请总部专项资金(元)',
prop: 'specialFundAmount',
colProps: {
span: 6
}
},
{
label: '部门分管领导',
prop: 'optionalChargeLeadership',
colProps: {
span: 6
}
}
]
})
const tableUpdateData = computed(() => {
return [
{
label: '项目负责人',
prop: 'projectChargePersonName',
colProps: {
span: 6
},
labelWidth:'left'
},
{
label: '项目开始时间',
prop: 'startTime',
colProps: {
span: 6
},
labelWidth:'left'
},
{
label: '项目预计持续时间',
prop: 'endTime',
colProps: {
span: 6
},
labelWidth:'left'
},
{
label: '项目开展方式',
prop: 'projectDevelopmentWay',
colProps: {
span: 24
},
labelWidth:'left'
},
{
label: '项目预算',
prop: 'projectBudgetDescription',
colProps: {
span: 24
},
labelWidth:'left'
},
{
label: '项目总体完成率',
prop: 'projectCompletionRate',
colProps: {
span: 6
},
labelWidth:'left',
component: () => <span>{tableData.value.projectCompletionRate}%</span>
},
{
label: '已完成工作量',
prop: 'completeWork',
colProps: {
span: 18
},
labelWidth:'left'
}
]
})
const baseForm = ref()
const tableUpdateFormData = ref()
const tableIns = ref()
const btns = ref([
{name: '导出', key: 'export', color: '#DED0B2', auth: ''}
@@ -238,6 +426,32 @@ const tableConfig = reactive({
// btns: btns.value
})
// const exportIds=ref([])
//匹配字典值,返回对应值的字典标签
const filterDict = (data, value) => {
if (data === undefined || value === undefined) return;
let label = ''
let result = []
if (value instanceof Array) {
value.forEach(item1 => {
data.find(item => {
if (item.value == item1) {
result.push(item.label)
}
})
})
label = result.map(item => item).join('')
} else {
if (data instanceof Array) {
data.find(item => {
if (item.value == value) {
label = item.label
}
})
}
}
return label
}
const selectionChange = (data) => {
console.log('data', data)
console.log(' data.forEach(item=>item.id)', data.forEach(item => item.id))
@@ -253,6 +467,7 @@ const handleUpdateTable = () => {
const getBaseInfo = async () => {
try {
const {code, data} = await getBaseInfoApi(route.query.id)
baseForm.value.setValues(data)
basicData.value = data
} catch {
}
@@ -265,7 +480,7 @@ const init = async () => {
nextTick(() => {
buttonShow.value = !data.view
})
baseForm.value.setValues(data)
tableUpdateFormData.value.setValues(data)
}
}
getBaseInfo()

View File

@@ -1,6 +1,6 @@
<template>
<baseTitle title="基础信息"></baseTitle>
<fvForm :schema="schema" @getInstance="(e)=>baseForm = e"></fvForm>
<baseTitle title="项目基本信息"></baseTitle>
<fvForm :schema="schema" @getInstance="(e)=>baseForm = e" label-position="left" label-width="left"></fvForm>
<el-form :model="attachment" inline style="margin-top: 15px">
<el-form-item label="标签" prop="tag">
<el-select v-model="attachment.tag" placeholder="请选择标签" clearable filterable style="width: 300px">
@@ -33,46 +33,217 @@ import {getTags} from "@/api/project-manage";
import {ElNotification} from "element-plus";
import {getBaseInfoApi} from "@/components/steps/api";
import {searchImplementationFileList} from "@/api/project-manage/attachment";
import {computed} from "vue";
import {useCacheStore} from '@/stores/cache.js'
import {toThousands} from '@/utils/changePrice.js'
import {computed, ref} from "vue";
const cacheStore = useCacheStore()
const route = useRoute()
const router = useRouter()
const uploadState = ref(false)
const attachment = reactive({
tag: ''
})
const baseFormData = ref([])
const schema = computed(() => {
return [
{
label: '承办单位',
prop: 'affiliatedCompany',
colProps: {
span: 6
}
},
{
label: '项目名称',
prop: 'projectName',
colProps: {
span: 8
span: 6
}
},
{
label: '开始时间',
prop: 'startTime',
colProps: {
span: 6
}
},
{
label: '征集公司',
prop: 'affiliatedCompany',
label: '结束时间',
prop: 'endTime',
colProps: {
span: 8
span: 6
}
},
{
label: '征集名称',
prop: 'requirementName',
label: '项目类型',
prop: 'projectType',
colProps: {
span: 8
span: 6
},
component: () => (
<div>
{
baseFormData.value?.projectType ?
<span>{filterDict(cacheStore.getDict('project_type'), baseFormData.value?.projectType)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '研发主体',
prop: 'rdSubject',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.rdSubject ?
<span>{filterDict(cacheStore.getDict('rd_subject'), baseFormData.value?.rdSubject)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '出资类型',
prop: 'investmentType',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.investmentType ?
<span>{filterDict(cacheStore.getDict('invest_type'), baseFormData.value?.investmentType)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '所属业务板块',
prop: 'businessSegment',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.businessSegment ?
<span>{filterDict(cacheStore.getDict('business_segment'), baseFormData.value?.businessSegment)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '标准制定',
prop: 'technicalStandard',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.technicalStandard ?
<span>{filterDict(cacheStore.getDict('technical_standard'), baseFormData.value?.technicalStandard)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '项目影响',
prop: 'projectImpact',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.projectImpact ?
<span>{filterDict(cacheStore.getDict('project_impact'), baseFormData.value?.projectImpact)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '经费预算(元)',
prop: 'economicEstimate',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.economicEstimate ?
<span>{ toThousands(baseFormData.value?.economicEstimate )}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '产学研联合',
prop: 'industryUniversityResearch',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.industryUniversityResearch ?
<span>{filterDict(cacheStore.getDict('industry_university'), baseFormData.value?.industryUniversityResearch)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '开展政府申报',
prop: 'governmentDeclaration',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.governmentDeclaration ?
<span>{filterDict(cacheStore.getDict('government_declaration'), baseFormData.value?.governmentDeclaration)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '所属专项资金项目',
prop: 'specialFund',
colProps: {
span: 6
}
},
{
label: '征集描述',
prop: 'collectExplain',
label: '申请总部专项资金(元)',
prop: 'specialFundAmount',
colProps: {
span: 24
span: 6
}
},
{
label: '部门分管领导',
prop: 'optionalChargeLeadership',
colProps: {
span: 6
}
}
]
})
const baseForm = ref()
const tagsOption = ref([])
const tableConfig = reactive({
@@ -117,10 +288,37 @@ const tableConfig = reactive({
})
const showTable = ref(true)
const otherFileList = ref([])
//匹配字典值,返回对应值的字典标签
const filterDict = (data, value) => {
if (data === undefined || value === undefined) return;
let label = ''
let result = []
if (value instanceof Array) {
value.forEach(item1 => {
data.find(item => {
if (item.value == item1) {
result.push(item.label)
}
})
})
label = result.map(item => item).join('')
} else {
if (data instanceof Array) {
data.find(item => {
if (item.value == value) {
label = item.label
}
})
}
}
return label
}
const getBaseInfo = async () => {
try {
const {code, data} = await getBaseInfoApi(route.query.id)
baseForm.value.setValues(data)
baseFormData.value = data
} catch {
}
}

View File

@@ -170,11 +170,6 @@ const tableConfig = reactive({
label: '项目名称',
align: 'center'
},
{
prop: 'approveName',
label: '审批人',
align: 'center'
},
{
prop: 'projectType',
label: '项目类型',
@@ -229,7 +224,7 @@ const tableConfig = reactive({
},
{
prop: 'economicEstimate',
label: '经预算(元)',
label: '经预算(元)',
align: 'center',
currentRender:({row})=>{
return <span>{toThousands(row.economicEstimate)}</span>
@@ -244,9 +239,18 @@ const tableConfig = reactive({
}
},
{
prop: 'taskNode',
label: '当前节点',
align: 'center'
prop: 'approveName',
label: '当前审批节点',
align: 'center',
currentRender: ({row, index}) => {
if(row.state=='3'||row.state=='4'){
return <span>{row.taskNode}</span>
}else if(row.state=='1'){
return <span>{row.approveName}</span>
}else {
return <span>--</span>
}
}
},
{
prop: 'state',

View File

@@ -1,7 +1,7 @@
<template>
<div class="apply-block" v-loading="loading">
<baseTitle title="项目基本信息"></baseTitle>
<fvForm :schema="schema" @getInstance="(e)=>baseForm = e" ></fvForm>
<fvForm :schema="schema" @getInstance="(e)=>baseForm = e" label-position="left" label-width="left"></fvForm>
<baseTitle title="阶段变更信息" style="margin-top: -10px"></baseTitle>
<el-form :model="formData" label-width="auto">
<el-form-item label="抄送人员" label-width="105">
@@ -52,7 +52,10 @@ import {useProcessStore} from '@/stores/processStore.js';
import {useTagsView} from '@/stores/tagsview.js'
import {computed, ref} from "vue";
import {getBaseInfoApi} from "@/components/steps/api";
import {useCacheStore} from '@/stores/cache.js'
import {toThousands} from '@/utils/changePrice.js'
const cacheStore = useCacheStore()
const changeDiagram = ref(false)
const tagsViewStore = useTagsView()
const router = useRouter()
@@ -73,43 +76,238 @@ const processInstanceData = ref()
const processDiagramViewer = ref(true)
const userList = ref([])
const processStore = useProcessStore()
const baseFormData = ref([])
const schema = computed(() => {
return [
{
label: '承办单位',
prop: 'affiliatedCompany',
colProps: {
span: 6
}
},
{
label: '项目名称',
prop: 'projectName',
colProps: {
span: 8
span: 6
}
},
{
label: '开始时间',
prop: 'startTime',
colProps: {
span: 6
}
},
{
label: '征集公司',
prop: 'affiliatedCompany',
label: '结束时间',
prop: 'endTime',
colProps: {
span: 8
span: 6
}
},
{
label: '征集名称',
prop: 'requirementName',
label: '项目类型',
prop: 'projectType',
colProps: {
span: 8
span: 6
},
component: () => (
<div>
{
baseFormData.value?.projectType ?
<span>{filterDict(cacheStore.getDict('project_type'), baseFormData.value?.projectType)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '研发主体',
prop: 'rdSubject',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.rdSubject ?
<span>{filterDict(cacheStore.getDict('rd_subject'), baseFormData.value?.rdSubject)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '出资类型',
prop: 'investmentType',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.investmentType ?
<span>{filterDict(cacheStore.getDict('invest_type'), baseFormData.value?.investmentType)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '所属业务板块',
prop: 'businessSegment',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.businessSegment ?
<span>{filterDict(cacheStore.getDict('business_segment'), baseFormData.value?.businessSegment)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '标准制定',
prop: 'technicalStandard',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.technicalStandard ?
<span>{filterDict(cacheStore.getDict('technical_standard'), baseFormData.value?.technicalStandard)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '项目影响',
prop: 'projectImpact',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.projectImpact ?
<span>{filterDict(cacheStore.getDict('project_impact'), baseFormData.value?.projectImpact)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '经费预算(元)',
prop: 'economicEstimate',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.economicEstimate ?
<span>{ toThousands(baseFormData.value?.economicEstimate )}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '产学研联合',
prop: 'industryUniversityResearch',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.industryUniversityResearch ?
<span>{filterDict(cacheStore.getDict('industry_university'), baseFormData.value?.industryUniversityResearch)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '开展政府申报',
prop: 'governmentDeclaration',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.governmentDeclaration ?
<span>{filterDict(cacheStore.getDict('government_declaration'), baseFormData.value?.governmentDeclaration)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '所属专项资金项目',
prop: 'specialFund',
colProps: {
span: 6
}
},
{
label: '征集描述',
prop: 'collectExplain',
label: '申请总部专项资金(元)',
prop: 'specialFundAmount',
colProps: {
span: 24
span: 6
}
},
{
label: '部门分管领导',
prop: 'optionalChargeLeadership',
colProps: {
span: 6
}
}
]
})
const baseForm = ref()
//匹配字典值,返回对应值的字典标签
const filterDict = (data, value) => {
if (data === undefined || value === undefined) return;
let label = ''
let result = []
if (value instanceof Array) {
value.forEach(item1 => {
data.find(item => {
if (item.value == item1) {
result.push(item.label)
}
})
})
label = result.map(item => item).join('')
} else {
if (data instanceof Array) {
data.find(item => {
if (item.value == value) {
label = item.label
}
})
}
}
return label
}
const getBaseInfo = async () => {
try {
const {code, data} = await getBaseInfoApi(route.query.projectId)
baseForm.value.setValues(data)
baseFormData.value = data
} catch {
}
}

View File

@@ -1,6 +1,6 @@
<template>
<baseTitle title="基础信息"></baseTitle>
<fvForm :schema="schema" @getInstance="(e)=>baseForm = e" ></fvForm>
<baseTitle title="项目基本信息"></baseTitle>
<fvForm :schema="schema" @getInstance="(e)=>baseForm = e" label-position="left" label-width="left"></fvForm>
<baseTitle title="阶段变更详情" style="margin-top: -10px"></baseTitle>
<div style="color: #606266;font-size: 14px;height:25px;"><span style="display:inline-block;text-align: right;margin-right: 14px">抄送人</span>{{copyName?copyName:'--'}}</div>
<ApprovalDetail :formData="summaryData.formData" :data="summaryData" type="phase"
@@ -14,7 +14,10 @@ import {useProcessStore} from '@/stores/processStore.js';
import {getPhaseDetail} from "@/api/project-manage";
import {computed, ref} from "vue";
import {getBaseInfoApi} from "@/components/steps/api";
import {useCacheStore} from '@/stores/cache.js'
import {toThousands} from '@/utils/changePrice.js'
const cacheStore = useCacheStore()
const route = useRoute()
const summaryData = ref({})
const summaryProcessViewer = ref(true)
@@ -23,43 +26,238 @@ const loading = ref(false)
const auditOpinion = ref('')
const copyName = ref('')
const fileListShow = ref('READ')
const baseFormData = ref([])
const schema = computed(() => {
return [
{
label: '承办单位',
prop: 'affiliatedCompany',
colProps: {
span: 6
}
},
{
label: '项目名称',
prop: 'projectName',
colProps: {
span: 8
span: 6
}
},
{
label: '开始时间',
prop: 'startTime',
colProps: {
span: 6
}
},
{
label: '征集公司',
prop: 'affiliatedCompany',
label: '结束时间',
prop: 'endTime',
colProps: {
span: 8
span: 6
}
},
{
label: '征集名称',
prop: 'requirementName',
label: '项目类型',
prop: 'projectType',
colProps: {
span: 8
span: 6
},
component: () => (
<div>
{
baseFormData.value?.projectType ?
<span>{filterDict(cacheStore.getDict('project_type'), baseFormData.value?.projectType)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '研发主体',
prop: 'rdSubject',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.rdSubject ?
<span>{filterDict(cacheStore.getDict('rd_subject'), baseFormData.value?.rdSubject)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '出资类型',
prop: 'investmentType',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.investmentType ?
<span>{filterDict(cacheStore.getDict('invest_type'), baseFormData.value?.investmentType)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '所属业务板块',
prop: 'businessSegment',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.businessSegment ?
<span>{filterDict(cacheStore.getDict('business_segment'), baseFormData.value?.businessSegment)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '标准制定',
prop: 'technicalStandard',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.technicalStandard ?
<span>{filterDict(cacheStore.getDict('technical_standard'), baseFormData.value?.technicalStandard)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '项目影响',
prop: 'projectImpact',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.projectImpact ?
<span>{filterDict(cacheStore.getDict('project_impact'), baseFormData.value?.projectImpact)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '经费预算(元)',
prop: 'economicEstimate',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.economicEstimate ?
<span>{ toThousands(baseFormData.value?.economicEstimate )}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '产学研联合',
prop: 'industryUniversityResearch',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.industryUniversityResearch ?
<span>{filterDict(cacheStore.getDict('industry_university'), baseFormData.value?.industryUniversityResearch)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '开展政府申报',
prop: 'governmentDeclaration',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.governmentDeclaration ?
<span>{filterDict(cacheStore.getDict('government_declaration'), baseFormData.value?.governmentDeclaration)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '所属专项资金项目',
prop: 'specialFund',
colProps: {
span: 6
}
},
{
label: '征集描述',
prop: 'collectExplain',
label: '申请总部专项资金(元)',
prop: 'specialFundAmount',
colProps: {
span: 24
span: 6
}
},
{
label: '部门分管领导',
prop: 'optionalChargeLeadership',
colProps: {
span: 6
}
}
]
})
const baseForm = ref()
//匹配字典值,返回对应值的字典标签
const filterDict = (data, value) => {
if (data === undefined || value === undefined) return;
let label = ''
let result = []
if (value instanceof Array) {
value.forEach(item1 => {
data.find(item => {
if (item.value == item1) {
result.push(item.label)
}
})
})
label = result.map(item => item).join('')
} else {
if (data instanceof Array) {
data.find(item => {
if (item.value == value) {
label = item.label
}
})
}
}
return label
}
const getBaseInfo = async () => {
try {
const {code, data} = await getBaseInfoApi(route.query.projectId)
baseForm.value.setValues(data)
baseFormData.value = data
} catch {
}
}

View File

@@ -1,6 +1,6 @@
<template>
<baseTitle title="基础信息"></baseTitle>
<fvForm :schema="schema" @getInstance="(e)=>baseForm = e"></fvForm>
<baseTitle title="项目基本信息"></baseTitle>
<fvForm :schema="schema" @getInstance="(e)=>baseForm = e" label-position="left" label-width="left"></fvForm>
<fvSearchForm :searchConfig="searchConfig" @search="search"></fvSearchForm>
<fvTable ref="tableIns" :tableConfig="tableConfig">
<template #empty>
@@ -12,40 +12,210 @@
<script setup lang="jsx">
import {computed, ref} from "vue";
import {getBaseInfoApi} from "@/components/steps/api";
import {useCacheStore} from '@/stores/cache.js'
import {toThousands} from '@/utils/changePrice.js'
const cacheStore = useCacheStore()
const route = useRoute()
const baseFormData = ref([])
const schema = computed(() => {
return [
{
label: '承办单位',
prop: 'affiliatedCompany',
colProps: {
span: 6
}
},
{
label: '项目名称',
prop: 'projectName',
colProps: {
span: 8
span: 6
}
},
{
label: '开始时间',
prop: 'startTime',
colProps: {
span: 6
}
},
{
label: '征集公司',
prop: 'affiliatedCompany',
label: '结束时间',
prop: 'endTime',
colProps: {
span: 8
span: 6
}
},
{
label: '征集名称',
prop: 'requirementName',
label: '项目类型',
prop: 'projectType',
colProps: {
span: 8
span: 6
},
component: () => (
<div>
{
baseFormData.value?.projectType ?
<span>{filterDict(cacheStore.getDict('project_type'), baseFormData.value?.projectType)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '研发主体',
prop: 'rdSubject',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.rdSubject ?
<span>{filterDict(cacheStore.getDict('rd_subject'), baseFormData.value?.rdSubject)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '出资类型',
prop: 'investmentType',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.investmentType ?
<span>{filterDict(cacheStore.getDict('invest_type'), baseFormData.value?.investmentType)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '所属业务板块',
prop: 'businessSegment',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.businessSegment ?
<span>{filterDict(cacheStore.getDict('business_segment'), baseFormData.value?.businessSegment)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '标准制定',
prop: 'technicalStandard',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.technicalStandard ?
<span>{filterDict(cacheStore.getDict('technical_standard'), baseFormData.value?.technicalStandard)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '项目影响',
prop: 'projectImpact',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.projectImpact ?
<span>{filterDict(cacheStore.getDict('project_impact'), baseFormData.value?.projectImpact)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '经费预算(元)',
prop: 'economicEstimate',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.economicEstimate ?
<span>{ toThousands(baseFormData.value?.economicEstimate )}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '产学研联合',
prop: 'industryUniversityResearch',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.industryUniversityResearch ?
<span>{filterDict(cacheStore.getDict('industry_university'), baseFormData.value?.industryUniversityResearch)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '开展政府申报',
prop: 'governmentDeclaration',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.governmentDeclaration ?
<span>{filterDict(cacheStore.getDict('government_declaration'), baseFormData.value?.governmentDeclaration)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '所属专项资金项目',
prop: 'specialFund',
colProps: {
span: 6
}
},
{
label: '征集描述',
prop: 'collectExplain',
label: '申请总部专项资金(元)',
prop: 'specialFundAmount',
colProps: {
span: 24
span: 6
}
},
{
label: '部门分管领导',
prop: 'optionalChargeLeadership',
colProps: {
span: 6
}
}
]
})
const baseForm = ref()
const searchConfig = reactive([
{
@@ -139,30 +309,41 @@ const search = (val) => {
tableConfig.params = {...val, projectId: route.query.id}
tableIns.value.refresh()
}
// const researchOptions = ref([])
// const getResearchOptions = async () => {
// const res = await getResearchUser()
// researchOptions.value = res.data
// }
// const getResearchName=(id)=>{
// if(!id)return;
// let label=''
// researchOptions.value.forEach(item=>{
// if(item.value==id){
// label=item.label
// }
// })
// return label
// }
//匹配字典值,返回对应值的字典标签
const filterDict = (data, value) => {
if (data === undefined || value === undefined) return;
let label = ''
let result = []
if (value instanceof Array) {
value.forEach(item1 => {
data.find(item => {
if (item.value == item1) {
result.push(item.label)
}
})
})
label = result.map(item => item).join('')
} else {
if (data instanceof Array) {
data.find(item => {
if (item.value == value) {
label = item.label
}
})
}
}
return label
}
const getBaseInfo = async () => {
try {
const {code, data} = await getBaseInfoApi(route.query.id)
baseForm.value.setValues(data)
baseFormData.value = data
} catch {
}
}
// getResearchOptions()
getBaseInfo()
</script>

View File

@@ -1,77 +1,79 @@
<template>
<baseTitle title="表格更新"></baseTitle>
<el-form :model="tableForm" ref="form">
<el-row>
<el-col :span="24">
<el-form-item prop="projectName" label="项目名称" label-width="150">
<span>{{ tableForm.projectName }}</span>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item prop="projectChargePerson" label="项目负责人" label-width="150">
<!-- <el-button color="#DED0B2" @click="showPersonnelPicker" style="margin-right: 10px">-->
<!-- {{ tableForm.projectChargePersonName ? '更改' : '请选择项目负责人' }}-->
<!-- </el-button>-->
{{ tableForm.projectChargePersonName }}
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="startTime" label="项目开始时间" label-width="150">
<el-date-picker
v-model="tableForm.startTime"
type="date"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
placeholder="选择项目开始时间"
>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="endTime" label="项目预计持续时间" :title="!tableForm.startTime?'请先选择项目开始时间!':''">
<el-date-picker
v-model="tableForm.endTime"
type="date"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
placeholder="选择项目预计持续时间"
:disabled="!tableForm.startTime"
:disabled-date="disabledDate"
>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item prop="projectDevelopmentWay" label="项目开展方式" style="width: 100%" label-width="150">
<el-input v-model="tableForm.projectDevelopmentWay" placeholder="请输入项目开展方式" clearable>
</el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item prop="projectBudgetDescription" label="项目预算" style="width: 100%" label-width="150">
<el-input v-model="tableForm.projectBudgetDescription" placeholder="请输入项目预算" clearable>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item prop="projectCompletionRate" label="项目总体完成率(%">
<el-input-number v-model="tableForm.projectCompletionRate" placeholder="请输入项目总体完成率" min="0" max="100"
:controls="false" style="width: 200px">
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="16" :offset="1">
<el-form-item prop="completeWork" label="已完成工作量">
<el-input v-model="tableForm.completeWork" placeholder="请输入已完成工作量" clearable>
</el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<user-picker :multiple="false" ref="userPicker" title="请选择项目负责人" @ok="selected" v-model:value="userList"/>
<div class="oper-page-btn">
<el-button color="#DED0B2" @click="handleSubmit">提交</el-button>
<el-button @click="handleBack">返回</el-button>
<div style="padding: 0 30px">
<baseTitle title="表格更新"></baseTitle>
<el-form :model="tableForm" ref="form">
<el-row gutter="20">
<el-col :span="6">
<el-form-item prop="projectName" label="项目名称" label-width="95">
<span>{{ tableForm.projectName }}</span>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item prop="projectChargePerson" label="项目负责人">
<!-- <el-button color="#DED0B2" @click="showPersonnelPicker" style="margin-right: 10px">-->
<!-- {{ tableForm.projectChargePersonName ? '更改' : '请选择项目负责人' }}-->
<!-- </el-button>-->
{{ tableForm.projectChargePersonName }}
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item prop="startTime" label="项目开始时间" >
<el-date-picker
v-model="tableForm.startTime"
type="date"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
placeholder="选择项目开始时间"
>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item prop="endTime" label="项目预计持续时间" :title="!tableForm.startTime?'请先选择项目开始时间!':''">
<el-date-picker
v-model="tableForm.endTime"
type="date"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
placeholder="选择项目预计持续时间"
:disabled="!tableForm.startTime"
:disabled-date="disabledDate"
>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item prop="projectDevelopmentWay" label="项目开展方式" style="width: 100%" >
<el-input v-model="tableForm.projectDevelopmentWay" placeholder="请输入项目开展方式" clearable>
</el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item prop="projectBudgetDescription" label="项目预算" style="width: 100%" label-width="95">
<el-input v-model="tableForm.projectBudgetDescription" placeholder="请输入项目预算" clearable>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item prop="projectCompletionRate" label="完成率(%)" label-width="95">
<el-input-number v-model="tableForm.projectCompletionRate" placeholder="请输入项目总体完成率" min="0" max="100"
:controls="false" style="width: 200px">
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="18">
<el-form-item prop="completeWork" label="已完成工作量">
<el-input v-model="tableForm.completeWork" placeholder="请输入已完成工作量" clearable>
</el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<user-picker :multiple="false" ref="userPicker" title="请选择项目负责人" @ok="selected" v-model:value="userList"/>
<div class="oper-page-btn">
<el-button color="#DED0B2" @click="handleSubmit">提交</el-button>
<el-button @click="handleBack">返回</el-button>
</div>
</div>
</template>

View File

@@ -1,6 +1,6 @@
<template>
<baseTitle title="基础信息"></baseTitle>
<fvForm :schema="schema" @getInstance="(e)=>baseForm = e"></fvForm>
<baseTitle title="项目基本信息"></baseTitle>
<fvForm :schema="schema" @getInstance="(e)=>baseForm = e" label-position="left" label-width="left"></fvForm>
<baseTitle title="项目实施-上传附件"></baseTitle>
<el-form :model="formData" ref="tagForm" label-width="auto">
<el-form-item label="标签名称" prop="tagName">
@@ -40,41 +40,212 @@ import {computed, ref} from "vue";
import {getBaseInfoApi} from "@/components/steps/api";
import {downloadFile, deleteFile} from "@/api/project-demand";
import {useCacheStore} from '@/stores/cache.js'
import {toThousands} from '@/utils/changePrice.js'
const cacheStore = useCacheStore()
const tagsViewStore = useTagsView()
const route = useRoute()
const router = useRouter()
const fileList = ref([])
const showInput = ref(false)
const baseFormData = ref([])
const schema = computed(() => {
return [
{
label: '承办单位',
prop: 'affiliatedCompany',
colProps: {
span: 6
}
},
{
label: '项目名称',
prop: 'projectName',
colProps: {
span: 8
span: 6
}
},
{
label: '开始时间',
prop: 'startTime',
colProps: {
span: 6
}
},
{
label: '征集公司',
prop: 'affiliatedCompany',
label: '结束时间',
prop: 'endTime',
colProps: {
span: 8
span: 6
}
},
{
label: '征集名称',
prop: 'requirementName',
label: '项目类型',
prop: 'projectType',
colProps: {
span: 8
span: 6
},
component: () => (
<div>
{
baseFormData.value?.projectType ?
<span>{filterDict(cacheStore.getDict('project_type'), baseFormData.value?.projectType)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '研发主体',
prop: 'rdSubject',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.rdSubject ?
<span>{filterDict(cacheStore.getDict('rd_subject'), baseFormData.value?.rdSubject)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '出资类型',
prop: 'investmentType',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.investmentType ?
<span>{filterDict(cacheStore.getDict('invest_type'), baseFormData.value?.investmentType)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '所属业务板块',
prop: 'businessSegment',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.businessSegment ?
<span>{filterDict(cacheStore.getDict('business_segment'), baseFormData.value?.businessSegment)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '标准制定',
prop: 'technicalStandard',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.technicalStandard ?
<span>{filterDict(cacheStore.getDict('technical_standard'), baseFormData.value?.technicalStandard)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '项目影响',
prop: 'projectImpact',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.projectImpact ?
<span>{filterDict(cacheStore.getDict('project_impact'), baseFormData.value?.projectImpact)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '经费预算(元)',
prop: 'economicEstimate',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.economicEstimate ?
<span>{ toThousands(baseFormData.value?.economicEstimate )}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '产学研联合',
prop: 'industryUniversityResearch',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.industryUniversityResearch ?
<span>{filterDict(cacheStore.getDict('industry_university'), baseFormData.value?.industryUniversityResearch)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '开展政府申报',
prop: 'governmentDeclaration',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.governmentDeclaration ?
<span>{filterDict(cacheStore.getDict('government_declaration'), baseFormData.value?.governmentDeclaration)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '所属专项资金项目',
prop: 'specialFund',
colProps: {
span: 6
}
},
{
label: '征集描述',
prop: 'collectExplain',
label: '申请总部专项资金(元)',
prop: 'specialFundAmount',
colProps: {
span: 24
span: 6
}
},
{
label: '部门分管领导',
prop: 'optionalChargeLeadership',
colProps: {
span: 6
}
}
]
})
const baseForm = ref()
@@ -140,6 +311,31 @@ onActivated(() => {
})
fileList.value = []
})
//匹配字典值,返回对应值的字典标签
const filterDict = (data, value) => {
if (data === undefined || value === undefined) return;
let label = ''
let result = []
if (value instanceof Array) {
value.forEach(item1 => {
data.find(item => {
if (item.value == item1) {
result.push(item.label)
}
})
})
label = result.map(item => item).join('')
} else {
if (data instanceof Array) {
data.find(item => {
if (item.value == value) {
label = item.label
}
})
}
}
return label
}
const handleDelete = (row) => {
deleteFile(row.fileId).then(res => {
ElNotification({
@@ -166,6 +362,7 @@ const getBaseInfo = async () => {
try {
const {code, data} = await getBaseInfoApi(route.query.projectId)
baseForm.value.setValues(data)
baseFormData.value = data
} catch {
}
}

View File

@@ -1,6 +1,6 @@
<template>
<baseTitle title="基础信息"></baseTitle>
<fvForm :schema="schema" @getInstance="(e)=>baseForm = e"></fvForm>
<baseTitle title="项目基本信息"></baseTitle>
<fvForm :schema="schema" @getInstance="(e)=>baseForm = e" label-position="left" label-width="left"></fvForm>
<el-form :model="tableForm" ref="form" class="query-form">
<el-table :data="tableForm.tableData">
<el-table-column prop="time" label="时间" min-width="180">
@@ -83,9 +83,9 @@ import {addLedger} from "@/api/project-manage";
import {useTagsView} from '@/stores/tagsview.js'
import {useRoute} from "vue-router";
import {useCacheStore} from '@/stores/cache.js'
import {computed, ref} from "vue";
import {getBaseInfoApi} from "../../../components/steps/api";
import {getBaseInfoApi} from "@/components/steps/api";
import {toThousands} from '@/utils/changePrice.js'
const baseFormData = ref([])
const cacheStore = useCacheStore()
const route = useRoute()
const router = useRouter()
@@ -95,36 +95,231 @@ const form = ref()
const projectName = ref()
const schema = computed(() => {
return [
// {
// label: '征集公司',
// prop: 'affiliatedCompany',
// colProps: {
// span: 6
// }
// },
// {
// label: '征集名称',
// prop: 'requirementName',
// colProps: {
// span: 6
// }
// },
// {
// label: '征集说明',
// prop: 'collectExplain',
// colProps: {
// span: 24
// }
// },
{
label: '承办单位',
prop: 'affiliatedCompany',
colProps: {
span: 6
}
},
{
label: '项目名称',
prop: 'projectName',
colProps: {
span: 8
span: 6
}
},
{
label: '开始时间',
prop: 'startTime',
colProps: {
span: 6
}
},
{
label: '征集公司',
prop: 'affiliatedCompany',
label: '结束时间',
prop: 'endTime',
colProps: {
span: 8
span: 6
}
},
{
label: '征集名称',
prop: 'requirementName',
label: '项目类型',
prop: 'projectType',
colProps: {
span: 8
span: 6
},
component: () => (
<div>
{
baseFormData.value?.projectType ?
<span>{filterDict(cacheStore.getDict('project_type'), baseFormData.value?.projectType)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '研发主体',
prop: 'rdSubject',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.rdSubject ?
<span>{filterDict(cacheStore.getDict('rd_subject'), baseFormData.value?.rdSubject)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '出资类型',
prop: 'investmentType',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.investmentType ?
<span>{filterDict(cacheStore.getDict('invest_type'), baseFormData.value?.investmentType)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '所属业务板块',
prop: 'businessSegment',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.businessSegment ?
<span>{filterDict(cacheStore.getDict('business_segment'), baseFormData.value?.businessSegment)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '标准制定',
prop: 'technicalStandard',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.technicalStandard ?
<span>{filterDict(cacheStore.getDict('technical_standard'), baseFormData.value?.technicalStandard)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '项目影响',
prop: 'projectImpact',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.projectImpact ?
<span>{filterDict(cacheStore.getDict('project_impact'), baseFormData.value?.projectImpact)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '经费预算(元)',
prop: 'economicEstimate',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.economicEstimate ?
<span>{ toThousands(baseFormData.value?.economicEstimate )}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '产学研联合',
prop: 'industryUniversityResearch',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.industryUniversityResearch ?
<span>{filterDict(cacheStore.getDict('industry_university'), baseFormData.value?.industryUniversityResearch)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '开展政府申报',
prop: 'governmentDeclaration',
colProps: {
span: 6
},
component: () => (
<div>
{
baseFormData.value?.governmentDeclaration ?
<span>{filterDict(cacheStore.getDict('government_declaration'), baseFormData.value?.governmentDeclaration)}</span>
: <span>{'--'}</span>
}
</div>
)
},
// {
// label: '是否专项资金项目',
// prop: 'isSpecialFund',
// colProps: {
// span: 6
// }
// },
{
label: '所属专项资金项目',
prop: 'specialFund',
colProps: {
span: 6
}
},
{
label: '征集描述',
prop: 'collectExplain',
label: '申请总部专项资金(元)',
prop: 'specialFundAmount',
colProps: {
span: 24
span: 6
}
},
{
label: '部门分管领导',
prop: 'optionalChargeLeadership',
colProps: {
span: 6
}
}
]
})
const baseForm = ref()
const rules = reactive({
time: [{required: true, message: '请选择时间', trigger: 'blur'}],
@@ -145,10 +340,36 @@ const tableForm = ref({
}
]
})
//匹配字典值,返回对应值的字典标签
const filterDict = (data, value) => {
if (data === undefined || value === undefined) return;
let label = ''
let result = []
if (value instanceof Array) {
value.forEach(item1 => {
data.find(item => {
if (item.value == item1) {
result.push(item.label)
}
})
})
label = result.map(item => item).join('')
} else {
if (data instanceof Array) {
data.find(item => {
if (item.value == value) {
label = item.label
}
})
}
}
return label
}
const getBaseInfo = async () => {
try {
const {code, data} = await getBaseInfoApi(route.query.id)
baseForm.value.setValues(data)
baseFormData.value = data
} catch {
}
}

View File

@@ -165,11 +165,6 @@ const tableConfig = reactive({
align: 'center'
},
{
prop: 'approveName',
label: '审批人',
align: 'center'
},
{
prop: 'projectType',
label: '项目类型',
@@ -211,7 +206,7 @@ const tableConfig = reactive({
},
{
prop: 'economicEstimate',
label: '经预算(元)',
label: '经预算(元)',
align: 'center',
currentRender:({row})=>{
return <span>{toThousands(row.economicEstimate)}</span>
@@ -226,10 +221,24 @@ const tableConfig = reactive({
}
},
{
prop: 'taskNode',
label: '当前节点',
align: 'center'
prop: 'approveName',
label: '当前审批节点',
align: 'center',
currentRender: ({row, index}) => {
if(row.state=='3'||row.state=='4'){
return <span>{row.taskNode}</span>
}else if(row.state=='1'){
return <span>{row.approveName}</span>
}else {
return <span>--</span>
}
}
},
// {
// prop: 'taskNode',
// label: '当前节点',
// align: 'center'
// },
{
prop: 'state',
label: '状态',

View File

@@ -28,7 +28,7 @@
</el-row>
<baseTitle v-if="type!='phase'" :title="getTagName(type)+'信息'" ></baseTitle>
<fvForm :schema="schema" @getInstance="(e)=>form = e"></fvForm>
<fvForm :schema="schema" @getInstance="(e)=>form = e" ></fvForm>
<el-form :model="formData" label-width="auto">
<file-component
:title="getTagName(type)+'附件'"
@@ -429,13 +429,14 @@ const schema = computed(() => {
colProps: {
span: 24
},
labelWidth:'left',
labelWidth: 'left',
component: () => {
let singleFileArray = [props.formData.singleFile]
return <fvTable style="width: 100%;max-height: 80px;" height="80"
tableConfig={editSingleTableConfig}
data={singleFileArray} isSettingCol={false} pagination={false}>
</fvTable>
return props.formData.singleFile ? <fvTable style="width: 100%;max-height: 80px;" height="80"
tableConfig={editSingleTableConfig}
data={singleFileArray} isSettingCol={false} pagination={false}>
</fvTable>
: <span>--</span>
}
},
]

View File

@@ -2,17 +2,50 @@
<!-- <baseTitle title="审核意见"></baseTitle>-->
<!-- <fvForm :schema="schema" @getInstance="(e)=>form = e"></fvForm>-->
<div class="oper-page-btn" style="display: flex">
<el-select v-if="taskUserOptionList?.length>0" v-model="backNode" placeholder="请选择退回节点" clearable style="width: 150px;margin-right: 10px">
<el-option
v-for="item in taskUserOptionList"
:key="item.nodeId"
:label="item.nodeName + (item.userInfo ? ':' + item.userInfo.name : '')"
:value="item.nodeId">
</el-option>
</el-select>
<el-button type="danger" @click="rollbackHandler">驳回</el-button>
<el-button type="danger" @click="handleReject">驳回</el-button>
<el-button color="#DED0B2" @click="handleAgree">同意</el-button>
</div>
<div class="opinion-dialog">
<el-dialog v-model="showBackNode" title="请选择退回节点" width="300">
<el-table :data="taskUserOptionList" style="width: 100%"
:header-cell-style="{background:'#f5f7fa'}">
<el-table-column width="55">
<template #default="scope">
<el-radio
class="radio"
:label="scope.row"
v-model="backNode"
>&emsp;&emsp;&emsp;
</el-radio>
</template>
</el-table-column>
<el-table-column
prop="nodeName"
label="节点名称">
</el-table-column>
<el-table-column
prop="name"
label="操作者">
<template #default="scope">
<el-tag v-if="scope.row.userInfo" type="success">{{ scope.row.userInfo.name }}</el-tag>
</template>
</el-table-column>
</el-table>
<div class="oper" style="display: flex;justify-content: flex-end;margin-top: 10px">
<el-button type="danger" @click="rollbackHandler">确定</el-button>
<el-button @click="showBackNode=false">取消</el-button>
</div>
<!-- <el-select v-if="taskUserOptionList?.length>0" v-model="backNode" placeholder="请选择退回节点" clearable>-->
<!-- <el-option-->
<!-- v-for="item in taskUserOptionList"-->
<!-- :key="item.nodeId"-->
<!-- :label="item.nodeName + (item.userInfo ? ':' + item.userInfo.name : '')"-->
<!-- :value="item.nodeId">-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- <el-button type="danger" @click="rollbackHandler">确认</el-button>-->
</el-dialog>
</div>
</template>
<script setup lang="jsx">
@@ -43,7 +76,8 @@ const props = defineProps({
}
})
const backNode = ref('')
const backNode = ref({})
const showBackNode = ref(false)
const form = ref()
const schema = computed(() => {
return [
@@ -134,30 +168,8 @@ const back = () => {
}
// 驳回
const handleReject = async () => {
// const values = form.value.getValues()
if (!_value.value) {
ElNotification({
title: '提示',
message: '请填写审核意见',
type: 'warning'
})
return
}
const params = {
taskId: props.taskId,
// ...values
auditOpinion: _value.value
}
// console.log('params', params)
const res = await rejectTask(params)
ElNotification({
title: '提示',
message: res.msg,
type: res.code === 1000 ? 'success' : 'error'
})
// tagsViewStore.delVisitedViews(router.currentRoute.value.path)
location.reload()
// back()
showBackNode.value = true
backNode.value = {}
}
//回退节点
@@ -175,7 +187,7 @@ const rollbackHandler = async () => {
taskId: props.taskId,
// ...values
auditOpinion: _value.value,
rollBackId: backNode.value
rollBackId: backNode.value.nodeId
}
// console.log('params', params)
const res = await rejectTask(params)
@@ -208,6 +220,10 @@ const handleAgree = async () => {
}
</script>
<style lang="scss" scoped>
<style lang="scss">
.opinion-dialog {
.el-dialog__body {
padding: 0 !important;
}
}
</style>

View File

@@ -1,6 +1,6 @@
<template>
<baseTitle title="基础信息"></baseTitle>
<fvForm :schema="schema" @getInstance="(e)=>baseForm = e"></fvForm>
<baseTitle title="项目基本信息"></baseTitle>
<fvForm :schema="schema" @getInstance="(e)=>baseForm = e" label-position="left" label-width="left"></fvForm>
<div class="steps-box">
<el-steps :active="localActive" finish-status="success">
<el-step
@@ -30,10 +30,11 @@
<script setup lang="jsx">
import {ElLoading, ElNotification} from 'element-plus';
import {computed, reactive, ref, watchEffect} from 'vue';
import {useRoute} from 'vue-router';
import {getBaseInfoApi} from './api';
import {useCacheStore} from '@/stores/cache.js'
import {toThousands} from '@/utils/changePrice.js'
const cacheStore = useCacheStore()
const props = defineProps({
// 步骤对应内容list
stepList: {
@@ -93,9 +94,17 @@ const localSteps = ref([
])
const baseForm = ref()
const baseFormData = ref([])
const schema = computed(() => {
return [
{
label: '承办单位',
prop: 'affiliatedCompany',
colProps: {
span: 24
}
},
{
label: '项目名称',
prop: 'projectName',
@@ -103,23 +112,189 @@ const schema = computed(() => {
span: 24
}
},
{
label: '征集公司',
prop: 'affiliatedCompany',
label: '开始时间',
prop: 'startTime',
colProps: {
span: 24
}
},
{
label: '征集名称',
prop: 'requirementName',
label: '结束时间',
prop: 'endTime',
colProps: {
span: 24
}
},
{
label: '征集描述',
prop: 'collectExplain',
label: '项目类型',
prop: 'projectType',
colProps: {
span: 24
},
component: () => (
<div>
{
baseFormData.value?.projectType ?
<span>{filterDict(cacheStore.getDict('project_type'), baseFormData.value?.projectType)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '研发主体',
prop: 'rdSubject',
colProps: {
span: 24
},
component: () => (
<div>
{
baseFormData.value?.rdSubject ?
<span>{filterDict(cacheStore.getDict('rd_subject'), baseFormData.value?.rdSubject)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '出资类型',
prop: 'investmentType',
colProps: {
span: 24
},
component: () => (
<div>
{
baseFormData.value?.investmentType ?
<span>{filterDict(cacheStore.getDict('invest_type'), baseFormData.value?.investmentType)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '所属业务板块',
prop: 'businessSegment',
colProps: {
span: 24
},
component: () => (
<div>
{
baseFormData.value?.businessSegment ?
<span>{filterDict(cacheStore.getDict('business_segment'), baseFormData.value?.businessSegment)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '标准制定',
prop: 'technicalStandard',
colProps: {
span: 24
},
component: () => (
<div>
{
baseFormData.value?.technicalStandard ?
<span>{filterDict(cacheStore.getDict('technical_standard'), baseFormData.value?.technicalStandard)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '项目影响',
prop: 'projectImpact',
colProps: {
span: 24
},
component: () => (
<div>
{
baseFormData.value?.projectImpact ?
<span>{filterDict(cacheStore.getDict('project_impact'), baseFormData.value?.projectImpact)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '经费预算(元)',
prop: 'economicEstimate',
colProps: {
span: 24
},
component: () => (
<div>
{
baseFormData.value?.economicEstimate ?
<span>{ toThousands(baseFormData.value?.economicEstimate )}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '产学研联合',
prop: 'industryUniversityResearch',
colProps: {
span: 24
},
component: () => (
<div>
{
baseFormData.value?.industryUniversityResearch ?
<span>{filterDict(cacheStore.getDict('industry_university'), baseFormData.value?.industryUniversityResearch)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '开展政府申报',
prop: 'governmentDeclaration',
colProps: {
span: 24
},
component: () => (
<div>
{
baseFormData.value?.governmentDeclaration ?
<span>{filterDict(cacheStore.getDict('government_declaration'), baseFormData.value?.governmentDeclaration)}</span>
: <span>{'--'}</span>
}
</div>
)
},
// {
// label: '是否专项资金项目',
// prop: 'isSpecialFund',
// colProps: {
// span: 24
// }
// },
{
label: '所属专项资金项目',
prop: 'specialFund',
colProps: {
span: 24
}
},
{
label: '申请总部专项资金(元)',
prop: 'specialFundAmount',
colProps: {
span: 24
}
},
{
label: '部门分管领导',
prop: 'optionalChargeLeadership',
colProps: {
span: 24
}
@@ -273,7 +448,31 @@ const handleStep = (key, index) => {
type: 'warning'
})
}
//匹配字典值,返回对应值的字典标签
const filterDict = (data, value) => {
if (data === undefined || value === undefined) return;
let label = ''
let result = []
if (value instanceof Array) {
value.forEach(item1 => {
data.find(item => {
if (item.value == item1) {
result.push(item.label)
}
})
})
label = result.map(item => item).join('')
} else {
if (data instanceof Array) {
data.find(item => {
if (item.value == value) {
label = item.label
}
})
}
}
return label
}
const getBaseInfo = async () => {
const loading = ElLoading.service({fullscreen: true})
try {
@@ -290,6 +489,7 @@ const getBaseInfo = async () => {
}
localStepSuccess.value = formatProcedure(data.procedure)
baseForm.value.setValues(data)
baseFormData.value = data
emits('setDetail', formatActive(localActive.value))
loading.close()
} catch {

View File

@@ -2,7 +2,7 @@
<div class="detail-block" v-loading="loading">
<baseTitle title="需求上报信息" style="margin-top: -15px"></baseTitle>
<el-form :model="localFormData" ref="summaryForm" :rules="rules">
<el-row gutter="50">
<el-row gutter="20" style="margin-bottom: -18px">
<el-col :span="24">
<el-form-item label="项目名称" prop="projectName">
<span>{{ localFormData.projectName }}</span>
@@ -50,7 +50,7 @@
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="经预算(元)" prop="economicEstimate">
<el-form-item label="经预算(元)" prop="economicEstimate">
<span>{{ toThousands(localFormData.economicEstimate) }}</span>
</el-form-item>
</el-col>
@@ -129,7 +129,7 @@
</el-col>
</el-row>
<el-row gutter="14" >
<el-row gutter="20" style="margin-bottom: -18px">
<el-col :span="24">
<baseTitle title="项目描述"></baseTitle>
</el-col>

View File

@@ -1,7 +1,7 @@
<template>
<div style="padding: 0 10px; box-sizing: border-box;">
<baseTitle title="基础信息"></baseTitle>
<fvForm :schema="schema" @getInstance="(e)=>baseForm = e"></fvForm>
<baseTitle title="项目基本信息"></baseTitle>
<fvForm :schema="schema" @getInstance="(e)=>baseForm = e" label-position="left" label-width="left"></fvForm>
<baseTitle title="阶段变更详情" style="margin-top: -10px"></baseTitle>
<div style="color: #606266;font-size: 14px;height:25px;"><span style="display:inline-block;text-align: right;margin-right: 14px">抄送人</span>{{copyName?copyName:'--'}}</div>
<ApprovalDetailMoblie :formData="summaryData.formData" :data="summaryData" type="phase"
@@ -20,7 +20,10 @@ import {computed, ref} from "vue";
import {getBaseInfoApi} from "@/components/steps/api";
import ApprovalDetailMoblie from '../mobledetail/ApprovalDetailMoblie.vue'
import OpinionMoblie from '@/views/project-management/mobledetail/OpinionMoblie.vue'
import {useCacheStore} from '@/stores/cache.js'
import {toThousands} from '@/utils/changePrice.js'
const cacheStore = useCacheStore()
const route = useRoute()
const summaryData = ref({})
const summaryProcessViewer = ref(true)
@@ -29,8 +32,16 @@ const loading = ref(false)
const auditOpinion = ref('')
const copyName = ref('')
const fileListShow = ref('READ')
const baseFormData = ref([])
const schema = computed(() => {
return [
{
label: '承办单位',
prop: 'affiliatedCompany',
colProps: {
span: 24
}
},
{
label: '项目名称',
prop: 'projectName',
@@ -38,34 +49,221 @@ const schema = computed(() => {
span: 24
}
},
{
label: '征集公司',
prop: 'affiliatedCompany',
{
label: '开始时间',
prop: 'startTime',
colProps: {
span: 24
}
},
{
label: '征集名称',
prop: 'requirementName',
label: '结束时间',
prop: 'endTime',
colProps: {
span: 24
}
},
{
label: '征集描述',
prop: 'collectExplain',
label: '项目类型',
prop: 'projectType',
colProps: {
span: 24
},
component: () => (
<div>
{
baseFormData.value?.projectType ?
<span>{filterDict(cacheStore.getDict('project_type'), baseFormData.value?.projectType)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '研发主体',
prop: 'rdSubject',
colProps: {
span: 24
},
component: () => (
<div>
{
baseFormData.value?.rdSubject ?
<span>{filterDict(cacheStore.getDict('rd_subject'), baseFormData.value?.rdSubject)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '出资类型',
prop: 'investmentType',
colProps: {
span: 24
},
component: () => (
<div>
{
baseFormData.value?.investmentType ?
<span>{filterDict(cacheStore.getDict('invest_type'), baseFormData.value?.investmentType)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '所属业务板块',
prop: 'businessSegment',
colProps: {
span: 24
},
component: () => (
<div>
{
baseFormData.value?.businessSegment ?
<span>{filterDict(cacheStore.getDict('business_segment'), baseFormData.value?.businessSegment)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '标准制定',
prop: 'technicalStandard',
colProps: {
span: 24
},
component: () => (
<div>
{
baseFormData.value?.technicalStandard ?
<span>{filterDict(cacheStore.getDict('technical_standard'), baseFormData.value?.technicalStandard)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '项目影响',
prop: 'projectImpact',
colProps: {
span: 24
},
component: () => (
<div>
{
baseFormData.value?.projectImpact ?
<span>{filterDict(cacheStore.getDict('project_impact'), baseFormData.value?.projectImpact)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '经费预算(元)',
prop: 'economicEstimate',
colProps: {
span: 24
},
component: () => (
<div>
{
baseFormData.value?.economicEstimate ?
<span>{ toThousands(baseFormData.value?.economicEstimate )}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '产学研联合',
prop: 'industryUniversityResearch',
colProps: {
span: 24
},
component: () => (
<div>
{
baseFormData.value?.industryUniversityResearch ?
<span>{filterDict(cacheStore.getDict('industry_university'), baseFormData.value?.industryUniversityResearch)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '开展政府申报',
prop: 'governmentDeclaration',
colProps: {
span: 24
},
component: () => (
<div>
{
baseFormData.value?.governmentDeclaration ?
<span>{filterDict(cacheStore.getDict('government_declaration'), baseFormData.value?.governmentDeclaration)}</span>
: <span>{'--'}</span>
}
</div>
)
},
{
label: '所属专项资金项目',
prop: 'specialFund',
colProps: {
span: 24
}
},
{
label: '申请总部专项资金(元)',
prop: 'specialFundAmount',
colProps: {
span: 24
}
},
{
label: '部门分管领导',
prop: 'optionalChargeLeadership',
colProps: {
span: 24
}
}
]
})
const baseForm = ref()
//匹配字典值,返回对应值的字典标签
const filterDict = (data, value) => {
if (data === undefined || value === undefined) return;
let label = ''
let result = []
if (value instanceof Array) {
value.forEach(item1 => {
data.find(item => {
if (item.value == item1) {
result.push(item.label)
}
})
})
label = result.map(item => item).join('')
} else {
if (data instanceof Array) {
data.find(item => {
if (item.value == value) {
label = item.label
}
})
}
}
return label
}
const getBaseInfo = async () => {
try {
const {code, data} = await getBaseInfoApi(route.query.projectId)
baseForm.value.setValues(data)
baseFormData.value = data
} catch {
}
}

View File

@@ -122,9 +122,9 @@ const schame = computed(() => {
},
on: {
change: async (val) => {
const {code, data} = await judgeIsSameRole()
const {code, data} = await judgeIsSameRole(form.value.getValues().userId)
if (code === 1000) {
console.log('currentRoleArray.value', currentRoleArray.value)
console.log('currentRoleArray.value',data)
if (currentRoleArray.value.length !== 0) {
val.forEach(selectItem => {
currentRoleArray.value.forEach(currentItem => {