fix : 需求征集新增/详情样式优化,需求汇总详情优化

src/components/DetailComponent/CollectionDetail.vue

@@ -1,6 +1,6 @@
 <template>
   <div v-loading="loading">
-    <el-form :model="formData" label-width="auto">
+    <el-form :model="formData">
       <el-row>
         <el-col :span="6" v-if="type==='singleDetail'">
           <el-form-item label="征集名称">
@@ -13,12 +13,17 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="截止时间">
+          <el-form-item label="需求上报截止时间">
             <span>{{ formData.deadline }}</span>
           </el-form-item>
         </el-col>
+        <el-col :span="6" v-if="formData.isSpecialFund">
+          <el-form-item label="专项资金名称">
+            <span>{{ formData.specialFund }}</span>
+          </el-form-item>
+        </el-col>
         <el-col :span="24" v-if="type==='singleDetail'">
-          <el-form-item label="所属公司">
+          <el-form-item label="征集公司">
             <span :class="showExpendClass(showMoreCompany,formData.companyIds)">{{
                 getCompanyName(formData.companyIds)
               }}</span>
@@ -27,11 +32,7 @@
             </div>
           </el-form-item>
         </el-col>
-        <el-col :span="24" v-if="formData.isSpecialFund">
-          <el-form-item label="专项资金名称">
-            <span>{{ formData.specialFund }}</span>
-          </el-form-item>
-        </el-col>
+
         <el-col :span="24">
           <baseTitle title="征集说明"></baseTitle>
           <el-form-item>

src/components/DetailComponent/SummaryDetail.vue

@@ -2,82 +2,85 @@
   <div class="detail-block" v-loading="loading">
     <el-form :model="localFormData" ref="summaryForm" :rules="rules">
       <el-row gutter="50">
-        <el-col :span="12">
+        <el-col :span="8">
           <el-form-item label="项目名称" prop="projectName">
             <span>{{ localFormData.projectName }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="专项资金名称" prop="specialFund" v-if="localFormData.isSpecialFund">
-            <span>{{localFormData.specialFundId===0?localFormData.specialFund:changeName(fundOption,localFormData.specialFundId) }}</span>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
+        <el-col :span="8">
           <el-form-item label="开始时间" prop="startTime">
             <span>{{ localFormData.startTime }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="8">
           <el-form-item label="结束时间" prop="endTime">
             <span>{{ localFormData.endTime }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="8">
           <el-form-item label="项目类型" prop="projectType">
             <span>{{ filterDict(cacheStore.getDict('project_type'), localFormData.projectType) }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="8">
           <el-form-item label="研发主体" prop="rdSubject">
             <span>{{ filterDict(cacheStore.getDict('rd_subject'), localFormData.rdSubject) }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="8">
           <el-form-item label="出资类型" prop="investmentType">
             <span>{{ filterDict(cacheStore.getDict('invest_type'), localFormData.investmentType) }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="8">
           <el-form-item label="项目影响" prop="projectImpact">
             <span>{{ filterDict(cacheStore.getDict('project_impact'), localFormData.projectImpact) }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="8">
           <el-form-item label="所属业务板块" prop="businessSegment">
             <span>{{ filterDict(cacheStore.getDict('business_segment'), localFormData.businessSegment) }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="预期成果形式" prop="resultForm">
-            <span>{{ filterDict(cacheStore.getDict('result_form'), localFormData.resultForm) }}</span>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
+        <el-col :span="8">
           <el-form-item label="预期技术标准制定" prop="technicalStandard">
             <span>{{ filterDict(cacheStore.getDict('technical_standard'), localFormData.technicalStandard) }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="8">
           <el-form-item label="产学研联合" prop="industryUniversityResearch">
             <span>{{
                 filterDict(cacheStore.getDict('industry_university'), localFormData.industryUniversityResearch)
               }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="8">
           <el-form-item label="开展政府申报" prop="governmentDeclaration">
             <span>{{
                 filterDict(cacheStore.getDict('government_declaration'), localFormData.governmentDeclaration)
               }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="8">
+          <el-form-item label="专项资金名称" prop="specialFund" v-if="localFormData.isSpecialFund">
+            <span>{{localFormData.specialFundId===0?localFormData.specialFund:changeName(fundOption,localFormData.specialFundId) }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
           <el-form-item label="知识产权状况" prop="intellectualProperty">
             <span>{{
                 filterDict(cacheStore.getDict('intellectual_property'), localFormData.intellectualProperty)
               }}</span>
           </el-form-item>
         </el-col>
+        <el-col :span="16">
+          <el-form-item label="预期成果形式" prop="resultForm">
+            <span>{{ filterDict(cacheStore.getDict('result_form'), localFormData.resultForm) }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <baseTitle title="预期知识产权"></baseTitle>
+        </el-col>
         <el-col :span="6">
           <el-form-item label="发明专利(项)" prop="inventionPatent">
             <span>{{ localFormData.inventionPatent }}</span>
@@ -125,14 +128,20 @@
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="需求上报申请书">
+          <baseTitle title="需求上报申请书"></baseTitle>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item>
             <el-button type="primary" link @click="handleDownload(localFormData.singleFile)" style="font-size: 16px">
               {{ localFormData.singleFile?.originalFileName }}
             </el-button>
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <file-component title="需求上报附件" tag="需求上报"
+          <baseTitle title="附件列表"></baseTitle>
+        </el-col>
+        <el-col :span="24">
+          <file-component  tag="需求上报"
                           v-model:value="localFormData.fileList" :processViewer="processViewer"
                           :file-list-show="fileListShow"/>
         </el-col>

src/components/steps/index.vue

@@ -1,7 +1,6 @@
 <template>
   <baseTitle title="基础信息"></baseTitle>
   <fvForm :schema="schema" @getInstance="(e)=>baseForm = e"></fvForm>
-  <baseTitle title="各流程信息"></baseTitle>
   <div class="steps-box">
     <el-steps :active="localActive" finish-status="success">
       <el-step
@@ -14,9 +13,9 @@
       />
     </el-steps>
   </div>
-
   <!-- 步骤内容 -->
   <div>
+    <baseTitle title="各流程信息"></baseTitle>
     <slot name="content" :localActive="localActive"></slot>
     <!-- <template v-for="(item, index) in stepList" :key="item.key">
       <component v-if="localActive == index" v-bind="item.props || {}" :is="item.component" />