From c77a12ce7f16b55f951e946bffdd5e4366cf9c91 Mon Sep 17 00:00:00 2001
From: Tom <manfulmr@outlook.com>
Date: Wed, 14 Jan 2026 18:23:28 +0800
Subject: [PATCH] =?UTF-8?q?feat(MmInventory):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E9=AB=98=E5=BA=A6=E5=92=8C=E6=92=A4=E9=94=80?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 为表格添加固定高度以优化显示
- 在出入库记录表格中添加撤销操作按钮
- 调整对话框位置和分页参数绑定
---
 .../productionMaterial/MmInventory.vue        | 40 ++++++++++++++-----
 1 file changed, 31 insertions(+), 9 deletions(-)

diff --git a/src/views/materialManagement/productionMaterial/MmInventory.vue b/src/views/materialManagement/productionMaterial/MmInventory.vue
index 40eb440..0c499e9 100644
--- a/src/views/materialManagement/productionMaterial/MmInventory.vue
+++ b/src/views/materialManagement/productionMaterial/MmInventory.vue
@@ -41,13 +41,6 @@
                     </el-option>
                 </el-select>
             </el-form-item>
-            <!-- <el-form-item label="出入库" prop="inOrOut">
-                <el-select v-model="queryParams.inOrOut" filterable placeholder="请选择">
-                    <el-option label="全部" value=""> </el-option>
-                    <el-option label="入库" value="入库"></el-option>
-                    <el-option label="出库" value="出库"></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>
@@ -79,6 +72,7 @@
         <el-table
             :data="dataList"
             v-loading="loading"
+            height="66vh"
             ref="table"
             border
             header-cell-class-name="el-table-header-cell"
@@ -544,7 +538,7 @@
         </el-dialog>
 
         <!-- 进出库记录弹出框 -->
-        <el-dialog :title="title" v-model="openRecord" width="80%">
+        <el-dialog :title="title" v-model="openRecord" width="80%" top="5vh">
             <el-form :model="queryParamsRecord" label-position="right" inline ref="queryRecordRef" @submit.prevent>
                 <el-form-item label="出入库" prop="searchType">
                     <el-select @change="handleRecordFlagChange" v-model="queryParamsRecord.recordFlag" filterable placeholder="请选择出入库">
@@ -578,6 +572,7 @@
             <el-table
                 v-if="inoroutFlag == '出库'"
                 :data="recordData"
+                height="64vh"
                 v-loading="loading"
                 ref="table"
                 border
@@ -606,10 +601,24 @@
                 <el-table-column prop="workorder" label="工单号" align="center" v-if="columns.showColumn('workorder')" />
                 <el-table-column prop="operator" label="操作员" align="center" v-if="columns.showColumn('operator')" />
                 <el-table-column prop="remarks" label="备注" align="center" v-if="columns.showColumn('remarks')" />
+                <el-table-column label="操作">
+                    <template #default="scope">
+                        <el-button
+                            type="info"
+                            size="small"
+                            icon="refresh-left"
+                            title="删除"
+                            v-hasPermi="['mmrecordinbound:delete']"
+                            @click="handleDelete(scope.row)"
+                            >撤销</el-button
+                        >
+                    </template>
+                </el-table-column>
             </el-table>
             <el-table
                 v-if="inoroutFlag == '入库'"
                 :data="recordData"
+                height="64vh"
                 v-loading="loading"
                 ref="table"
                 border
@@ -636,8 +645,21 @@
                 <el-table-column prop="warehouseCode" label="仓库编码" align="center" v-if="columns.showColumn('warehouseCode')" />
                 <el-table-column prop="batchNo" label="批次号" align="center" v-if="columns.showColumn('batchNo')" />
                 <el-table-column prop="operator" label="操作员" align="center" v-if="columns.showColumn('operator')" />
+                <el-table-column label="操作">
+                    <template #default="scope">
+                        <el-button
+                            type="info"
+                            size="small"
+                            icon="refresh-left"
+                            title="删除"
+                            v-hasPermi="['mmrecordinbound:delete']"
+                            @click="handleDelete(scope.row)"
+                            >撤销</el-button
+                        >
+                    </template>
+                </el-table-column>
             </el-table>
-            <pagination :total="recordTotal" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="queryRecord" />
+            <pagination :total="recordTotal" v-model:page="queryParamsRecord.pageNum" v-model:limit="queryParamsRecord.pageSize" @pagination="queryRecord" />
         </el-dialog>
     </div>
 </template>