From fe3a15fcbd3cf45446b01f2f53e01f0a98aa74b2 Mon Sep 17 00:00:00 2001
From: dj <1042039504@qq.com>
Date: Sat, 19 Apr 2025 21:03:54 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9F=A5=E8=AF=86=E4=BA=A7=E6=9D=83=E8=BE=93?=
 =?UTF-8?q?=E5=87=BA=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DetailComponent/SummaryDetail.vue         | 63 ++++++++++++++++---
 src/views/plan/detail.vue                     | 15 +++--
 src/views/project-demand/summary/add.vue      |  5 +-
 .../mobledetail/SummaryDetailMoblie.vue       | 62 +++++++++++++++---
 4 files changed, 123 insertions(+), 22 deletions(-)

diff --git a/src/components/DetailComponent/SummaryDetail.vue b/src/components/DetailComponent/SummaryDetail.vue
index 7dff89c..8c29333 100644
--- a/src/components/DetailComponent/SummaryDetail.vue
+++ b/src/components/DetailComponent/SummaryDetail.vue
@@ -16,25 +16,72 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="发明专利(项)" prop="inventionPatent">
+          <el-form-item label="专利(项)" prop="inventionPatent">
             <span>{{ localFormData.inventionPatent }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
-          <el-form-item label="新型专利(项)" prop="newPatent">
-            <span>{{ localFormData.newPatent }}</span>
-          </el-form-item>
-        </el-col>
+
         <el-col :span="6">
           <el-form-item label="软件著作权(项)" prop="softwareCopyright">
             <span>{{ localFormData.softwareCopyright }}</span>
           </el-form-item>
         </el-col>
+
+
         <el-col :span="6">
-          <el-form-item label="著作权(项)" prop="copyright">
-            <span>{{ localFormData.copyright }}</span>
+          <el-form-item label="技术标准(项)" prop="softwareCopyright">
+            <span>{{ localFormData.softwareCopyright }}</span>
           </el-form-item>
         </el-col>
+
+        <el-col :span="6">
+          <el-form-item label="新产品(项)" prop="softwareCopyright">
+            <span>{{ localFormData.softwareCopyright }}</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="6">
+          <el-form-item label="新工艺(项)" prop="softwareCopyright">
+            <span>{{ localFormData.softwareCopyright }}</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="6">
+          <el-form-item label="新装置(项)" prop="softwareCopyright">
+            <span>{{ localFormData.softwareCopyright }}</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="6">
+          <el-form-item label="新材料(项)" prop="softwareCopyright">
+            <span>{{ localFormData.softwareCopyright }}</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="6">
+          <el-form-item label="计算机软件(项)" prop="softwareCopyright">
+            <span>{{ localFormData.softwareCopyright }}</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="6">
+          <el-form-item label="论文论著(项)" prop="softwareCopyright">
+            <span>{{ localFormData.softwareCopyright }}</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="6">
+          <el-form-item label="研究报告(项)" prop="softwareCopyright">
+            <span>{{ localFormData.softwareCopyright }}</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="6">
+          <el-form-item label="商标(项)" prop="softwareCopyright">
+            <span>{{ localFormData.softwareCopyright }}</span>
+          </el-form-item>
+        </el-col>
+
         <el-col :span="6">
           <el-form-item label="其他(项)" prop="other">
             <span>{{ localFormData.other }}</span>
diff --git a/src/views/plan/detail.vue b/src/views/plan/detail.vue
index 258fa59..4599c17 100644
--- a/src/views/plan/detail.vue
+++ b/src/views/plan/detail.vue
@@ -114,11 +114,18 @@
           <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.inventionPatent ? scope.row.inventionPatent : 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 }}）项，
