From 98d8ea4805eda4f6d9349a5c81328f3dee8c3653 Mon Sep 17 00:00:00 2001 From: dj <1042039504@qq.com> Date: Mon, 31 Mar 2025 23:14:54 +0800 Subject: [PATCH] =?UTF-8?q?feat(expense-management):=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E8=B4=B9=E7=94=A8=E5=88=86=E6=91=8A=E5=8A=9F=E8=83=BD=E5=B9=B6?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/expense-manage/index.js | 7 ++++ .../expend-detail/index.vue | 2 +- .../expense-management/share-detail/add.vue | 32 +++++++++---------- src/views/project-demand/summary/add.vue | 2 +- src/views/project-management/filing/index.vue | 6 ++++ .../implementation/index.vue | 6 ++++ .../project-management/initiation/index.vue | 5 +++ 7 files changed, 41 insertions(+), 19 deletions(-) diff --git a/src/api/expense-manage/index.js b/src/api/expense-manage/index.js index 523ebdd..2391872 100644 --- a/src/api/expense-manage/index.js +++ b/src/api/expense-manage/index.js @@ -9,6 +9,13 @@ export const addAllocation = (data) => { data }); }; +export const addShare = (data) => { + return request({ + url:'/workflow/mosr/cost/share', + method: "post", + data + }); +}; export const getAllocationDetail = (allocationId) => { return request({ url: `/workflow/mosr/cost/allocation/info/${allocationId}`, diff --git a/src/views/expense-management/expend-detail/index.vue b/src/views/expense-management/expend-detail/index.vue index 7a24eac..bb67237 100644 --- a/src/views/expense-management/expend-detail/index.vue +++ b/src/views/expense-management/expend-detail/index.vue @@ -208,7 +208,7 @@ const tableConfig = reactive({ params: {}, export:{ open :true, - fileName:`科技创新费用支出明细.xlsx` + fileName:`科研项日现金支出明细表` } }) const search = (val) => { diff --git a/src/views/expense-management/share-detail/add.vue b/src/views/expense-management/share-detail/add.vue index d94d720..40cc870 100644 --- a/src/views/expense-management/share-detail/add.vue +++ b/src/views/expense-management/share-detail/add.vue @@ -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, diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue index d4a2820..bfaff07 100644 --- a/src/views/project-demand/summary/add.vue +++ b/src/views/project-demand/summary/add.vue @@ -232,7 +232,7 @@ - + diff --git a/src/views/project-management/filing/index.vue b/src/views/project-management/filing/index.vue index 45fd58a..78f2ab5 100644 --- a/src/views/project-management/filing/index.vue +++ b/src/views/project-management/filing/index.vue @@ -216,6 +216,12 @@ const tableConfig = reactive({ return (tableIns.value.getQuery().pageNum - 1) * tableIns.value.getQuery().pageSize + index + 1 } }, + + { + prop: 'processNumber', + label: '编号', + align: 'center', + }, { prop: 'requirementName', label: '征集名称', diff --git a/src/views/project-management/implementation/index.vue b/src/views/project-management/implementation/index.vue index f12e1c2..cb440d3 100644 --- a/src/views/project-management/implementation/index.vue +++ b/src/views/project-management/implementation/index.vue @@ -219,6 +219,12 @@ const tableConfig = reactive({ return (tableIns.value.getQuery().pageNum - 1) * tableIns.value.getQuery().pageSize + index + 1 } }, + + { + prop: 'processNumber', + label: '编号', + align: 'center', + }, { prop: 'requirementName', label: '征集名称', diff --git a/src/views/project-management/initiation/index.vue b/src/views/project-management/initiation/index.vue index c7f9f5a..8089ba1 100644 --- a/src/views/project-management/initiation/index.vue +++ b/src/views/project-management/initiation/index.vue @@ -214,6 +214,11 @@ const tableConfig = reactive({ return (tableIns.value.getQuery().pageNum - 1) * tableIns.value.getQuery().pageSize + index + 1 } }, + { + prop: 'processNumber', + label: '编号', + align: 'center', + }, { prop: 'requirementName', label: '征集名称',