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

fix : 项目立项页面细节优化

Browse Source
This commit is contained in:
odjbin
2024-07-11 23:31:59 +08:00
parent 0b6e825bbd
commit 80cd6363ab
3 changed files with 45 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/components/AttachmentUpload.vue
View File

@@ -213,7 +213,7 @@ const singleTableConfig = reactive({
}
]
})
const fileUploadRef=ref()
const fileUploadRef = ref()
const rules = reactive({
attachment: [{required: true, message: '请上传附件', trigger: ['blur', 'change']}],
})
@@ -230,7 +230,7 @@ watch(() => props.showSingleTable, (newVal) => {
props.showSingleTable = newVal
}, {deep: true})
watch(() => props.formData.fileList, (newVal) => {
console.log('newVal-fileList', newVal)
// console.log('newVal-fileList', newVal)
if (props.preview) {
newVal?.forEach(item => {
allFileList.value.push(item)
@@ -239,19 +239,19 @@ watch(() => props.formData.fileList, (newVal) => {
}, {immediate: true})
// watch(() => props.otherFileList, (newVal) => {
// props.otherFileList=newVal
// if (props.preview) {
// console.log('newotherFileList', newVal,props.preview,props.formData.fileList)
// if (props.formData.fileList === null || props.formData.fileList?.length === 0) {
// allFileList.value = newVal
// } else {
// console.log('props.otherFileList',props.otherFileList)
// // props.otherFileList?.forEach(item => {
// // allFileList.value.push(item)
// // })
// }
// } else {
// allFileList.value = newVal
// }
// if (props.preview) {
// console.log('newotherFileList', newVal,props.preview,props.formData.fileList)
// if (props.formData.fileList === null || props.formData.fileList?.length === 0) {
// allFileList.value = newVal
// } else {
// console.log('props.otherFileList',props.otherFileList)
// // props.otherFileList?.forEach(item => {
// // allFileList.value.push(item)
// // })
// }
// } else {
// allFileList.value = newVal
// }
// }, {deep: true})
watch(() => props.showTable, (newVal) => {
props.showTable = newVal
@@ -263,6 +263,7 @@ watch(() => props.singleList, (newVal) => {
watch(() => props.formData.singleFile, (newVal) => {
// console.log('singleFile', newVal)
singleFile.value = newVal
props.formData.singleFile=newVal
}, {deep: true})
watch(() => isSingleFile.value, (newVal) => {
isSingleFile.value = newVal
@@ -303,12 +304,12 @@ const compositeParam = (item) => {
fileType: item.fileType,
url: item.url,
newFile: true,
tag:props.tag
tag: props.tag
}
}
const getOtherFile = (val) => {
if (props.preview) {
allFileList.value.push(compositeParam(val))
allFileList.value.push(compositeParam(val))
} else {
allFileList.value = props.otherFileList
}

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

@@ -3,11 +3,11 @@
<el-form :model="localFormData" ref="formRef" label-width="auto" :rules="rules" v-if="step!=='50'">
<el-row>
<el-col :span="24" v-if="title==='apply'">
<el-form-item label="项目负责人" :required="true" prop="projectChargePerson"
<el-form-item label="项目负责人" :required="true" prop="projectChargePerson"
label-width="125">
<el-button style="margin-right: 10px" color="#DED0B2" @click="handleShowProjectChargePersonTable">
<!-- {{ localFormData.projectChargePerson ? '更改' : '请选择' }}-->
{{projectChargePersonUserList.length!==0 ? '更改' : '请选择' }}
<!-- {{ localFormData.projectChargePerson ? '更改' : '请选择' }}-->
{{ projectChargePersonUserList.length !== 0 ? '更改' : '请选择' }}
</el-button>
<div v-for="item in projectChargePersonUserList" :key="item.id" style="margin-right: 5px">
{{ item.name }}
@@ -20,8 +20,8 @@
<el-form-item label="项目成员" :required="true" prop="projectPerson"
label-width="125">
<el-button color="#DED0B2" style="margin-right: 10px" @click="handleShowProjectPersonTable">
<!-- {{ localFormData.projectPersonIds ? '更改' : '请选择' }}-->
{{projectPersonUserList.length!==0 ? '更改' : '请选择' }}
<!-- {{ localFormData.projectPersonIds ? '更改' : '请选择' }}-->
{{ projectPersonUserList.length !== 0 ? '更改' : '请选择' }}
</el-button>
<div v-for="item in projectPersonUserList" :key="item.id" style="margin-right: 5px">
{{ item.name }}
@@ -210,17 +210,17 @@ const name = ref(router.currentRoute.value.name)
const deploymentId = ref()
const selectRows = ref([])
const projectId = ref(route.query.projectId)
const getProjectChargePersonUser=()=>{
console.log('list',projectChargePersonUserList.value)
if(projectChargePersonUserList.value.length!==0){
return projectChargePersonUserList.value.map(item=>item.name).join()
const getProjectChargePersonUser = () => {
console.log('list', projectChargePersonUserList.value)
if (projectChargePersonUserList.value.length !== 0) {
return projectChargePersonUserList.value.map(item => item.name).join()
}
// if(list[0]!==null){
// return list.map(item=>item.name).join()
// }
}
const getProjectPersonUser=(list)=>{
console.log('list2',projectPersonUserList.value)
const getProjectPersonUser = (list) => {
console.log('list2', projectPersonUserList.value)
// if(list!=null){
// return list.map(item=>item.name).join()
// }
@@ -270,7 +270,7 @@ const projectPersonUserPickerOk = (userList) => {
userIds.push(user.id)
}
// localFormData.value.projectPersonIds = userIds
console.log(userList,projectPersonUserList.value)
console.log(userList, projectPersonUserList.value)
}
const getPreProcessList = () => {
loading.value = true
@@ -415,13 +415,13 @@ const handleSubmit = async () => {
fileList: files,
singleFile: attachment.value.singleFile,
projectId: projectId.value,
projectChargePerson: parseInt(projectChargePersonUserList.value[0].id),
projectPersonIds: projectPersonIds,
preProcess: JSON.stringify(localFormData.value.preProcess)
}
console.log(params)
let res
if (props.step === '20') {
params.projectChargePersonq = parseInt(projectChargePersonUserList.value[0].id)
params.projectPersonIds = projectPersonIds
if (props.mode === 'resubmit') {
res = await resubmitApply(params)
} else {
@@ -498,15 +498,15 @@ const init = async () => {
}
watchEffect(() => {
if(props.formData.projectChargePerson==null){
// projectChargePersonUserList.value = []
}else {
if (props.formData.projectChargePerson == null) {
// projectChargePersonUserList.value = []
} else {
projectChargePersonUserList.value = [props.formData.projectChargePerson]
}
// console.log('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){
if (props.formData.projectChargePerson != null) {
localFormData.value.projectChargePerson = props.formData.projectChargePerson.id
}
// localFormData.value.projectPersonIds = []