diff --git a/src/components/ProjectSelect/index.vue b/src/components/ProjectSelect/index.vue index 8fabfe0..c045a82 100644 --- a/src/components/ProjectSelect/index.vue +++ b/src/components/ProjectSelect/index.vue @@ -6,14 +6,18 @@
- + - + - + + + + + + - 搜索 重置 @@ -38,9 +42,14 @@ > - + + + + - + @@ -96,6 +105,8 @@ const emit = defineEmits(['update:modelValue', 'confirmCallBack']); const { proxy } = getCurrentInstance() as ComponentInternalInstance; +const { project_category } = toRefs(proxy?.useDict('project_category')); + const loading = ref(true); const showSearch = ref(true); const total = ref(0); @@ -108,7 +119,7 @@ const queryFormRef = ref(); const tableRef = ref>(); const projectSelectDialog = useDialog({ - title: '项目选择' + title: '选择项目' }); const initFormData: ProjectInfoForm = { diff --git a/src/views/oa/erp/projectPurchase/edit.vue b/src/views/oa/erp/projectPurchase/edit.vue index cdda0b2..0e669ae 100644 --- a/src/views/oa/erp/projectPurchase/edit.vue +++ b/src/views/oa/erp/projectPurchase/edit.vue @@ -806,7 +806,7 @@ onMounted(async () => { nextTick(async () => { // 获取路由参数 Object.assign(routeParams, route.query); - pageLoading.value = true; + // pageLoading.value = true; loadSelectOptions(); const id = routeParams.id as string | number; const type = routeParams.type as string; @@ -820,6 +820,7 @@ onMounted(async () => { } const shouldLoadDetail = !!id && (type === 'update' || type === 'view' || type === 'approval'); await loadDetail(shouldLoadDetail ? (id as string | number) : undefined); + pageLoading.value = false; }); });