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

feat(expense-management): 新增费用分摊功能并优化项目管理相关页面

Browse Source
This commit is contained in:
dj
2025-03-31 23:14:54 +08:00
parent 244f2e72b4
commit 98d8ea4805
7 changed files with 41 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/expense-management/expend-detail/index.vue
View File

@@ -208,7 +208,7 @@ const tableConfig = reactive({
params: {},
export:{
open :true,
fileName:`科技创新费用支出明细.xlsx`
fileName:`科研项日现金支出明细表`
}
})
const search = (val) => {

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

@@ -96,7 +96,7 @@ import {
getResearchUser,
getProjectOption,
editAllocation,
getAllocationDetailList
getAllocationDetailList, addShare
} from "@/api/expense-manage";
import {useProcessStore} from '@/stores/processStore.js';
import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
@@ -107,16 +107,16 @@ localStorage.removeItem('originallySelectedList')
const userList = ref([])
const changeDiagram = ref(false)
const rules = reactive({
shareName: [{required: true, message: '请输入分摊名称', trigger: ['blur', 'change']}],
// shareName: [{required: true, message: '请输入分摊名称', trigger: ['blur', 'change']}],
apportionmentMonth: [{required: true, message: '请选择月份', trigger: ['blur', 'change']}],
projectId: [{required: true, message: '请选择项目名称', trigger: ['blur', 'change']}],
// researchPersonnelId: [{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']}],
// 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()
@@ -135,12 +135,12 @@ const formData = ref({
{
projectId: '',
projectName: '',
researchPersonnelId: '',
wagesPayable: null,
performance: null,
reserveFund: null,
socialSecurity: null,
annuity: null,
// researchPersonnelId: '',
// wagesPayable: null,
// performance: null,
// reserveFund: null,
// socialSecurity: null,
// annuity: null,
workday: '21.75',
researchDuration: null,
}
@@ -383,13 +383,11 @@ const handleSubmit = (instance) => {
return;
}
let params = {
shareName: formData.value.shareName,
apportionmentMonth: formData.value.apportionmentMonth,
usrAllocations: formData.value.tableData,
deploymentId: processInstanceData.value.deploymentId,
}
console.log('params', params, formData.value.tableData)
const {code, msg} = await addAllocation(params)
const {code, msg} = await addShare(params)
ElNotification({
title: '提示',
message: msg,