diff --git a/src/views/expense-management/ledger/index.vue b/src/views/expense-management/ledger/index.vue index b72e195..06e5445 100644 --- a/src/views/expense-management/ledger/index.vue +++ b/src/views/expense-management/ledger/index.vue @@ -55,7 +55,7 @@ const searchConfig = reactive([ clearable: true, filterable: true, checkStrictly: true, - cacheKey: 'research_stage', + cacheKey: 'fee_stage', } }, { @@ -126,6 +126,11 @@ const tableConfig = reactive({ } } }, + { + label: '摘要', + prop: 'digest', + align: 'center' + }, { prop: 'afterTax', label: '税后余额(元)', diff --git a/src/views/project-demand/requirement/add.vue b/src/views/project-demand/requirement/add.vue index c72297a..0f48cbb 100644 --- a/src/views/project-demand/requirement/add.vue +++ b/src/views/project-demand/requirement/add.vue @@ -153,7 +153,7 @@ const processStore = useProcessStore() const processInstanceData = ref() const formPermMap = ref(new Map()); const rules = reactive({ - requirementName: [{required: true, message: '请输入需求名称', trigger: 'blur'}], + requirementName: [{required: true, message: '请输入征集名称', trigger: 'blur'}], companyIds: [{required: true, message: '请选择所属公司', trigger: 'blur'}], collectType: [{required: true, message: '请选择征集类型', trigger: 'blur'}], deadline: [{required: true, message: '请选择截止时间', trigger: 'blur'}], diff --git a/src/views/project-demand/requirement/index.vue b/src/views/project-demand/requirement/index.vue index 6a00740..4a68881 100644 --- a/src/views/project-demand/requirement/index.vue +++ b/src/views/project-demand/requirement/index.vue @@ -36,7 +36,7 @@ const searchConfig = reactive([ placeholder: '请选择征集类型', clearable: true, filterable: true, - cacheKey: 'todo_type' + cacheKey: 'collect_type' } }, { diff --git a/src/views/project-demand/summary/index.vue b/src/views/project-demand/summary/index.vue index 69fff49..6cc316b 100644 --- a/src/views/project-demand/summary/index.vue +++ b/src/views/project-demand/summary/index.vue @@ -10,10 +10,10 @@ const tableIns = ref() const router = useRouter() const searchConfig = reactive([ { - label: '需求名称', + label: '征集名称', prop: 'requirementName', props: { - placeholder: '请输入需求名称', + placeholder: '请输入征集名称', clearable: true, checkStrictly: true }, @@ -34,7 +34,7 @@ const searchConfig = reactive([ }, { label: '研发主体', - prop: 'productMainBody', + prop: 'rdSubject', component: shallowRef(fvSelect), props: { placeholder: '请选择研发主体', @@ -46,9 +46,14 @@ const searchConfig = reactive([ }, // { // label: '项目影响', - // prop: 'projectEffect', + // prop: 'projectImpact', // component: shallowRef(fvSelect), - // props: {}, + // props: { + // placeholder: '请选择项目影响', + // cacheKey: 'project_impact', + // clearable: true, + // filterable: true + // }, // colProps: {} // }, // { diff --git a/src/views/project-management/implementation/index.vue b/src/views/project-management/implementation/index.vue index 73e644a..57f9f3c 100644 --- a/src/views/project-management/implementation/index.vue +++ b/src/views/project-management/implementation/index.vue @@ -93,7 +93,7 @@ const searchConfig = reactive([ component: 'el-date-picker', props: { clearable: true, - type: 'datetimerange', + type: 'daterange', startPlaceholder: '开始日期', endPlaceholder: '结束日期', valueFormat: 'YYYY-MM-DD HH:mm:ss', diff --git a/src/views/project-management/initiation/index.vue b/src/views/project-management/initiation/index.vue index d80ec63..1593ab8 100644 --- a/src/views/project-management/initiation/index.vue +++ b/src/views/project-management/initiation/index.vue @@ -91,7 +91,7 @@ const searchConfig = reactive([ component: 'el-date-picker', props: { clearable: true, - type: 'datetimerange', + type: 'daterange', startPlaceholder: '开始日期', endPlaceholder: '结束日期', valueFormat: 'YYYY-MM-DD HH:mm:ss',