From 29ec2b053139f87e69cec75babf51a63d9e27ba8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Mon, 25 Dec 2023 16:18:20 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=B8=9C=E9=98=B3pc-FE=E3=80=91?=
 =?UTF-8?q?=E9=9D=9E=E7=94=9F=E4=BA=A7=E9=A2=86/=E9=80=80=E6=96=99?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=A1=B5=E9=9D=A2=E8=AF=B4=E6=98=8E=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E6=9B=B4=E6=94=B9=E4=B8=BA<explain>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PC/src/utils/detailsTableColumns/index.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/fe/PC/src/utils/detailsTableColumns/index.js b/fe/PC/src/utils/detailsTableColumns/index.js
index b43cbb48f..320771e1c 100644
--- a/fe/PC/src/utils/detailsTableColumns/index.js
+++ b/fe/PC/src/utils/detailsTableColumns/index.js
@@ -1858,7 +1858,7 @@ export const pickingRequest =  [
   { label: "箱码", prop: 'packingCode' },
   { label: "调出库位", prop: "locationCode" },
   { label: "调出ERP库位", prop: 'locationErpCode' },
-  { label: "说明", prop: 'remark' },
+  { label: "说明", prop: 'explain' },
   { label: "专案代码", prop: 'caseCode' },
   { label: "项目分类", prop: 'projCapacityCode' },
   { label: "次交易码", prop: 'onceBusiCode' },
@@ -1896,7 +1896,7 @@ export const pickingApproval =  [
   { label: "箱码", prop: 'packingCode' },
   { label: "调出库位", prop: "locationCode" },
   { label: "调出ERP库位", prop: 'locationErpCode' },
-  { label: "说明", prop: 'remark' },
+  { label: "说明", prop: 'explain' },
   { label: "专案代码", prop: 'caseCode' },
   { label: "项目分类", prop: 'projCapacityCode' },
   { label: "次交易码", prop: 'onceBusiCode' },
@@ -1934,7 +1934,7 @@ export const pickingNote =  [
   { label: "箱码", prop: "packingCode" },
   { label: "调出库位", prop: "locationCode" },
   { label: "调出ERP库位", prop: 'locationErpCode' },
-  { label: "说明", prop: 'remark' },
+  { label: "说明", prop: 'explain' },
   { label: "专案代码", prop: 'caseCode' },
   { label: "项目分类", prop: 'projCapacityCode' },
   { label: "次交易码", prop: 'onceBusiCode' },
@@ -1997,7 +1997,7 @@ export const pickingNote =  [
   { label: "箱码", prop: 'packingCode' },
   { label: "调入库位", prop: "locationCode" },
   { label: "调入ERP库位", prop: 'locationErpCode' },
-  { label: "说明", prop: 'remark' },
+  { label: "说明", prop: 'explain' },
   { label: "专案代码", prop: 'caseCode' },
   { label: "项目分类", prop: 'projCapacityCode' },
   { label: "次交易码", prop: 'onceBusiCode' },
@@ -2034,7 +2034,7 @@ export const materialReturnApproval =  [
   { label: "箱码", prop: 'packingCode' },
   { label: "调入库位", prop: "locationCode" },
   { label: "调入ERP库位", prop: 'locationErpCode' },
-  { label: "说明", prop: 'remark' },
+  { label: "说明", prop: 'explain' },
   { label: "专案代码", prop: 'caseCode' },
   { label: "项目分类", prop: 'projCapacityCode' },
   { label: "次交易码", prop: 'onceBusiCode' },
@@ -2071,6 +2071,7 @@ export const materialReturnNote =  [
   { label: "箱码", prop: "packingCode" },
   { label: "调入库位", prop: "locationCode" },
   { label: "调入ERP库位", prop: 'locationErpCode' },
+  { label: "说明", prop: 'explain' },
   { label: "专案代码", prop: 'caseCode' },
   { label: "项目分类", prop: 'projCapacityCode' },
   { label: "次交易码", prop: 'onceBusiCode' },