From ddcbc0202504743485f7de0a2f6dfbaffe0c0513 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Thu, 11 Jul 2024 16:40:11 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=20=E9=A1=B9=E7=9B=AE=E7=AB=8B=E9=A1=B9?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DetailComponent/ProjectApply.vue          | 37 ++++++++++++++-----
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/src/components/DetailComponent/ProjectApply.vue b/src/components/DetailComponent/ProjectApply.vue
index 6681d3c..fe8d22c 100644
--- a/src/components/DetailComponent/ProjectApply.vue
+++ b/src/components/DetailComponent/ProjectApply.vue
@@ -2,28 +2,31 @@
   <div class="apply-block">
     <el-form :model="localFormData" ref="formRef" label-width="auto" :rules="rules" v-if="step!=='50'">
       <el-row>
-        <el-col :span="24">
-          <el-form-item label="项目负责人" :required="true" prop="projectChargePerson"
+        <el-col :span="24" v-if="title==='apply'">
+          <el-form-item label="项目负责人"  :required="true" prop="projectChargePerson"
                         label-width="125">
-            <div v-for="item in projectChargePersonUserList" :key="item.id" style="margin-right: 5px">
-              {{ item.name }}
-            </div>
+<!--            <div v-for="item in projectChargePersonUserList" :key="item.id" style="margin-right: 5px">-->
+<!--              {{ item.name }}-->
+<!--            </div>-->
             <el-button color="#DED0B2" @click="handleShowProjectChargePersonTable">
               {{ localFormData.projectChargePerson ? '更改' : '请选择' }}
             </el-button>
+            <span style="margin-right: 5px">{{getProjectChargePersonUser(projectChargePersonUserList)}}</span>
             <user-picker :multiple="false" ref="projectChargePersonUserPicker" title="请选择项目负责人"
                          v-model:value="projectChargePersonUserList" @ok="projectChargePersonUserPickerOk"/>
           </el-form-item>
         </el-col>
-        <el-col :span="24">
+        <el-col :span="24" v-if="title==='apply'">
           <el-form-item label="项目成员" :required="true" prop="projectPerson"
                         label-width="125">
-            <div v-for="item in projectPersonUserList" :key="item.id" style="margin-right: 5px">
-              {{ item.name }}
-            </div>
+<!--            {{projectPersonUserList}}-->
+<!--            <div v-for="item in projectPersonUserList" :key="item.id" style="margin-right: 5px">-->
+<!--              {{ item.name }}-->
+<!--            </div>-->
             <el-button color="#DED0B2" @click="handleShowProjectPersonTable">
               {{ localFormData.projectPersonIds ? '更改' : '请选择' }}
             </el-button>
+            <span style="margin-right: 5px">{{getProjectPersonUser(projectPersonUserList)}}</span>
             <user-picker :multiple="true" ref="projectPersonUserPicker" title="请选择项目成员"
                          v-model:value="projectPersonUserList" @ok="projectPersonUserPickerOk"/>
           </el-form-item>
@@ -208,6 +211,18 @@ const name = ref(router.currentRoute.value.name)
 const deploymentId = ref()
 const selectRows = ref([])
 const projectId = ref(route.query.projectId)
+const getProjectChargePersonUser=(list)=>{
+  console.log('list',list)
+  if(list[0]!==null){
+    return list.map(item=>item.name).join()
+  }
+}
+const getProjectPersonUser=(list)=>{
+  console.log('list2',list)
+  if(list!=null){
+    return list.map(item=>item.name).join()
+  }
+}
 const getPreProcessUrl = (list) => {
   // list.map(item => {
   //   item.baseUrl = getPreProcessUrl(item.preProcess)
@@ -490,7 +505,9 @@ watchEffect(() => {
   projectChargePersonUserList.value = [props.formData.projectChargePerson]
   projectPersonUserList.value = props.formData.projectPersonList
   let flag = Object.keys(props.formData).length && (localFormData.value = props.formData)
-  localFormData.value.projectChargePerson = props.formData.projectChargePerson.id
+  if(props.formData.projectChargePerson!=null){
+    localFormData.value.projectChargePerson = props.formData.projectChargePerson.id
+  }
   localFormData.value.projectPersonIds = []
   if (projectPersonUserList.value){
     projectPersonUserList.value.forEach(item => {