From cccd14ec790ac7e6cf777c530b275d8a65a521a6 Mon Sep 17 00:00:00 2001
From: dj <1042039504@qq.com>
Date: Sat, 19 Apr 2025 19:03:10 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=A7=BB=E9=99=A4=E9=A2=84=E6=9C=9F?=
 =?UTF-8?q?=E6=88=90=E6=9E=9C=E5=BD=A2=E5=BC=8F=E7=9B=B8=E5=85=B3=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DetailComponent/SummaryDetail.vue         | 10 +++----
 src/components/SelectPreProcess.vue           |  2 +-
 src/views/plan/detail.vue                     | 16 +++++-----
 src/views/project-demand/summary/add.vue      | 30 +++++++++----------
 .../mobledetail/SummaryDetailMoblie.vue       | 10 +++----
 5 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/src/components/DetailComponent/SummaryDetail.vue b/src/components/DetailComponent/SummaryDetail.vue
index 6321e71..7dff89c 100644
--- a/src/components/DetailComponent/SummaryDetail.vue
+++ b/src/components/DetailComponent/SummaryDetail.vue
@@ -3,11 +3,11 @@
     <el-form :model="localFormData" ref="summaryForm" :rules="rules">
       <baseTitle title="预期知识产权"></baseTitle>
       <el-row gutter="20" style="margin-bottom: -18px;margin-left: 5px">
-        <el-col :span="6">
-          <el-form-item label="预期成果形式" prop="resultForm">
-            <span>{{ filterDict(cacheStore.getDict('result_form'), localFormData.resultForm) }}</span>
-          </el-form-item>
-        </el-col>
+<!--        <el-col :span="6">-->
+<!--          <el-form-item label="预期成果形式" prop="resultForm">-->
+<!--            <span>{{ filterDict(cacheStore.getDict('result_form'), localFormData.resultForm) }}</span>-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
         <el-col :span="6">
           <el-form-item label="知识产权归属" prop="intellectualProperty">
             <span>{{
diff --git a/src/components/SelectPreProcess.vue b/src/components/SelectPreProcess.vue
index 2059582..7f7883e 100644
--- a/src/components/SelectPreProcess.vue
+++ b/src/components/SelectPreProcess.vue
@@ -102,7 +102,7 @@ const getPreProcessTag = (impact,basicImpact) => {
   }
   if (data == 1) {
     //一般项目
-    return '一般项目20万以下要总经理审批'
+    return '研发费用20万元（含）以下科技创新项目报总经理审批'
   } else if (data == 2) {
     //重大项目
     return '重大项目20万元到500万元之间要总办会审批'
diff --git a/src/views/plan/detail.vue b/src/views/plan/detail.vue
index ad894cb..258fa59 100644
--- a/src/views/plan/detail.vue
+++ b/src/views/plan/detail.vue
@@ -79,14 +79,14 @@
               <div v-else>--</div>
             </template>
           </el-table-column>
-          <el-table-column prop="resultForm" label="预期成果形式" align="center" min-width="100px">
-            <template #default="scope">
-              <div v-if="scope.row.resultForm !== null">
-                  <Tag style="margin-top: 3px" dictType="result_form" v-for="item in scope.row.resultForm" :value="item"/>
-              </div>
-              <div v-else>--</div>
-            </template>
-          </el-table-column>
+<!--          <el-table-column prop="resultForm" label="预期成果形式" align="center" min-width="100px">-->
+<!--            <template #default="scope">-->
+<!--              <div v-if="scope.row.resultForm !== null">-->
+<!--                  <Tag style="margin-top: 3px" dictType="result_form" v-for="item in scope.row.resultForm" :value="item"/>-->
+<!--              </div>-->
+<!--              <div v-else>&#45;&#45;</div>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
           <el-table-column prop="technicalStandard" label="预期技术标准制定" align="center">
             <template #default="scope">
               <div v-if="scope.row.technicalStandard !== null">
diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue
index 5cc7c12..cc5a638 100644
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -249,20 +249,20 @@
       <baseTitle title="预期知识产权"></baseTitle>
       <el-row gutter="30" style="margin-bottom: -18px;"
               :style="{marginLeft:!formData.isSpecialFund?'-8.5px':'-48.5px'}">
-        <el-col :span="12">
-          <el-form-item label="预期成果形式" prop="resultForm"
-                        :style="{marginRight:!formData.isSpecialFund?'0':route.query.id?'':'40px'}">
-            <el-select v-model="formData.resultForm" placeholder="请选择预期成果形式" clearable filterable multiple
-                       @change="changeCollectData">
-              <el-option
-                  v-for="item in cacheStore.getDict('result_form')"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
+<!--        <el-col :span="12">-->
+<!--          <el-form-item label="预期成果形式" prop="resultForm"-->
+<!--                        :style="{marginRight:!formData.isSpecialFund?'0':route.query.id?'':'40px'}">-->
+<!--            <el-select v-model="formData.resultForm" placeholder="请选择预期成果形式" clearable filterable multiple-->
+<!--                       @change="changeCollectData">-->
+<!--              <el-option-->
+<!--                  v-for="item in cacheStore.getDict('result_form')"-->
+<!--                  :key="item.value"-->
+<!--                  :label="item.label"-->
+<!--                  :value="item.value"-->
+<!--              />-->
+<!--            </el-select>-->
+<!--          </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
@@ -434,7 +434,7 @@ const rules = reactive({
   investmentType: [{required: true, message: '请选择出资类型', trigger: ['blur', 'change']}],
   projectImpact: [{required: true, message: '请选择项目影响', trigger: ['blur', 'change']}],
   businessSegment: [{required: true, message: '请选择所属业务板块', trigger: ['blur', 'change']}],
-  resultForm: [{required: true, message: '请选择预期成果形式', trigger: ['blur', 'change']}],
+  // resultForm: [{required: true, message: '请选择预期成果形式', trigger: ['blur', 'change']}],
   technicalStandard: [{required: true, message: '请选择预期技术标准制定', trigger: ['blur', 'change']}],
   industryUniversityResearch: [{required: true, message: '请选择产学研联合', trigger: ['blur', 'change']}],
   governmentDeclaration: [{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 58b8fef..56ae005 100644
--- a/src/views/project-management/mobledetail/SummaryDetailMoblie.vue
+++ b/src/views/project-management/mobledetail/SummaryDetailMoblie.vue
@@ -3,11 +3,11 @@
     <el-form :model="localFormData" ref="summaryForm" :rules="rules">
       <baseTitle title="预期知识产权"></baseTitle>
       <el-row gutter="20" style="margin-bottom: -18px;margin-left: 5px">
-        <el-col :span="24">
-          <el-form-item label="预期成果形式" prop="resultForm">
-            <span>{{ filterDict(cacheStore.getDict('result_form'), localFormData.resultForm) }}</span>
-          </el-form-item>
-        </el-col>
+<!--        <el-col :span="24">-->
+<!--          <el-form-item label="预期成果形式" prop="resultForm">-->
+<!--            <span>{{ filterDict(cacheStore.getDict('result_form'), localFormData.resultForm) }}</span>-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
         <el-col :span="24">
           <el-form-item label="知识产权归属" prop="intellectualProperty">
             <span>{{