From c25a27347be2c46177b615426297836b30915608 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 20 六月 2025 15:19:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/procureMent/components/ProductionDialog.vue | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/views/procureMent/components/ProductionDialog.vue b/src/views/procureMent/components/ProductionDialog.vue
index 31a6243..e420fbe 100644
--- a/src/views/procureMent/components/ProductionDialog.vue
+++ b/src/views/procureMent/components/ProductionDialog.vue
@@ -133,7 +133,7 @@
import { ref, defineProps, watch, onMounted, nextTick, computed } from "vue";
import { ElMessage } from "element-plus";
import useUserStore from "@/store/modules/user";
-import { addOrEditPR } from "@/api/procureMent";
+import { addOrEditPR,getSupplyList, getCoalInfoList } from "@/api/procureMent";
import { getSupply } from "@/api/basicInformation/supplier";
import { getCoalInfo } from "@/api/basicInformation/coal";
const props = defineProps({
@@ -161,11 +161,12 @@
const getDropdownData = async () => {
try {
const [supplyRes, coalRes] = await Promise.all([
- getSupply(),
- getCoalInfo(),
+ getSupplyList(),
+ getCoalInfoList(),
]);
- let supplyData = supplyRes.data.records;
- let coalData = coalRes.data.records;
+ console.log(supplyRes, coalRes);
+ let supplyData = supplyRes.data;
+ let coalData = coalRes.data;
supplyList.value = supplyData.map((item) => ({
value: item.id,
label: item.supplierName,
@@ -288,6 +289,7 @@
onMounted(async () => {
let res = await userStore.getInfo();
userInfo.value = res;
+ getDropdownData()
});
const rules = {
supplierName: [
--
Gitblit v1.9.3