From 04bbedf0251eb20228feb47228c3f82f50611e01 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 14 Jul 2024 22:50:58 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=9C=80=E6=B1=82?=
 =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E6=8E=92=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project-demand/summary/add.vue | 112 +++++++++++++----------
 1 file changed, 62 insertions(+), 50 deletions(-)

diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue
index aeeefe2..84537ce 100644
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -24,7 +24,7 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="结束时间" prop="endTime"
-                        :title="!formData.startTime?'请先选择开始时间!':''" label-width="134">
+                        :title="!formData.startTime?'请先选择开始时间!':''" label-width="135">
             <el-config-provider>
               <el-date-picker
                   v-model="formData.endTime"
@@ -64,7 +64,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="出资类型" prop="investmentType" label-width="134">
+          <el-form-item label="出资类型" prop="investmentType" label-width="135">
             <el-select v-model="formData.investmentType" placeholder="请选择出资类型" clearable filterable>
               <el-option
                   v-for="item in cacheStore.getDict('invest_type')"
@@ -75,20 +75,20 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <!--        <el-col :span="8">-->
+        <!--          <el-form-item label="项目影响" prop="projectImpact" label-width="125">-->
+        <!--            <el-select v-model="formData.projectImpact" placeholder="请选择项目影响" clearable filterable>-->
+        <!--              <el-option-->
+        <!--                  v-for="item in cacheStore.getDict('project_impact')"-->
+        <!--                  :key="item.value"-->
+        <!--                  :label="item.label"-->
+        <!--                  :value="item.value"-->
+        <!--              />-->
+        <!--            </el-select>-->
+        <!--          </el-form-item>-->
+        <!--        </el-col>-->
         <el-col :span="8">
-          <el-form-item label="项目影响" prop="projectImpact" label-width="125">
-            <el-select v-model="formData.projectImpact" placeholder="请选择项目影响" clearable filterable>
-              <el-option
-                  v-for="item in cacheStore.getDict('project_impact')"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="所属业务板块" prop="businessSegment" label-width="145">
+          <el-form-item label="所属业务板块" prop="businessSegment" label-width="125">
             <el-select v-model="formData.businessSegment" placeholder="请选择所属业务板块" clearable filterable>
               <el-option
                   v-for="item in cacheStore.getDict('business_segment')"
@@ -100,7 +100,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="预期技术标准制定" prop="technicalStandard">
+          <el-form-item label="预期技术标准制定" prop="technicalStandard" label-width="145">
             <el-select v-model="formData.technicalStandard" placeholder="请选择预期技术标准制定" clearable filterable>
               <el-option
                   v-for="item in cacheStore.getDict('technical_standard')"
@@ -111,8 +111,10 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="route.query.id && formData.isSpecialFund?8:!formData.isSpecialFund?!route.query.id?6:8:6">
-          <el-form-item label="产学研联合" prop="industryUniversityResearch" label-width="125">
+        <!--        <el-col :span="route.query.id && formData.isSpecialFund?8:!formData.isSpecialFund?!route.query.id?6:8:6">-->
+
+        <el-col :span="8">
+          <el-form-item label="产学研联合" prop="industryUniversityResearch" label-width="135">
             <el-radio-group v-model="formData.industryUniversityResearch">
               <el-radio v-for="item in cacheStore.getDict('industry_university')"
                         :key="item.value"
@@ -121,8 +123,12 @@
             </el-radio-group>
           </el-form-item>
         </el-col>
-        <el-col :span="route.query.id && formData.isSpecialFund?8:!formData.isSpecialFund?route.query.id?8:6:6">
-          <el-form-item label="开展政府申报" prop="governmentDeclaration" :label-width="route.query.id && formData.isSpecialFund?145:!formData.isSpecialFund?145:145">
+        <!--        <el-col :span="route.query.id && formData.isSpecialFund?8:!formData.isSpecialFund?route.query.id?8:6:6">-->
+      </el-row>
+      <el-row gutter="15">
+        <el-col :span="8">
+          <el-form-item label="开展政府申报" prop="governmentDeclaration" label-width="125">
+<!--                        :label-width="route.query.id && formData.isSpecialFund?145:!formData.isSpecialFund?145:145">-->
             <el-radio-group v-model="formData.governmentDeclaration">
               <el-radio v-for="item in cacheStore.getDict('government_declaration')"
                         :key="item.value"
