diff --git a/src/views/mes/moldget/components/StockOutItemForm.vue b/src/views/mes/moldget/components/StockOutItemForm.vue
index b58fb9a3..08289ccd 100644
--- a/src/views/mes/moldget/components/StockOutItemForm.vue
+++ b/src/views/mes/moldget/components/StockOutItemForm.vue
@@ -3,14 +3,14 @@
-
+
-
+
@@ -24,25 +24,59 @@ v-model="queryParams.name" :placeholder="t('MoldManagement.Mold.name')" clearabl
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ subScope.row.installLocation || subScope.row.installPosition || subScope.row.currentPosition || subScope.row.machineName || '-' }}
+
+
+
+
+ {{ subScope.row.material || '-' }}
+
+
+
+
+ {{ subScope.row.quantity || subScope.row.count || 1 }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.deviceName }}
+
+
+
+
+
@@ -64,8 +98,7 @@ v-model="queryParams.name" :placeholder="t('MoldManagement.Mold.name')" clearabl
diff --git a/src/views/mes/moldget/index.vue b/src/views/mes/moldget/index.vue
index ad033595..ef523c16 100644
--- a/src/views/mes/moldget/index.vue
+++ b/src/views/mes/moldget/index.vue
@@ -409,7 +409,7 @@ onMounted(async () => {
await getList()
// 加载产品、仓库列表、客户
// productList.value = await ProductApi.getProductSimpleList()
- moldList.value = await MoldBrandApi.getMoldAllList()
+ moldList.value = await MoldBrandApi.getBrandList()
warehouseList.value = await WarehouseApi.getWarehouseSimpleList()
customerList.value = await CustomerApi.getCustomerSimpleList()
userList.value = await UserApi.getSimpleUserList()
diff --git a/src/views/mes/moldreturn/components/StockInItemForm.vue b/src/views/mes/moldreturn/components/StockInItemForm.vue
index 5d8ee791..be7d2152 100644
--- a/src/views/mes/moldreturn/components/StockInItemForm.vue
+++ b/src/views/mes/moldreturn/components/StockInItemForm.vue
@@ -3,14 +3,14 @@
-
+
-
+
@@ -24,25 +24,59 @@ v-model="queryParams.name" :placeholder="t('MoldManagement.Mold.name')" clearabl
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ subScope.row.installLocation || subScope.row.installPosition || subScope.row.currentPosition || subScope.row.machineName || '-' }}
+
+
+
+
+ {{ subScope.row.material || '-' }}
+
+
+
+
+ {{ subScope.row.quantity || subScope.row.count || 1 }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.deviceName }}
+
+
+
+
+
@@ -64,8 +98,7 @@ v-model="queryParams.name" :placeholder="t('MoldManagement.Mold.name')" clearabl
diff --git a/src/views/mes/moldreturn/index.vue b/src/views/mes/moldreturn/index.vue
index 114ad4b2..4ce2d006 100644
--- a/src/views/mes/moldreturn/index.vue
+++ b/src/views/mes/moldreturn/index.vue
@@ -405,7 +405,7 @@ onMounted(async () => {
await getList()
// 加载产品、仓库列表、客户
// productList.value = await ProductApi.getProductSimpleList()
- moldList.value = await MoldBrandApi.getMoldAllList()
+ moldList.value = await MoldBrandApi.getBrandList()
warehouseList.value = await WarehouseApi.getWarehouseSimpleList()
customerList.value = await CustomerApi.getCustomerSimpleList()
userList.value = await UserApi.getSimpleUserList()