From 8db323d37462b5e1f4e0cf333c67f41b9826db72 Mon Sep 17 00:00:00 2001
From: Tom <manfulmr@outlook.com>
Date: Tue, 13 Jan 2026 15:00:41 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E7=94=9F=E4=BA=A7=E7=89=A9=E6=96=99):=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2=E5=87=BA=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=8A=9F=E8=83=BD=E5=B9=B6=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在mminventory.js中添加queryMmInventory接口方法
- 移除MmRecordInbound和MmRecordOutbound中的操作列
- 在MmInventory中将操作按钮改为下拉菜单
- 实现查看进出库记录功能
---
 .../productionMaterial/mminventory.js         | 13 ++++
 .../productionMaterial/MmInventory.vue        | 60 +++++++++++++------
 .../productionMaterial/MmRecordInbound.vue    |  9 ++-
 .../productionMaterial/MmRecordOutbound.vue   |  8 +--
 4 files changed, 64 insertions(+), 26 deletions(-)

diff --git a/src/api/materialManagement/productionMaterial/mminventory.js b/src/api/materialManagement/productionMaterial/mminventory.js
index 62d6bb8..7ac559b 100644
--- a/src/api/materialManagement/productionMaterial/mminventory.js
+++ b/src/api/materialManagement/productionMaterial/mminventory.js
@@ -125,3 +125,16 @@ export async function exportMmInventory(query) {
   // })
   await downFile('/mes/productionMaterial/MmInventory/export', { ...query })
 }
+
+/**
+ * 查询出/入库记录
+ */ 
+export async function queryMmInventory(data) {
+    return request({
+        url: 'mes/productionMaterial/MmInventory/GetInOrOutRecord',
+        method: 'post',
+        data: data
+    })
+}
+
+
diff --git a/src/views/materialManagement/productionMaterial/MmInventory.vue b/src/views/materialManagement/productionMaterial/MmInventory.vue
index 9732dbf..cf06b37 100644
--- a/src/views/materialManagement/productionMaterial/MmInventory.vue
+++ b/src/views/materialManagement/productionMaterial/MmInventory.vue
@@ -102,7 +102,7 @@
             <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="242">
+            <el-table-column label="操作" width="166">
                 <template #default="scope">
                     <!-- <el-button
                         type="success"
@@ -120,18 +120,19 @@
                         @click="handleTickets(scope.row)"
                         >记录</el-button
                     >
-                    <el-button
-                        type="primary"
-                        size="small"
-                        icon="operation"
-                        title="出入库操作"
-                        v-hasPermi="['mminventory:operation']"
-                        @click="handleTickets(scope.row)"
-                        >操作</el-button
-                    >
-                    <el-button type="danger" size="small" icon="delete" title="删除" v-hasPermi="['mminventory:delete']" @click="handleDelete(scope.row)"
+                    <el-dropdown>
+                        <el-button size="small" type="primary">操作<i class="el-icon-arrow-down el-icon--right"></i> </el-button>
+                        <el-dropdown-menu slot="dropdown">
+                            <el-dropdown-item>黄金糕</el-dropdown-item>
+                            <el-dropdown-item>狮子头</el-dropdown-item>
+                            <el-dropdown-item>螺蛳粉</el-dropdown-item>
+                            <el-dropdown-item>双皮奶</el-dropdown-item>
+                            <el-dropdown-item>蚵仔煎</el-dropdown-item>
+                        </el-dropdown-menu>
+                    </el-dropdown>
+                    <!-- <el-button type="danger" size="small" icon="delete" title="删除" v-hasPermi="['mminventory:delete']" @click="handleDelete(scope.row)"
                         >删除</el-button
-                    >
+                    > -->
                 </template>
             </el-table-column>
         </el-table>
@@ -541,8 +542,8 @@
         </el-dialog>
 
         <!-- 进出库记录弹出框 -->
-        <el-dialog title="进出库记录" :visible.sync="dialogTableVisible">
-            <el-table :data="gridData">
+        <el-dialog :title="title" v-model="openRecord">
+            <el-table :data="recordData">
                 <el-table-column property="date" label="日期" width="150"></el-table-column>
                 <el-table-column property="name" label="姓名" width="200"></el-table-column>
                 <el-table-column property="address" label="地址"></el-table-column>
