From 6acf265fd8bb3067d7ecf38fc134c9db0bea8e37 Mon Sep 17 00:00:00 2001
From: git_rabbit <zhaozhengyi1b@126.com>
Date: Mon, 5 Jan 2026 11:51:13 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat(=E7=89=A9=E6=96=99=E7=AE=A1=E7=90=86):?=
 =?UTF-8?q?=20=E4=BC=98=E5=8C=96=E8=A1=A8=E5=8D=95=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=E5=92=8C=E6=98=BE=E7=A4=BA=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 为所有下拉选择框添加"全部"选项
- 在物料管理页面新增物料标号筛选字段
- 将操作方向输入框改为下拉选择框
- 调整表格列显示顺序和可见性
- 移除冗余的主键ID字段
- 优化表单布局和字段顺序
---
 .../productionMaterial/MmInventory.vue        |  4 +-
 .../productionMaterial/MmLocation.vue         | 10 ++-
 .../productionMaterial/MmMaterial.vue         | 89 +++++++++++--------
 .../productionMaterial/MmMaterialCategory.vue | 11 +--
 .../productionMaterial/MmTransactionType.vue  | 45 +++++-----
 5 files changed, 86 insertions(+), 73 deletions(-)

diff --git a/src/views/materialManagement/productionMaterial/MmInventory.vue b/src/views/materialManagement/productionMaterial/MmInventory.vue
index dc3e73e..f406145 100644
--- a/src/views/materialManagement/productionMaterial/MmInventory.vue
+++ b/src/views/materialManagement/productionMaterial/MmInventory.vue
@@ -15,11 +15,12 @@
                     </el-option>
                 </el-select>
             </el-form-item>
-             <el-form-item label="批次号" prop="batchNo">
+            <el-form-item label="批次号" prop="batchNo">
                 <el-input v-model="queryParams.batchNo" placeholder="请输入批次号" />
             </el-form-item>
             <el-form-item label="库位名称" prop="locationCode">
                 <el-select v-model="queryParams.locationCode" filterable placeholder="请选择">
+                    <el-option label="全部" value=""> </el-option>
                     <el-option v-for="item in locationOptions" :key="item.locationCode" :label="item.locationName" :value="item.locationCode">
                         <span style="float: left">{{ item.locationCode }}</span>
                         <span style="float: right; color: #8492a6; font-size: 13px">{{ item.locationName }}</span>
@@ -28,6 +29,7 @@
             </el-form-item>
             <el-form-item label="仓库名称" prop="warehouseCode">
                 <el-select v-model="queryParams.warehouseCode" filterable placeholder="请选择">
+                    <el-option label="全部" value=""> </el-option>
                     <el-option v-for="item in warehouseOptions" :key="item.warehouseCode" :label="item.warehouseName" :value="item.warehouseCode">
                         <span style="float: left">{{ item.warehouseCode }}</span>
                         <span style="float: right; color: #8492a6; font-size: 13px">{{ item.warehouseName }}</span>
diff --git a/src/views/materialManagement/productionMaterial/MmLocation.vue b/src/views/materialManagement/productionMaterial/MmLocation.vue
index 3669fba..c4a1154 100644
--- a/src/views/materialManagement/productionMaterial/MmLocation.vue
+++ b/src/views/materialManagement/productionMaterial/MmLocation.vue
@@ -8,6 +8,7 @@
         <el-form :model="queryParams" label-position="right" inline ref="queryRef" v-show="showSearch" @submit.prevent>
             <el-form-item label="库位名称" prop="locationCode">
                 <el-select v-model="queryParams.locationCode" filterable placeholder="请选择">
+                    <el-option label="全部" value=""> </el-option>
                     <el-option v-for="item in dataList" :key="item.locationCode" :label="item.locationName" :value="item.locationCode">
                         <span style="float: left">{{ item.locationCode }}</span>
                         <span style="float: right; color: #8492a6; font-size: 13px">{{ item.locationName }}</span>
@@ -16,6 +17,7 @@
             </el-form-item>
             <el-form-item label="仓库名称" prop="warehouseCode">
                 <el-select v-model="queryParams.warehouseCode" filterable placeholder="请选择">
+                    <el-option label="全部" value=""> </el-option>
                     <el-option v-for="item in warehouseOptions" :key="item.warehouseCode" :label="item.warehouseName" :value="item.warehouseCode">
                         <span style="float: left">{{ item.warehouseCode }}</span>
                         <span style="float: right; color: #8492a6; font-size: 13px">{{ item.warehouseName }}</span>
@@ -47,7 +49,13 @@
             @sort-change="sortChange"
             :default-sort="{ prop: 'createdTime', order: 'descending' }">
             <!-- <el-table-column prop="id" label="主键ID" align="center" v-if="columns.showColumn('id')" /> -->
-            <el-table-column prop="createdTime" sortable align="center" label="创建时间" :show-overflow-tooltip="true" v-if="columns.showColumn('createdTime')" />
+            <el-table-column
+                prop="createdTime"
+                sortable
+                align="center"
+                label="创建时间"
+                :show-overflow-tooltip="true"
+                v-if="columns.showColumn('createdTime')" />
             <el-table-column prop="locationCode" label="库位编码" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('locationCode')" />
             <el-table-column prop="locationName" label="库位名称" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('locationName')" />
             <el-table-column prop="warehouseCode" label="仓库编码" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('warehouseCode')" />
diff --git a/src/views/materialManagement/productionMaterial/MmMaterial.vue b/src/views/materialManagement/productionMaterial/MmMaterial.vue
index faa1455..38a7c8e 100644
--- a/src/views/materialManagement/productionMaterial/MmMaterial.vue
+++ b/src/views/materialManagement/productionMaterial/MmMaterial.vue
@@ -13,18 +13,30 @@
             <el-form-item label="物料名称" prop="materialName">
                 <el-input v-model="queryParams.materialName" placeholder="请输入物料名称" />
             </el-form-item>
-            <el-form-item label="物料分类名称" prop="categoryCode">
-                <el-select v-model="queryParams.categoryCode" placeholder="请选择">
-                    <el-option v-for="item in options.materialCodeOptions" :key="item.value" :label="item.label" :value="item.value">
-                        <span style="float: left">{{ item.value }}</span>
-                        <span style="float: right; color: #8492a6; font-size: 13px">{{ item.label }}</span>
-                    </el-option>
-                </el-select>
-            </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>
+            <el-form-item label="物料标号" prop="type">
+                <el-input v-model="queryParams.type" placeholder="请输入物料标号" />
             </el-form-item>
+            <div>
+                <el-form-item label="物料分类名称" prop="categoryCode">
+                    <el-select v-model="queryParams.categoryCode" placeholder="请选择">
+                        <el-option label="全部" value=""> </el-option>
+                        <el-option v-for="item in options.materialCodeOptions" :key="item.value" :label="item.label" :value="item.value">
+                            <span style="float: left">{{ item.value }}</span>
+                            <span style="float: right; color: #8492a6; font-size: 13px">{{ item.label }}</span>
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="状态" prop="status">
+                    <el-select v-model="queryParams.status" placeholder="请选择">
+                        <el-option label="全部" value=""> </el-option>
+                        <el-option v-for="item in options.statusOptions" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue"> </el-option>
+                    </el-select>
+                </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>
+                </el-form-item>
+            </div>
         </el-form>
         <!-- 工具区域 -->
         <el-row :gutter="15" class="mb10">
@@ -46,24 +58,25 @@
             @sort-change="sortChange"
             :default-sort="{ prop: 'createdTime', order: 'descending' }">
             <!-- <el-table-column prop="id" label="主键ID" align="center" v-if="columns.showColumn('id')" /> -->
-            <el-table-column prop="createdTime" sortable label="创建时间" :show-overflow-tooltip="true" v-if="columns.showColumn('createdTime')" />
-            <el-table-column prop="materialCode" label="物料编码" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('materialCode')" />
-            <el-table-column prop="materialName" label="物料名称" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('materialName')" />
-            <el-table-column prop="specification" label="规格型号" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('specification')" />
-            <el-table-column prop="categoryCode" label="物料分类编码" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('categoryCode')" />
-            <el-table-column prop="categoryName" label="物料分类名称" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('categoryName')" />
-            <el-table-column prop="unit" label="计量单位" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('unit')" />
-            <el-table-column prop="type" label="物料类型" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('type')" />
-            <el-table-column prop="supplierCode" label="供应商编码" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('supplierCode')" />
-            <el-table-column prop="supplierName" label="供应商名称" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('supplierName')" />
+            <!-- <el-table-column prop="createdTime" sortable label="创建时间" v-if="columns.showColumn('createdTime')" /> -->
+            <el-table-column prop="type" label="标号" align="center" v-if="columns.showColumn('type')" />
+            <el-table-column prop="materialCode" label="物料编码" align="center" v-if="columns.showColumn('materialCode')" />
+            <el-table-column prop="materialName" label="物料名称" align="center" v-if="columns.showColumn('materialName')" />
+            <el-table-column prop="specification" label="规格型号" align="center" v-if="columns.showColumn('specification')" />
+            <el-table-column prop="categoryCode" label="物料分类编码" align="center" v-if="columns.showColumn('categoryCode')" />
+            <el-table-column prop="categoryName" label="物料分类名称" align="center" v-if="columns.showColumn('categoryName')" />
+            <el-table-column prop="unit" label="计量单位" align="center" v-if="columns.showColumn('unit')" />
+
+            <el-table-column prop="supplierCode" label="供应商编码" align="center" v-if="columns.showColumn('supplierCode')" />
+            <el-table-column prop="supplierName" label="供应商名称" align="center" v-if="columns.showColumn('supplierName')" />
             <el-table-column prop="safetyStock" label="安全库存" align="center" v-if="columns.showColumn('safetyStock')" />
-            <el-table-column prop="status" label="状态(停用/启用)" align="center" v-if="columns.showColumn('status')">
+            <el-table-column prop="status" label="状态" align="center" v-if="columns.showColumn('status')">
                 <template #default="scope">
                     <dict-tag :options="options.statusOptions" :value="scope.row.status" />
                 </template>
             </el-table-column>
-            <el-table-column prop="updatedTime" label="更新时间" :show-overflow-tooltip="true" v-if="columns.showColumn('updatedTime')" />
-            <el-table-column prop="description" label="描述" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('description')" />
+            <el-table-column prop="updatedTime" label="更新时间" v-if="columns.showColumn('updatedTime')" />
+            <el-table-column prop="description" label="描述" align="center" v-if="columns.showColumn('description')" />
             <el-table-column label="操作" width="160">
                 <template #default="scope">
                     <el-button
