From 4eab60e6ec69f55047e84ca05f597283a395e545 Mon Sep 17 00:00:00 2001
From: Tom <manfulmr@outlook.com>
Date: Mon, 29 Dec 2025 10:14:41 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E7=89=A9=E6=96=99=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=89=A9=E6=96=99=E7=8A=B6=E6=80=81=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9=E5=92=8C=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在MmMaterial.vue中添加物料状态选项，并在MmInventory.vue中新增物料编码和仓库名称查询条件，以增强物料管理功能
---
 .../productionMaterial/MmInventory.vue               | 11 ++++++++++-
 .../productionMaterial/MmMaterial.vue                | 12 +++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/views/materialManagement/productionMaterial/MmInventory.vue b/src/views/materialManagement/productionMaterial/MmInventory.vue
index 682100b..0960df7 100644
--- a/src/views/materialManagement/productionMaterial/MmInventory.vue
+++ b/src/views/materialManagement/productionMaterial/MmInventory.vue
@@ -6,6 +6,13 @@
 <template>
     <div>
         <el-form :model="queryParams" label-position="right" inline ref="queryRef" v-show="showSearch" @submit.prevent>
+            <!-- 库存查询功能（按物料编码，仓库名称） -->
+            <el-form-item label="物料编码" prop="materialCode">
+                <el-input v-model="queryParams.materialCode" placeholder="请输入物料编码" />
+            </el-form-item>
+            <el-form-item label="仓库名称" prop="warehouseName">
+                <el-input v-model="queryParams.warehouseName" placeholder="请输入仓库名称" />
+            </el-form-item>
             <el-form-item>
                 <el-button icon="search" type="primary" @click="handleQuery">{{ $t('btn.search') }}</el-button>
                 <el-button icon="refresh" @click="resetQuery">{{ $t('btn.reset') }}</el-button>
@@ -167,7 +174,9 @@ const queryParams = reactive({
     pageNum: 1,
     pageSize: 10,
     sort: '',
-    sortType: 'asc'
+    sortType: 'asc',
+    materialCode: '',
+    warehouseName: ''
 })
 const columns = ref([
     { visible: true, align: 'center', type: '', prop: 'id', label: '主键ID' },
diff --git a/src/views/materialManagement/productionMaterial/MmMaterial.vue b/src/views/materialManagement/productionMaterial/MmMaterial.vue
index c1183d0..52b284f 100644
--- a/src/views/materialManagement/productionMaterial/MmMaterial.vue
+++ b/src/views/materialManagement/productionMaterial/MmMaterial.vue
@@ -13,7 +13,7 @@
             <el-form-item label="物料名称" prop="materialName">
                 <el-input v-model="queryParams.materialName" placeholder="请输入物料名称" />
             </el-form-item>
-            <el-form-item label="物料分类名称" prop="categoryName">
+            <el-form-item label="物料分类名称" prop="categoryCode">
                 <el-select v-model="queryParams.categoryCode" placeholder="请选择">
                     <el-option label="全部" value="" />
                     <el-option v-for="item in materialCategoryOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
@@ -322,6 +322,16 @@ const state = reactive({
                 dictValue: '4',
                 dictLabel: '辅料'
             }
+        ],
+        statusOptions: [
+            {
+                dictValue: '0',
+                dictLabel: '停用'
+            },
+            {
+                dictValue: '1',
+                dictLabel: '启用'
+            }
         ]
     }
 })