From 6c5be1c7718a06ea8bd5a5a08c28aa83bad51c65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Fri, 8 Nov 2024 16:40:49 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90nev-pc=E3=80=91=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PC/src/utils/tableColumns/index.js | 2 ++
 fe/PC/src/utils/tabsDesTions/index.js | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js
index e79789914..b50e0817c 100644
--- a/fe/PC/src/utils/tableColumns/index.js
+++ b/fe/PC/src/utils/tableColumns/index.js
@@ -2559,6 +2559,7 @@ export const pickingNote =  [
   { label: "建档日期", prop: "buildDate", type: "dateTime" },
   { label: "请求单号", prop: 'unplannedIssueRequestNumber',width: orderWidth},
   { label: "操作员", prop: "worker" },
+  { label: "执行人", prop: "executor" },
   // { label: "部门代码", prop: "deptCode" },
   // { label: "部门名称", prop: "deptName" },
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
@@ -2659,6 +2660,7 @@ export const materialReturnNote =  [
   { label: "建档日期", prop: "buildDate", type: "dateTime" },
   { label: "请求单号", prop: 'unplannedReceiptRequestNumber',width: orderWidth },
   { label: "操作员", prop: "worker" },
+  { label: "执行人", prop: "executor" },
   // { label: "部门代码", prop: "deptCode" },
   // { label: "部门名称", prop: "deptName" },
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js
index b7cc98190..29f116cd5 100644
--- a/fe/PC/src/utils/tabsDesTions/index.js
+++ b/fe/PC/src/utils/tabsDesTions/index.js
@@ -1717,6 +1717,7 @@ export const pickingNote =  [
   { label: "建档日期", prop: "buildDate", type: "dateTime" },
   { label: "请求单号", prop: 'unplannedIssueRequestNumber'},
   { label: "操作员", prop: "worker" },
+  { label: "执行人", prop: "executor" },
   // { label: "部门代码", prop: "deptCode" },
   // { label: "部门名称", prop: "deptName" },
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
@@ -1798,6 +1799,7 @@ export const materialReturnNote =  [
   { label: "建档日期", prop: "buildDate", type: "dateTime" },
   { label: "请求单号", prop: 'unplannedReceiptRequestNumber' },
   { label: "操作员", prop: "worker" },
+  { label: "执行人", prop: "executor" },
   // { label: "部门代码", prop: "deptCode" },
   // { label: "部门名称", prop: "deptName" },
   { label: "创建时间", prop: "creationTime", type: "dateTime" },