odjbin/mosr-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'dd' (#518) from dd into master

Browse Source 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/518
This commit is contained in:
odjbin
2024-07-11 08:40:31 +00:00
parent 7bf6336a46 ddcbc02025
commit 06e175cd8c
1 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/components/DetailComponent/ProjectApply.vue
View File

@@ -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 => {