From b032903ed4eb990b05098f70b439afa9063f8826 Mon Sep 17 00:00:00 2001
From: dj <1042039504@qq.com>
Date: Fri, 18 Apr 2025 22:37:22 +0800
Subject: [PATCH] =?UTF-8?q?fix(project):=20=E8=B0=83=E6=95=B4=E7=9F=A5?=
 =?UTF-8?q?=E8=AF=86=E4=BA=A7=E6=9D=83=E7=9B=B8=E5=85=B3=E8=A1=A8=E8=BF=B0?=
 =?UTF-8?q?=E5=92=8C=E9=99=84=E4=BB=B6=E8=A1=A8=E6=A0=BC=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=20-=20=E5=B0=86"=E7=9F=A5=E8=AF=86=E4=BA=A7=E6=9D=83=E7=8A=B6?=
 =?UTF-8?q?=E5=86=B5"=E4=BF=AE=E6=94=B9=E4=B8=BA"=E7=9F=A5=E8=AF=86?=
 =?UTF-8?q?=E4=BA=A7=E6=9D=83=E5=BD=92=E5=B1=9E"=20-=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E9=99=84=E4=BB=B6=E4=B8=8A=E4=BC=A0=E5=92=8C=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E7=9A=84=E6=A0=B7=E5=BC=8F-=20=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=80=E7=9F=A5=E8=AF=86=E4=BA=A7=E6=9D=83=E5=BD=92=E5=B1=9E?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E7=9A=84=E6=A0=87=E7=AD=BE=E5=92=8C=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E4=BF=A1=E6=81=AF=20-=20=E8=B0=83=E6=95=B4=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E7=BB=84=E4=BB=B6=E7=9A=84=E6=98=BE=E7=A4=BA=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E5=92=8C=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AttachmentUpload.vue           | 10 +++-----
 .../DetailComponent/FileComponent.vue         |  4 +--
 .../DetailComponent/ProjectApply.vue          |  2 +-
 .../DetailComponent/ProjectAttachment.vue     | 25 ++++++++++++++++++-
 .../DetailComponent/SummaryDetail.vue         |  2 +-
 src/views/plan/detail.vue                     |  2 +-
 src/views/project-demand/summary/add.vue      |  6 ++---
 .../mobledetail/SummaryDetailMoblie.vue       |  2 +-
 8 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/src/components/AttachmentUpload.vue b/src/components/AttachmentUpload.vue
index 39b4e32..61b7b50 100644
--- a/src/components/AttachmentUpload.vue
+++ b/src/components/AttachmentUpload.vue
@@ -27,7 +27,7 @@
           <el-button color="#DED0B2" v-if="templateDownloadBtnShow" @click="handleImportTemplateDownload"
                      style="margin-left: 10px">模板下载
           </el-button>
-          <fvTable style="width: 100%;" :style="{maxHeight:label=='项目立项附件'?'320px':'160px',height:label=='项目立项附件'?'320px':'160px'}" v-if="showTable" :height="label=='项目立项附件'?'320':'160'" :tableConfig="tableConfig"
+          <fvTable style="width: 100%;"  :height="label=='项目立项附件'?'160':'160'" :scrollbar-always-on="true" :style="{maxHeight:label=='项目立项附件'?'160px':'160px',height:label=='项目立项附件'?'160px':'160px'}" v-if="showTable" :tableConfig="tableConfig"
                    :data="allFileList" :isSettingCol="false" :pagination="false">
             <template #empty>
               <el-empty :image-size="55" description="暂无数据" style="padding: 0"/>
@@ -532,12 +532,10 @@ defineExpose({
 })
 </script>
 
-<style scoped>
-:deep(.el-table--fit ) {
-  //height: 300px !important;
-}
-</style>
 <style lang="scss" scoped>