@@ -88,12 +101,6 @@
         <el-dialog :title="title" :lock-scroll="false" v-model="open">
             <el-form ref="formRef" :model="form" :rules="rules" label-width="100px">
                 <el-row :gutter="20">
-                    <el-col :lg="12" v-if="opertype != 1">
-                        <el-form-item label="主键ID" prop="id">
-                            <el-input-number v-model.number="form.id" controls-position="right" placeholder="请输入主键ID" :disabled="true" />
-                        </el-form-item>
-                    </el-col>
-
                     <el-col :lg="12">
                         <el-form-item label="物料编码" prop="materialCode">
                             <el-input v-model="form.materialCode" placeholder="请输入物料编码" />
@@ -106,6 +113,12 @@
                         </el-form-item>
                     </el-col>
 
+                    <el-col :lg="12">
+                        <el-form-item label="物料标号" prop="type">
+                            <el-input v-model="form.type" placeholder="请输入物料标号" />
+                        </el-form-item>
+                    </el-col>
+
                     <el-col :lg="12">
                         <el-form-item label="规格型号" prop="specification">
                             <el-input v-model="form.specification" placeholder="请输入规格型号" />
@@ -129,12 +142,6 @@
                         </el-form-item>
                     </el-col>
 
-                    <el-col :lg="12">
-                        <el-form-item label="计量单位" prop="unit">
-                            <el-input v-model="form.unit" placeholder="请输入计量单位" />
-                        </el-form-item>
-                    </el-col>
-
                     <el-col :lg="12">
                         <el-form-item label="供应商编码" prop="supplierCode">
                             <el-input v-model="form.supplierCode" placeholder="请输入供应商编码" />
@@ -147,6 +154,12 @@
                         </el-form-item>
                     </el-col>
 
+                    <el-col :lg="12">
+                        <el-form-item label="计量单位" prop="unit">
+                            <el-input v-model="form.unit" placeholder="请输入计量单位" />
+                        </el-form-item>
+                    </el-col>
+
                     <el-col :lg="12">
                         <el-form-item label="安全库存" prop="safetyStock">
                             <el-input v-model="form.safetyStock" placeholder="请输入安全库存" />
@@ -165,7 +178,7 @@
 
                     <el-col :lg="12">
                         <el-form-item label="描述" prop="description">
