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