fix : 需求上报详情删除重复项,优化台账上方基础信息排版,表格内容少时固定宽度,驳回弹窗'重新提交'改为'发起节点'

src/components/DetailComponent/Opinion.vue

@@ -22,6 +22,9 @@
         <el-table-column
             prop="nodeName"
             label="节点名称">
+          <template #default="scope">
+            {{scope.row.nodeId==-1?'发起节点':scope.row.nodeName}}
+          </template>
         </el-table-column>
         <el-table-column
             prop="name"

src/components/DetailComponent/SummaryDetail.vue

@@ -1,96 +1,9 @@
 <template>
   <div class="detail-block" v-loading="loading">
-    <baseTitle title="需求上报信息"></baseTitle>
     <el-form :model="localFormData" ref="summaryForm" :rules="rules">
-      <el-row gutter="20" style="margin-bottom: -18px">
+      <baseTitle title="预期知识产权"></baseTitle>
+      <el-row gutter="20" style="margin-bottom: -18px;margin-left: 5px">
         <el-col :span="6">
-          <el-form-item label="项目名称" prop="projectName">
-            <span>{{ localFormData.projectName }}</span>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="开始时间" prop="startTime">
-            <span>{{ localFormData.startTime }}</span>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="结束时间" prop="endTime">
-            <span>{{ localFormData.endTime }}</span>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="项目类型" prop="projectType">
-            <span>{{ filterDict(cacheStore.getDict('project_type'), localFormData.projectType) }}</span>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="研发主体" prop="rdSubject">
-            <span>{{ filterDict(cacheStore.getDict('rd_subject'), localFormData.rdSubject) }}</span>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="出资类型" prop="investmentType">
-            <span>{{ filterDict(cacheStore.getDict('invest_type'), localFormData.investmentType) }}</span>
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="6">
-          <el-form-item label="所属业务板块" prop="businessSegment">
-            <span>{{ filterDict(cacheStore.getDict('business_segment'), localFormData.businessSegment) }}</span>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="标准制定" prop="technicalStandard">
-            <span>{{ filterDict(cacheStore.getDict('technical_standard'), localFormData.technicalStandard) }}</span>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="项目影响" prop="projectImpact">
-            <span>{{ filterDict(cacheStore.getDict('project_impact'), localFormData.projectImpact) }}</span>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="经费预算(元)" prop="economicEstimate">
-            <span>{{ toThousands(localFormData.economicEstimate) }}</span>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="产学研联合" prop="industryUniversityResearch">
-            <span>{{
-                filterDict(cacheStore.getDict('industry_university'), localFormData.industryUniversityResearch)
-              }}</span>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="开展政府申报" prop="governmentDeclaration">
-            <span>{{
-                filterDict(cacheStore.getDict('government_declaration'), localFormData.governmentDeclaration)
-              }}</span>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6" v-if="localFormData.isSpecialFund">
-          <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">
-            <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>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row gutter="20" style="margin-bottom: -18px">
-        <el-col :span="24">
-          <baseTitle title="预期知识产权"></baseTitle>
-        </el-col>
-        <el-col :span="12">
           <el-form-item label="预期成果形式" prop="resultForm">
             <span>{{ filterDict(cacheStore.getDict('result_form'), localFormData.resultForm) }}</span>
           </el-form-item>
@@ -128,10 +41,9 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row gutter="20" >
-        <el-col :span="24">
-          <baseTitle title="项目描述"></baseTitle>
-        </el-col>
+
+      <baseTitle title="项目描述"></baseTitle>
+      <el-row gutter="20" style="margin-left: 5px;margin-bottom: -18px;">
         <el-col :span="24">
           <el-form-item label="现有业务描述" prop="serviceDescription">
             <span>{{ localFormData.serviceDescription }}</span>
@@ -142,11 +54,12 @@
             <span>{{ localFormData.contentDescription }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="24" style="margin-top: -18px">
-          <baseTitle title="需求上报申请书"></baseTitle>
-        </el-col>
+      </el-row>
+
+      <baseTitle title="需求上报申请书" style="margin-bottom: 10px">></baseTitle>
+      <el-row gutter="20" style="margin-bottom: -15px;">
         <el-col :span="24">
-          <single-file-component tag="需求上报" v-model:value="localFormData.singleFile" :processViewer="processViewer" />
+          <single-file-component tag="需求上报" v-model:value="localFormData.singleFile" :processViewer="processViewer"/>
           <!--          <el-form-item>-->
           <!--            {{localFormData.singleFile}}-->
           <!--            <el-button type="primary" link @click="handleDownload(localFormData.singleFile)" style="font-size: 16px">-->
@@ -154,9 +67,9 @@
           <!--            </el-button>-->
           <!--          </el-form-item>-->
         </el-col>
-        <el-col :span="24" style="margin-top: -12px">
-          <baseTitle title="附件列表"></baseTitle>
-        </el-col>
+      </el-row>
+      <baseTitle title="附件列表" style="margin-bottom: 0"></baseTitle>
+      <el-row gutter="20" style="margin-bottom: -18px;">
         <el-col :span="24">
           <file-component tag="需求上报"
                           v-model:value="localFormData.fileList" :processViewer="processViewer"
@@ -175,7 +88,7 @@
             </el-form-item>
           </div>
           <div v-if="data.state==='5'" style="margin-bottom: 15px">
-            <baseTitle title="前置流程"></baseTitle>
+            <baseTitle title="前置流程" v-if="localFormData.preProcess"></baseTitle>
             <div style="display: flex;align-items: center;flex-wrap: wrap;">
               <div v-for="(item,index) in localFormData.preProcess" :key="item.requestId">
                 <a :href="item.baseUrl" target="_blank"
@@ -404,6 +317,22 @@ getFundOptions()
 </script>
 
 <style scoped lang="scss">
+:deep(.el-table__header) {
+  .is-leaf:first-child {
+    .cell {
+      margin-left: -25px !important;
+    }
+  }
+}
+
+:deep(.el-table__body) {
+  .el-table__cell:first-child {
+    .cell {
+      margin-left: -13px !important;
+    }
+  }
+}
+
 .detail-block {
   overflow-x: hidden;
   overflow-y: auto;

src/components/steps/index.vue

@@ -1,6 +1,8 @@
 <template>
+  <div style="padding: 0 30px">
+
   <baseTitle title="项目基本信息"></baseTitle>
-  <fvForm :schema="schema" @getInstance="(e)=>baseForm = e" label-position="left" label-width="left"></fvForm>
+  <fvForm :schema="schema" @getInstance="(e)=>baseForm = e" label-position="left" label-width="left" style="margin-left: 15px"></fvForm>
   <div class="steps-box">
     <el-steps v-if="stepsShow" :active="localActive" finish-status="success">
       <el-step
@@ -30,6 +32,7 @@
       <component v-if="localActive == index" v-bind="item.props || {}" :is="item.component" />
     </template> -->
   </div>
+  </div>
 </template>
 
 <script setup lang="jsx">