+                技术标准（{{ scope.row.softwareCopyright ? scope.row.softwareCopyright : 0 }}）项，<br>
+                新产品（{{ scope.row.softwareCopyright ? scope.row.softwareCopyright : 0 }}）项，<br>
+                新工艺（{{ scope.row.softwareCopyright ? scope.row.softwareCopyright : 0 }}）项，<br>
+                新装置（{{ scope.row.softwareCopyright ? scope.row.softwareCopyright : 0 }}）项，<br>
+                新材料（{{ scope.row.softwareCopyright ? scope.row.softwareCopyright : 0 }}）项，<br>
+                计算机软件（{{ scope.row.softwareCopyright ? scope.row.softwareCopyright : 0 }}）项，<br>
+                论文论著（{{ scope.row.softwareCopyright ? scope.row.softwareCopyright : 0 }}）项，<br>
+                研究报告（{{ scope.row.softwareCopyright ? scope.row.softwareCopyright : 0 }}）项，<br>
+                商标（{{ scope.row.softwareCopyright ? scope.row.softwareCopyright : 0 }}）项，<br>
+                其他 {{ scope.row.other ? scope.row.other : 0 }}
               </div>
             </template>
           </el-table-column>
diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue
index bac6601..b8c98a2 100644
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -475,6 +475,7 @@ const formData = ref({
   isSpecialFund: false,
   industryUniversityResearch: '1',
   governmentDeclaration: '1',
+  other: '无',
   resultForm: []
 })
 
@@ -494,9 +495,9 @@ const rules = reactive({
   governmentDeclaration: [{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']}],
+  // newPatent: [{required: true, message: '请输入实用性新型专利数量', trigger: ['blur', 'change']}],
   softwareCopyright: [{required: true, message: '请输入软件著作权数量', trigger: ['blur', 'change']}],
-  copyright: [{required: true, message: '请输入著作权数量', trigger: ['blur', 'change']}],
+  // copyright: [{required: true, message: '请输入著作权数量', trigger: ['blur', 'change']}],
   other: [{required: true, message: '请输入其他数量', trigger: ['blur', 'change']}],
   economicEstimate: [{required: true, message: '请输入预估经费预算', trigger: ['blur', 'change']}],
   isSpecialFund: [{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 56ae005..9f863c8 100644
--- a/src/views/project-management/mobledetail/SummaryDetailMoblie.vue
+++ b/src/views/project-management/mobledetail/SummaryDetailMoblie.vue
@@ -17,25 +17,71 @@
         </el-col>
 
         <el-col :span="24">
-          <el-form-item label="发明专利(项)" prop="inventionPatent">
+          <el-form-item label="专利(项)" prop="inventionPatent">
             <span>{{ localFormData.inventionPatent }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="24">
-          <el-form-item label="新型专利(项)" prop="newPatent">
-            <span>{{ localFormData.newPatent }}</span>
-          </el-form-item>
-        </el-col>
+       
         <el-col :span="24">
           <el-form-item label="软件著作权(项)" prop="softwareCopyright">
             <span>{{ localFormData.softwareCopyright }}</span>
           </el-form-item>
         </el-col>
+
         <el-col :span="24">
-          <el-form-item label="著作权(项)" prop="copyright">
-            <span>{{ localFormData.copyright }}</span>
+          <el-form-item label="技术标准(项)" prop="softwareCopyright">
+            <span>{{ localFormData.softwareCopyright }}</span>
           </el-form-item>
         </el-col>
+
+        <el-col :span="24">
+          <el-form-item label="新产品(项)" prop="softwareCopyright">
+            <span>{{ localFormData.softwareCopyright }}</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="24">
+          <el-form-item label="新工艺(项)" prop="softwareCopyright">
+            <span>{{ localFormData.softwareCopyright }}</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="24">
+          <el-form-item label="新装置(项)" prop="softwareCopyright">
+            <span>{{ localFormData.softwareCopyright }}</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="24">
+          <el-form-item label="新材料(项)" prop="softwareCopyright">
+            <span>{{ localFormData.softwareCopyright }}</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="24">
+          <el-form-item label="计算机软件(项)" prop="softwareCopyright">
+            <span>{{ localFormData.softwareCopyright }}</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="24">
+          <el-form-item label="论文论著(项)" prop="softwareCopyright">
+            <span>{{ localFormData.softwareCopyright }}</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="24">
+          <el-form-item label="研究报告(项)" prop="softwareCopyright">
+            <span>{{ localFormData.softwareCopyright }}</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="24">
+          <el-form-item label="商标(项)" prop="softwareCopyright">
+            <span>{{ localFormData.softwareCopyright }}</span>
+          </el-form-item>
+        </el-col>
+        
         <el-col :span="24">
           <el-form-item label="其他(项)" prop="other">
             <span>{{ localFormData.other }}</span>