From eb6256827b821c0848c3b3dbf4189c6455b39495 Mon Sep 17 00:00:00 2001
From: git_rabbit <zhaozhengyi1b@126.com>
Date: Mon, 2 Feb 2026 12:20:25 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E7=89=A9=E6=96=99=E7=AE=A1=E7=90=86):?=
 =?UTF-8?q?=20=E7=A7=BB=E9=99=A4=E9=A2=86=E6=96=99=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E5=B9=B6=E4=BF=AE=E6=AD=A3=E4=BA=A7=E5=93=81=E5=88=97=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在入库记录页面移除10线领料按钮及相关条件判断
- 在工单详情对话框中将产品编号和名称列改为物料编号和名称
---
 .../productionMaterial/MmRecordInbound.vue                | 6 ++----
 .../ProWorkorder/components/WorkorderDetailDialog.vue     | 8 ++++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/views/materialManagement/productionMaterial/MmRecordInbound.vue b/src/views/materialManagement/productionMaterial/MmRecordInbound.vue
index 2365c7c..63a4e47 100644
--- a/src/views/materialManagement/productionMaterial/MmRecordInbound.vue
+++ b/src/views/materialManagement/productionMaterial/MmRecordInbound.vue
@@ -87,10 +87,8 @@
                     <el-button v-if="scope.row.remarks == '已撤销' || scope.row.transactionType == '入库红单'" type="info" size="small" title="撤销" disabled
                         >已撤销</el-button
                     >
-
                     <template v-else>
                         <el-button
-                            v-if="scope.row.workorderRaw == null || scope.row.workorderRaw == ''"
                             type="info"
                             size="small"
                             icon="refresh-left"
@@ -99,7 +97,7 @@
                             @click="handleCancel(scope.row)"
                             >撤销</el-button
                         >
-                        <el-button
+                        <!-- <el-button
                             type="primary"
                             size="small"
                             icon="takeaway-box"
@@ -107,7 +105,7 @@
                             v-hasPermi="['mmrecordinbound:lingliao']"
                             @click="handleTakeMaterial(scope.row)"
                             >10线领料</el-button
-                        >
+                        > -->
                     </template>
                 </template>
             </el-table-column>
diff --git a/src/views/productManagement/ProWorkorder/components/WorkorderDetailDialog.vue b/src/views/productManagement/ProWorkorder/components/WorkorderDetailDialog.vue
index a91fd5c..5c30626 100644
--- a/src/views/productManagement/ProWorkorder/components/WorkorderDetailDialog.vue
+++ b/src/views/productManagement/ProWorkorder/components/WorkorderDetailDialog.vue
@@ -141,8 +141,8 @@
                     <el-table-column prop="createdTime" label="操作时间" width="120" />
                     <el-table-column prop="operator" label="操作员" width="80" />
                     <el-table-column prop="inboundNo" label="入库单号" />
-                    <el-table-column prop="productCode" label="产品编号" />
-                    <el-table-column prop="productName" label="产品名称" />
+                    <el-table-column prop="materialCode" label="产品编号" />
+                    <el-table-column prop="materialName" label="产品名称" />
                     <el-table-column prop="batchNo" label="原材料批次号" width="120" />
                     <el-table-column prop="quantity" label="入库数量" />
                     <el-table-column label="操作" width="120" fixed="right" align="center">
@@ -163,8 +163,8 @@
                     <el-table-column prop="createdTime" label="操作时间" width="120" />
                     <el-table-column prop="operator" label="操作员" width="80" />
                     <el-table-column prop="outboundNo" label="出货单号" />
-                    <el-table-column prop="productCode" label="产品编号" />
-                    <el-table-column prop="productName" label="产品名称" />
+                    <el-table-column prop="materialCode" label="产品编号" />
+                    <el-table-column prop="materialName" label="产品名称" />
                     <el-table-column prop="batchNo" label="原材料批次号" width="120" />
                     <el-table-column prop="workorder" label="出货工单号" width="120" />
                     <el-table-column prop="workorderRaw" label="原材料工单号" width="120" />