From ed08c6a7960d6afa29f2bac8b7bf366f1cb1ef50 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 29 Jun 2024 11:21:50 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=20=E9=9C=80=E6=B1=82=E4=B8=8A=E6=8A=A5-?=
 =?UTF-8?q?=E9=A2=84=E6=9C=9F=E6=88=90=E6=9E=9C=E5=BD=A2=E5=BC=8F=E5=A4=9A?=
 =?UTF-8?q?=E9=80=89=E5=8F=8A=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DetailComponent/SummaryDetail.vue         | 27 ++++++++++++++-----
 src/views/project-demand/summary/add.vue      |  7 +++--
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/src/components/DetailComponent/SummaryDetail.vue b/src/components/DetailComponent/SummaryDetail.vue
index 5b8fee4..6b7fa74 100644
--- a/src/components/DetailComponent/SummaryDetail.vue
+++ b/src/components/DetailComponent/SummaryDetail.vue
@@ -240,12 +240,27 @@ const _value = computed({
 const filterDict = (data, value) => {
   if (data === undefined || value === undefined) return;
   let label = ''
-  if (data instanceof Array) {
-    data.find(item => {
-      if (item.value == value) {
-        label = item.label
-      }
-    })
+  let result=[]
+  if(value.indexOf(",") >= 0){
+    if (value.split(",") instanceof Array) {
+      value.split(",").forEach(item1 => {
+        console.log('item',item1)
+        data.find(item => {
+          if (item.value == item1) {
+            result.push(item.label)
+          }
+        })
+      })
+    }
+    label=result.map(item=>item).join('，')
+  }else {
+    if (data instanceof Array) {
+      data.find(item => {
+        if (item.value == value) {
+          label = item.label
+        }
+      })
+    }
   }
   return label
 }
diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue
index f401b4f..1546f67 100644
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -170,7 +170,7 @@
         </el-col>
         <el-col :span="16" style="margin-bottom: -18px">
           <el-form-item label="预期成果形式" prop="resultForm" label-width="145">
-            <el-select v-model="formData.resultForm" placeholder="请选择预期成果形式" clearable filterable>
+            <el-select v-model="formData.resultForm" placeholder="请选择预期成果形式" clearable filterable multiple>
               <el-option
                   v-for="item in cacheStore.getDict('result_form')"
                   :key="item.value"
@@ -286,9 +286,10 @@ const showSingleTable = ref(false)
 const otherFileList = ref([])
 const singleList = ref([])
 const formData = ref({
-  isSpecialFund: false,
+  isSpecialFund: true,
   industryUniversityResearch: '0',
   governmentDeclaration: '0',
+  resultForm:[]
 })
 
 const rules = reactive({
@@ -411,6 +412,7 @@ const handleSubmit = debounce(async (instance) => {
     if (formData.value.singleFile !== undefined) {
       formData.value.singleFile = getFileParam(formData.value.singleFile)
     }
+    formData.value.resultForm=formData.value.resultForm.map(item=>item).join(',')
     let params = {
       ...formData.value,
       deploymentId: deploymentId.value,
@@ -464,6 +466,7 @@ const handleResubmit = debounce(() => {
   if (formData.value.isSpecialFund && formData.value.specialFund === null) {
     formData.value.specialFund = getFundName(formData.value.specialFundId)
   }
+  formData.value.resultForm=formData.value.resultForm.map(item=>item).join(',')
   let params = {
     ...formData.value,
     deploymentId: deploymentId.value,