odjbin/mosr-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix : 修复分摊编辑传参和台账导出

Browse Source
This commit is contained in:
odjbin
2024-06-25 11:55:48 +08:00
parent 87768bfdf4
commit 9d0490a253
2 changed files with 46 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/views/expense-management/share/add.vue
View File

@@ -160,17 +160,17 @@ import UserPicker from "@/views/workflow/process/common/UserPicker.vue";
const userList = ref([])
const changeDiagram = ref(false)
const rules = reactive({
shareName: [{required: true, message: '请输入分摊名称', trigger: 'blur'}],
apportionmentMonth: [{required: true, message: '请选择月份', trigger: 'blur'}],
projectId: [{required: true, message: '请选择项目名称', trigger: 'blur'}],
// researchPersonnel: [{required: true, message: '请选择研发人员', trigger: 'blur'}],
wagesPayable: [{required: true, message: '请输入应发工资', trigger: 'blur'}],
performance: [{required: true, message: '请输入绩效', trigger: 'blur'}],
reserveFund: [{required: true, message: '请输入公积金', trigger: 'blur'}],
socialSecurity: [{required: true, message: '请输入社保', trigger: 'blur'}],
annuity: [{required: true, message: '请输入年金', trigger: 'blur'}],
workday: [{required: true, message: '请输入工作日', trigger: 'blur'}],
researchDuration: [{required: true, message: '请输入研发时长', trigger: 'blur'}],
shareName: [{required: true, message: '请输入分摊名称', trigger: ['blur', 'change']}],
apportionmentMonth: [{required: true, message: '请选择月份', trigger: ['blur', 'change']}],
projectId: [{required: true, message: '请选择项目名称', trigger: ['blur', 'change']}],
// researchPersonnel: [{required: true, message: '请选择研发人员', trigger: ['blur', 'change']}],
wagesPayable: [{required: true, message: '请输入应发工资', trigger: ['blur', 'change']}],
performance: [{required: true, message: '请输入绩效', trigger: ['blur', 'change']}],
reserveFund: [{required: true, message: '请输入公积金', trigger: ['blur', 'change']}],
socialSecurity: [{required: true, message: '请输入社保', trigger: ['blur', 'change']}],
annuity: [{required: true, message: '请输入年金', trigger: ['blur', 'change']}],
workday: [{required: true, message: '请输入工作日', trigger: ['blur', 'change']}],
researchDuration: [{required: true, message: '请输入研发时长', trigger: ['blur', 'change']}],
})
const processStore = useProcessStore()
const opentionData = ref()
@@ -293,7 +293,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: '提示',
@@ -318,21 +318,35 @@ const handleResubmit = (instance) => {
type: 'error'
})
}
let newUsrAllocationsObj={}
let newUsrAllocationsObjArray=[]
formData.value.tableData.forEach(item => {
item.allocationId = formData.value.allocationId
item.projectName = getProjectName(item.projectId)
if (item.performance == 0) {
item.performance = null
}
newUsrAllocationsObj={
projectId: item.projectId,
projectName:item.projectName,
researchPersonnel: item.researchPersonnel,
wagesPayable: item.wagesPayable,
performance: item.performance,
reserveFund: item.reserveFund,
socialSecurity: item.socialSecurity,
annuity: item.annuity,
workday: item.workday,
researchDuration: item.researchDuration,
}
newUsrAllocationsObjArray.push(newUsrAllocationsObj)
})
let params = {
allocationId: formData.value.allocationId,
shareName: formData.value.shareName,
apportionmentMonth: formData.value.apportionmentMonth,
usrAllocations: formData.value.tableData,
usrAllocations: newUsrAllocationsObjArray,
deploymentId: processInstanceData.value.deploymentId,
}
console.log('params', params)
const {code, msg} = await editAllocation(params)
ElNotification({
title: '提示',