fix : 修复分摊编辑传参问题

This commit is contained in:
2024-07-03 21:31:05 +08:00
parent 0f0fa0f4e0
commit 9a789db8a7
2 changed files with 25 additions and 19 deletions

View File

@@ -115,7 +115,7 @@
<baseTitle title="审批记录" v-if="processDiagramViewer&& opentionData?.operationList"></baseTitle>
<div v-else></div>
<div style="display: flex;align-items: center;justify-content: flex-start;">
<div class="base-title">流程图</div>
<div class="base-title" style="margin-left: 10px">流程图</div>
<el-switch
v-model="changeDiagram"
style="--el-switch-on-color:#BEA266 ; --el-switch-off-color:#cecdcd"
@@ -214,11 +214,14 @@ const showPersonnelPicker = (row, index) => {
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: '提示',