diff --git a/src/views/expense-management/cost-detail/index.vue b/src/views/expense-management/cost-detail/index.vue index 037db85..25e324c 100644 --- a/src/views/expense-management/cost-detail/index.vue +++ b/src/views/expense-management/cost-detail/index.vue @@ -28,17 +28,17 @@ const searchConfig = ref([ checkStrictly: true } }, - { - label: '子项目', - prop: 'subProjectName', - component: 'el-input', - props: { - placeholder: '请输入子项目查询', - clearable: true, - filterable: true, - checkStrictly: true - } - }, + // { + // label: '子项目', + // prop: 'subProjectName', + // component: 'el-input', + // props: { + // placeholder: '请输入子项目查询', + // clearable: true, + // filterable: true, + // checkStrictly: true + // } + // }, // { // label: '项目类型', // prop: 'projectType', @@ -80,112 +80,89 @@ const tableConfig = reactive({ // } // }, { - prop: 'affiliatedCompany', - label: '支出年份', + prop: 'paymentYear', + label: '支付年份', align: 'center', width: 80 }, { - prop: 'projectName', - label: '月份', + prop: 'paymentMonth', + label: '支付月份', align: 'center', width: 80 }, { - prop: 'projectCost', + prop: 'masterProjectName', label: '主项目', align: 'center', width: 120, - showOverflowTooltip: false, - currentRender: ({row, index}) => { - if (row.projectCost !== null&&row.projectCost !== null&&row.projectCost!==undefined) { - return () - } else { - return '--' - } - } + }, { - prop: 'time', + prop: 'subProjectName', label: '子项目', align: 'center', width: 120, }, { - prop: 'researchStage', + prop: 'certificateDate', label: '凭证日期', align: 'center', width: 120, - showOverflowTooltip: false, - currentRender: ({row, index}) => { - if (row.researchStage&&row.researchStage !== null&&row.researchStage!==undefined) { - return () - } else { - return '--' - } - } }, { - prop: 'digest', + prop: 'voucherNumber', label: '凭证号', align: 'center' }, { - prop: 'digest', + prop: 'entryNumber', label: '分录号', align: 'center', - currentRender:({row})=>{ - return {toThousands(row.afterTax)} - } + }, { - prop: 'digest', + prop: 'remarks', label: '摘要', align: 'center', }, { - prop: 'digest', + prop: 'accountCode', label: '科目编码', align: 'center', showOverflowTooltip: false, - currentRender: ({row, index}) => { - if (row.source&&row.source !== null&&row.source!==undefined) { - return () - } else { - return '--' - } - } + }, { - prop: 'digest', + prop: 'accountName', label: '科目名称', align: 'center', }, { - prop: 'digest', + prop: 'auxiliaryItem', label: '辅助项', align: 'center', }, { - prop: 'digest', + prop: 'recordedAmount', label: '会计凭证记载金额(元)', align: 'center', width: 170 }, { - prop: 'digest', + prop: 'rdAmount', label: '归集研发费用金额(元)', align: 'center', width: 170 }, ], - api: '', + api: '/workflow/mosr/payment/list', params: {}, export:{ open :true, - fileName:`科技创新费用支出明细.xlsx` + fileName:`研发费用明细表.xlsx` } }) const search = (val) => { diff --git a/src/views/expense-management/expend-detail/index.vue b/src/views/expense-management/expend-detail/index.vue index 26f251f..2f24c0c 100644 --- a/src/views/expense-management/expend-detail/index.vue +++ b/src/views/expense-management/expend-detail/index.vue @@ -1,5 +1,5 @@