fix : 征集公司校验,单文件显示改为表格,手机端审批后刷新,需求征集回车触发搜索,组织机构管理搜索

This commit is contained in:
2024-07-22 20:39:26 +08:00
parent ae6da83a1a
commit 3c1fcc327c
17 changed files with 470 additions and 169 deletions

View File

@@ -60,7 +60,7 @@ import Opinion from "@/components/DetailComponent/Opinion.vue";
const route = useRoute()
const editShow = ref(false)
const applyTitle = ref('apply')
const applyTitle = ref('filing')
const loading = ref(false)
const processStore = useProcessStore()
const fileListShow = ref('READ')
@@ -83,6 +83,9 @@ localStorage.removeItem('projectChargePersonUserList')
localStorage.removeItem('projectPersonUserList')
const getAllInfo = async (state) => {
const loading = ElLoading.service({fullscreen: true})
detailData.value = {
state: "0"
}
try {
detailShow.value = false
fileListShow.value = 'READ'
@@ -125,14 +128,16 @@ const getAllInfo = async (state) => {
}
}
const changeModel = (active, mode) => {
// console.log('active, mode',active, mode)
editShow.value = false
nextTick(() => {
editShow.value = mode === 'submit' || mode === 'resubmit';
if (route.query.step === '20' && active === '20') {
// route.query.step === '20' &&
if (active === '20') {
applyTitle.value = 'apply'
} else if (route.query.step === '40' && active === '40') {
} else if (active === '40') {
applyTitle.value = 'check'
} else if (route.query.step === '50' && active === '50') {
}else if ( active === '50') {
applyTitle.value = 'filing'
}
})
@@ -146,14 +151,9 @@ const stepChange = (data) => {
showActive.value = data.active
getAllInfo(data.active)
}
</script>
<style scoped lang="scss">
//.detail-block{
// padding-top: 15px;
//}
:deep(.el-tabs__nav-scroll) {
width: 100%;
@@ -167,11 +167,6 @@ const stepChange = (data) => {
flex: 1;
font-size: 16px;
}
//.is-active {
// color: black;
// //background-color: #DED0B2;
//}
}
}
</style>

View File

@@ -1,5 +1,6 @@
<template>
<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-col :span="24">
@@ -80,6 +81,10 @@
}}</span>
</el-form-item>
</el-col>
<el-col :span="24" style="margin-top: -15px">
<baseTitle title="预期知识产权"></baseTitle>
</el-col>
<el-col :span="24">
<el-form-item label="发明专利(项)" prop="inventionPatent">
<span>{{ localFormData.inventionPatent }}</span>
@@ -126,26 +131,35 @@
<span>{{ localFormData.contentDescription }}</span>
</el-form-item>
</el-col>
<el-col :span="24" style="margin-top: -15px">
<baseTitle title="需求上报申请书"></baseTitle>
</el-col>
<el-col :span="24">
<el-form-item label="需求上报申请书" label-position="top" style="display:block;">
<!-- style="font-size: 16px"-->
<el-button type="primary" link @click="handleDownload(localFormData.singleFile)">
{{ localFormData.singleFile?.originalFileName }}
</el-button>
</el-form-item>
<single-file-component tag="需求上报" :fileNameTableWidth="200"
v-model:value="localFormData.singleFile" :processViewer="processViewer"
labelAlign="top"
:file-list-show="fileListShow"/>
<!-- <el-form-item label="需求上报申请书" label-position="top" style="display:block;">-->
<!-- &lt;!&ndash; style="font-size: 16px"&ndash;&gt;-->
<!-- <el-button type="primary" link @click="handleDownload(localFormData.singleFile)">-->
<!-- {{ localFormData.singleFile?.originalFileName }}-->
<!-- </el-button>-->
<!-- </el-form-item>-->
</el-col>
<el-col :span="24" style="margin-top: -15px">
<baseTitle title="附件列表"></baseTitle>
</el-col>
<el-col :span="24">
<file-component
title="需求上报附件"
tag="需求上报"
tag="需求上报" :fileNameTableWidth="200"
v-model:value="localFormData.fileList"
:processViewer="processViewer"
:file-list-show="fileListShow"
labelAlign="top"
/>
</el-col>
<el-col :span="24">
<div v-if="data.taskId">
<el-col :span="24" style="margin-top: -15px">
<div v-if="data.taskId||data.state==='4'">
<baseTitle title="审核意见"></baseTitle>
<el-form-item prop="_value">
<el-input
@@ -159,7 +173,7 @@
</el-col>
</el-row>
<div class="approval-record">
<div class="approval-title">
<div class="approval-title" style="margin-top: -15px">
<baseTitle title="审批记录"></baseTitle>
<div class="diagram">
<div class="base-title">流程图</div>
@@ -350,6 +364,7 @@ watch(() => props.loading, (newVal) => {
}, {deep: true})
watchEffect(() => {
props.formData.singleFile=[props.formData.singleFile]
return Object.keys(props.formData).length && (localFormData.value = props.formData)
})