From 56e728d49c9afd20f9aaaa3d376e1f3b7afb88da Mon Sep 17 00:00:00 2001
From: git_rabbit <zhaozhengyi1b@126.com>
Date: Mon, 19 Jan 2026 19:15:43 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E7=89=A9=E6=96=99=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BB=93=E5=BA=93=E4=BF=A1=E6=81=AF=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=B9=B6=E6=B7=BB=E5=8A=A0=E5=B7=A5=E5=8D=95=E5=8F=B7?=
 =?UTF-8?q?=E5=92=8C=E5=A4=87=E6=B3=A8=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

隐藏出库和入库记录中的仓库编码和名称列
在入库记录中添加工单号和备注列
---
 .../productionMaterial/MmRecordInbound.vue                  | 6 ++++--
 .../productionMaterial/MmRecordOutbound.vue                 | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/views/materialManagement/productionMaterial/MmRecordInbound.vue b/src/views/materialManagement/productionMaterial/MmRecordInbound.vue
index 63ea3f1..6718886 100644
--- a/src/views/materialManagement/productionMaterial/MmRecordInbound.vue
+++ b/src/views/materialManagement/productionMaterial/MmRecordInbound.vue
@@ -90,6 +90,8 @@
             <el-table-column prop="transactionType" label="入库类型" align="center" v-if="columns.showColumn('transactionType')" />
             <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="workorder" label="工单号" align="center" v-if="columns.showColumn('workorder')" />
+            <el-table-column prop="remarks" label="备注" align="center" v-if="columns.showColumn('remarks')" />
             <el-table-column prop="operator" label="操作员" align="center" v-if="columns.showColumn('operator')" />
             <el-table-column label="操作">
                 <template #default="scope">
@@ -343,8 +345,8 @@ const columns = ref([
     { visible: true, align: 'center', type: '', prop: 'quantity', label: '入库数量' },
     { visible: true, align: 'center', type: '', prop: 'locationName', label: '库位名称', showOverflowTooltip: true },
     { visible: true, align: 'center', type: '', prop: 'locationCode', label: '库位编码', showOverflowTooltip: true },
-    { visible: true, align: 'center', type: '', prop: 'warehouseName', label: '仓库名称', showOverflowTooltip: true },
-    { visible: true, align: 'center', type: '', prop: 'warehouseCode', label: '仓库编码', showOverflowTooltip: true },
+    { visible: false, align: 'center', type: '', prop: 'warehouseName', label: '仓库名称', showOverflowTooltip: true },
+    { visible: false, align: 'center', type: '', prop: 'warehouseCode', label: '仓库编码', showOverflowTooltip: true },
     { visible: true, align: 'center', type: '', prop: 'materialName', label: '物料名称', showOverflowTooltip: true },
     { visible: true, align: 'center', type: '', prop: 'materialCode', label: '物料编码', showOverflowTooltip: true },
     { visible: true, align: 'center', type: '', prop: 'inboundNo', label: '入库单号', showOverflowTooltip: true }
diff --git a/src/views/materialManagement/productionMaterial/MmRecordOutbound.vue b/src/views/materialManagement/productionMaterial/MmRecordOutbound.vue
index 90f16d2..2df585a 100644
--- a/src/views/materialManagement/productionMaterial/MmRecordOutbound.vue
+++ b/src/views/materialManagement/productionMaterial/MmRecordOutbound.vue
@@ -303,8 +303,8 @@ const columns = ref([
     { visible: true, align: 'center', type: '', prop: 'outboundNo', label: '出库单号', showOverflowTooltip: true },
     { visible: true, align: 'center', type: '', prop: 'materialCode', label: '物料编码', showOverflowTooltip: true },
     { visible: true, align: 'center', type: '', prop: 'materialName', label: '物料名称', showOverflowTooltip: true },
-    { visible: true, align: 'center', type: '', prop: 'warehouseCode', label: '仓库编码', showOverflowTooltip: true },
-    { visible: true, align: 'center', type: '', prop: 'warehouseName', label: '仓库名称', showOverflowTooltip: true },
+    { visible: false, align: 'center', type: '', prop: 'warehouseCode', label: '仓库编码', showOverflowTooltip: true },
+    { visible: false, align: 'center', type: '', prop: 'warehouseName', label: '仓库名称', showOverflowTooltip: true },
     { visible: true, align: 'center', type: '', prop: 'locationCode', label: '库位编码', showOverflowTooltip: true },
     { visible: true, align: 'center', type: '', prop: 'locationName', label: '库位名称', showOverflowTooltip: true },
     { visible: true, align: 'center', type: '', prop: 'quantity', label: '出库数量' },