Merge pull request 'fix : 项目立项页面细节优化' (#524) from dd into master

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/524

src/components/DetailComponent/ProjectApply.vue

@@ -6,7 +6,8 @@
           <el-form-item label="项目负责人"  :required="true" prop="projectChargePerson"
                         label-width="125">
             <el-button style="margin-right: 10px" color="#DED0B2" @click="handleShowProjectChargePersonTable">
-              {{ localFormData.projectChargePerson ? '更改' : '请选择' }}
+<!--              {{ localFormData.projectChargePerson ? '更改' : '请选择' }}-->
+              {{projectChargePersonUserList.length!==0 ? '更改' : '请选择' }}
             </el-button>
             <div v-for="item in projectChargePersonUserList" :key="item.id" style="margin-right: 5px">
               {{ item.name }}
@@ -19,10 +20,9 @@
           <el-form-item label="项目成员" :required="true" prop="projectPerson"
                         label-width="125">
             <el-button color="#DED0B2" style="margin-right: 10px" @click="handleShowProjectPersonTable">
-              {{ localFormData.projectPersonIds ? '更改' : '请选择' }}
+<!--              {{ localFormData.projectPersonIds ? '更改' : '请选择' }}-->
+              {{projectPersonUserList.length!==0 ? '更改' : '请选择' }}
             </el-button>
-
-<!--                        <span style="margin-right: 5px">{{getProjectPersonUser()}}</span>-->
             <div v-for="item in projectPersonUserList" :key="item.id" style="margin-right: 5px">
               {{ item.name }}
             </div>
@@ -137,7 +137,7 @@ const route = useRoute()
 const changeDiagram = ref(false)
 const preProcessTable = ref()
 const showSingleTable = ref(false)
-const projectChargePersonUserList = ref()
+const projectChargePersonUserList = ref([])
 const projectChargePersonUserPicker = ref()
 const projectPersonUserList = ref([])
 const projectPersonUserPicker = ref()
@@ -257,19 +257,7 @@ const handleShowProjectChargePersonTable = () => {
   projectChargePersonUserPicker.value.showUserPicker()
 }
 const projectChargePersonUserPickerOk = (userList) => {
-  console.log(userList)
-  let userInfoList = []
-  for (let val of userList) {
-    let userInfo = {
-      id: val.id,
-      name: val.name,
-      companyName: val.companyName,
-      accountType: val.accountType,
-    }
-    userInfoList.push(userInfo)
-  }
-  projectChargePersonUserList.value = userInfoList
-  // localFormData.value.projectChargePerson = userList[0].id
+  projectChargePersonUserList.value = userList
 }
 const handleShowProjectPersonTable = () => {
   projectPersonUserPicker.value.showUserPicker()
@@ -281,7 +269,7 @@ const projectPersonUserPickerOk = (userList) => {
   for (const user of userList) {
     userIds.push(user.id)
   }
-  localFormData.value.projectPersonIds = userIds
+  // localFormData.value.projectPersonIds = userIds
   console.log(userList,projectPersonUserList.value)
 }
 const getPreProcessList = () => {
@@ -406,13 +394,6 @@ const handleSubmit = async () => {
       files.push(getFileParam(item))
     })
   }
-  // if (localFormData.value.singleFile !== undefined) {
-  //   localFormData.value.singleFile = getFileParam(localFormData.value.singleFile)
-  // }
-  // console.log('attachment.value.singleFile', attachment.value, attachment.value.singleFile)
-  // if (localFormData.value.singleFile) {
-  //
-  // } else {
   if (attachment.value.singleFile == null) {
     attachment.value.validate()
     ElNotification({
@@ -424,7 +405,6 @@ const handleSubmit = async () => {
   } else {
     attachment.value.clearValidate()
   }
-  // }
   let projectPersonIds = []
   for (const item of projectPersonUserList.value) {
     projectPersonIds.push(item.id)
@@ -439,9 +419,7 @@ const handleSubmit = async () => {
     projectPersonIds: projectPersonIds,
     preProcess: JSON.stringify(localFormData.value.preProcess)
   }
-
   console.log(params)
-  // return
   let res
   if (props.step === '20') {
     if (props.mode === 'resubmit') {
@@ -521,35 +499,24 @@ const init = async () => {
 
 watchEffect(() => {
   if(props.formData.projectChargePerson==null){
-    projectChargePersonUserList.value = []
+  //   projectChargePersonUserList.value = []
   }else {
     projectChargePersonUserList.value = [props.formData.projectChargePerson]
   }
   // console.log('props.formData.projectPersonList',props.formData.projectPersonList)
-  // projectPersonUserList.value = props.formData.projectPersonList ? props.formData.projectPersonList : []
+  projectPersonUserList.value = props.formData.projectPersonList ? props.formData.projectPersonList : []
   let flag = Object.keys(props.formData).length && (localFormData.value = props.formData)
   if(props.formData.projectChargePerson!=null){
     localFormData.value.projectChargePerson = props.formData.projectChargePerson.id
   }
-  localFormData.value.projectPersonIds = []
-  if (projectPersonUserList.value){
-    projectPersonUserList.value.forEach(item => {
-      localFormData.value.projectPersonIds.push(item.id)
-    })
-  }
-  // console.log('projectPersonUserList.value',projectPersonUserList.value)
-  return flag
-  // // 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
   // localFormData.value.projectPersonIds = []
   // if (projectPersonUserList.value){
   //   projectPersonUserList.value.forEach(item => {
   //     localFormData.value.projectPersonIds.push(item.id)
   //   })
   // }
-  // return flag
+  // console.log('projectPersonUserList.value',projectPersonUserList.value)
+  return flag
 })
 onMounted(async () => {
   await init()