From 0f0fa0f4e065beef1b47ed668afb9587aa47bbec Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Wed, 3 Jul 2024 20:47:47 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E7=A0=94?= =?UTF-8?q?=E7=A9=B6=E4=BA=BA=E5=91=98=E6=AF=8F=E8=A1=8C=E7=9A=84=E5=9B=9E?= =?UTF-8?q?=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/AttachmentUpload.vue | 78 +++-- .../DetailComponent/ProjectApply.vue | 2 +- src/views/expense-management/share/add.vue | 14 +- src/views/project-demand/summary/add.vue | 2 +- .../project-management/filing/conclusion.vue | 263 ----------------- .../implementation/check.vue | 239 --------------- .../implementation/phase.vue | 2 +- .../project-management/initiation/apply.vue | 277 ------------------ .../mobledetail/ProjectApplyMoblie.vue | 2 +- 9 files changed, 63 insertions(+), 816 deletions(-) delete mode 100644 src/views/project-management/filing/conclusion.vue delete mode 100644 src/views/project-management/implementation/check.vue delete mode 100644 src/views/project-management/initiation/apply.vue diff --git a/src/components/AttachmentUpload.vue b/src/components/AttachmentUpload.vue index 68101c4..3a317b4 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"]) @@ -222,32 +226,34 @@ const singleFileList = ref([]) 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) - 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}) - +// watch(() => props.formData.fileList, (newVal) => { +// console.log('newVal-fileList', newVal) +// if (props.preview) { +// // newVal?.forEach(item => { +// // allFileList.value.push(item) +// // }) +// } +// }, {deep: 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 +277,44 @@ 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); + console.log('allFileList.value',allFileList.value,row) + console.log('allFileList.value.findIndex((item) => item.id === row.fileId)',allFileList.value.findIndex((item) => item.id === row.fileId)) + 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..1e868fe 100644 --- a/src/views/expense-management/share/add.vue +++ b/src/views/expense-management/share/add.vue @@ -208,6 +208,14 @@ const researchOptions = ref([]) const showPersonnelPicker = (row, index) => { currentRow.value = row currentIndex.value = index + if(row.companyName){ + let userObj = { + id: row.researchPersonnelId, + name: row.researchPersonnel, + companyName: row.companyName, + } + userList.value.push(userObj) + } userPicker.value.showUserPicker() } const selected = (select) => { @@ -413,12 +421,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 @@ From 9a789db8a71c973b36c04af988b0d0965c53aa15 Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Wed, 3 Jul 2024 21:31:05 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E5=88=86?= =?UTF-8?q?=E6=91=8A=E7=BC=96=E8=BE=91=E4=BC=A0=E5=8F=82=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/AttachmentUpload.vue | 25 ++++++++++------------ src/views/expense-management/share/add.vue | 19 +++++++++++----- 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/src/components/AttachmentUpload.vue b/src/components/AttachmentUpload.vue index 3a317b4..70bb806 100644 --- a/src/components/AttachmentUpload.vue +++ b/src/components/AttachmentUpload.vue @@ -223,21 +223,20 @@ 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) -// if (props.preview) { -// // newVal?.forEach(item => { -// // allFileList.value.push(item) -// // }) -// } -// }, {deep: true}) +watch(() => props.formData.fileList, (newVal) => { + console.log('newVal-fileList', newVal) + if (props.preview) { + newVal?.forEach(item => { + allFileList.value.push(item) + }) + } +}, {immediate: true}) // watch(() => props.otherFileList, (newVal) => { // props.otherFileList=newVal // if (props.preview) { @@ -280,8 +279,6 @@ const handleDelete = (row, type) => { singleFileList.value.splice(singleFileList.value.findIndex((item) => item.fileId === row.fileId), 1); isSingleFile.value = false } else { - console.log('allFileList.value',allFileList.value,row) - console.log('allFileList.value.findIndex((item) => item.id === row.fileId)',allFileList.value.findIndex((item) => item.id === row.fileId)) allFileList.value.splice(allFileList.value.findIndex((item) => item.fileId === row.fileId), 1); } } diff --git a/src/views/expense-management/share/add.vue b/src/views/expense-management/share/add.vue index 1e868fe..d74d6b5 100644 --- a/src/views/expense-management/share/add.vue +++ b/src/views/expense-management/share/add.vue @@ -115,7 +115,7 @@
-
流程图
+
流程图
{ name: row.researchPersonnel, companyName: row.companyName, } - userList.value.push(userObj) + userList.value=[userObj] } - userPicker.value.showUserPicker() + nextTick(() => { + userPicker.value.showUserPicker() + }) } const selected = (select) => { + console.log('select',select) if (!select || select.length === 0) { return } @@ -228,7 +231,7 @@ const selected = (select) => { item.researchPersonnel = select[0].name } }) - userList.value=select + // userList.value=select } const getResearchOptions = async () => { const res = await getResearchUser() @@ -353,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, @@ -378,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: '提示', From 361510242cabf5f24b80da53c67dc97e86510da2 Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Wed, 3 Jul 2024 21:38:51 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E5=8F=B0?= =?UTF-8?q?=E8=B4=A6=E8=A1=A8=E6=A0=BC=E6=9C=80=E5=B0=8F=E9=AB=98=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../implementation/account.vue | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/src/views/project-management/implementation/account.vue b/src/views/project-management/implementation/account.vue index 5c24d7e..3a92081 100644 --- a/src/views/project-management/implementation/account.vue +++ b/src/views/project-management/implementation/account.vue @@ -1,12 +1,15 @@