From 35100bb6a179376d769a619a3d0e52d7a05f8d92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=BE=E5=BA=86=E6=BA=90?= <qingyuan.zeng@ccwin-in.com>
Date: Mon, 12 May 2025 14:57:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E4=BD=8D=E7=A7=BB=E5=8A=A8=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=98=BE=E7=A4=BAID=20=E5=BA=93=E5=AD=98=E4=BA=8B?=
 =?UTF-8?q?=E5=8A=A1=E5=B1=95=E7=A4=BA=E6=93=8D=E4=BD=9C=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../itemLocationReplace.data.ts                    |  5 +++++
 src/views/eam/item/transaction/transaction.data.ts | 14 ++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/src/views/eam/item/itemLocationReplace/itemLocationReplace.data.ts b/src/views/eam/item/itemLocationReplace/itemLocationReplace.data.ts
index 7245632..e954da0 100644
--- a/src/views/eam/item/itemLocationReplace/itemLocationReplace.data.ts
+++ b/src/views/eam/item/itemLocationReplace/itemLocationReplace.data.ts
@@ -18,6 +18,11 @@ export const ItemLocationReplaceRules = reactive({
 })
 
 export const ItemLocationReplace = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '主键',
+    field: 'id',
+    isForm: false,
+  },
   {
     label: '变更后库位编号',
     field: 'locationNumber',
diff --git a/src/views/eam/item/transaction/transaction.data.ts b/src/views/eam/item/transaction/transaction.data.ts
index bb78a3c..6551d85 100644
--- a/src/views/eam/item/transaction/transaction.data.ts
+++ b/src/views/eam/item/transaction/transaction.data.ts
@@ -1,5 +1,7 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import {dateFormatter} from "@/utils/formatTime";
+import * as UserApi from "@/api/system/user";
+const userListAll = await UserApi.getSimpleUserList()
 
 // 表单校验
 export const Rules = reactive({
@@ -102,6 +104,18 @@ export const Transaction = useCrudSchemas(reactive<CrudSchema[]>([
       width: 170
     },
   },
+  {
+    label: '操作人',
+    field: 'creator',
+    sort: 'custom',
+    isForm: false,
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return userListAll.find((account) => account.id == cellValue)?.nickname
+    },
+    table: {
+      width: 170
+    },
+  },
   // {
   //   label: '操作',
   //   field: 'action',