diff --git a/apps/web-office/src/utils/dict/shared.ts b/apps/web-office/src/utils/dict/shared.ts index b8863cbf..a479bf1c 100644 --- a/apps/web-office/src/utils/dict/shared.ts +++ b/apps/web-office/src/utils/dict/shared.ts @@ -11,6 +11,7 @@ export enum DICT_TYPE { meeting_type = 'meeting_type', meeting_facilities = 'meeting_facilities', meeting_room = 'meeting_room', + // 订餐 // 主食 canteen_staplefood = 'canteen_staplefood', @@ -62,6 +63,8 @@ export enum DICT_TYPE { /** 综合管理-项目名称管理 */ comprehensiveProjectName = 'comprehensive_project_name', - comprehensiveConfig = 'comprehensive_config' + comprehensiveConfig = 'comprehensive_config', + /** 合同管理-签约依据类型 */ + contractBasisType = 'contract_basis_type', } diff --git a/apps/web-office/src/views/canteen/collect/collect-detail-modal.vue b/apps/web-office/src/views/canteen/collect/collect-detail-modal.vue index 14cf8f9f..b312417b 100644 --- a/apps/web-office/src/views/canteen/collect/collect-detail-modal.vue +++ b/apps/web-office/src/views/canteen/collect/collect-detail-modal.vue @@ -80,7 +80,7 @@ const searchBinding = ref({ class: 'min-w-[180px]', allowClear: true, dict: dict({ - async getData(dict, context) { + async getData(form) { return getDictOptions(DICT_TYPE.canteen_dineway); }, }), @@ -97,18 +97,10 @@ const searchBinding = ref({ class: 'min-w-[180px]', allowClear: true, dict: dict({ - async getData(dict, context) { - return [ - { - label: "已结算", - value: "1", - }, - { - label: "未结算", - value: "0", - }, - ]; - }, + data: [ + { label: "已结算", value: "1", }, + { label: "未结算", value: "0", }, + ], }), }, autoSearchTrigger: 'enter', diff --git a/apps/web-office/src/views/contract/approval/edit/index.vue b/apps/web-office/src/views/contract/approval/edit/index.vue index 054e3b69..3221001c 100644 --- a/apps/web-office/src/views/contract/approval/edit/index.vue +++ b/apps/web-office/src/views/contract/approval/edit/index.vue @@ -311,7 +311,7 @@ onMounted(async () => {