@@ -131,8 +137,9 @@
             </el-radio-group>
           </el-form-item>
         </el-col>
-        <el-col :span="!route.query.id && formData.isSpecialFund?4:!route.query.id?12:12" v-if="!route.query.id">
-          <el-form-item label="是否专项资金" prop="isSpecialFund" >
+        <!--        <el-col :span="!route.query.id && formData.isSpecialFund?4:!route.query.id?12:12" v-if="!route.query.id">-->
+        <el-col :span="8" v-if="!route.query.id">
+          <el-form-item label="是否专项资金" prop="isSpecialFund" label-width="145">
             <el-radio-group v-model="formData.isSpecialFund" @change="specialFundChange">
               <el-radio :label="true">是</el-radio>
               <el-radio :label="false">否</el-radio>
@@ -140,11 +147,12 @@
           </el-form-item>
         </el-col>
         <el-col :span="8" v-if="route.query.id && formData.isSpecialFund">
-          <el-form-item label="专项资金名称" prop="specialFundId" :label-width="route.query.id && formData.isSpecialFund?135:''">
+          <el-form-item label="专项资金名称" prop="specialFundId"
+                        :label-width="route.query.id && formData.isSpecialFund?145:''">
             <span>{{ formData.specialFund }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="8" v-if="!route.query.id && formData.isSpecialFund" >
+        <el-col :span="8" v-if="!route.query.id && formData.isSpecialFund">
           <el-form-item label="专项资金名称" prop="specialFundId" label-width="135">
             <el-select v-model="formData.specialFundId" placeholder="请选择专项资金名称" clearable filterable>
               <el-option
@@ -157,29 +165,33 @@
           </el-form-item>
         </el-col>
         <el-col :span="8" style="margin-bottom: -18px">
-          <el-form-item label="知识产权状况" prop="intellectualProperty" :label-width="!formData.isSpecialFund?!route.query.id?125:135:125">
-            <el-select v-model="formData.intellectualProperty" placeholder="请选择知识产权状况" clearable filterable>
-              <el-option
-                  v-for="item in cacheStore.getDict('intellectual_property')"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="16" style="margin-bottom: -18px">
-          <el-form-item label="预期成果形式" prop="resultForm" label-width="145">
-            <el-select v-model="formData.resultForm" placeholder="请选择预期成果形式" clearable filterable multiple>
-              <el-option
-                  v-for="item in cacheStore.getDict('result_form')"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
+        <!--          :label-width="!formData.isSpecialFund?!route.query.id?125:125:125">-->
+        <el-form-item label="知识产权状况" prop="intellectualProperty" :label-width="route.query.id && formData.isSpecialFund?135:formData.isSpecialFund?125:route.query.id?145:135">
+          <el-select v-model="formData.intellectualProperty" placeholder="请选择知识产权状况" clearable filterable>
+            <el-option
+                v-for="item in cacheStore.getDict('intellectual_property')"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+      </el-col>
+        <el-col :span="route.query.id && formData.isSpecialFund?24:formData.isSpecialFund?16:24" style="margin-bottom: -18px">
+        <el-form-item label="预期成果形式" prop="resultForm" :label-width="route.query.id && formData.isSpecialFund?125:formData.isSpecialFund?145:125">
+          <el-select v-model="formData.resultForm" placeholder="请选择预期成果形式" clearable filterable multiple>
+            <el-option
+                v-for="item in cacheStore.getDict('result_form')"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+      </el-col>
+
+      </el-row>
+      <el-row gutter="15">
         <el-col :span="24">
           <baseTitle title="预期知识产权"></baseTitle>
         </el-col>
@@ -289,7 +301,7 @@ const formData = ref({
   isSpecialFund: true,
   industryUniversityResearch: '0',
   governmentDeclaration: '0',
-  resultForm:[]
+  resultForm: []
 })
 
 const rules = reactive({
@@ -366,9 +378,9 @@ const compositeParam = (item, type) => {
 
 const getAttachment = (val) => {
   // console.log('上传文件getAttachment', val)
-  showSingleTable.value=false
+  showSingleTable.value = false
   formData.value.singleFile = compositeParam(val)
-  singleList.value.push( compositeParam(val))
+  singleList.value.push(compositeParam(val))
   nextTick(() => {
     showSingleTable.value = true
   })