From 7a38c34da92b4aad3457b8082442c4914a435806 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Tue, 9 Jul 2024 19:35:04 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E5=B9=B4=E5=BA=A6?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E8=AF=A6=E6=83=85=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/plan/detail.vue | 46 ++++++++++++++++++++++++---------------
 1 file changed, 28 insertions(+), 18 deletions(-)

diff --git a/src/views/plan/detail.vue b/src/views/plan/detail.vue
index 7d0842c..e7350d2 100644
--- a/src/views/plan/detail.vue
+++ b/src/views/plan/detail.vue
@@ -5,7 +5,7 @@
         <el-col :span="8">
           <el-form-item label="年度计划名称" prop="annualPlanName">
             <div v-if="isEdit">
-              <el-input  v-model="formData.annualPlanName" placeholder="请输入年度计划名称" clearable>
+              <el-input v-model="formData.annualPlanName" placeholder="请输入年度计划名称" clearable>
               </el-input>
               <el-button color="#DED0B2" style="margin-left: 10px" @click="editName">提交</el-button>
             </div>
@@ -21,14 +21,16 @@
     </el-form>
     <div class="query-btn">
       <el-button color="#DED0B2" style="float: right;margin: 0 10px 10px 0" @click="exportTable">导出</el-button>
-      <el-button color="#DED0B2" v-perm="['annual:plan:edit']" style="float: right;margin: 0 10px 10px 0" @click="editBtn">编辑</el-button>
+      <el-button color="#DED0B2" v-perm="['annual:plan:edit']" style="float: right;margin: 0 10px 10px 0"
+                 @click="editBtn">编辑
+      </el-button>
     </div>
     <el-table ref="table" :data="formData.projectList" border :header-cell-style="{background:'#f5f7fa'}">
       <el-table-column label="四川省国有资产经营投资管理有限责任公司科技创新项目年度计划表" align="center">
         <template #default="scope">
           <el-table-column type="index" label="序号" align="center" width="60"/>
-          <el-table-column prop="projectName" label="项目名称" align="center"/>
-          <el-table-column prop="time" label="起始时间" align="center" min-width="120px">
+          <el-table-column prop="projectName" label="项目名称" align="center" width="100"/>
+          <el-table-column prop="time" label="起始时间" align="center" width="100">
             <template #default="scope">
               {{ scope.row.startTime + ' 至 ' + scope.row.endTime }}
             </template>
@@ -41,7 +43,7 @@
               <div v-else>--</div>
             </template>
           </el-table-column>
-          <el-table-column prop="departmentName" label="承办部门" align="center"/>
+          <el-table-column prop="departmentName" label="承办部门" align="center" width="90"/>
           <el-table-column prop="investmentType" label="出资类型" align="center">
             <template #default="scope">
               <div v-if="scope.row.investmentType !== null">
@@ -50,7 +52,7 @@
               <div v-else>--</div>
             </template>
           </el-table-column>
-          <el-table-column prop="projectImpact" label="项目影响" align="center">
+          <el-table-column prop="projectImpact" label="项目影响" align="center" width="90">
             <template #default="scope">
               <div v-if="scope.row.projectImpact !== null">
                 <Tag dictType="project_impact" :value="scope.row.projectImpact"/>
@@ -58,7 +60,7 @@
               <div v-else>--</div>
             </template>
           </el-table-column>
-          <el-table-column prop="businessSegment" label="所属业务板块" align="center">
+          <el-table-column prop="businessSegment" label="所属业务板块" align="center" width="110">
             <template #default="scope">
               <div v-if="scope.row.businessSegment !== null">
                 <Tag dictType="business_segment" :value="scope.row.businessSegment"/>
@@ -69,10 +71,7 @@
           <el-table-column prop="resultForm" label="预期成果形式" align="center" min-width="100px">
             <template #default="scope">
               <div v-if="scope.row.resultForm !== null">
-                <el-tag effect="plain">{{
-                    filterDict(cacheStore.getDict('result_form'), scope.row.resultForm)
-                  }}
-                </el-tag>
+                  <Tag style="margin-top: 3px" dictType="result_form" v-for="item in scope.row.resultForm" :value="item"/>
               </div>
               <div v-else>--</div>
             </template>
@@ -101,6 +100,17 @@
               <div v-else>--</div>
             </template>
           </el-table-column>
+          <el-table-column prop="prospectiveIntellectualProperty" label="预期知识产权" align="center" width="190">
+            <template #default="scope">
+              <div style="text-align: left">
+                发明专利（{{ scope.row.inventionPatent ? scope.row.inventionPatent : 0 }}）项，<br>
+                实用新型专利（{{ scope.row.newPatent ? scope.row.newPatent : 0 }}）项，<br>
+                软件著作权（{{ scope.row.softwareCopyright ? scope.row.softwareCopyright : 0 }}）项，<br>
+                著作权（{{ scope.row.copyright ? scope.row.copyright : 0 }}）项，<br>
+                其他（{{ scope.row.other ? scope.row.other : 0 }}）项，
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column prop="intellectualProperty" label="知识产权状况" align="center">
             <template #default="scope">
               <div v-if="scope.row.intellectualProperty !== null">
@@ -128,7 +138,7 @@
 <script setup>
 import {toThousands} from '@/utils/changePrice.js'
 import {ElNotification} from "element-plus";
-import {getPlan,editPlan} from "@/api/project-demand/summary";
+import {getPlan, editPlan} from "@/api/project-demand/summary";
 import {useCacheStore} from '@/stores/cache.js'
 import {exportExcel} from "@/utils/export-excel";
 
@@ -146,10 +156,10 @@ const exportTable = () => {
   }
   exportExcel($table, (5 + (Object.keys(formData.value.projectList[0]).length - 5) * 5), "四川省国有资产经营投资管理有限责任公司科技创新项目年度计划表", 2)
 }
-const editName=()=>{
-  let param={
-    annualPlanId:route.query.annualPlanId,
-    annualPlanName:formData.value.annualPlanName
+const editName = () => {
+  let param = {
+    annualPlanId: route.query.annualPlanId,
+    annualPlanName: formData.value.annualPlanName
   }
   editPlan(param).then(res => {
     ElNotification({
@@ -158,12 +168,12 @@ const editName=()=>{
       type: res.code === 1000 ? 'success' : 'error'
     })
     if (res.code === 1000) {
-      isEdit.value=false
+      isEdit.value = false
     }
   })
 }
 const editBtn = () => {
-  isEdit.value=true
+  isEdit.value = true
 }
 const filterDict = (data, value) => {
   if (data === undefined || value === undefined) return;