+:deep(.el-table--fit ) {
+  height: 160px !important;
+}
 :deep(.el-table__header) {
   .is-leaf:first-child {
     .cell {
diff --git a/src/components/DetailComponent/FileComponent.vue b/src/components/DetailComponent/FileComponent.vue
index d92314b..acd03f6 100644
--- a/src/components/DetailComponent/FileComponent.vue
+++ b/src/components/DetailComponent/FileComponent.vue
@@ -3,7 +3,7 @@
     <el-form-item :label="title" v-if="fileListShow === 'READ' || fileListShow === 'EDIT'" :label-position="labelAlign"  :style="{marginTop: '10px',marginLeft: tag!=='需求上报'?'15px':'0'}">
       <file-upload @getFile="getOtherFile" v-if="fileListShow === 'EDIT'"/>
 <!--      :style="{width:isOpenPrint?'610px': '100%'}"  table-layout="auto"  id="printTable"-->
-      <fvTable style="width:100%;" :style="{maxHeight:tag=='项目立项'?'500px':'160px',height:tag=='项目立项'?'500px':'160px'}" v-if="processViewer" :scrollbar-always-on="true" :height="tag=='项目立项'?'500':'160'"  :tableConfig="tableConfig"
+      <fvTable style="width:100%;" :height="tag=='项目立项'?'160':'160'"   :style="{maxHeight:tag=='项目立项'?'160px':'160px',height:tag=='项目立项'?'160px':'160px'}"  v-if="processViewer" :scrollbar-always-on="true" :tableConfig="tableConfig"
               :data="_value" :isSettingCol="false" :pagination="false">
         <template #empty>
           <el-empty :image-size="55" description="暂无数据" style="padding: 0"/>
@@ -201,7 +201,7 @@ watch(() => props.processViewer, (newVal) => {
 
 <style scoped lang="scss">
 :deep(.el-table--fit ) {
-  //height: 160px !important;
+  height: 160px !important;
 }
 @media print {
   //#printTable{
diff --git a/src/components/DetailComponent/ProjectApply.vue b/src/components/DetailComponent/ProjectApply.vue
index 070dfb5..6054e3b 100644
--- a/src/components/DetailComponent/ProjectApply.vue
+++ b/src/components/DetailComponent/ProjectApply.vue
@@ -59,7 +59,7 @@
                          v-model:value="optionalChargeLeadershipList" @ok="optionalChargeLeaderPickerOk" @cancelOrClear="optionalChargeLeaderPickerCancel"/>
           </el-form-item>
         </el-col>
-        <el-col :span="24" v-if="preProcessShow === 'EDIT'">
+        <el-col :span="24" v-if="preProcessShow === 'EDIT'||title==='apply'">
           <el-form-item label="前置流程" :required="preProcessRequired" prop="preProcess" label-width="125">
             <el-button color="#DED0B2" @click="handleShowPreTable" style="margin-right: 10px">
               {{
diff --git a/src/components/DetailComponent/ProjectAttachment.vue b/src/components/DetailComponent/ProjectAttachment.vue
index e19dfe6..2d77247 100644
--- a/src/components/DetailComponent/ProjectAttachment.vue
+++ b/src/components/DetailComponent/ProjectAttachment.vue
@@ -390,6 +390,7 @@ const getTagsOption = (flag) => {
   if (!route.query.projectId) return
   getTagList(route.query.projectId).then(res => {
     if (res.code === 1000) {
+
       tagsOption.value = res.data.rows
       let list=[]
       if(flag){
@@ -406,7 +407,29 @@ const getTagsOption = (flag) => {
       })
       console.log("🚀 otherAttachmentList.value", allFiles.value)
       console.log("🚀 ~ file:\tagsOption.value ", tagsOption.value)
-
+      let defaultArray=[
+        {
+          tagId: 'd1',
+          fileTag: '合同(专项任务书)',
+          isClose: 2
+        },
+        {
+          tagId: 'd2',
+          fileTag: '周报',
+          isClose: 2
+        },
+        {
+          tagId: 'd3',
+          fileTag: '阶段性验收',
+          isClose: 2
+        },
+        {
+          tagId: 'd4',
+          fileTag: '科研成果',
+          isClose: 2
+        }
+      ]
+      tagsOption.value=[...defaultArray,...tagsOption.value]
       // if (!res.data.rows || res.data.rows.length == 0) return;
       // activeName.value=res.data.rows[0].tagId
     } else {
diff --git a/src/components/DetailComponent/SummaryDetail.vue b/src/components/DetailComponent/SummaryDetail.vue
index bd20185..6321e71 100644
--- a/src/components/DetailComponent/SummaryDetail.vue
+++ b/src/components/DetailComponent/SummaryDetail.vue
@@ -9,7 +9,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="知识产权状况" prop="intellectualProperty">
+          <el-form-item label="知识产权归属" prop="intellectualProperty">
             <span>{{
                 filterDict(cacheStore.getDict('intellectual_property'), localFormData.intellectualProperty)
               }}</span>
diff --git a/src/views/plan/detail.vue b/src/views/plan/detail.vue
index 3c03d5e..ad894cb 100644
--- a/src/views/plan/detail.vue
+++ b/src/views/plan/detail.vue
@@ -122,7 +122,7 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column prop="intellectualProperty" label="知识产权状况" align="center">
+          <el-table-column prop="intellectualProperty" label="知识产权归属" align="center">
             <template #default="scope">
               <div v-if="scope.row.intellectualProperty !== null">
                 <Tag dictType="intellectual_property" :value="scope.row.intellectualProperty"/>
diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue
index f9f0bdc..4f07a0c 100644
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -264,8 +264,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="6" :style="{marginLeft:!formData.isSpecialFund?'-10px':'-40px'}">
-          <el-form-item label="知识产权状况" prop="intellectualProperty">
-            <el-select v-model="formData.intellectualProperty" placeholder="请选择知识产权状况" clearable filterable
+          <el-form-item label="知识产权归属" prop="intellectualProperty">
+            <el-select v-model="formData.intellectualProperty" placeholder="请选择知识产权归属" clearable filterable
                        @change="changeCollectData">
               <el-option
                   v-for="item in cacheStore.getDict('intellectual_property')"
@@ -438,7 +438,7 @@ const rules = reactive({
   technicalStandard: [{required: true, message: '请选择预期技术标准制定', trigger: ['blur', 'change']}],
   industryUniversityResearch: [{required: true, message: '请选择产学研联合', trigger: ['blur', 'change']}],
   governmentDeclaration: [{required: true, message: '请选择开展政府申报', trigger: ['blur', 'change']}],
-  intellectualProperty: [{required: true, message: '请选择知识产权状况', trigger: ['blur', 'change']}],
+  intellectualProperty: [{required: true, message: '请选择知识产权归属', trigger: ['blur', 'change']}],
   inventionPatent: [{required: true, message: '请输入发明专利数量', trigger: ['blur', 'change']}],
   newPatent: [{required: true, message: '请输入实用性新型专利数量', trigger: ['blur', 'change']}],
   softwareCopyright: [{required: true, message: '请输入软件著作权数量', trigger: ['blur', 'change']}],
diff --git a/src/views/project-management/mobledetail/SummaryDetailMoblie.vue b/src/views/project-management/mobledetail/SummaryDetailMoblie.vue
index be972ea..58b8fef 100644
--- a/src/views/project-management/mobledetail/SummaryDetailMoblie.vue
+++ b/src/views/project-management/mobledetail/SummaryDetailMoblie.vue
@@ -9,7 +9,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="知识产权状况" prop="intellectualProperty">
+          <el-form-item label="知识产权归属" prop="intellectualProperty">
             <span>{{
                 filterDict(cacheStore.getDict('intellectual_property'), localFormData.intellectualProperty)
               }}</span>