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

Merge pull request 'fix : 修复需求上报/详情下流程渲染' (#215) from dj into master

Browse Source 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/215
This commit is contained in:
odjbin
2024-05-20 03:47:24 +00:00
parent 92e9468cb9 f83ae8df51
commit a663b84fab
4 changed files with 288 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/components/DetailComponent/CollectionDetail.vue
View File

@@ -74,10 +74,8 @@ import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.v
import {matterTree} from '@/utils/matterTree.js'; import {matterTree} from '@/utils/matterTree.js';
import {downloadFile} from "@/api/project-demand"; import {downloadFile} from "@/api/project-demand";
const emit = defineEmits(['getInfo']) const emit = defineEmits(['getInfo',"update:formData"])
const form = ref() const form = ref()
const showForm = ref(true)
const loading = ref(false)
const showTable = ref(false) const showTable = ref(false)
const companyNameArray = ref([]) const companyNameArray = ref([])
@@ -97,7 +95,10 @@ const props = defineProps({
companyOption: { companyOption: {
type: Array, type: Array,
default: [] default: []
}, }, loading: {
type: Boolean,
default: false
}
}) })
const tableConfig = reactive({ const tableConfig = reactive({
columns: [ columns: [
@@ -136,10 +137,6 @@ const tableConfig = reactive({
} }
] ]
}) })
const getInfo = () => {
emit('getInfo')
}
const handleDownload = (row) => { const handleDownload = (row) => {
downloadFile(row.fileId).then(res => { downloadFile(row.fileId).then(res => {
const blob = new Blob([res]) const blob = new Blob([res])
@@ -152,28 +149,26 @@ const handleDownload = (row) => {
const getDataSourceOptionItem = (val) => { const getDataSourceOptionItem = (val) => {
if (val instanceof Array) { if (val instanceof Array) {
val.forEach(item => { val.forEach(item => {
matterTree(companyNameArray.value,props.companyOption, item) matterTree(companyNameArray.value, props.companyOption, item)
}) })
} }
return companyNameArray.value.join('，'); let uniqueArr = Array.from(new Set(companyNameArray.value));
return uniqueArr.join('，');
} }
watch(() => props.companyOption, (newVal) => {
props.companyOption=newVal watch(() => props.loading, (newVal) => {
props.loading = newVal
}, {deep: true}) }, {deep: true})
watch(() => props.formData, (newVal) => {
if (newVal) { watch(() => props.companyOption, (newVal) => {
newVal.companyIds = getDataSourceOptionItem(newVal.companyIds) props.companyOption = newVal
props.formData=newVal }, {deep: true})
} watch(() => props.formData.companyIds, (newVal) => {
props.formData.companyIds = getDataSourceOptionItem(newVal)
}, {deep: true}) }, {deep: true})
watch(() => props.processViewer, (newVal) => { watch(() => props.processViewer, (newVal) => {
props.processViewer = newVal props.processViewer = newVal
}, {deep: true}) }, {deep: true})
onMounted(() => {
loading.value = true
getInfo()
loading.value = false
})
</script> </script>
<style scoped> <style scoped>

395
src/components/DetailComponent/SummaryDetail.vue
View File

@@ -1,158 +1,183 @@
<template> <template>
<el-form :model="localFormData" ref="summaryForm"> <div class="detail-block" v-loading="loading">
<el-row gutter="50"> <el-form :model="localFormData" ref="summaryForm" :rules="rules">
<el-col :span="12"> <el-row gutter="50">
<el-form-item label="名称" prop="requirementName"> <el-col :span="12">
<span>{{ localFormData.requirementId }}</span> <el-form-item label="名称" prop="projectName">
</el-form-item> <span>{{ localFormData.projectName }}</span>
</el-col> </el-form-item>
<el-col :span="12"> </el-col>
<el-form-item label="专项资金" prop="specialFund"> <el-col :span="12">
<span>{{ localFormData.specialFund }}</span> <el-form-item label="专项资金" prop="specialFund">
</el-form-item> <span>{{ localFormData.specialFund }}</span>
</el-col> </el-form-item>
<el-col :span="12"> </el-col>
<el-form-item label="开始时间" prop="startTime"> <el-col :span="12">
<span>{{ localFormData.startTime }}</span> <el-form-item label="开始时间" prop="startTime">
</el-form-item> <span>{{ localFormData.startTime }}</span>
</el-col> </el-form-item>
<el-col :span="12"> </el-col>
<el-form-item label="结束时间" prop="endTime"> <el-col :span="12">
<span>{{ formData.endTime }}</span> <el-form-item label="结束时间" prop="endTime">
</el-form-item> <span>{{ formData.endTime }}</span>
</el-col> </el-form-item>
<el-col :span="12"> </el-col>
<el-form-item label="所属公司" prop="companyName"> <el-col :span="12">
<span>{{ localFormData.companyName }}</span> <el-form-item label="所属公司" prop="companyName">
</el-form-item> <span>{{ localFormData.companyName }}</span>
</el-col> </el-form-item>
<el-col :span="12"> </el-col>
<el-form-item label="项目类型" prop="projectType"> <el-col :span="12">
<span>{{ localFormData.projectType }}</span> <el-form-item label="项目类型" prop="projectType">
</el-form-item> <span>{{ localFormData.projectType }}</span>
</el-col> </el-form-item>
<el-col :span="12"> </el-col>
<el-form-item label="结束时间" prop="endTime"> <el-col :span="12">
<span>{{ localFormData.endTime }}</span> <el-form-item label="研发主体" prop="rdSubject">
</el-form-item> <span>{{ localFormData.rdSubject }}</span>
</el-col> </el-form-item>
<el-col :span="12"> </el-col>
<el-form-item label="出资类型" prop="investmentType"> <el-col :span="12">
<span>{{ localFormData.investmentType }}</span> <el-form-item label="出资类型" prop="investmentType">
</el-form-item> <span>{{ localFormData.investmentType }}</span>
</el-col> </el-form-item>
<el-col :span="12"> </el-col>
<el-form-item label="项目影响" prop="projectImpact"> <el-col :span="12">
<span>{{ localFormData.projectImpact }}</span> <el-form-item label="项目影响" prop="projectImpact">
</el-form-item> <span>{{ localFormData.projectImpact }}</span>
</el-col> </el-form-item>
<el-col :span="12"> </el-col>
<el-form-item label="所属业务板块" prop="businessSegment"> <el-col :span="12">
<span>{{ localFormData.businessSegment }}</span> <el-form-item label="所属业务板块" prop="businessSegment">
</el-form-item> <span>{{ localFormData.businessSegment }}</span>
</el-col> </el-form-item>
<el-col :span="12"> </el-col>
<el-form-item label="预期成果形式" prop="resultForm"> <el-col :span="12">
<span>{{ localFormData.resultForm }}</span> <el-form-item label="预期成果形式" prop="resultForm">
</el-form-item> <span>{{ localFormData.resultForm }}</span>
</el-col> </el-form-item>
<el-col :span="12"> </el-col>
<el-form-item label="预期技术标准制定" prop="technicalStandard"> <el-col :span="12">
<span>{{ localFormData.technicalStandard }}</span> <el-form-item label="预期技术标准制定" prop="technicalStandard">
</el-form-item> <span>{{ localFormData.technicalStandard }}</span>
</el-col> </el-form-item>
<el-col :span="12"> </el-col>
<el-form-item label="产学研联合" prop="industryUniversityResearch"> <el-col :span="12">
<span>{{ localFormData.industryUniversityResearch }}</span> <el-form-item label="产学研联合" prop="industryUniversityResearch">
</el-form-item> <span>{{ localFormData.industryUniversityResearch }}</span>
</el-col> </el-form-item>
<el-col :span="12"> </el-col>
<el-form-item label="开展政府申报" prop="governmentDeclaration"> <el-col :span="12">
<span>{{ localFormData.governmentDeclaration }}</span> <el-form-item label="开展政府申报" prop="governmentDeclaration">
</el-form-item> <span>{{ localFormData.governmentDeclaration }}</span>
</el-col> </el-form-item>
<el-col :span="12"> </el-col>
<el-form-item label="知识产权状况" prop="intellectualProperty"> <el-col :span="12">
<span>{{ localFormData.intellectualProperty }}</span> <el-form-item label="知识产权状况" prop="intellectualProperty">
</el-form-item> <span>{{ localFormData.intellectualProperty }}</span>
</el-col> </el-form-item>
<el-col :span="6"> </el-col>
<el-form-item label="发明专利(项)" prop="inventionPatent"> <el-col :span="6">
<span>{{ localFormData.inventionPatent }}</span> <el-form-item label="发明专利(项)" prop="inventionPatent">
</el-form-item> <span>{{ localFormData.inventionPatent }}</span>
</el-col> </el-form-item>
<el-col :span="6"> </el-col>
<el-form-item label="实用性新型专利(项)" prop="newPatent"> <el-col :span="6">
<span>{{ localFormData.newPatent }}</span> <el-form-item label="实用性新型专利(项)" prop="newPatent">
</el-form-item> <span>{{ localFormData.newPatent }}</span>
</el-col> </el-form-item>
<el-col :span="6"> </el-col>
<el-form-item label="软件著作权(项)" prop="softwareCopyright"> <el-col :span="6">
<span>{{ localFormData.softwareCopyright }}</span> <el-form-item label="软件著作权(项)" prop="softwareCopyright">
</el-form-item> <span>{{ localFormData.softwareCopyright }}</span>
</el-col> </el-form-item>
<el-col :span="6"> </el-col>
<el-form-item label="著作权(项)" prop="copyright"> <el-col :span="6">
<span>{{ localFormData.copyright }}</span> <el-form-item label="著作权(项)" prop="copyright">
</el-form-item> <span>{{ localFormData.copyright }}</span>
</el-col> </el-form-item>
<el-col :span="6"> </el-col>
<el-form-item label="其他(项)" prop="other"> <el-col :span="6">
<span>{{ localFormData.other }}</span> <el-form-item label="其他(项)" prop="other">
</el-form-item> <span>{{ localFormData.other }}</span>
</el-col> </el-form-item>
<el-col :span="6"> </el-col>
<el-form-item label="经济概算(万元)" prop="economicEstimate"> <el-col :span="6">
<span>{{ localFormData.economicEstimate }}</span> <el-form-item label="经济概算(万元)" prop="economicEstimate">
</el-form-item> <span>{{ localFormData.economicEstimate }}</span>
</el-col> </el-form-item>
<el-col :span="6"> </el-col>
<el-form-item label="其中申请公司总部科技创新专项资金(万元)" prop="specialFundAmount"> <el-col :span="6">
<span>{{ localFormData.specialFundAmount }}</span> <el-form-item label="其中申请公司总部科技创新专项资金(万元)" prop="specialFundAmount">
</el-form-item> <span>{{ localFormData.specialFundAmount }}</span>
</el-col> </el-form-item>
<el-col :span="24"> </el-col>
<el-form-item label="现有业务描述" prop="serviceDescription"> <el-col :span="24">
<span>{{ localFormData.serviceDescription }}</span> <el-form-item label="现有业务描述" prop="serviceDescription">
</el-form-item> <span>{{ localFormData.serviceDescription }}</span>
</el-col> </el-form-item>
<el-col :span="24"> </el-col>
<el-form-item label="研发项目关键内容描述" prop="contentDescription"> <el-col :span="24">
<span>{{ localFormData.contentDescription }}</span> <el-form-item label="研发项目关键内容描述" prop="contentDescription">
</el-form-item> <span>{{ localFormData.contentDescription }}</span>
</el-col> </el-form-item>
<el-col :span="24"> </el-col>
<el-form-item label="需求上报申请书"> <el-col :span="24">
<el-button type="primary" link @click="handleDownload(localFormData.singleFile)">{{localFormData.singleFile?.originalFileName}}</el-button> <el-form-item label="需求上报申请书">
</el-form-item> <el-button type="primary" link @click="handleDownload(localFormData.singleFile)">
</el-col> {{ localFormData.singleFile?.originalFileName }}
<el-col :span="24"> </el-button>
<el-form-item label="需求上报附件"> </el-form-item>
<fvTable style="width: 100%;max-height: 400px;" v-if="processViewer" :tableConfig="tableConfig" </el-col>
:data="localFormData.fileList" :isSettingCol="false" :pagination="false"> <el-col :span="24">
<template #empty> <el-form-item label="需求上报附件">
<el-empty :image-size="90" description="暂无数据" style="padding: 0"/> <fvTable style="width: 100%;max-height: 400px;" v-if="processViewer" :tableConfig="tableConfig"
</template> :data="localFormData.fileList" :isSettingCol="false" :pagination="false">
</fvTable> <template #empty>
</el-form-item> <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
</el-col> </template>
</el-row> </fvTable>
<div class="approval-record"> </el-form-item>
<baseTitle title="审批记录"></baseTitle> </el-col>
<div class="process"> <el-col :span="24">
<operation-render v-if="processViewer" :operation-list="data.operationList" <div v-if="data.taskId">
:state="data.state"/> <baseTitle title="审核意见"></baseTitle>
<process-diagram-viewer v-if="processViewer"/> <el-form-item prop="auditOpinion">
<el-input
v-model="localFormData.auditOpinion"
:rows="3"
type="textarea"
placeholder="请输入审核意见"
/>
</el-form-item>
</div>
</el-col>
</el-row>
<div class="approval-record">
<baseTitle title="审批记录"></baseTitle>
<div class="process">
<operation-render v-if="processViewer" :operation-list="data.operationList"
:state="data.state"/>
</div>
</div> </div>
</div>
</el-form>
<div class="oper-page-btn" v-if="data.state === '1' && data.taskId">
<el-button @click="handleReject(summaryForm)">驳回</el-button>
<el-button color="#DED0B2" @click="handleAgree">同意</el-button>
</div>
</el-form>
</div>
</template> </template>
<script setup lang="jsx"> <script setup lang="jsx">
import {downloadFile} from "@/api/project-demand"; import {downloadFile} from "@/api/project-demand";
import OperationRender from '@/views/workflow/common/OperationRender.vue' import OperationRender from '@/views/workflow/common/OperationRender.vue'
import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue' import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue'
import {ElMessage, ElNotification} from "element-plus";
import {agreeTask, rejectTask} from "@/api/project-demand";
import {useTagsView} from '@/stores/tagsview.js'
const tagsViewStore = useTagsView()
const props = defineProps({ const props = defineProps({
formData: { formData: {
type: Object, type: Object,
@@ -165,7 +190,10 @@ const props = defineProps({
processViewer: { processViewer: {
type: Boolean, type: Boolean,
default: false default: false
}, }, loading: {
type: Boolean,
default: false
}
}) })
const localFormData = ref({}) const localFormData = ref({})
const tableConfig = reactive({ const tableConfig = reactive({
@@ -205,25 +233,78 @@ const tableConfig = reactive({
} }
] ]
}) })
const router = useRouter()
const summaryForm = ref()
const rules = reactive({
auditOpinion: [{required: true, message: '请输入审核意见', trigger: 'blur'}],
})
const handleReject = (instance) => {
if (!instance) return
instance.validate(async (valid) => {
if (!valid) return
let approve = {
taskId: props.data.taskId,
auditOpinion: localFormData.value.auditOpinion,
}
rejectTask(approve).then(res => {
ElNotification({
title: '提示',
message: res.msg,
type: res.code === 1000 ? 'success' : 'error'
})
if (res.code === 1000) {
tagsViewStore.delVisitedViews(router.currentRoute.value.path)
router.push({
name: 'Summary'
})
}
})
})
}
const handleAgree = () => {
let approve = {
taskId: props.data.taskId,
auditOpinion: localFormData.value.auditOpinion,
formData: localFormData.value
}
agreeTask(approve).then(res => {
ElNotification({
title: '提示',
message: res.msg,
type: res.code === 1000 ? 'success' : 'error'
})
if (res.code === 1000) {
tagsViewStore.delVisitedViews(router.currentRoute.value.path)
router.push({
name: 'Summary'
})
}
})
}
const handleDownload = (row) => { const handleDownload = (row) => {
downloadFile(row.fileId).then(res => { downloadFile(row.fileId).then(res => {
const blob = new Blob([res]) const blob = new Blob([res])
let a = document.createElement('a') let a = document.createElement('a')
a.href=URL.createObjectURL(blob) a.href = URL.createObjectURL(blob)
a.download = row.originalFileName a.download = row.originalFileName
a.click() a.click()
}) })
} }
watch( watch(
()=>props.formData, () => props.formData,
(val)=>{ (val) => {
console.log(val, 'ssss'); console.log(val, 'ssss');
} }
) )
watch(() => props.processViewer, (newVal) => {
props.processViewer = newVal
}, {deep: true})
watch(() => props.loading, (newVal) => {
props.loading = newVal
}, {deep: true})
watchEffect(()=>{ watchEffect(() => {
Object.keys(props.formData).length && (localFormData.value = props.formData) Object.keys(props.formData).length && (localFormData.value = props.formData)
}) })
</script> </script>
@@ -233,4 +314,10 @@ watchEffect(()=>{
height: auto !important; height: auto !important;
} }
.detail-block {
overflow-x: hidden;
overflow-y: auto;
padding-bottom: 20px;
}
</style> </style>

28
src/views/project-demand/summary/add.vue
View File

@@ -1,5 +1,5 @@
<template> <template>
<div class="detail-block"> <div class="detail-block" v-loading="loading">
<baseTitle title="需求上报"></baseTitle> <baseTitle title="需求上报"></baseTitle>
<el-form :model="formData" ref="summaryForm" :rules="rules"> <el-form :model="formData" ref="summaryForm" :rules="rules">
<el-row gutter="50"> <el-row gutter="50">
@@ -223,6 +223,13 @@
@getAttachment="getAttachment" @getAttachment="getAttachment"
@getOtherFile="getOtherFile" :showFileList="true" :formData="formData" :preview="router.currentRoute.value.name === 'Summary/edit'"/> @getOtherFile="getOtherFile" :showFileList="true" :formData="formData" :preview="router.currentRoute.value.name === 'Summary/edit'"/>
<!-- <fvForm :schema="schame" @getInstance="getInstance"></fvForm>--> <!-- <fvForm :schema="schame" @getInstance="getInstance"></fvForm>-->
<div class="approval-record">
<baseTitle title="流程"></baseTitle>
<process-diagram-viewer mode="view" v-if="processDiagramViewer"/>
<!-- <div class="process" id="approvalRecord">-->
<!-- <process-tree ref="processTree" mode="view" id-name="approvalRecord"/>-->
<!-- </div>-->
</div>
<div class="oper-page-btn"> <div class="oper-page-btn">
<el-button type="primary" @click="staging">存为草稿</el-button> <el-button type="primary" @click="staging">存为草稿</el-button>
<el-button type="primary" @click="handleSubmit(summaryForm)">发布</el-button> <el-button type="primary" @click="handleSubmit(summaryForm)">发布</el-button>
@@ -236,12 +243,16 @@ import {getDetail, getProcessInfo, requirementReported, resubmitReported} from "
import {ElMessage, ElNotification} from "element-plus"; import {ElMessage, ElNotification} from "element-plus";
import {useTagsView} from '@/stores/tagsview.js' import {useTagsView} from '@/stores/tagsview.js'
import {useCacheStore} from '@/stores/cache.js' import {useCacheStore} from '@/stores/cache.js'
import {useProcessStore} from '@/stores/processStore.js';
import {getSubCompOpt} from "@/api/user/user"; import {getSubCompOpt} from "@/api/user/user";
import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
const cacheStore = useCacheStore() const cacheStore = useCacheStore()
const processStore = useProcessStore()
const router = useRouter() const router = useRouter()
const route = useRoute() const route = useRoute()
const name=ref(router.currentRoute.value.name) const name=ref(router.currentRoute.value.name)
const loading = ref(false)
const processDiagramViewer = ref(false)
const tagsViewStore = useTagsView() const tagsViewStore = useTagsView()
const companyOption = ref([]) const companyOption = ref([])
const summaryForm = ref() const summaryForm = ref()
@@ -430,6 +441,7 @@ const getDetailInfo = async () => {
}) })
if (res.code === 1000) { if (res.code === 1000) {
formData.value = res.data.formData formData.value = res.data.formData
loading.value=false
} }
}) })
} }
@@ -445,20 +457,30 @@ const init = async () => {
if (res.code === 1000) { if (res.code === 1000) {
let data = res.data let data = res.data
deploymentId.value = data.deploymentId deploymentId.value = data.deploymentId
processStore.setDesign(data)
processStore.runningList.value = data.runningList;
processStore.endList.value = data.endList;
processStore.noTakeList.value = data.noTakeList;
processStore.refuseList.value = data.refuseList;
processStore.passList.value = data.passList;
nextTick(() => {
processDiagramViewer.value = true
})
} }
}) })
} }
onMounted(async () => { onMounted(async () => {
loading.value=true
await init() await init()
if (route.query.projectId) { if (route.query.projectId) {
await getDetailInfo() await getDetailInfo()
} }
}) })
const staging = async () => { const staging = async () => {
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.detail-block { .detail-block {
overflow: hidden; overflow: hidden;
padding-bottom: 30px; padding-bottom: 30px;

7
src/views/project-demand/summary/detail.vue
View File

@@ -2,9 +2,9 @@
<steps :active="active" @setDetail="setDetail" @stepChange="stepChange"> <steps :active="active" @setDetail="setDetail" @stepChange="stepChange">
<template #content> <template #content>
<collection-detail v-show="showActive == '00'" :formData="summaryData.formData" :data="summaryData" <collection-detail v-show="showActive == '00'" :formData="summaryData.formData" :data="summaryData"
:processViewer="summaryProcessViewer" :companyOption="companyOption" /> :processViewer="summaryProcessViewer" :companyOption="companyOption" :loading="loading"/>
<summary-detail v-show="showActive == '10'" :formData="summaryData.formData" :data="summaryData" <summary-detail v-show="showActive == '10'" :formData="summaryData.formData" :data="summaryData"
:processViewer="summaryProcessViewer"/> :processViewer="summaryProcessViewer" :loading="loading"/>
</template> </template>
</steps> </steps>
</template> </template>
@@ -20,6 +20,7 @@ const route = useRoute()
const companyOption = ref([]) const companyOption = ref([])
const summaryData = ref({}) const summaryData = ref({})
const summaryProcessViewer = ref(true) const summaryProcessViewer = ref(true)
const loading = ref(false)
const processStore = useProcessStore() const processStore = useProcessStore()
const active = ref(route.query.state) const active = ref(route.query.state)
const showActive = ref() const showActive = ref()
@@ -31,8 +32,10 @@ const getInfo = async (state) => {
const projectId = route.query.projectId const projectId = route.query.projectId
await getCompanyOption() await getCompanyOption()
summaryProcessViewer.value = false summaryProcessViewer.value = false
loading.value = true
const {code, data} = await getMapProjectStateInfo(projectId, state) const {code, data} = await getMapProjectStateInfo(projectId, state)
summaryData.value = data; summaryData.value = data;
loading.value = false
processStore.setDesign(data) processStore.setDesign(data)
processStore.runningList.value = data.runningList; processStore.runningList.value = data.runningList;
processStore.endList.value = data.endList; processStore.endList.value = data.endList;