diff --git a/src/views/expense-management/cost-detail/index.vue b/src/views/expense-management/cost-detail/index.vue index c994ab8..037db85 100644 --- a/src/views/expense-management/cost-detail/index.vue +++ b/src/views/expense-management/cost-detail/index.vue @@ -11,95 +11,60 @@ import fvSelect from '@/fvcomponents/fvSelect/index.vue' import {toThousands} from '@/utils/changePrice.js' import { getSubCompOpt } from '@/api/user/user.js'; +import {reactive, ref} from "vue"; +import {useRoute, useRouter} from "vue-router"; const router = useRouter() const route = useRoute() const searchConfig = ref([ - { - label: '公司名称', - prop: 'affiliatedCompanyIds', - component: 'el-tree-select', - props: { - placeholder: '请输入公司名称查询', - clearable: true, - data: [], - filterable: true, - checkStrictly: true, - remote: true - } - }, - { - label: '项目名称', - prop: 'projectName', - component: 'el-input', - props: { - placeholder: '请输入项目名称查询', - clearable: true, - filterable: true, - checkStrictly: true - } - }, { - label: '项目费用', - prop: 'projectCost', - component: shallowRef(fvSelect), - props: { - placeholder: '请选择项目费用查询', - clearable: true, - filterable: true, - cacheKey: 'project_cost', - remote: true - } - }, - { - label: '研发阶段', - prop: 'researchStage', - component: shallowRef(fvSelect), - props: { - placeholder: '请选择研发阶段查询', - clearable: true, - filterable: true, - checkStrictly: true, - cacheKey: 'fee_stage', - remote: true - } - }, - - { - label: '时间', - prop: 'time', - component: 'el-date-picker', - props: { - placeholder: '请选择时间', - clearable: true, - type:'month', - format: 'YYYY-MM', - valueFormat:'YYYY-MM', - }, - colProps: {} - }, - { - label: '税后余额', - prop: 'afterTax', + label: '主项目', + prop: 'masterProjectName', component: 'el-input', props: { - placeholder: '请输入税后余额查询', + placeholder: '请输入主项目查询', clearable: true, filterable: true, checkStrictly: true } }, { - label: '摘要', - prop: 'digest', + label: '子项目', + prop: 'subProjectName', component: 'el-input', props: { - placeholder: '请输入摘要查询', + placeholder: '请输入子项目查询', clearable: true, filterable: true, checkStrictly: true } }, + // { + // label: '项目类型', + // prop: 'projectType', + // component: shallowRef(fvSelect), + // props: { + // placeholder: '请选择项目类型', + // cacheKey: 'project_type', + // clearable: true, + // filterable: true, + // remote: true + // }, + // colProps: {} + // }, + // { + // label: '归档时间', + // prop: 'filingTime', + // component: 'el-date-picker', + // props: { + // placeholder: '请选择归档时间', + // clearable: true, + // type:'date', + // format: 'YYYY-MM-DD HH:mm', + // valueFormat:'YYYY-MM-DD HH:mm', + // }, + // colProps: {} + // }, ]) const tableIns = ref() const tableConfig = reactive({ @@ -117,12 +82,14 @@ const tableConfig = reactive({ { prop: 'affiliatedCompany', label: '支出年份', - align: 'center' + align: 'center', + width: 80 }, { prop: 'projectName', label: '月份', - align: 'center' + align: 'center', + width: 80 }, { @@ -173,6 +140,11 @@ const tableConfig = reactive({ return {toThousands(row.afterTax)} } }, + { + prop: 'digest', + label: '摘要', + align: 'center', + }, { prop: 'digest', label: '科目编码', @@ -200,11 +172,13 @@ const tableConfig = reactive({ prop: 'digest', label: '会计凭证记载金额(元)', align: 'center', + width: 170 }, { prop: 'digest', label: '归集研发费用金额(元)', align: 'center', + width: 170 }, ], api: '', diff --git a/src/views/expense-management/expend-detail/index.vue b/src/views/expense-management/expend-detail/index.vue index bb67237..26f251f 100644 --- a/src/views/expense-management/expend-detail/index.vue +++ b/src/views/expense-management/expend-detail/index.vue @@ -1,6 +1,6 @@