diff --git a/src/views/expense-management/share/add.vue b/src/views/expense-management/share/add.vue index d74d6b5..f0917d6 100644 --- a/src/views/expense-management/share/add.vue +++ b/src/views/expense-management/share/add.vue @@ -153,8 +153,6 @@ import { import {useProcessStore} from '@/stores/processStore.js'; import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue'; import OperationRender from '@/views/workflow/common/OperationRender.vue' -import {ref} from "vue"; - import UserPicker from "@/views/workflow/process/common/UserPicker.vue"; const userList = ref([]) @@ -213,6 +211,7 @@ const showPersonnelPicker = (row, index) => { id: row.researchPersonnelId, name: row.researchPersonnel, companyName: row.companyName, + accountType: row.accountType, } userList.value=[userObj] } @@ -229,6 +228,8 @@ const selected = (select) => { if (index === currentIndex.value) { item.researchPersonnelId = select[0].id item.researchPersonnel = select[0].name + item.companyName = select[0].companyName + item.accountType = select[0].accountType } }) // userList.value=select @@ -382,6 +383,7 @@ const handleResubmit = (instance) => { }) return; } + console.log('formData.value.apportionmentMonth',new Date(formData.value.apportionmentMonth)) let params = { allocationId: formData.value.allocationId, shareName: formData.value.shareName, diff --git a/src/views/project-management/implementation/phase.vue b/src/views/project-management/implementation/phase.vue index 4d8e78d..54ab532 100644 --- a/src/views/project-management/implementation/phase.vue +++ b/src/views/project-management/implementation/phase.vue @@ -163,7 +163,8 @@ const selected = (select) => { let userInfo = { id: val.id, name: val.name, - avatar: val.avatar, + companyName: val.companyName, + accountType: val.accountType, } userInfoList.push(userInfo) } diff --git a/src/views/project-management/implementation/updateTable.vue b/src/views/project-management/implementation/updateTable.vue index 950611d..8cfdbd6 100644 --- a/src/views/project-management/implementation/updateTable.vue +++ b/src/views/project-management/implementation/updateTable.vue @@ -114,6 +114,8 @@ const selected = (select) => { for (const selectElement of select) { tableForm.value.projectChargePerson = selectElement.id tableForm.value.projectChargePersonName = selectElement.name + tableForm.value.companyName = selectElement.companyName + tableForm.value.accountType = selectElement.accountType } userList.value = select } @@ -159,6 +161,7 @@ const init = async () => { id: data.projectChargePerson, name: data.projectChargePersonName, companyName: data.companyName, + accountType: data.accountType, } userList.value.push(userObj) }