From 9fd97f6ea2a47eadc10d053225c805bc5e553470 Mon Sep 17 00:00:00 2001
From: dj <1042039504@qq.com>
Date: Sat, 19 Apr 2025 20:13:11 +0800
Subject: [PATCH] =?UTF-8?q?feat=20:=E9=9C=80=E6=B1=82=E4=B8=8A=E6=8A=A5?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project-demand/summary/add.vue | 93 +++++++++++++++++++-----
 1 file changed, 75 insertions(+), 18 deletions(-)

diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue
index cc5a638..bac6601 100644
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -263,7 +263,7 @@
 <!--            </el-select>-->
 <!--          </el-form-item>-->
 <!--        </el-col>-->
-        <el-col :span="6" :style="{marginLeft:!formData.isSpecialFund?'-10px':'-40px'}">
+        <el-col :span="6" >
           <el-form-item label="知识产权归属" prop="intellectualProperty">
             <el-select v-model="formData.intellectualProperty" placeholder="请选择知识产权归属" clearable filterable
                        @change="changeCollectData">
@@ -276,37 +276,91 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6" :style="{marginLeft:!formData.isSpecialFund?'-10px':'-40px'}">
-          <el-form-item label="发明专利(项)" prop="inventionPatent">
-            <el-input-number v-model="formData.inventionPatent" placeholder="请输入发明专利数量" :controls="false"
+        <el-col :span="6" :style="{marginLeft:!formData.isSpecialFund?'0':route.query.id?'0':'-40px'}" >
+          <el-form-item label="专利(项)" prop="inventionPatent">
+            <el-input-number v-model="formData.inventionPatent" placeholder="请输入专利数量" :controls="false"
                              @change="changeCollectData"/>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
-          <el-form-item label="新型专利(项)" prop="newPatent">
-            <el-input-number v-model="formData.newPatent" placeholder="请输入实用性新型专利数量" :controls="false"
-                             @change="changeCollectData"
-                             style="width: 100%"/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6" :style="{marginLeft:!formData.isSpecialFund?'0':route.query.id?'':'-40px'}">
+<!--        <el-col :span="6">-->
+<!--          <el-form-item label="新型专利(项)" prop="newPatent">-->
+<!--            <el-input-number v-model="formData.newPatent" placeholder="请输入实用性新型专利数量" :controls="false"-->
+<!--                             @change="changeCollectData"-->
+<!--                             style="width: 100%"/>-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
+        <el-col :span="6" :style="{marginLeft:!formData.isSpecialFund?'-10px':route.query.id?'-40px':'0'}">
           <el-form-item label="软件著作权(项)" prop="softwareCopyright">
             <el-input-number v-model="formData.softwareCopyright" placeholder="请输入软件著作权数量" :controls="false"
                              @change="changeCollectData"/>
           </el-form-item>
         </el-col>
-        <el-col :span="6" :style="{marginLeft:!formData.isSpecialFund?'-10px':route.query.id?'-40px':'0'}">
-          <el-form-item label="著作权(项)" prop="copyright">
-            <el-input-number v-model="formData.copyright" placeholder="请输入著作权数量" :controls="false"
+<!--        <el-col :span="6" :style="{marginLeft:!formData.isSpecialFund?'-10px':route.query.id?'-40px':'0'}">-->
+<!--          <el-form-item label="著作权(项)" prop="copyright">-->
+<!--            <el-input-number v-model="formData.copyright" placeholder="请输入著作权数量" :controls="false"-->
+<!--                             @change="changeCollectData"/>-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
+        <el-col :span="6" :style="{marginLeft:!formData.isSpecialFund?'-10px':route.query.id?'-40px':'-40px'}">
+          <el-form-item label="技术标准(项)" prop="copyright">
+            <el-input-number v-model="formData.copyright" placeholder="请输入技术标准数量" :controls="false"
                              @change="changeCollectData"/>
           </el-form-item>
         </el-col>
-        <el-col :span="6" :style="{marginLeft:!formData.isSpecialFund?'-10px':'-40px'}">
-          <el-form-item label="其他(项)" prop="other">
-            <el-input-number v-model="formData.other" placeholder="请输入其他数量" :controls="false"
+        <el-col :span="6" :style="{marginLeft:!formData.isSpecialFund?'0':route.query.id?'0':'0'}">
+          <el-form-item label="新产品(项)" prop="copyright">
+            <el-input-number v-model="formData.copyright" placeholder="请输入新产品数量" :controls="false"
                              @change="changeCollectData"/>
           </el-form-item>
         </el-col>
+        <el-col :span="6" :style="{marginLeft:!formData.isSpecialFund?'0':route.query.id?'0':'-40px'}">
+          <el-form-item label="新工艺(项)" prop="copyright">
+            <el-input-number v-model="formData.copyright" placeholder="请输入新工艺数量" :controls="false"
+                             @change="changeCollectData"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6" :style="{marginLeft:!formData.isSpecialFund?'-10px':route.query.id?'-40px':'0'}">
+          <el-form-item label="新装置(项)" prop="copyright">
+            <el-input-number v-model="formData.copyright" placeholder="请输入新装置数量" :controls="false"
+                             @change="changeCollectData"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6" :style="{marginLeft:!formData.isSpecialFund?'-10px':route.query.id?'-40px':'-40px'}">
+          <el-form-item label="新材料(项)" prop="copyright">
+            <el-input-number v-model="formData.copyright" placeholder="请输入新材料数量" :controls="false"
+                             @change="changeCollectData"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6" :style="{marginLeft:!formData.isSpecialFund?'0':route.query.id?'0':'0'}">
+          <el-form-item label="计算机软件(项)" prop="copyright">
+            <el-input-number v-model="formData.copyright" placeholder="请输入计算机软件数量" :controls="false"
+                             @change="changeCollectData"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6" :style="{marginLeft:!formData.isSpecialFund?'0':route.query.id?'0':'-40px'}">
+          <el-form-item label="论文论著(项)" prop="copyright">
+            <el-input-number v-model="formData.copyright" placeholder="请输入论文论著数量" :controls="false"
+                             @change="changeCollectData"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6" :style="{marginLeft:!formData.isSpecialFund?'-10px':route.query.id?'-40px':'0'}">
+          <el-form-item label="研究报告(项)" prop="copyright">
+            <el-input-number v-model="formData.copyright" placeholder="请输入研究报告数量" :controls="false"
+                             @change="changeCollectData"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6" :style="{marginLeft:!formData.isSpecialFund?'-10px':route.query.id?'-40px':'-40px'}">
+          <el-form-item label="商标(项)" prop="copyright">
+            <el-input-number v-model="formData.copyright" placeholder="请输入商标数量" :controls="false"
+                             @change="changeCollectData"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24" >
+          <el-form-item label="其他(项)" prop="other">
+            <el-input rows="4" type="textarea" v-model="formData.other"
+                             @change="changeCollectData" :style="{marginRight:!formData.isSpecialFund?'20px':'80px'}"/>
+          </el-form-item>
+        </el-col>
       </el-row>
       <baseTitle title="项目描述"></baseTitle>
       <el-row gutter="30" style="margin-bottom: -18px;"
@@ -482,6 +536,9 @@ const changeRequirement=async ()=>{
       if ( res.data.formData.isSpecialFund) {
         formData.value.specialFundId =  res.data.formData.specialFundId
         formData.value.specialFund =  res.data.formData.specialFund
+      }else{
+        formData.value.specialFundId =  null
+        formData.value.specialFund =  null
       }
     }
   })