From 3dbaf2128196dce64e956a584d6650466c951060 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 10 Aug 2024 22:48:46 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=20=E5=BE=81=E9=9B=86=E8=AF=B4=E6=98=8E/?=
 =?UTF-8?q?=E4=B8=93=E9=A1=B9=E8=B5=84=E9=87=91=E4=BB=8B=E7=BB=8D=E6=8D=A2?=
 =?UTF-8?q?=E8=A1=8C=E6=A0=BC=E5=BC=8F,=20=E9=9C=80=E6=B1=82=E5=BE=81?=
 =?UTF-8?q?=E9=9B=86=E5=88=97=E8=A1=A8=E9=A1=B5=E6=90=9C=E7=B4=A2=E6=A1=86?=
 =?UTF-8?q?=E9=97=B4=E8=B7=9D,=20=E5=88=87=E6=8D=A2=E8=B4=A6=E5=8F=B7?=
 =?UTF-8?q?=E5=B1=82=E7=BA=A7,=20=E9=9C=80=E6=B1=82=E4=B8=8A=E6=8A=A54?=
 =?UTF-8?q?=E7=A7=8D=E6=83=85=E5=86=B5=E6=8E=92=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DetailComponent/CollectionDetail.vue      | 17 +++++++++++-
 .../DetailComponent/SpecialFundDetail.vue     |  2 +-
 src/layout/navbar/index.vue                   |  2 +-
 .../project-demand/requirement/index.vue      |  4 +--
 src/views/project-demand/summary/add.vue      | 26 +++++++++----------
 5 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/src/components/DetailComponent/CollectionDetail.vue b/src/components/DetailComponent/CollectionDetail.vue
index 9cf182f..396faf7 100644
--- a/src/components/DetailComponent/CollectionDetail.vue
+++ b/src/components/DetailComponent/CollectionDetail.vue
@@ -35,7 +35,7 @@
         </el-col>
         <el-col :span="24" style="margin-bottom: -15px">
           <el-form-item label="征集说明">
-            <div v-if="formData.collectExplain" v-html="formData.collectExplain">
+            <div v-if="formData.collectExplain" v-html="formData.collectExplain" style="white-space: pre-wrap;">
             </div>
             <div v-else>--</div>
           </el-form-item>
