From 9d0490a2536b076b18cb5fa7bdb8efb4d5d713db Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Tue, 25 Jun 2024 11:55:48 +0800 Subject: [PATCH] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E5=88=86=E6=91=8A?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E4=BC=A0=E5=8F=82=E5=92=8C=E5=8F=B0=E8=B4=A6?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/expense-management/share/add.vue | 42 ++++++++++++------- .../implementation/account.vue | 23 +++++++--- 2 files changed, 46 insertions(+), 19 deletions(-) diff --git a/src/views/expense-management/share/add.vue b/src/views/expense-management/share/add.vue index 47f618c..6a8dad3 100644 --- a/src/views/expense-management/share/add.vue +++ b/src/views/expense-management/share/add.vue @@ -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: '提示', diff --git a/src/views/project-management/implementation/account.vue b/src/views/project-management/implementation/account.vue index 070031f..a279d04 100644 --- a/src/views/project-management/implementation/account.vue +++ b/src/views/project-management/implementation/account.vue @@ -2,8 +2,7 @@ - 导出 - + @@ -89,7 +88,8 @@ const formDataArray = ref([ prop: 'projectCompletionRate', colProps: { span: 6 - } + }, + component: ()=>{tableData.value.projectCompletionRate}% }, { label: '已完成工作量', @@ -99,7 +99,6 @@ const formDataArray = ref([ } } ]) - const tableData = ref({}) const schema = computed(() => { if (JSON.stringify(tableData.value) !== '{}') { @@ -111,7 +110,8 @@ const schema = computed(() => { const baseForm = ref() const tableIns = ref() const btns = ref([ - {name: '表格更新', key: 'update', color: '#DED0B2', auth: ''} + {name: '表格更新', key: 'update', color: '#DED0B2', auth: ''}, + {name: '导出', key: 'export', color: '#DED0B2', auth: ''} ]) const searchConfig = reactive([ { @@ -173,6 +173,10 @@ const searchConfig = reactive([ ]) const tableConfig = reactive({ columns: [ + { + type: 'selection', + prop: 'selection' + }, { prop: 'name', type: 'index', @@ -234,6 +238,11 @@ const tableConfig = reactive({ if (route.query.state !== '4') { btns.value.push({name: '上传费用', key: 'add', color: '#DED0B2', auth: ''}) } +const exportIds=ref([]) +const selectionChange=(data)=>{ + console.log('data',data) + console.log(' data.forEach(item=>item.id)', data.forEach(item=>item.id)) +} const handleUpdateTable = () => { router.push({ name: 'Implementation/update', @@ -259,6 +268,9 @@ const headBtnClick = (key) => { case 'update': handleUpdateTable() break; + case 'export': + exportExcelHandler() + break; } } const handleUploadFee = () => { @@ -271,6 +283,7 @@ const handleUploadFee = () => { } const exportExcelHandler = () => { + console.log('exportIds.value',exportIds.value) let data = { projectId: 113 }