From 72171fb573e9ecfccc32ea14d5a79c8e18a94ce4 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 29 Jun 2024 00:07:43 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=20=E9=9C=80=E6=B1=82=E5=BE=81=E9=9B=86?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E/=E8=AF=A6=E6=83=85=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96,=E9=9C=80=E6=B1=82=E6=B1=87=E6=80=BB?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DetailComponent/CollectionDetail.vue      | 17 ++---
 .../DetailComponent/SummaryDetail.vue         | 57 +++++++++-------
 src/components/steps/index.vue                |  3 +-
 src/views/project-demand/requirement/add.vue  | 65 +++++++++----------
 src/views/project-demand/summary/add.vue      |  5 +-
 .../implementation/uploadFee.vue              |  4 +-
 src/views/workflow/common/OperationRender.vue |  2 +-
 7 files changed, 80 insertions(+), 73 deletions(-)

diff --git a/src/components/DetailComponent/CollectionDetail.vue b/src/components/DetailComponent/CollectionDetail.vue
index 6c3db8a..c02bd4e 100644
--- a/src/components/DetailComponent/CollectionDetail.vue
+++ b/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>
diff --git a/src/components/DetailComponent/SummaryDetail.vue b/src/components/DetailComponent/SummaryDetail.vue
index ee64028..bf34c34 100644
--- a/src/components/DetailComponent/SummaryDetail.vue
+++ b/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>
diff --git a/src/components/steps/index.vue b/src/components/steps/index.vue
index c95f922..67ab94d 100644
--- a/src/components/steps/index.vue
+++ b/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" />
diff --git a/src/views/project-demand/requirement/add.vue b/src/views/project-demand/requirement/add.vue
index 37b7c18..3ae6605 100644
--- a/src/views/project-demand/requirement/add.vue
+++ b/src/views/project-demand/requirement/add.vue
@@ -1,16 +1,16 @@
 <template>
   <div v-loading="loading" class="add-block">
     <baseTitle title="需求征集信息录入"></baseTitle>
-    <el-form :model="formData" inline class="query-form" ref="demandForm" :rules="rules">
-      <el-row>
-        <el-col :span="6">
-          <el-form-item label="名称" prop="requirementName">
+    <el-form :model="formData"  ref="demandForm" :rules="rules">
+      <el-row gutter="30">
+        <el-col :span="8">
+          <el-form-item label="征集名称" prop="requirementName" label-width="96">
             <el-input v-model="formData.requirementName" placeholder="请输入名称" clearable></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
-          <el-form-item label="科技创新与信息化系统建设" prop="collectType">
-            <el-select v-model="formData.collectType" placeholder="科技创新与信息化系统建设" clearable filterable>
+        <el-col :span="8">
+          <el-form-item label="征集类型" prop="collectType" label-width="105">
+            <el-select v-model="formData.collectType" placeholder="请选择征集类型" clearable filterable>
               <el-option
                   v-for="item in cacheStore.getDict('collect_type')"
                   :key="item.value"
@@ -20,7 +20,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="8">
           <el-form-item label="需求上报截止时间" prop="deadline">
             <el-config-provider>
               <el-date-picker
@@ -32,8 +32,28 @@
             </el-config-provider>
           </el-form-item>
         </el-col>
-        <el-col :span="24">
-          <el-form-item label="征集公司" prop="companyIds" class="tree-select">
+        <el-col :span="8">
+          <el-form-item label="是否专项资金" prop="isSpecialFund">
+            <el-select v-model="formData.isSpecialFund" placeholder="是否专项资金" clearable filterable>
+              <el-option value="true" label="是"></el-option>
+              <el-option value="false" label="否"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="专项资金名称" prop="specialFundId">
+            <el-select v-model="formData.specialFundId" placeholder="请选择专项资金名称" clearable filterable :disabled="formData.isSpecialFund==='false'">
+              <el-option
+                  v-for="item in specialFundOption"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24" style="margin-bottom: -18px">
+          <el-form-item label="征集公司" prop="companyIds" class="tree-select" label-width="96">
             <div style="width: 100%">
               <el-button color="#DED0B2" @click="showCompany">{{ selectedCompanyList.length === 0 ? '请选择征集公司' : '更改' }}
               </el-button>
@@ -43,30 +63,9 @@
             <div style="color: #2a99ff;text-align: center;width: 100%;font-size: 15px;cursor: pointer"
                  @click="handleExpend">
               {{ showExpendText }}
-
             </div>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
-          <el-form-item label="是否专项资金" prop="isSpecialFund">
-            <el-radio-group v-model="formData.isSpecialFund" size="mini">
-              <el-radio :label="true">是</el-radio>
-              <el-radio :label="false">否</el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6" v-if="formData.isSpecialFund">
-          <el-form-item label="专项资金名称" prop="specialFundId">
-            <el-select v-model="formData.specialFundId" placeholder="请选择专项资金名称" clearable filterable>
-              <el-option
-                  v-for="item in specialFundOption"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value">
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
       </el-row>
     </el-form>
     <baseTitle title="征集说明"></baseTitle>
@@ -146,11 +145,11 @@ const dateValue = ref()
 const formData = ref({
   requirementName: '',
   companyIds: [],
-  collectType: '',
+  collectType: '科技创新与信息化系统建设',
   deadline: '',
   collectExplain: '',
   fileList: [],
-  isSpecialFund: false
+  isSpecialFund: 'false'
 })
 const showTinymce = ref(true)
 const routerName = ref(router.currentRoute.value.name)
diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue
index 9d3f60b..dc42ec0 100644
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -3,7 +3,6 @@
     <baseTitle title="需求上报"></baseTitle>
     <el-form :model="formData" ref="summaryForm" :rules="rules">
       <el-row gutter="15">
-        <!--        label-width="140"-->
         <el-col :span="8">
           <el-form-item label="项目名称" prop="projectName" label-width="105">
             <el-input v-model="formData.projectName" placeholder="请输入项目名称" clearable></el-input>
@@ -170,8 +169,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="16">
-          <el-form-item label="预期成果形式" prop="resultForm">
-            <el-select v-model="formData.resultForm" placeholder="请选择预期成果形式" clearable filterable>
+          <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"
diff --git a/src/views/project-management/implementation/uploadFee.vue b/src/views/project-management/implementation/uploadFee.vue
index 68027a0..f3c2d48 100644
--- a/src/views/project-management/implementation/uploadFee.vue
+++ b/src/views/project-management/implementation/uploadFee.vue
@@ -114,8 +114,8 @@ const schema = computed(() => {
 const baseForm = ref()
 const rules = reactive({
   time: [{required: true, message: '请选择时间', trigger: 'blur'}],
-  projectCost: [{required: true, message: '请输入项目费用', trigger: 'blur'}],
-  researchStage: [{required: true, message: '请输入研发阶段', trigger: 'blur'}],
+  projectCost: [{required: true, message: '请选择项目费用', trigger: 'blur'}],
+  researchStage: [{required: true, message: '请选择研发阶段', trigger: 'blur'}],
   digest: [{required: true, message: '请输入摘要', trigger: 'blur'}],
   afterTax: [{required: true, message: '请输入税后余额', trigger: 'blur'}]
 })
diff --git a/src/views/workflow/common/OperationRender.vue b/src/views/workflow/common/OperationRender.vue
index b4fc42e..4d2f616 100644
--- a/src/views/workflow/common/OperationRender.vue
+++ b/src/views/workflow/common/OperationRender.vue
@@ -312,7 +312,7 @@ init()
       }
 
       > div:nth-child(2) {
-        display: flex;
+        //display: flex;
         margin-top: -5px;
       }
     }