diff --git a/src/components/AttachmentUpload.vue b/src/components/AttachmentUpload.vue index 68101c4..70bb806 100644 --- a/src/components/AttachmentUpload.vue +++ b/src/components/AttachmentUpload.vue @@ -82,6 +82,10 @@ const props = defineProps({ labelPosition: { type: String, default: '' + }, + tag: { + type: String, + default: '' } }) const emit = defineEmits(["getAttachment", "getOtherFile"]) @@ -219,35 +223,36 @@ const isSingleFile = ref(false) const allFileList = ref([]) const deleteFileVal = ref({}) const singleFileList = ref([]) -if (props.formData.fileList !== null && props.formData.fileList?.length > 0) { - allFileList.value = props.formData.fileList -} +// if (props.formData.fileList !== null && props.formData.fileList?.length > 0) { +// allFileList.value = props.formData.fileList +// } 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) }) } -}, {deep: true}) -watch(() => props.otherFileList, (newVal) => { - // console.log('newotherFileList', newVal) - if (props.preview) { - if (props.formData.fileList === null || props.formData.fileList?.length === 0) { - allFileList.value = newVal - } else { - newVal?.forEach(item => { - allFileList.value.push(item) - }) - } - } else { - allFileList.value = newVal - } -}, {deep: true}) - +}, {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 + // } +// }, {deep: true}) watch(() => props.showTable, (newVal) => { props.showTable = newVal }, {deep: true}) @@ -271,26 +276,42 @@ const handleDelete = (row, type) => { }) if (res.code === 1000) { if (type === 'single') { - singleFileList.value.splice(singleFileList.value.findIndex((item) => item.id === row.fileId), 1); + singleFileList.value.splice(singleFileList.value.findIndex((item) => item.fileId === row.fileId), 1); isSingleFile.value = false } else { - allFileList.value.splice(allFileList.value.findIndex((item) => item.id === row.fileId), 1); + allFileList.value.splice(allFileList.value.findIndex((item) => item.fileId === row.fileId), 1); } } }); } const handleSingleDelete = (row) => { - console.log('row',row) + // console.log('row',row) // fileUploadRef.value.handleRemove(deleteFileVal.value.id) handleDelete(row, 'single') } const getAttachment = (val) => { - console.log('getAttachment', val) + // console.log('getAttachment', val) isSingleFile.value = true // deleteFileVal.value=val emit('getAttachment', val) } +const compositeParam = (item) => { + return { + fileId: item.id, + size: item.size, + originalFileName: item.originalFilename, + fileType: item.fileType, + url: item.url, + newFile: true, + tag:props.tag + } +} const getOtherFile = (val) => { + if (props.preview) { + allFileList.value.push(compositeParam(val)) + } else { + allFileList.value = props.otherFileList + } emit('getOtherFile', val) } const deleteAttachment = (val) => { diff --git a/src/components/DetailComponent/ProjectApply.vue b/src/components/DetailComponent/ProjectApply.vue index 7622c89..1e912d3 100644 --- a/src/components/DetailComponent/ProjectApply.vue +++ b/src/components/DetailComponent/ProjectApply.vue @@ -16,7 +16,7 @@ diff --git a/src/views/expense-management/share/add.vue b/src/views/expense-management/share/add.vue index 2730e08..d74d6b5 100644 --- a/src/views/expense-management/share/add.vue +++ b/src/views/expense-management/share/add.vue @@ -115,7 +115,7 @@
-
流程图
+
流程图
{ currentRow.value = row currentIndex.value = index - userPicker.value.showUserPicker() + if(row.companyName){ + let userObj = { + id: row.researchPersonnelId, + name: row.researchPersonnel, + companyName: row.companyName, + } + userList.value=[userObj] + } + nextTick(() => { + userPicker.value.showUserPicker() + }) } const selected = (select) => { + console.log('select',select) if (!select || select.length === 0) { return } @@ -220,7 +231,7 @@ const selected = (select) => { item.researchPersonnel = select[0].name } }) - userList.value=select + // userList.value=select } const getResearchOptions = async () => { const res = await getResearchUser() @@ -345,13 +356,18 @@ const handleResubmit = (instance) => { item.performance = null } newUsrAllocationsObj = { + allocationId: formData.value.allocationId, + id: item.id, projectId: item.projectId, projectName: item.projectName, + researchPersonnel: item.researchPersonnel, researchPersonnelId: item.researchPersonnelId, wagesPayable: item.wagesPayable, performance: item.performance, reserveFund: item.reserveFund, socialSecurity: item.socialSecurity, + time: item.time, + subtotal: item.subtotal, annuity: item.annuity, workday: item.workday, researchDuration: item.researchDuration, @@ -370,9 +386,10 @@ const handleResubmit = (instance) => { allocationId: formData.value.allocationId, shareName: formData.value.shareName, apportionmentMonth: formData.value.apportionmentMonth, - usrAllocations: newUsrAllocationsObjArray, + usrAllocations:newUsrAllocationsObjArray, deploymentId: processInstanceData.value.deploymentId, } + console.log('params', params, formData.value.tableData) const {code, msg} = await editAllocation(params) ElNotification({ title: '提示', @@ -413,12 +430,6 @@ const getDetailList = async () => { if (code === 1000) { data.rows.forEach(item => { item.researchPersonnelId = Number(item.researchPersonnelId) - let userObj = { - id: item.researchPersonnelId, - name: item.researchPersonnel, - companyName: item.companyName, - } - userList.value.push(userObj) }) formData.value.tableData = data.rows nextTick(() => { diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue index d3d854f..57b0d08 100644 --- a/src/views/project-demand/summary/add.vue +++ b/src/views/project-demand/summary/add.vue @@ -234,7 +234,7 @@
diff --git a/src/views/project-management/filing/conclusion.vue b/src/views/project-management/filing/conclusion.vue deleted file mode 100644 index f67715f..0000000 --- a/src/views/project-management/filing/conclusion.vue +++ /dev/null @@ -1,263 +0,0 @@ - - - - - diff --git a/src/views/project-management/implementation/check.vue b/src/views/project-management/implementation/check.vue deleted file mode 100644 index 588f6d6..0000000 --- a/src/views/project-management/implementation/check.vue +++ /dev/null @@ -1,239 +0,0 @@ - - - - - diff --git a/src/views/project-management/implementation/phase.vue b/src/views/project-management/implementation/phase.vue index f71e6d6..4d8e78d 100644 --- a/src/views/project-management/implementation/phase.vue +++ b/src/views/project-management/implementation/phase.vue @@ -10,7 +10,7 @@
diff --git a/src/views/project-management/initiation/apply.vue b/src/views/project-management/initiation/apply.vue deleted file mode 100644 index c39704d..0000000 --- a/src/views/project-management/initiation/apply.vue +++ /dev/null @@ -1,277 +0,0 @@ - - - - - diff --git a/src/views/project-management/mobledetail/ProjectApplyMoblie.vue b/src/views/project-management/mobledetail/ProjectApplyMoblie.vue index 5ce838e..993eb5e 100644 --- a/src/views/project-management/mobledetail/ProjectApplyMoblie.vue +++ b/src/views/project-management/mobledetail/ProjectApplyMoblie.vue @@ -16,7 +16,7 @@