@@ -190,4 +190,19 @@ watch(() => props.processViewer, (newVal) => {
   display: -webkit-box;
   -webkit-box-orient: vertical;
 }
+:deep(.el-table__header) {
+  .is-leaf:first-child {
+    .cell {
+      margin-left: -53px !important;
+    }
+  }
+}
+
+:deep(.el-table__body) {
+  .el-table__cell:first-child {
+    .cell {
+      margin-left: -26px !important;
+    }
+  }
+}
 </style>
diff --git a/src/components/DetailComponent/SpecialFundDetail.vue b/src/components/DetailComponent/SpecialFundDetail.vue
index 3ca4079..c4af7a8 100644
--- a/src/components/DetailComponent/SpecialFundDetail.vue
+++ b/src/components/DetailComponent/SpecialFundDetail.vue
@@ -22,7 +22,7 @@
         <el-col :span="24">
           <el-form-item>
             <el-card style="width: 100%">
-              <div v-html="formData.introduce">
+              <div style="white-space: pre-wrap">{{formData.introduce}}
               </div>
             </el-card>
           </el-form-item>
diff --git a/src/layout/navbar/index.vue b/src/layout/navbar/index.vue
index 6f4ea55..96c90cc 100644
--- a/src/layout/navbar/index.vue
+++ b/src/layout/navbar/index.vue
@@ -200,7 +200,7 @@ const handleLogout = () => {
         position: absolute;
         width: 280px;
         right: 0;
-        z-index: 300;
+        z-index: 3000;
         top: 54px;
         padding: 5px 0;
         border-radius: 4px;
diff --git a/src/views/project-demand/requirement/index.vue b/src/views/project-demand/requirement/index.vue
index c554b0e..8b2f709 100644
--- a/src/views/project-demand/requirement/index.vue
+++ b/src/views/project-demand/requirement/index.vue
@@ -1,6 +1,6 @@
 <template>
   <el-form ref="formRef" :model="selectForm" class="search-form select-form" style="margin-top: 18px;">
-    <el-row gutter="20">
+    <el-row >
       <el-col :span="5">
         <el-form-item prop="requirementName" label="征集名称">
           <el-input v-model="selectForm.requirementName" placeholder="请输入征集名称" clearable @keyup.enter.native="getList"/>
@@ -31,7 +31,7 @@
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col :span="6">
+      <el-col :span="6" :offset="1">
         <el-form-item>
           <el-button color="#DED0B2" @click="getList">搜索</el-button>
           <el-button @click="handleReset">重置</el-button>
diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue
index fa9ec5d..ad35794 100644
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -2,20 +2,20 @@
   <div class="detail-block" v-loading="loading">
     <baseTitle title="项目基本信息"></baseTitle>
     <el-form :model="formData" ref="summaryForm" :rules="rules"  label-width="120" :scroll-to-error="true">
-      <el-row gutter="40" style="margin-bottom: -18px">
+      <el-row gutter="25" style="margin-bottom: -18px">
         <el-col :span="6">
-          <el-form-item label="承办单位"  :label-width="route.query.id && formData.isSpecialFund?135:120">
+          <el-form-item label="承办单位" >
             <Tooltip :content="authStore.userinfo?.subCompanyName" placement="bottom-start" width="240" textAlign="left">
             </Tooltip>
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="项目名称" prop="projectName" >
+          <el-form-item label="项目名称" prop="projectName" :label-width="route.query.id && formData.isSpecialFund?160:120">
             <el-input v-model="formData.projectName" placeholder="请输入项目名称" clearable></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="开始时间" prop="startTime" label-width="135">
+          <el-form-item label="开始时间" prop="startTime" label-width="160">
             <el-config-provider>
               <el-date-picker
                   v-model="formData.startTime"
@@ -58,7 +58,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="研发主体" prop="rdSubject"  :label-width="route.query.id && formData.isSpecialFund?135:120">
+          <el-form-item label="研发主体" prop="rdSubject"  :label-width="route.query.id && formData.isSpecialFund?160:120">
             <el-select v-model="formData.rdSubject" placeholder="请选择研发主体" clearable filterable>
               <el-option
                   v-for="item in cacheStore.getDict('rd_subject')"
@@ -70,7 +70,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="出资类型" prop="investmentType" label-width="135">
+          <el-form-item label="出资类型" prop="investmentType" label-width="160">
             <el-select v-model="formData.investmentType" placeholder="请选择出资类型" clearable filterable>
               <el-option
                   v-for="item in cacheStore.getDict('invest_type')"
@@ -119,12 +119,12 @@
         </el-col>
         <!--        <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-form-item label="经费预算(元)" prop="economicEstimate" :label-width="route.query.id && formData.isSpecialFund?160:120">
             <el-input-number v-model="formData.economicEstimate" placeholder="请输入经费预算数量" :controls="false"/>
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="产学研联合" prop="industryUniversityResearch" label-width="135">
+          <el-form-item label="产学研联合" prop="industryUniversityResearch" label-width="160">
             <el-select v-model="formData.industryUniversityResearch" clearable>
               <el-option
                   v-for="item in cacheStore.getDict('industry_university')"
@@ -184,12 +184,12 @@
           </el-form-item>
         </el-col>
         <el-col :span="6" v-if="formData.isSpecialFund">
-          <el-form-item label="申请总部专项资金" prop="specialFundAmount" label-width="135">
+          <el-form-item label="申请总部专项资金(元)" prop="specialFundAmount" label-width="160">
             <el-input-number v-model="formData.specialFundAmount" placeholder="请输入专项资金" :controls="false"/>
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="部门分管领导" required prop=""  :label-width="route.query.id && formData.isSpecialFund?135:120">
+          <el-form-item label="部门分管领导" required prop=""  :label-width="route.query.id && formData.isSpecialFund?160:120">
             <el-button color="#DED0B2" style="margin-right: 10px" @click="handleShowOptionalChargeLeadershipPicker">
               {{ optionalChargeLeadershipList.length !== 0 ? '更改' : '请选择' }}
             </el-button>
@@ -220,7 +220,7 @@
         </el-col>
         <el-col :span="6">
           <!--          :label-width="!formData.isSpecialFund?!route.query.id?125:125:125">-->
-          <el-form-item label="知识产权状况" prop="intellectualProperty"  label-width="135">
+          <el-form-item label="知识产权状况" prop="intellectualProperty"  label-width="160">
             <el-select v-model="formData.intellectualProperty" placeholder="请选择知识产权状况" clearable filterable>
               <el-option
                   v-for="item in cacheStore.getDict('intellectual_property')"
@@ -242,12 +242,12 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="软件著作权(项)" prop="softwareCopyright"  :label-width="route.query.id && formData.isSpecialFund?135:120">
+          <el-form-item label="软件著作权(项)" prop="softwareCopyright"  :label-width="route.query.id && formData.isSpecialFund?160:120">
             <el-input-number v-model="formData.softwareCopyright" placeholder="请输入软件著作权数量" :controls="false"/>
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="著作权(项)" prop="copyright"  label-width="135">
+          <el-form-item label="著作权(项)" prop="copyright"  label-width="160">
             <el-input-number v-model="formData.copyright" placeholder="请输入著作权数量" :controls="false"/>
           </el-form-item>
         </el-col>