diff --git a/src/views/expense-management/share/add.vue b/src/views/expense-management/share/add.vue index f0917d6..29eb247 100644 --- a/src/views/expense-management/share/add.vue +++ b/src/views/expense-management/share/add.vue @@ -320,7 +320,7 @@ const handleSubmit = (instance) => { usrAllocations: formData.value.tableData, deploymentId: processInstanceData.value.deploymentId, } - console.log('params', params, formData.value.tableData) + // console.log('params', params, formData.value.tableData) const {code, msg} = await addAllocation(params) ElNotification({ title: '提示', @@ -346,8 +346,6 @@ const handleResubmit = (instance) => { }) return; } - let newUsrAllocationsObj = {} - let newUsrAllocationsObjArray = [] let researchPersonnelId = '' formData.value.tableData.forEach(item => { item.allocationId = formData.value.allocationId @@ -356,24 +354,6 @@ const handleResubmit = (instance) => { if (item.performance == 0) { 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, - } - newUsrAllocationsObjArray.push(newUsrAllocationsObj) }) if (!researchPersonnelId) { ElNotification({ @@ -383,15 +363,14 @@ const handleResubmit = (instance) => { }) return; } - console.log('formData.value.apportionmentMonth',new Date(formData.value.apportionmentMonth)) let params = { allocationId: formData.value.allocationId, shareName: formData.value.shareName, apportionmentMonth: formData.value.apportionmentMonth, - usrAllocations:newUsrAllocationsObjArray, + usrAllocations:formData.value.tableData, deploymentId: processInstanceData.value.deploymentId, } - console.log('params', params, formData.value.tableData) + // console.log('params', params, formData.value.tableData) const {code, msg} = await editAllocation(params) ElNotification({ title: '提示',