From f1a2def555ad5ca1e9122520551a54a6f7627716 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 13 三月 2026 13:10:06 +0800
Subject: [PATCH] Merge branch 'dev_银川_中盛建材' of http://114.132.189.42:9002/r/product-inventory-management into dev_银川_中盛建材
---
src/views/productionPlan/productionPlan/index.vue | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/views/productionPlan/productionPlan/index.vue b/src/views/productionPlan/productionPlan/index.vue
index 33dbeb0..d0a6cba 100644
--- a/src/views/productionPlan/productionPlan/index.vue
+++ b/src/views/productionPlan/productionPlan/index.vue
@@ -349,7 +349,11 @@
productionPlanCombine,
} from "@/api/productionPlan/productionPlan.js";
import PIMTable from "./components/PIMTable.vue";
- import { modelListPage, productTreeList } from "@/api/basicData/newProduct.js";
+ import {
+ modelListPage,
+ productTreeList,
+ productTreeListQuery,
+ } from "@/api/basicData/newProduct.js";
const { proxy } = getCurrentInstance();
@@ -456,7 +460,7 @@
label: "鏁版嵁鏉ユ簮",
width: "100px",
prop: "dataSourceType",
- formatData: cell => (cell == 1 ? "鍚屾" : "鎵嬪姩"),
+ formatData: cell => (cell == 1 ? "閽夐拤鍚屾" : "鎵嬪姩鏂板"),
},
{
label: "澶囨敞 1",
@@ -645,7 +649,7 @@
};
const fetchProductOptions = () => {
- return productTreeList().then(res => {
+ return productTreeList({ type: 2 }).then(res => {
productOptions.value = convertIdToValue(res.data);
return res;
});
--
Gitblit v1.9.3