From 04fff31b3a3318c528945b06194505cf4f20de16 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Mon, 5 Aug 2024 17:22:23 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=20=E4=BF=AE=E6=94=B9'=E7=BB=8F=E8=B4=B9?=
 =?UTF-8?q?=E9=A2=84=E7=AE=97'=E6=96=87=E5=AD=97=E5=8F=8A=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=8E=92=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DetailComponent/CollectionDetail.vue         |  7 ++++---
 src/components/DetailComponent/SummaryDetail.vue | 16 ++++++++--------
 src/views/plan/detail.vue                        |  2 +-
 src/views/project-demand/summary/add.vue         |  4 ++--
 src/views/project-management/filing/index.vue    |  2 +-
 .../project-management/implementation/index.vue  |  2 +-
 .../project-management/initiation/index.vue      |  2 +-
 .../mobledetail/SummaryDetailMoblie.vue          |  2 +-
 8 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/components/DetailComponent/CollectionDetail.vue b/src/components/DetailComponent/CollectionDetail.vue
index 40b2074..1c91b1c 100644
--- a/src/components/DetailComponent/CollectionDetail.vue
+++ b/src/components/DetailComponent/CollectionDetail.vue
@@ -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>
diff --git a/src/components/DetailComponent/SummaryDetail.vue b/src/components/DetailComponent/SummaryDetail.vue
index 0245859..73d1d9b 100644
--- a/src/components/DetailComponent/SummaryDetail.vue
+++ b/src/components/DetailComponent/SummaryDetail.vue
@@ -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>
diff --git a/src/views/plan/detail.vue b/src/views/plan/detail.vue
index 2601f0b..38dae38 100644
--- a/src/views/plan/detail.vue
+++ b/src/views/plan/detail.vue
@@ -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>
diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue
index db9d68c..cc3a0cb 100644
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -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'}]
diff --git a/src/views/project-management/filing/index.vue b/src/views/project-management/filing/index.vue
index 601d794..b74d541 100644
--- a/src/views/project-management/filing/index.vue
+++ b/src/views/project-management/filing/index.vue
@@ -213,7 +213,7 @@ const tableConfig = reactive({
     },
     {
       prop: 'economicEstimate',
-      label: '经济预算(元)',
+      label: '经费预算(元)',
       align: 'center',
       currentRender:({row})=>{
         return <span>{toThousands(row.economicEstimate)}</span>
diff --git a/src/views/project-management/implementation/index.vue b/src/views/project-management/implementation/index.vue
index 0938ac3..7cfd10e 100644
--- a/src/views/project-management/implementation/index.vue
+++ b/src/views/project-management/implementation/index.vue
@@ -229,7 +229,7 @@ const tableConfig = reactive({
     },
     {
       prop: 'economicEstimate',
-      label: '经济预算(元)',
+      label: '经费预算(元)',
       align: 'center',
       currentRender:({row})=>{
         return <span>{toThousands(row.economicEstimate)}</span>
diff --git a/src/views/project-management/initiation/index.vue b/src/views/project-management/initiation/index.vue
index d40c7f7..ced95f4 100644
--- a/src/views/project-management/initiation/index.vue
+++ b/src/views/project-management/initiation/index.vue
@@ -211,7 +211,7 @@ const tableConfig = reactive({
     },
     {
       prop: 'economicEstimate',
-      label: '经济预算(元)',
+      label: '经费预算(元)',
       align: 'center',
       currentRender:({row})=>{
         return <span>{toThousands(row.economicEstimate)}</span>
diff --git a/src/views/project-management/mobledetail/SummaryDetailMoblie.vue b/src/views/project-management/mobledetail/SummaryDetailMoblie.vue
index 6aa1fd0..adc7502 100644
--- a/src/views/project-management/mobledetail/SummaryDetailMoblie.vue
+++ b/src/views/project-management/mobledetail/SummaryDetailMoblie.vue
@@ -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>