fix: 调整详情页面知识产权输出项

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">
+          <el-form-item label="技术标准(项)" prop="softwareCopyright">
-            <span>{{ localFormData.copyright }}</span>
+            <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>

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.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.softwareCopyright ? scope.row.softwareCopyright : 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.other ? scope.row.other : 0 }}
               </div>
             </template>
           </el-table-column>

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']}],

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">
+          <el-form-item label="技术标准(项)" prop="softwareCopyright">
-            <span>{{ localFormData.copyright }}</span>
+            <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>