diff --git a/src/api/materials/batchPlan/index.ts b/src/api/materials/batchPlan/index.ts index 0866153..c9231af 100644 --- a/src/api/materials/batchPlan/index.ts +++ b/src/api/materials/batchPlan/index.ts @@ -143,6 +143,13 @@ export const getDictList = (query: any): AxiosPromise => { params: query }); }; +export const coryEngineeringList = (query: any): AxiosPromise => { + return request({ + url: '/cailiaoshebei/mrpBase/coryEngineeringList', + method: 'get', + params: query + }); +}; /** * 获取到物资状态为已完成的版本 */ diff --git a/src/views/materials/batchPlan/index.vue b/src/views/materials/batchPlan/index.vue index d29a31b..bac3df0 100644 --- a/src/views/materials/batchPlan/index.vue +++ b/src/views/materials/batchPlan/index.vue @@ -166,7 +166,7 @@ import { getBatch, delBatch, listSelectCailiaoshebei, obtainTheVersion, - getDictList + getDictList, coryEngineeringList } from '@/api/materials/batchPlan'; import { CailiaoshebeiVO, CailiaoshebeiQuery, CailiaoshebeiForm } from '@/api/materials/batchPlan/types'; import { useUserStoreHook } from '@/store/modules/user'; @@ -459,7 +459,7 @@ const handleAudit = async () => { }; const getNameList = (versions) => { - getDictList({ projectId: currentProject.value?.id, versions }).then((res) => { + coryEngineeringList({ projectId: currentProject.value?.id, versions }).then((res) => { nameList.value = res.data; }); }; diff --git a/src/views/out/purchase/comm/purchPage.vue b/src/views/out/purchase/comm/purchPage.vue index fe29bfa..52dc92c 100644 --- a/src/views/out/purchase/comm/purchPage.vue +++ b/src/views/out/purchase/comm/purchPage.vue @@ -6,8 +6,8 @@ - - + + @@ -50,7 +50,7 @@ import { useUserStoreHook } from '@/store/modules/user'; const userStore = useUserStoreHook(); // 从 store 中获取项目列表和当前选中的项目 const currentProject = computed(() => userStore.selectedProject); -const monthPlanList = ref([]); +const monthPlanList = ref([]); const buttonLoading = ref(false); const loading = ref(true); const showSearch = ref(true); @@ -107,7 +107,9 @@ const getList = async (type?) => { } loading.value = true; const res = await purchaseValueA({ projectId: currentProject.value?.id, type: queryParams.value.type }); - monthPlanList.value = res.rows; + monthPlanList.value = res.data; + console.log(monthPlanList.value); + total.value = res.total; loading.value = false; }; @@ -146,7 +148,6 @@ const submitForm = () => { if (valid) { buttonLoading.value = true; form.value.isDesign = true; - if (form.value.id) { await purchaseValueAup(form.value).finally(() => (buttonLoading.value = false)); } diff --git a/src/views/out/purchase/index.vue b/src/views/out/purchase/index.vue index 46e410e..eba6578 100644 --- a/src/views/out/purchase/index.vue +++ b/src/views/out/purchase/index.vue @@ -14,13 +14,17 @@