@@ -561,7 +562,8 @@ import {
     getMaterialOption,
     createInboundReceipt,
     getLocationOption,
-    createOutboundReceipt
+    createOutboundReceipt,
+    queryMmInventory
 } from '@/api/materialManagement/productionMaterial/mminventory.js'
 import { listMmTransactionType } from '@/api/materialManagement/productionMaterial/mmtransactiontype.js'
 import { warehouseOptions } from '@/utils/warehouse.js'
@@ -667,6 +669,7 @@ const opertype = ref(0)
 const openStorage = ref(false)
 const openOutStorage = ref(false)
 const openUpdate = ref(false)
+const openRecord = ref(false)
 const state = reactive({
     single: true,
     multiple: true,
@@ -699,10 +702,11 @@ const state = reactive({
     options: {},
     transactionOptions: {},
     locationOptions: [],
-    inOrOut: '入库'
+    inOrOut: '入库',
+    recordData: []
 })
 
-const { form, rules, rulesOut, rulesUpdate, options, transactionOptions, locationOptions, single, multiple, inOrOut } = toRefs(state)
+const { form, rules, rulesOut, rulesUpdate, options, transactionOptions, locationOptions, single, multiple, inOrOut, recordData } = toRefs(state)
 
 // 关闭dialog
 function cancel() {
@@ -774,6 +778,28 @@ function handleUpdate(row) {
     })
 }
 
+// 查看进出库记录
+function handleTickets(row) {
+    console.log(row, '==================')
+    queryMmInventory({
+        searchType: 1,
+        materialCode: row.materialCode,
+        locationCode: row.locationCode,
+        supplierCode: row.supplierCode,
+        batchNo: row.batchNo
+    }).then((res) => {
+
+        const { code, result } = res
+        console.log(res, '==================')
+        if (code == 200) {
+            openRecord.value = true
+            title.value = '查看进出库记录'
+
+            state.recordData = result
+        }
+    })
+}
+
 // 添加&修改 表单提交
 function submitInboundForm() {
     proxy.$refs['formRef'].validate((valid) => {
diff --git a/src/views/materialManagement/productionMaterial/MmRecordInbound.vue b/src/views/materialManagement/productionMaterial/MmRecordInbound.vue
index 68a9132..f6e9664 100644
--- a/src/views/materialManagement/productionMaterial/MmRecordInbound.vue
+++ b/src/views/materialManagement/productionMaterial/MmRecordInbound.vue
@@ -91,16 +91,15 @@
             <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="操作" width="160">
+            <!-- <el-table-column label="操作" width="160">
                 <template #default="scope">
-                    <!-- <el-button
+                    <el-button
                         type="success"
                         size="small"
                         icon="edit"
                         title="编辑"
                         v-hasPermi="['mmrecordinbound:edit']"
-                        @click="handleUpdate(scope.row)"></el-button> -->
+                        @click="handleUpdate(scope.row)"></el-button>
                     <el-button
                         type="danger"
                         size="small"
@@ -109,7 +108,7 @@
                         v-hasPermi="['mmrecordinbound:delete']"
                         @click="handleDelete(scope.row)"></el-button>
                 </template>
-            </el-table-column>
+            </el-table-column> -->
         </el-table>
         <pagination :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
 
diff --git a/src/views/materialManagement/productionMaterial/MmRecordOutbound.vue b/src/views/materialManagement/productionMaterial/MmRecordOutbound.vue
index 3c8b394..0a959b8 100644
--- a/src/views/materialManagement/productionMaterial/MmRecordOutbound.vue
+++ b/src/views/materialManagement/productionMaterial/MmRecordOutbound.vue
@@ -90,15 +90,15 @@
             <el-table-column prop="workOrderNo" label="工单号" align="center" v-if="columns.showColumn('workOrderNo')" />
             <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="操作" width="160">
+            <!-- <el-table-column label="操作" width="160">
                 <template #default="scope">
-                    <!-- <el-button
+                    <el-button
                         type="success"
                         size="small"
                         icon="edit"
                         title="编辑"
                         v-hasPermi="['mmrecordoutbound:edit']"
-                        @click="handleUpdate(scope.row)"></el-button> -->
+                        @click="handleUpdate(scope.row)"></el-button>
                     <el-button
                         type="danger"
                         size="small"
@@ -107,7 +107,7 @@
                         v-hasPermi="['mmrecordoutbound:delete']"
                         @click="handleDelete(scope.row)"></el-button>
                 </template>
-            </el-table-column>
+            </el-table-column> -->
         </el-table>
         <pagination :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />