From 291708e71a5edc8bd7f4d8741f7602187bf7df62 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Fri, 28 Jun 2024 20:05:23 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=20=E4=BF=AE=E6=94=B9=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=BE=81=E9=9B=86"=E4=B8=93=E9=A1=B9?=
 =?UTF-8?q?=E8=B5=84=E9=87=91=E5=90=8D=E7=A7=B0"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project-demand/requirement/add.vue | 46 +++++++++++++-------
 1 file changed, 30 insertions(+), 16 deletions(-)

diff --git a/src/views/project-demand/requirement/add.vue b/src/views/project-demand/requirement/add.vue
index 93c11e1..74fbbc6 100644
--- a/src/views/project-demand/requirement/add.vue
+++ b/src/views/project-demand/requirement/add.vue
@@ -38,10 +38,12 @@
               <el-button color="#DED0B2" @click="showCompany">{{ selectedCompanyList.length === 0 ? '请选择所属公司' : '更改' }}
               </el-button>
             </div>
-            <div v-if="route.query.id" :class="showExpendClass(showMoreCompany)">{{ selectedCompanyList }}</div>
+            <div v-if="route.query.id" :class="showExpendClass(showMoreCompany)">{{ getName(selectedCompanyList) }}</div>
             <div v-else :class="showExpendClass(showMoreCompany)">{{ getName(selectedCompanyList) }}</div>
             <div style="color: #2a99ff;text-align: center;width: 100%;font-size: 15px;cursor: pointer"
-                 @click="handleExpend">{{ showExpendText }}
+                 @click="handleExpend">
+              {{ showExpendText }}
+
             </div>
           </el-form-item>
         </el-col>
@@ -54,7 +56,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="6" v-if="formData.isSpecialFund">
-          <el-form-item label="专项资金" prop="specialFundId">
+          <el-form-item label="专项资金名称" prop="specialFundId">
             <el-select v-model="formData.specialFundId" placeholder="请选择专项资金" clearable filterable>
               <el-option
                   v-for="item in specialFundOption"
@@ -100,7 +102,8 @@
       <el-button color="#DED0B2" v-else @click="handleResubmit">重新提交</el-button>
       <el-button @click="handleBack">返回</el-button>
     </div>
-    <company-picker :multiple="true" ref="companyRef" title="请选择所属公司" @ok="selected" v-model:value="selectedCompanyList"/>
+    <company-picker :multiple="true" ref="companyRef" title="请选择所属公司" @ok="selected"
+                    v-model:value="selectedCompanyList"/>
   </div>
 </template>
 
@@ -222,24 +225,16 @@ const showExpendClass = (showMoreCompany) => {
   if (!showMoreCompany) {
     if (selectedCompanyList.value.length === 0) {
       showExpendText.value = ''
-      return  ''
-    } else if (selectedCompanyList.value.length>14) {
+      return ''
+    } else if (selectedCompanyList.value.length > 14) {
       showExpendText.value = '展开'
-      return  'company-style'
+      return 'company-style'
     }
   } else {
     showExpendText.value = '收缩'
-    return  ''
+    return ''
   }
 }
-const getCompanyOptionItem = (val) => {
-  if (val !== undefined) {
-    val.forEach(item => {
-      matterTree(companyNameArray.value, companyOption.value, item)
-    })
-  }
-  return companyNameArray.value.join('，');
-}
 const getName = (list) => {
   return list.map(item => item.label).join('，')
 }
@@ -405,6 +400,25 @@ const handleResubmit = () => {
     }
   })
 }
+
+const getCompanyOptionItem = (val) => {
+  let newObj = {}
+  let newArray = []
+  if (val !== undefined) {
+    val.forEach(item => {
+      matterTree(companyNameArray.value, companyOption.value, item)
+      companyNameArray.value.forEach(companyItem => {
+        newObj = {
+          label: companyItem,
+          value: item
+        }
+        newArray.push(newObj)
+      })
+    })
+  }
+
+  return newArray;
+}
 const getDetailInfo = async () => {
   getFormInfo(route.query.id).then(res => {
     if (res.code === 1000) {