-                            <el-input v-model="form.description" placeholder="请输入描述" />
+                            <el-input type="textarea" rows="4" v-model="form.description" placeholder="请输入描述" />
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -212,7 +225,7 @@ const columns = ref([
     { visible: true, align: 'center', type: '', prop: 'supplierCode', label: '供应商编码', showOverflowTooltip: true },
     { visible: true, align: 'center', type: '', prop: 'supplierName', label: '供应商名称', showOverflowTooltip: true },
     { visible: false, align: 'center', type: '', prop: 'safetyStock', label: '安全库存' },
-    { visible: false, align: 'center', type: 'dict', prop: 'status', label: '状态(停用/启用)', showOverflowTooltip: true },
+    { visible: true, align: 'center', type: 'dict', prop: 'status', label: '状态', showOverflowTooltip: true },
     { visible: true, align: 'center', type: '', prop: 'createdTime', label: '创建时间', showOverflowTooltip: true },
     { visible: false, align: 'center', type: '', prop: 'updatedTime', label: '更新时间', showOverflowTooltip: true },
     { visible: false, align: 'center', type: '', prop: 'description', label: '描述', showOverflowTooltip: true }
diff --git a/src/views/materialManagement/productionMaterial/MmMaterialCategory.vue b/src/views/materialManagement/productionMaterial/MmMaterialCategory.vue
index fc0b040..8c65cf0 100644
--- a/src/views/materialManagement/productionMaterial/MmMaterialCategory.vue
+++ b/src/views/materialManagement/productionMaterial/MmMaterialCategory.vue
@@ -12,6 +12,7 @@
             </el-form-item>
             <el-form-item label="状态" prop="status">
                 <el-select v-model="queryParams.status" placeholder="请选择">
+                    <el-option label="全部" value=""> </el-option>
                     <el-option label="启用" value="启用"> </el-option>
                     <el-option label="停用" value="停用"> </el-option>
                 </el-select>
@@ -77,12 +78,6 @@
         <el-dialog :title="title" :lock-scroll="false" v-model="open">
             <el-form ref="formRef" :model="form" :rules="rules" label-width="100px">
                 <el-row :gutter="20">
-                    <el-col :lg="12" v-if="opertype != 1">
-                        <el-form-item label="主键ID" prop="id">
-                            <el-input-number v-model.number="form.id" controls-position="right" placeholder="请输入主键ID" :disabled="true" />
-                        </el-form-item>
-                    </el-col>
-
                     <el-col :lg="12">
                         <el-form-item label="分类编码" prop="categoryCode">
                             <el-input v-model="form.categoryCode" placeholder="请输入分类编码" />
@@ -116,7 +111,7 @@
                             </el-radio-group>
                         </el-form-item>
                     </el-col>
-                    
+
                     <el-col :lg="12">
                         <el-form-item label="描述" prop="description">
                             <el-input v-model="form.description" placeholder="请输入描述" />
@@ -232,7 +227,7 @@ const state = reactive({
     single: true,
     multiple: true,
     form: {
-        status: '启用',
+        status: '启用'
     },
     rules: {
         categoryCode: [{ required: true, message: '分类编码不能为空', trigger: 'blur' }],
diff --git a/src/views/materialManagement/productionMaterial/MmTransactionType.vue b/src/views/materialManagement/productionMaterial/MmTransactionType.vue
index 79da30c..db3cbd9 100644
--- a/src/views/materialManagement/productionMaterial/MmTransactionType.vue
+++ b/src/views/materialManagement/productionMaterial/MmTransactionType.vue
@@ -82,12 +82,6 @@
         <el-dialog :title="title" :lock-scroll="false" v-model="open">
             <el-form ref="formRef" :model="form" :rules="rules" label-width="100px">
                 <el-row :gutter="20">
-                    <el-col :lg="12" v-if="opertype != 1">
-                        <el-form-item label="主键ID" prop="id">
-                            <el-input-number v-model.number="form.id" controls-position="right" placeholder="请输入主键ID" :disabled="true" />
-                        </el-form-item>
-                    </el-col>
-
                     <el-col :lg="12">
                         <el-form-item label="类别编码" prop="typeCode">
                             <el-input v-model="form.typeCode" placeholder="请输入类别编码" />
@@ -102,7 +96,13 @@
 
                     <el-col :lg="12">
                         <el-form-item label="操作方向" prop="transactionDirection">
-                            <el-input v-model="form.transactionDirection" placeholder="请输入操作方向" />
+                            <el-select v-model="form.transactionDirection" placeholder="请选择操作方向">
+                                <el-option
+                                    v-for="item in options.transactionTypeOptions"
+                                    :key="item.dictValue"
+                                    :value="item.dictValue"
+                                    :label="item.dictLabel" />
+                            </el-select>
                         </el-form-item>
                     </el-col>
 
@@ -121,20 +121,6 @@
                             </el-radio-group>
                         </el-form-item>
                     </el-col>
-
-                    <el-col :lg="12">
-                        <el-form-item label="创建时间" prop="createdTime">
-                            <el-date-picker v-model="form.createdTime" type="datetime" placeholder="选择日期时间" value-format="YYYY-MM-DD HH:mm:ss">
-                            </el-date-picker>
-                        </el-form-item>
-                    </el-col>
-
-                    <el-col :lg="12">
-                        <el-form-item label="更新时间" prop="updatedTime">
-                            <el-date-picker v-model="form.updatedTime" type="datetime" placeholder="选择日期时间" value-format="YYYY-MM-DD HH:mm:ss">
-                            </el-date-picker>
-                        </el-form-item>
-                    </el-col>
                 </el-row>
             </el-form>
             <template #footer v-if="opertype != 3">
@@ -168,7 +154,7 @@ const queryParams = reactive({
 })
 const columns = ref([
     // { visible: true, align: 'center', type: '', prop: 'id', label: '主键ID' },
-    { visible: false, align: 'center', type: '', prop: 'typeCode', label: '类别编码', showOverflowTooltip: true },
+    { visible: true, align: 'center', type: '', prop: 'typeCode', label: '类别编码', showOverflowTooltip: true },
     { visible: true, align: 'center', type: '', prop: 'typeName', label: '类别名称', showOverflowTooltip: true },
     { visible: true, align: 'center', type: '', prop: 'transactionDirection', label: '操作方向', showOverflowTooltip: true },
     { visible: true, align: 'center', type: '', prop: 'description', label: '描述', showOverflowTooltip: true },
@@ -236,7 +222,7 @@ const state = reactive({
     rules: {
         typeCode: [{ required: true, message: '类别编码不能为空', trigger: 'blur' }],
         typeName: [{ required: true, message: '类别名称不能为空', trigger: 'blur' }],
-        transactionDirection: [{ required: true, message: '操作方向(入库/出库)不能为空', trigger: 'blur' }]
+        transactionDirection: [{ required: true, message: '操作方向不能为空', trigger: 'blur' }]
     },
     options: {
         // 状态(停用/启用) 选项列表 格式 eg:{ dictLabel: '标签', dictValue: '0'}
@@ -249,9 +235,18 @@ const state = reactive({
                 dictValue: '启用',
                 dictLabel: '启用'
             }
+        ],
+        transactionTypeOptions: [
+            {
+                dictValue: '入库',
+                dictLabel: '入库'
+            },
+            {
+                dictValue: '出库',
+                dictLabel: '出库'
+            }
         ]
-    },
-    transactionTypeOptions: []
+    }
 })
 
 const { form, rules, options, transactionTypeOptions, single, multiple } = toRefs(state)

From 158570af1ccbd9a9a21245d2bf5c3350a69b3893 Mon Sep 17 00:00:00 2001
From: git_rabbit <zhaozhengyi1b@126.com>
Date: Mon, 5 Jan 2026 12:55:23 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat(=E5=BA=93=E5=AD=98=E7=AE=A1=E7=90=86):?=
 =?UTF-8?q?=20=E4=BC=98=E5=8C=96=E6=9F=A5=E7=9C=8B=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=E4=B8=8B=E7=9A=84=E8=A1=A8=E5=8D=95=E5=AD=97=E6=AE=B5=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

调整MmInventory.vue页面查看模式下的表单字段可编辑状态，仅允许编辑批次号、库存量和库位字段
修改MmTransactionType.vue查询表单，增加类别编号和状态筛选
优化MmLocation.vue表格列显示，移除不必要的溢出提示
重构出入库对话框表单布局和字段禁用逻辑
---
 .../productionMaterial/MmInventory.vue        | 112 ++++++++++--------
 .../productionMaterial/MmLocation.vue         |  32 ++---
 .../productionMaterial/MmTransactionType.vue  |  16 ++-
 3 files changed, 87 insertions(+), 73 deletions(-)

diff --git a/src/views/materialManagement/productionMaterial/MmInventory.vue b/src/views/materialManagement/productionMaterial/MmInventory.vue
index f406145..0c2279e 100644
--- a/src/views/materialManagement/productionMaterial/MmInventory.vue
+++ b/src/views/materialManagement/productionMaterial/MmInventory.vue
@@ -9,6 +9,7 @@
             <!-- 库存查询功能（按物料编码，仓库名称） -->
             <el-form-item label="物料名称" prop="materialCode">
                 <el-select v-model="queryParams.materialCode" filterable placeholder="请选择">
+                    <el-option label="全部" value=""> </el-option>
                     <el-option v-for="item in options" :key="item.materialCode" :label="item.materialName" :value="item.materialCode">
                         <span style="float: left">{{ item.materialCode }}</span>
                         <span style="float: right; color: #8492a6; font-size: 13px">{{ item.materialName }}</span>
@@ -64,18 +65,20 @@
             @sort-change="sortChange"
             :default-sort="{ prop: 'createdTime', order: 'descending' }">
             <!-- <el-table-column prop="id" label="主键ID" align="center" v-if="columns.showColumn('id')" /> -->
-            <el-table-column prop="lastUpdatedTime" sortable label="最后更新时间" :show-overflow-tooltip="true" v-if="columns.showColumn('lastUpdatedTime')" />
-            <el-table-column prop="materialCode" label="物料编码" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('materialCode')" />
-            <el-table-column prop="warehouseCode" label="仓库编码" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('warehouseCode')" />
-            <el-table-column prop="warehouseName" label="仓库名称" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('warehouseName')" />
-            <el-table-column prop="locationCode" label="库位编码" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('locationCode')" />
-            <el-table-column prop="locationName" label="库位名称" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('locationName')" />
-            <el-table-column prop="batchNo" label="批次号" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('batchNo')" />
+
+            <el-table-column prop="materialCode" label="物料编码" align="center" v-if="columns.showColumn('materialCode')" />
+            <el-table-column prop="batchNo" label="批次号" align="center" v-if="columns.showColumn('batchNo')" />
             <el-table-column prop="currentQty" label="当前库存量" align="center" v-if="columns.showColumn('currentQty')" />
-            <el-table-column prop="unit" label="计量单位" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('unit')" />
-            <el-table-column prop="productionDate" label="生产日期" :show-overflow-tooltip="true" v-if="columns.showColumn('productionDate')" />
-            <el-table-column prop="expiryDate" label="有效期至" :show-overflow-tooltip="true" v-if="columns.showColumn('expiryDate')" />
-            <el-table-column prop="createdTime" label="创建时间" :show-overflow-tooltip="true" v-if="columns.showColumn('createdTime')" />
+            <el-table-column prop="warehouseCode" label="仓库编码" align="center" v-if="columns.showColumn('warehouseCode')" />
+            <el-table-column prop="warehouseName" label="仓库名称" align="center" v-if="columns.showColumn('warehouseName')" />
+            <el-table-column prop="locationCode" label="库位编码" align="center" v-if="columns.showColumn('locationCode')" />
+            <el-table-column prop="locationName" label="库位名称" align="center" v-if="columns.showColumn('locationName')" />
+
+            <el-table-column prop="unit" label="计量单位" align="center" v-if="columns.showColumn('unit')" />
+            <el-table-column prop="productionDate" label="生产日期" v-if="columns.showColumn('productionDate')" />
+            <el-table-column prop="expiryDate" label="有效期至" v-if="columns.showColumn('expiryDate')" />
+            <el-table-column prop="createdTime" label="创建时间" v-if="columns.showColumn('createdTime')" />
+            <el-table-column prop="lastUpdatedTime" sortable label="最后更新时间" v-if="columns.showColumn('lastUpdatedTime')" />
             <el-table-column label="操作" width="160">
                 <template #default="scope">
                     <el-button
@@ -107,16 +110,16 @@
                         </el-form-item>
                     </el-col> -->
 
-                    <el-col :lg="12">
+                    <!-- <el-col :lg="12" v-if="opertype == 1">
                         <el-form-item label="入库单号" prop="inboundNo">
-                            <el-input v-model="form.inboundNo" placeholder="请输入入库单号" />
+                            <el-input v-model="form.inboundNo" placeholder="请输入入库单号" :disabled="opertype == 3" />
                         </el-form-item>
-                    </el-col>
+                    </el-col> -->
 
                     <el-col :lg="12">
                         <el-form-item label="物料编码" prop="materialCode">
-                            <el-select @change="handleMaterialChange" v-model="form.materialCode" filterable placeholder="请选择">
-                                <el-option v-for="item in options" :key="item.materialCode" :label="item.materialCode" :value="item">
+                            <el-select @change="handleMaterialChange" v-model="form.materialCode" filterable placeholder="请选择" :disabled="opertype == 3">
+                                <el-option v-for="(item, index) in options" :key="index" :label="item.materialCode" :value="item">
                                     <span style="float: left">{{ item.materialCode }}</span>
                                     <span style="float: right; color: #8492a6; font-size: 13px">{{ item.materialName }}</span>
                                 </el-option>
@@ -159,22 +162,20 @@
                     </el-col>
 
                     <el-col :lg="12">
-                        <el-form-item label="入库数量" prop="quantity">
-                            <el-input v-model="form.quantity" placeholder="请输入入库数量" />
+                        <el-form-item label="仓库编码" prop="warehouseCode">
+                            <el-input :disabled="true" v-model="form.warehouseCode" placeholder="请输入仓库编码" />
                         </el-form-item>
                     </el-col>
-
                     <el-col :lg="12">
                         <el-form-item label="入库类型" prop="transactionType">
-                            <el-select v-model="form.transactionType" filterable placeholder="请选择">
+                            <el-select v-model="form.transactionType" filterable placeholder="请选择" :disabled="opertype == 3">
                                 <el-option v-for="item in transactionOptions" :key="item.id" :label="item.typeCode" :value="item.typeName"> </el-option>
                             </el-select>
                         </el-form-item>
                     </el-col>
-
                     <el-col :lg="12">
-                        <el-form-item label="仓库编码" prop="warehouseCode">
-                            <el-input :disabled="true" v-model="form.warehouseCode" placeholder="请输入仓库编码" />
+                        <el-form-item label="入库数量" prop="quantity">
+                            <el-input v-model="form.quantity" placeholder="请输入入库数量" :disabled="opertype == 3" />
                         </el-form-item>
                     </el-col>
 
@@ -186,7 +187,7 @@
 
                     <el-col :lg="12">
                         <el-form-item label="操作员" prop="operator">
-                            <el-input v-model="form.operator" placeholder="请输入操作员" />
+                            <el-input v-model="form.operator" placeholder="请输入操作员" :disabled="opertype == 3" />
                         </el-form-item>
                     </el-col>
 
@@ -211,12 +212,17 @@
                         </el-form-item>
                     </el-col> -->
 
-                    <el-col :lg="12" v-if="opertype != 1">
+                    <!-- <el-col :lg="12" v-if="opertype != 1">
                         <el-form-item label="创建时间" prop="createdTime">
-                            <el-date-picker v-model="form.createdTime" type="datetime" placeholder="选择日期时间" value-format="YYYY-MM-DD HH:mm:ss">
+                            <el-date-picker
+                                v-model="form.createdTime"
+                                type="datetime"
+                                placeholder="选择日期时间"
+                                value-format="YYYY-MM-DD HH:mm:ss"
+                                :disabled="opertype == 3">
                             </el-date-picker>
                         </el-form-item>
-                    </el-col>
+                    </el-col> -->
                 </el-row>
             </el-form>
             <template #footer v-if="opertype != 3">
@@ -234,15 +240,15 @@
                         </el-form-item>
                     </el-col> -->
 
-                    <el-col :lg="12">
+                    <!-- <el-col :lg="12" v-if="opertype == 1">
                         <el-form-item label="出库单号" prop="outboundNo">
-                            <el-input v-model="form.outboundNo" placeholder="请输入出库单号" />
+                            <el-input v-model="form.outboundNo" placeholder="请输入出库单号" :disabled="opertype == 3" />
                         </el-form-item>
-                    </el-col>
+                    </el-col> -->
 
                     <el-col :lg="12">
                         <el-form-item label="物料编码" prop="materialCode">
-                            <el-select @change="handleMaterialChange" v-model="form.materialCode" filterable placeholder="请选择">
+                            <el-select @change="handleMaterialChange" v-model="form.materialCode" filterable placeholder="请选择" :disabled="opertype == 2">
                                 <el-option v-for="item in options" :key="item.materialCode" :label="item.materialCode" :value="item">
                                     <span style="float: left">{{ item.materialCode }}</span>
                                     <span style="float: right; color: #8492a6; font-size: 13px">{{ item.materialName }}</span>
@@ -281,21 +287,25 @@
                         </el-form-item>
                     </el-col>
 
-                    <el-col :lg="12">
+                    <el-col :lg="12" v-if="opertype == 1">
                         <el-form-item label="出库数量" prop="quantity">
-                            <el-input v-model="form.quantity" placeholder="请输入入库数量" />
+                            <el-input v-model="form.quantity" placeholder="请输入入库数量" :disabled="opertype == 2" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :lg="12" v-if="opertype == 2">
+                        <el-form-item label="库存数量" prop="currentQty">
+                            <el-input v-model="form.currentQty" :disabled="opertype == 2" />
                         </el-form-item>
                     </el-col>
-
                     <!-- <el-col :lg="12">
                         <el-form-item label="规格型号" prop="specificationModel">
                             <el-input v-model="form.specificationModel" placeholder="请输入规格型号" />
                         </el-form-item>
                     </el-col> -->
 
-                    <el-col :lg="12">
+                    <el-col :lg="12" v-if="opertype == 1">
                         <el-form-item label="出库类型" prop="transactionType">
-                            <el-select v-model="form.transactionType" filterable placeholder="请选择">
+                            <el-select v-model="form.transactionType" filterable placeholder="请选择" :disabled="opertype == 2">
                                 <el-option v-for="item in transactionOptions" :key="item.id" :label="item.typeCode" :value="item.typeName"> </el-option>
                             </el-select>
                         </el-form-item>
@@ -315,7 +325,7 @@
 
                     <el-col :lg="12">
                         <el-form-item label="操作员" prop="operator">
-                            <el-input v-model="form.operator" placeholder="请输入操作员" />
+                            <el-input v-model="form.operator" placeholder="请输入操作员" :disabled="opertype == 3" />
                         </el-form-item>
                     </el-col>
 
@@ -340,12 +350,17 @@
                         </el-form-item>
                     </el-col> -->
 
-                    <el-col :lg="12" v-if="opertype != 1">
+                    <!-- <el-col :lg="12" v-if="opertype != 1">
                         <el-form-item label="创建时间" prop="createdTime">
-                            <el-date-picker v-model="form.createdTime" type="datetime" placeholder="选择日期时间" value-format="YYYY-MM-DD HH:mm:ss">
+                            <el-date-picker
+                                v-model="form.createdTime"
+                                type="datetime"
+                                placeholder="选择日期时间"
+                                value-format="YYYY-MM-DD HH:mm:ss"
+                                :disabled="opertype == 3">
                             </el-date-picker>
                         </el-form-item>
-                    </el-col>
+                    </el-col> -->
                 </el-row>
             </el-form>
             <template #footer v-if="opertype != 3">
@@ -396,8 +411,8 @@ const columns = ref([
     { visible: false, align: 'center', type: '', prop: 'unit', label: '计量单位', showOverflowTooltip: true },
     { visible: false, align: 'center', type: '', prop: 'productionDate', label: '生产日期', showOverflowTooltip: true },
     { visible: false, align: 'center', type: '', prop: 'expiryDate', label: '有效期至', showOverflowTooltip: true },
-    { visible: true, align: 'center', type: '', prop: 'lastUpdatedTime', label: '最后更新时间', showOverflowTooltip: true },
-    { visible: false, align: 'center', type: '', prop: 'createdTime', label: '创建时间', showOverflowTooltip: true }
+    { visible: false, align: 'center', type: '', prop: 'lastUpdatedTime', label: '最后更新时间', showOverflowTooltip: true },
+    { visible: true, align: 'center', type: '', prop: 'createdTime', label: '创建时间', showOverflowTooltip: true }
     //{ visible: false, prop: 'actions', label: '操作', type: 'slot', width: '160' }
 ])
 const total = ref(0)
@@ -460,14 +475,16 @@ const state = reactive({
         transactionType: [{ required: true, message: '入库类型不能为空', trigger: 'blur' }],
         quantity: [{ required: true, message: '入库数量不能为空', trigger: 'blur' }],
         warehouseCode: [{ required: true, message: '仓库编码不能为空', trigger: 'blur' }],
-        inboundNo: [{ required: true, message: '入库单号不能为空', trigger: 'blur' }]
+        // inboundNo: [{ required: true, message: '入库单号不能为空', trigger: 'blur' }],
+        batchNo: [{ required: true, message: '批次号不能为空', trigger: 'blur' }]
     },
     rulesOut: {
         materialCode: [{ required: true, message: '物料编码不能为空', trigger: 'blur' }],
         transactionType: [{ required: true, message: '入库类型不能为空', trigger: 'blur' }],
         quantity: [{ required: true, message: '入库数量不能为空', trigger: 'blur' }],
         warehouseCode: [{ required: true, message: '仓库编码不能为空', trigger: 'blur' }],
-        outboundNo: [{ required: true, message: '出库单号不能为空', trigger: 'blur' }]
+        // outboundNo: [{ required: true, message: '出库单号不能为空', trigger: 'blur' }],
+        batchNo: [{ required: true, message: '批次号不能为空', trigger: 'blur' }]
     },
     options: {},
     transactionOptions: {},
@@ -507,20 +524,21 @@ function reset() {
 // 填入库单操作
 function handleStorage() {
     reset()
-    openStorage.value = true
+
     title.value = '填写入库单信息'
     opertype.value = 1
     inOrOut.value = '入库'
     getTypeOfWarehousingList()
+    openStorage.value = true
 }
 // 出库操作
 function handleOutStorage() {
     reset()
-    openOutStorage.value = true
     title.value = '填写出库单信息'
     opertype.value = 1
     inOrOut.value = '出库'
     getTypeOfWarehousingList()
+    openOutStorage.value = true
 }
 // 修改按钮操作
 function handleUpdate(row) {
@@ -530,7 +548,7 @@ function handleUpdate(row) {
         const { code, data } = res
         if (code == 200) {
             openOutStorage.value = true
-            title.value = '修改库存表'
+            title.value = '修改库存'
             opertype.value = 2
 
             form.value = {
diff --git a/src/views/materialManagement/productionMaterial/MmLocation.vue b/src/views/materialManagement/productionMaterial/MmLocation.vue
index c4a1154..a33bc9b 100644
--- a/src/views/materialManagement/productionMaterial/MmLocation.vue
+++ b/src/views/materialManagement/productionMaterial/MmLocation.vue
@@ -49,21 +49,15 @@
             @sort-change="sortChange"
             :default-sort="{ prop: 'createdTime', order: 'descending' }">
             <!-- <el-table-column prop="id" label="主键ID" align="center" v-if="columns.showColumn('id')" /> -->
-            <el-table-column
-                prop="createdTime"
-                sortable
-                align="center"
-                label="创建时间"
-                :show-overflow-tooltip="true"
-                v-if="columns.showColumn('createdTime')" />
-            <el-table-column prop="locationCode" label="库位编码" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('locationCode')" />
-            <el-table-column prop="locationName" label="库位名称" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('locationName')" />
-            <el-table-column prop="warehouseCode" label="仓库编码" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('warehouseCode')" />
-            <el-table-column prop="warehouseName" label="仓库名称" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('warehouseName')" />
-            <el-table-column prop="areaCode" label="区域编码" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('areaCode')" />
-            <el-table-column prop="areaName" label="区域名称" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('areaName')" />
+            <!-- <el-table-column prop="createdTime" sortable align="center" label="创建时间" v-if="columns.showColumn('createdTime')" /> -->
+            <el-table-column prop="locationCode" label="库位编码" align="center" v-if="columns.showColumn('locationCode')" />
+            <el-table-column prop="locationName" label="库位名称" align="center" v-if="columns.showColumn('locationName')" />
+            <el-table-column prop="warehouseCode" label="仓库编码" align="center" v-if="columns.showColumn('warehouseCode')" />
+            <el-table-column prop="warehouseName" label="仓库名称" align="center" v-if="columns.showColumn('warehouseName')" />
+            <el-table-column prop="areaCode" label="区域编码" align="center" v-if="columns.showColumn('areaCode')" />
+            <el-table-column prop="areaName" label="区域名称" align="center" v-if="columns.showColumn('areaName')" />
             <el-table-column prop="capacity" label="容量" align="center" v-if="columns.showColumn('capacity')" />
-            <el-table-column prop="unit" label="容量单位" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('unit')" />
+            <el-table-column prop="unit" label="容量单位" align="center" v-if="columns.showColumn('unit')" />
             <el-table-column prop="locationType" label="库位类型" align="center" v-if="columns.showColumn('locationType')">
                 <template #default="scope">
                     <dict-tag :options="options.locationTypeOptions" :value="scope.row.locationType" />
@@ -74,8 +68,8 @@
                     <dict-tag :options="options.statusOptions" :value="scope.row.status" />
                 </template>
             </el-table-column>
-            <el-table-column prop="updatedTime" label="更新时间" :show-overflow-tooltip="true" v-if="columns.showColumn('updatedTime')" />
-            <el-table-column prop="description" label="描述" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('description')" />
+            <el-table-column prop="updatedTime" label="更新时间" v-if="columns.showColumn('updatedTime')" />
+            <el-table-column prop="description" label="描述" align="center" v-if="columns.showColumn('description')" />
             <el-table-column label="操作" width="160">
                 <template #default="scope">
                     <el-button
@@ -100,12 +94,6 @@
         <el-dialog :title="title" :lock-scroll="false" v-model="open">
             <el-form ref="formRef" :model="form" :rules="rules" label-width="100px">
                 <el-row :gutter="20">
-                    <el-col :lg="12" v-if="opertype != 1">
-                        <el-form-item label="主键ID" prop="id">
-                            <el-input-number v-model.number="form.id" controls-position="right" placeholder="请输入主键ID" :disabled="true" />
-                        </el-form-item>
-                    </el-col>
-
                     <el-col :lg="12">
                         <el-form-item label="库位编码" prop="locationCode">
                             <el-input v-model="form.locationCode" placeholder="请输入库位编码" />
diff --git a/src/views/materialManagement/productionMaterial/MmTransactionType.vue b/src/views/materialManagement/productionMaterial/MmTransactionType.vue
index db3cbd9..980de3e 100644
--- a/src/views/materialManagement/productionMaterial/MmTransactionType.vue
+++ b/src/views/materialManagement/productionMaterial/MmTransactionType.vue
@@ -6,18 +6,26 @@
 <template>
     <div>
         <el-form :model="queryParams" label-position="right" inline ref="queryRef" v-show="showSearch" @submit.prevent>
+            <el-form-item label="类别编号" prop="typeCode">
+                <el-input v-model="queryParams.typeCode" placeholder="请输入类别编号" clearable />
+            </el-form-item>
             <el-form-item label="类别名称" prop="typeName">
-                <el-select @focus="getTypeOfWarehousingList" v-model="queryParams.typeName" placeholder="请选择">
-                    <el-option label="全部" value="" />
-                    <el-option v-for="item in transactionTypeOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
-                </el-select>
+                <el-input v-model="queryParams.typeName" placeholder="请输入类别名称" clearable />
             </el-form-item>
             <el-form-item label="操作方向" prop="transactionDirection">
                 <el-select v-model="queryParams.transactionDirection" placeholder="请选择">
+                    <el-option label="全部" value=""> </el-option>
                     <el-option label="出库" value="出库" />
                     <el-option label="入库" value="入库" />
                 </el-select>
             </el-form-item>
+            <el-form-item label="状态" prop="status">
+                <el-select v-model="queryParams.status" placeholder="请选择">
+                    <el-option label="全部" value=""> </el-option>
+                    <el-option label="启用" value="启用" />
+                    <el-option label="停用" value="停用" />
+                </el-select>
+            </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>