diff --git a/src/views/wms/inventory/selectInventoryInWMS.vue b/src/views/wms/inventory/selectInventoryInWMS.vue
index 9f907e7..957072e 100644
--- a/src/views/wms/inventory/selectInventoryInWMS.vue
+++ b/src/views/wms/inventory/selectInventoryInWMS.vue
@@ -11,16 +11,16 @@
-
+
搜索
重置
@@ -29,9 +29,9 @@
-
-
@@ -80,7 +80,7 @@ const props = defineProps({
default: undefined
},
warehouseId: {
- type: [String, Number],
+ type: [String, Number],
default: undefined
}
});
@@ -123,7 +123,7 @@ const getList = async () => {
loading.value = true;
try {
const res = await listInventory(queryParams.value);
- inventoryList.value = res.rows.filter(item =>
+ inventoryList.value = res.rows.filter(item =>
item.inventoryQty > 0 && // 只显示有库存的物料
(item.lockState === '0' || item.lockState === null || item.lockState === undefined || item.lockState === '') && // 允许未锁定或空值
item.inventoryStatus === '1' // 只显示正常状态的库存
@@ -173,7 +173,7 @@ watch(
);
onMounted(async () => {
- await getMaterialCategorySelect();
+ // await getMaterialCategorySelect();
await getList();
});
@@ -187,4 +187,4 @@ defineExpose({
.p-2 {
padding: 8px;
}
-
\ No newline at end of file
+
diff --git a/src/views/wms/linkage/index.vue b/src/views/wms/linkage/index.vue
index dc98dd3..4f0d28e 100644
--- a/src/views/wms/linkage/index.vue
+++ b/src/views/wms/linkage/index.vue
@@ -85,7 +85,7 @@
- 审批
+ 审批
@@ -1174,7 +1174,7 @@ const loadAllTasks = async () => {
const childrenTablePrint = async (row) => {
try {
// 检查是否已经打印过
- const result = await validatePrintable(row.aoDId);
+ const result = await validatePrintable({aoDId: row.aoDId});
if (!result.data) {
ElMessage.warning('该调拨明细已经打印过,不允许重复打印');
return;