From c1d054c712f3f56f9f7e39c136579d3ea0c36d33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Fri, 2 Feb 2024 09:02:02 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E4=BF=AE=E6=94=B9=20?=
 =?UTF-8?q?=E6=89=80=E6=9C=89=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../count/countRequestMain/countRequestMain.data.ts         | 4 +++-
 src/views/wms/countManage/count/countRequestMain/index.vue  | 5 +++++
 .../countadjustRequestMain/countadjustRequestMain.data.ts   | 4 +++-
 .../countadjust/countadjustRequestMain/index.vue            | 5 +++++
 .../customerreceiptRequestMain.data.ts                      | 4 +++-
 .../customerreceipt/customerreceiptRequestMain/index.vue    | 5 +++++
 .../customerreturnRequestMain.data.ts                       | 4 +++-
 .../customerreturn/customerreturnRequestMain/index.vue      | 5 +++++
 .../customersettleRequestMain.data.ts                       | 4 +++-
 .../customersettle/customersettleRequestMain/index.vue      | 5 +++++
 .../deliver/deliverRequestMain/deliverRequestMain.data.ts   | 4 +++-
 .../deliver/deliverRequestMain/index.vue                    | 6 +++++-
 .../inventoryinitial/inventoryinitRequestMain/index.vue     | 5 +++++
 .../inventoryinitRequestMain.data.ts                        | 4 +++-
 .../wms/inventoryjobManage/scrap/scrapRequestMain/index.vue | 5 +++++
 .../scrap/scrapRequestMain/scrapRequestMain.data.ts         | 4 +++-
 .../transferissue/transferissueRequestMain/index.vue        | 5 +++++
 .../transferissueRequestMain.data.ts                        | 4 +++-
 .../transferreceipt/transferreceiptRequestMain/index.vue    | 6 +++++-
 .../transferreceiptRequestMain.data.ts                      | 4 +++-
 .../unplannedissue/unplannedissueRequestMain/index.vue      | 6 +++++-
 .../unplannedissueRequestMain.data.ts                       | 4 +++-
 .../unplannedreceipt/unplannedreceiptRequestMain/index.vue  | 5 +++++
 .../unplannedreceiptRequestMain.data.ts                     | 4 +++-
 src/views/wms/issueManage/issue/issueRequestMain/index.vue  | 5 +++++
 .../issue/issueRequestMain/issueRequestMain.data.ts         | 4 +++-
 .../onlinesettlement/onlinesettlementRequestMain/index.vue  | 5 +++++
 .../onlinesettlementRequestMain.data.ts                     | 4 +++-
 src/views/wms/issueManage/pick/pickRequestMain/index.vue    | 5 +++++
 .../pick/pickRequestMain/pickRequestMain.data.ts            | 4 +++-
 .../productionreturn/productionreturnRequestMain/index.vue  | 5 +++++
 .../productionreturnRequestMain.data.ts                     | 4 +++-
 .../issueManage/repleinsh/repleinshRequestMain/index.vue    | 5 +++++
 .../repleinshRequestMain/repleinshRequestMain.data.ts       | 4 +++-
 .../inventorychange/inventorychangeRequestMain/index.vue    | 5 +++++
 .../inventorychangeRequestMain.data.ts                      | 4 +++-
 .../inventorymove/inventorymoveRequestMain/index.vue        | 5 +++++
 .../inventorymoveRequestMain.data.ts                        | 4 +++-
 .../offlinesettlementRequestMain/index.vue                  | 5 +++++
 .../offlinesettlementRequestMain.data.ts                    | 4 +++-
 .../productdismantle/productdismantleRequestMain/index.vue  | 5 +++++
 .../productdismantleRequestMain.data.ts                     | 4 +++-
 .../productputaway/productputawayRequestMain/index.vue      | 5 +++++
 .../productputawayRequestMain.data.ts                       | 4 +++-
 .../productreceipt/productreceiptRequestMain/index.vue      | 5 +++++
 .../productreceiptRequestMain.data.ts                       | 4 +++-
 .../productrepair/productrepairRequestMain/index.vue        | 5 +++++
 .../productrepairRequestMain.data.ts                        | 4 +++-
 .../productscrap/productscrapRequestMain/index.vue          | 5 +++++
 .../productscrapRequestMain/productscrapRequestMain.data.ts | 4 +++-
 .../inspect/inspectRequestMain/index.vue                    | 5 +++++
 .../inspect/inspectRequestMain/inspectRequestMain.data.ts   | 4 +++-
 .../purchasereceipt/purchasereceiptRequestMain/index.vue    | 5 +++++
 .../purchasereceiptRequestMain.data.ts                      | 4 +++-
 .../purchasereturn/purchasereturnRequestMain/index.vue      | 5 +++++
 .../purchasereturnRequestMain.data.ts                       | 4 +++-
 .../putaway/putawayRequestMain/index.vue                    | 5 +++++
 .../putaway/putawayRequestMain/putawayRequestMain.data.ts   | 4 +++-
 .../supplierdeliver/supplierdeliverRequestMain/index.vue    | 5 +++++
 .../supplierdeliverRequestMain.data.ts                      | 4 +++-
 .../purchaseclaim/purchaseclaimRequestMain/index.vue        | 5 +++++
 .../purchaseclaimRequestMain.data.ts                        | 4 +++-
 .../supplierinvoice/supplierinvoiceRequestMain/index.vue    | 5 +++++
 .../supplierinvoiceRequestMain.data.ts                      | 4 +++-
 64 files changed, 256 insertions(+), 35 deletions(-)

diff --git a/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts b/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts
index 78b3a17e3..d96a9f3c7 100644
--- a/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts
+++ b/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts
@@ -22,6 +22,8 @@ const queryParams = {
 import { useUserStore } from '@/store/modules/user'
 const userStore = useUserStore()
 const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
 const userDeptArray:any = [userDept]
 
 /**
@@ -177,7 +179,7 @@ export const CountRequestMain = useCrudSchemas(<CrudSchema[]>([
       width: 150
     },
     formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
-      return userDeptArray.find((account) => account.id === cellValue)?.name
+      return userDeptArray.find((account) => account.id == cellValue)?.name
     },
     form: {
       value: userDept.id,
diff --git a/src/views/wms/countManage/count/countRequestMain/index.vue b/src/views/wms/countManage/count/countRequestMain/index.vue
index 65542b32c..58d0bd6f8 100644
--- a/src/views/wms/countManage/count/countRequestMain/index.vue
+++ b/src/views/wms/countManage/count/countRequestMain/index.vue
@@ -101,6 +101,7 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import {
   CountRequestMain,
   CountRequestMainRules,
@@ -447,9 +448,13 @@ const openForm = async (type: string, row?: number) => {
   formRef.value.open(type, row)
 }
 
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
   detailRef.value.openDetail(row, titleName, titleValue)
 }
 
diff --git a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
index b9f6d987c..f6930d8c5 100644
--- a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
+++ b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
@@ -22,6 +22,8 @@ const queryParams = {
 import { useUserStore } from '@/store/modules/user'
 const userStore = useUserStore()
 const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
 const userDeptArray:any = [userDept]
 
 /**
@@ -163,7 +165,7 @@ export const CountadjustRequestMain = useCrudSchemas(<CrudSchema[]>([
       width: 150
     },
     formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
-      return userDeptArray.find((account) => account.id === cellValue)?.name
+      return userDeptArray.find((account) => account.id == cellValue)?.name
     },
     form: {
       value: userDept.id,
diff --git a/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue b/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue
index b78ffc9c3..dafd918cd 100644
--- a/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue
+++ b/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue
@@ -79,6 +79,7 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { CountadjustRequestMain,CountadjustRequestMainRules,CountadjustRequestDetail,CountadjustRequestDetailRules } from './countadjustRequestMain.data'
 import * as CountadjustRequestMainApi from '@/api/wms/countadjustRequestMain'
 import * as CountadjustRequestDetailApi from '@/api/wms/countadjustRequestDetail'
@@ -276,9 +277,13 @@ const openForm =async (type: string, row?: number) => {
   formRef.value.open(type, row)
 }
 
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
   detailRef.value.openDetail(row, titleName, titleValue)
 }
 
diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts
index dd284d1e6..1825c13e1 100644
--- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts
@@ -18,6 +18,8 @@ const queryParams = {
 import { useUserStore } from '@/store/modules/user'
 const userStore = useUserStore()
 const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
 const userDeptArray:any = [userDept]
 
 /**
@@ -228,7 +230,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
     formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
-      return userDeptArray.find((account) => account.id === cellValue)?.name
+      return userDeptArray.find((account) => account.id == cellValue)?.name
     },
     form: {
       value: userDept.id,
diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue
index fef424909..541d9da6f 100644
--- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue
@@ -80,6 +80,7 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { CustomerreceiptRequestMain,CustomerreceiptRequestMainRules,CustomerreceiptRequestDetail,CustomerreceiptRequestDetailRules } from './customerreceiptRequestMain.data'
 import * as CustomerreceiptRequestMainApi from '@/api/wms/customerreceiptRequestMain'
 import * as CustomerreceiptRequestDetailApi from '@/api/wms/customerreceiptRequestDetail'
@@ -284,9 +285,13 @@ const openForm =async (type: string, row?: number) => {
   formRef.value.open(type, row)
 }
 
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
   detailRef.value.openDetail(row, titleName, titleValue,'requestCustomerreceiptMain')
 }
 
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
index a6fefd9bd..3c4d37d7f 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
@@ -39,6 +39,8 @@ const queryParams = {
 import { useUserStore } from '@/store/modules/user'
 const userStore = useUserStore()
 const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
 const userDeptArray:any = [userDept]
 
 /**
@@ -345,7 +347,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
-      return userDeptArray.find((account) => account.id === cellValue)?.name
+      return userDeptArray.find((account) => account.id == cellValue)?.name
     },
     form: {
       value: userDept.id,
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
index 13f291fa5..5a6170841 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
@@ -80,6 +80,7 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { CustomerreturnRequestMain,CustomerreturnRequestMainRules,CustomerreturnRequestDetail,CustomerreturnRequestDetailRules } from './customerreturnRequestMain.data'
 import * as CustomerreturnRequestMainApi from '@/api/wms/customerreturnRequestMain'
 import * as CustomerreturnRequestDetailApi from '@/api/wms/customerreturnRequestDetail'
@@ -408,6 +409,8 @@ const detailOpenForm = (type) => {
   }
 }
 
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
@@ -416,6 +419,8 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
     }else {
       trueFalse.value = true
     }
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
   detailRef.value.openDetail(row, titleName, titleValue,'requestCustomerreturnMain')
 }
 
diff --git a/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts b/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts
index 56119bf31..4ff422381 100644
--- a/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts
@@ -23,6 +23,8 @@ const queryParams = {
 import { useUserStore } from '@/store/modules/user'
 const userStore = useUserStore()
 const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
 const userDeptArray:any = [userDept]
 
 /**
@@ -174,7 +176,7 @@ export const CustomersettleRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
-      return userDeptArray.find((account) => account.id === cellValue)?.name
+      return userDeptArray.find((account) => account.id == cellValue)?.name
     },
     form: {
       value: userDept.id,
diff --git a/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue b/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue
index dcdf0e971..bd88f4f6f 100644
--- a/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue
@@ -81,6 +81,7 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { CustomersettleRequestMain,CustomersettleRequestMainRules,CustomersettleRequestDetail,CustomersettleRequestDetailRules } from './customersettleRequestMain.data'
 import * as CustomersettleRequestMainApi from '@/api/wms/customersettleRequestMain'
 import * as CustomersettleRequestDetailApi from '@/api/wms/customersettleRequestDetail'
@@ -295,9 +296,13 @@ const openForm =async (type: string, row?: number) => {
   formRef.value.open(type, row)
 }
 
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
   detailRef.value.openDetail(row, titleName, titleValue,'requestCustomersettleMain')
 }
 
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
index 28eb2652e..d1e652780 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
@@ -34,6 +34,8 @@ const queryParams = {
 import { useUserStore } from '@/store/modules/user'
 const userStore = useUserStore()
 const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
 const userDeptArray:any = [userDept]
 
 /**
@@ -341,7 +343,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
-      return userDeptArray.find((account) => account.id === cellValue)?.name
+      return userDeptArray.find((account) => account.id == cellValue)?.name
     },
     form: {
       value: userDept.id,
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
index d812509ca..85e3635d3 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
@@ -84,6 +84,7 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { DeliverRequestMain,DeliverRequestMainRules,DeliverRequestDetail,DeliverRequestDetailRules } from './deliverRequestMain.data'
 import * as DeliverRequestMainApi from '@/api/wms/deliverRequestMain'
 import * as DeliverRequestDetailApi from '@/api/wms/deliverRequestDetail'
@@ -403,15 +404,18 @@ const openForm =async (type: string, row?: number) => {
   }
 }
 
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  console.log(999,row.deliverPlanNumber);
   if(row.deliverPlanNumber != null){
         trueFalse.value = false
     }else {
       trueFalse.value = true
     }
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
   detailRef.value.openDetail(row, titleName, titleValue,'requestDeliverMain')
 }
 
diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue
index c3b4049ed..527706479 100644
--- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue
@@ -78,6 +78,7 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { InventoryinitRequestMain,InventoryinitRequestMainRules,InventoryinitRequestDetail,InventoryinitRequestDetailRules } from './inventoryinitRequestMain.data'
 import * as InventoryinitRequestMainApi from '@/api/wms/inventoryinitRequestMain'
 import * as InventoryinitRequestDetailApi from '@/api/wms/inventoryinitRequestDetail'
@@ -302,9 +303,13 @@ const openForm =async (type: string, row?: number) => {
   formRef.value.open(type, row)
 }
 
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
   detailRef.value.openDetail(row, titleName, titleValue,'requestInventoryinitMain')
 }
 
diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts
index 735860417..34c4d8138 100644
--- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts
@@ -30,6 +30,8 @@ import { useUserStore } from '@/store/modules/user'
 import { TableColumn } from '@/types/table'
 const userStore = useUserStore()
 const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
 const userDeptArray:any = [userDept]
 
 /**
@@ -156,7 +158,7 @@ export const InventoryinitRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
-      return userDeptArray.find((account) => account.id === cellValue)?.name
+      return userDeptArray.find((account) => account.id == cellValue)?.name
     },
     form: {
       value: userDept.id,
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
index f1c6c7c0d..40519f859 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
@@ -79,6 +79,7 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { ScrapRequestMain,ScrapRequestMainRules,ScrapRequestDetail,ScrapRequestDetailRules } from './scrapRequestMain.data'
 import * as ScrapRequestMainApi from '@/api/wms/scrapRequestMain'
 import * as ScrapRequestDetailApi from '@/api/wms/scrapRequestDetail'
@@ -309,9 +310,13 @@ const openForm =async (type: string, row?: number) => {
   formRef.value.open(type, row)
 }
 
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
   detailRef.value.openDetail(row, titleName, titleValue,'requestScrapMain')
 }
 
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
index 1c3d6871f..339591b3a 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
@@ -24,6 +24,8 @@ import { useUserStore } from '@/store/modules/user'
 import { TableColumn } from '@/types/table'
 const userStore = useUserStore()
 const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
 const userDeptArray:any = [userDept]
 
 /**
@@ -185,7 +187,7 @@ export const ScrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
-      return userDeptArray.find((account) => account.id === cellValue)?.name
+      return userDeptArray.find((account) => account.id == cellValue)?.name
     },
     form: {
       value: userDept.id,
diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue
index b7f6e65d2..231f2455c 100644
--- a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue
@@ -79,6 +79,7 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { TransferissueRequestMain,TransferissueRequestMainRules,TransferissueRequestDetail,TransferissueRequestDetailRules } from './transferissueRequestMain.data'
 import * as TransferissueRequestMainApi from '@/api/wms/transferissueRequestMain'
 import * as TransferissueRequestDetailApi from '@/api/wms/transferissueRequestDetail'
@@ -323,9 +324,13 @@ const openForm =async (type: string, row?: number) => {
   formRef.value.open(type, row)
 }
 
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
   detailRef.value.openDetail(row, titleName, titleValue,'requestTransferissueMain')
 }
 
diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
index 1f37c0f92..ab656bd87 100644
--- a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
@@ -33,6 +33,8 @@ import { useUserStore } from '@/store/modules/user'
 import { TableColumn } from '@/types/table'
 const userStore = useUserStore()
 const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
 const userDeptArray:any = [userDept]
 
 
@@ -313,7 +315,7 @@ export const TransferissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
-      return userDeptArray.find((account) => account.id === cellValue)?.name
+      return userDeptArray.find((account) => account.id == cellValue)?.name
     },
     form: {
       value: userDept.id,
diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue
index 22eab287c..24a179d68 100644
--- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue
@@ -81,6 +81,7 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { TransferreceiptRequestMain,TransferreceiptRequestMainRules,TransferreceiptRequestDetail,TransferreceiptRequestDetailRules } from './transferreceiptRequestMain.data'
 import * as TransferreceiptRequestMainApi from '@/api/wms/transferreceiptRequestMain'
 import * as TransferreceiptRequestDetailApi from '@/api/wms/transferreceiptRequestDetail'
@@ -315,10 +316,13 @@ const openForm =async (type: string, row?: number) => {
   tableData.value = [] // 重置明细数据
   formRef.value.open(type, row)
 }
-
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
   detailRef.value.openDetail(row, titleName, titleValue,'requestTransferreceiptMain')
 }
 
diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts
index 9453096e3..607aa3fb6 100644
--- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts
@@ -17,6 +17,8 @@ import { useUserStore } from '@/store/modules/user'
 import { TableColumn } from '@/types/table'
 const userStore = useUserStore()
 const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
 const userDeptArray:any = [userDept]
 
 /**
@@ -202,7 +204,7 @@ export const TransferreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
     formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
-      return userDeptArray.find((account) => account.id === cellValue)?.name
+      return userDeptArray.find((account) => account.id == cellValue)?.name
     },
     form: {
       value: userDept.id,
diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue
index 596e2e324..c477ec814 100644
--- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue
@@ -79,6 +79,7 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { UnplannedissueRequestMain,UnplannedissueRequestMainRules,UnplannedissueRequestDetail,UnplannedissueRequestDetailRules } from './unplannedissueRequestMain.data'
 import * as UnplannedissueRequestMainApi from '@/api/wms/unplannedissueRequestMain'
 import * as UnplannedissueRequestDetailApi from '@/api/wms/unplannedissueRequestDetail'
@@ -304,10 +305,13 @@ const openForm =async (type: string, row?: number) => {
   tableData.value = [] // 重置明细数据
   formRef.value.open(type, row)
 }
-
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
   detailRef.value.openDetail(row, titleName, titleValue,'requestUnplannedissueMain')
 }
 
diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
index 2df111255..b1509aaab 100644
--- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
@@ -21,6 +21,8 @@ import { useUserStore } from '@/store/modules/user'
 import { TableColumn } from '@/types/table'
 const userStore = useUserStore()
 const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
 const userDeptArray:any = [userDept]
 
 /**
@@ -153,7 +155,7 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
-      return userDeptArray.find((account) => account.id === cellValue)?.name
+      return userDeptArray.find((account) => account.id == cellValue)?.name
     },
     form: {
       value: userDept.id,
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
index 22e75a119..983eb7684 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
@@ -97,6 +97,7 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import {
   UnplannedreceiptRequestMain,
   UnplannedreceiptRequestMainRules,
@@ -467,9 +468,13 @@ const openForm =async (type: string, row?: number) => {
   formRef.value.open(type, row)
 }
 
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
   detailRef.value.openDetail(row, titleName, titleValue,'requestUnplannedreceiptMain')
 }
 
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
index f42f6f89b..ae6a18bc3 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
@@ -37,6 +37,8 @@ const queryParams = {
  import { TableColumn } from '@/types/table'
  const userStore = useUserStore()
  const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
  const userDeptArray:any = [userDept]
  
 /**
@@ -193,7 +195,7 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
     formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
-      return userDeptArray.find((account) => account.id === cellValue)?.name
+      return userDeptArray.find((account) => account.id == cellValue)?.name
     },
     form: {
       value: userDept.id,
diff --git a/src/views/wms/issueManage/issue/issueRequestMain/index.vue b/src/views/wms/issueManage/issue/issueRequestMain/index.vue
index 6297e41f9..5829f45d1 100644
--- a/src/views/wms/issueManage/issue/issueRequestMain/index.vue
+++ b/src/views/wms/issueManage/issue/issueRequestMain/index.vue
@@ -78,6 +78,7 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { IssueRequestMain,IssueRequestMainRules,IssueRequestDetail,IssueRequestDetailRules } from './issueRequestMain.data'
 import * as IssueRequestMainApi from '@/api/wms/issueRequestMain'
 import * as IssueRequestDetailApi from '@/api/wms/issueRequestDetail'
@@ -307,9 +308,13 @@ const openForm =async (type: string, row?: number) => {
   formRef.value.open(type, row)
 }
 
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
   detailRef.value.openDetail(row, titleName, titleValue)
 }
 
diff --git a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
index 5d903a91c..798ea0e11 100644
--- a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
+++ b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
@@ -36,6 +36,8 @@ const queryParams = {
  import { TableColumn } from '@/types/table'
  const userStore = useUserStore()
  const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
  const userDeptArray:any = [userDept]
  
 /**
@@ -240,7 +242,7 @@ export const IssueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
-      return userDeptArray.find((account) => account.id === cellValue)?.name
+      return userDeptArray.find((account) => account.id == cellValue)?.name
     },
     form: {
       value: userDept.id,
diff --git a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/index.vue b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/index.vue
index ff02adb8e..eb21cbe1e 100644
--- a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/index.vue
+++ b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/index.vue
@@ -78,6 +78,7 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { OnlinesettlementRequestMain,OnlinesettlementRequestMainRules,OnlinesettlementRequestDetail,OnlinesettlementRequestDetailRules } from './onlinesettlementRequestMain.data'
 import * as OnlinesettlementRequestMainApi from '@/api/wms/onlinesettlementRequestMain'
 import * as OnlinesettlementRequestDetailApi from '@/api/wms/onlinesettlementRequestDetail'
@@ -245,9 +246,13 @@ const openForm =async (type: string, row?: number) => {
   formRef.value.open(type, row)
 }
 
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
   detailRef.value.openDetail(row, titleName, titleValue)
 }
 
diff --git a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/onlinesettlementRequestMain.data.ts b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/onlinesettlementRequestMain.data.ts
index 6cbac6089..61fdbce9e 100644
--- a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/onlinesettlementRequestMain.data.ts
+++ b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/onlinesettlementRequestMain.data.ts
@@ -21,6 +21,8 @@ const queryParams = {
  import { TableColumn } from '@/types/table'
  const userStore = useUserStore()
  const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
  const userDeptArray:any = [userDept]
  
 /**
@@ -114,7 +116,7 @@ export const OnlinesettlementRequestMain = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
     formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
-      return userDeptArray.find((account) => account.id === cellValue)?.name
+      return userDeptArray.find((account) => account.id == cellValue)?.name
     },
     form: {
       value: userDept.id,
diff --git a/src/views/wms/issueManage/pick/pickRequestMain/index.vue b/src/views/wms/issueManage/pick/pickRequestMain/index.vue
index 2213c39e1..b1ff89c76 100644
--- a/src/views/wms/issueManage/pick/pickRequestMain/index.vue
+++ b/src/views/wms/issueManage/pick/pickRequestMain/index.vue
@@ -78,6 +78,7 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { PickRequestMain,PickRequestMainRules,PickRequestDetail,PickRequestDetailRules } from './pickRequestMain.data'
 import * as PickRequestMainApi from '@/api/wms/pickRequestMain'
 import * as PickRequestDetailApi from '@/api/wms/pickRequestDetail'
@@ -235,9 +236,13 @@ const openForm =async (type: string, row?: number) => {
   formRef.value.open(type, row)
 }
 
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
   detailRef.value.openDetail(row, titleName, titleValue)
 }
 
diff --git a/src/views/wms/issueManage/pick/pickRequestMain/pickRequestMain.data.ts b/src/views/wms/issueManage/pick/pickRequestMain/pickRequestMain.data.ts
index 3549ddbae..3d0b1efc4 100644
--- a/src/views/wms/issueManage/pick/pickRequestMain/pickRequestMain.data.ts
+++ b/src/views/wms/issueManage/pick/pickRequestMain/pickRequestMain.data.ts
@@ -17,6 +17,8 @@ const queryParams = {
  import { TableColumn } from '@/types/table'
  const userStore = useUserStore()
  const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
  const userDeptArray:any = [userDept]
  
 
@@ -192,7 +194,7 @@ export const PickRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
-      return userDeptArray.find((account) => account.id === cellValue)?.name
+      return userDeptArray.find((account) => account.id == cellValue)?.name
     },
     form: {
       value: userDept.id,
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
index 4516a3016..b65bfa774 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
@@ -89,6 +89,7 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { ProductionreturnRequestMain,ProductionreturnRequestMainRules,ProductionreturnRequestDetail,ProductionreturnRequestDetailRules,ProductionreturnRequestDetailLabel,ProductionreturnRequestDetailLabelRules } from './productionreturnRequestMain.data'
 import * as ProductionreturnRequestMainApi from '@/api/wms/productionreturnRequestMain'
 import * as ProductionreturnRequestDetailApi from '@/api/wms/productionreturnRequestDetail'
@@ -477,9 +478,13 @@ const openForm =async (type: string, row?: number) => {
   formRef.value.open(type, row)
 }
 
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
   detailRef.value.openDetail(row, titleName, titleValue)
 }
 /** 详情操作——子表表单 */
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
index c513c2fa7..3ce0b65a1 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
@@ -38,6 +38,8 @@ const queryParams = {
  import { TableColumn } from '@/types/table'
  const userStore = useUserStore()
  const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
  const userDeptArray:any = [userDept]
  
 /**
@@ -228,7 +230,7 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
     formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
-      return userDeptArray.find((account) => account.id === cellValue)?.name
+      return userDeptArray.find((account) => account.id == cellValue)?.name
     },
     form: {
       value: userDept.id,
diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue
index aea968e36..9a2ff9392 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue
+++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue
@@ -77,6 +77,7 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { RepleinshRequestMain,RepleinshRequestMainRules,RepleinshRequestDetail,RepleinshRequestDetailRules } from './repleinshRequestMain.data'
 import * as RepleinshRequestMainApi from '@/api/wms/repleinshRequestMain'
 import * as RepleinshRequestDetailApi from '@/api/wms/repleinshRequestDetail'
@@ -288,9 +289,13 @@ const openForm =async (type: string, row?: number) => {
   formRef.value.open(type, row)
 }
 
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
   detailRef.value.openDetail(row, titleName, titleValue)
 }
 
diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
index a40591ba8..5b68ade91 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
+++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
@@ -27,6 +27,8 @@ const queryParams = {
  import { TableColumn } from '@/types/table'
  const userStore = useUserStore()
  const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
  const userDeptArray:any = [userDept]
  
 /**
@@ -229,7 +231,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
-      return userDeptArray.find((account) => account.id === cellValue)?.name
+      return userDeptArray.find((account) => account.id == cellValue)?.name
     },
     form: {
       value: userDept.id,
diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
index 517013206..1f2af5f01 100644
--- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
+++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
@@ -77,6 +77,7 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { InventorychangeRequestMain,InventorychangeRequestMainRules,InventorychangeRequestDetail,InventorychangeRequestDetailRules } from './inventorychangeRequestMain.data'
 import * as InventorychangeRequestMainApi from '@/api/wms/inventorychangeRequestMain'
 import * as InventorychangeRequestDetailApi from '@/api/wms/inventorychangeRequestDetail'
@@ -331,9 +332,13 @@ const openForm =async (type: string, row?: number) => {
   formRef.value.open(type, row)
 }
 
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
   detailRef.value.openDetail(row, titleName, titleValue)
 }
 
diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts
index 14eac07e3..4f392559c 100644
--- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts
+++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts
@@ -24,6 +24,8 @@ const queryParams = {
  import { TableColumn } from '@/types/table'
  const userStore = useUserStore()
  const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
  const userDeptArray:any = [userDept]
  
 
@@ -129,7 +131,7 @@ export const InventorychangeRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
     formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
-      return userDeptArray.find((account) => account.id === cellValue)?.name
+      return userDeptArray.find((account) => account.id == cellValue)?.name
     },
     form: {
       value: userDept.id,
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
index b69e86e70..c5cccc3b5 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
@@ -78,6 +78,7 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { InventorymoveRequestMain,InventorymoveRequestMainRules,InventorymoveRequestDetail,InventorymoveRequestDetailRules } from './inventorymoveRequestMain.data'
 import * as InventorymoveRequestMainApi from '@/api/wms/inventorymoveRequestMain'
 import * as InventorymoveRequestDetailApi from '@/api/wms/inventorymoveRequestDetail'
@@ -486,10 +487,14 @@ const detailOpenForm = (type, row) => {
 
 const fromWarehouseCodeMain = ref()
 
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
   fromWarehouseCodeMain.value = row.fromWarehouseCode
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
   detailRef.value.openDetail(row, titleName, titleValue)
 }
 
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
index b90304246..1b8e666ce 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
@@ -27,6 +27,8 @@ const queryParams = {
  import { TableColumn } from '@/types/table'
  const userStore = useUserStore()
  const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
  const userDeptArray:any = [userDept]
  
 /**
@@ -217,7 +219,7 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
-      return userDeptArray.find((account) => account.id === cellValue)?.name
+      return userDeptArray.find((account) => account.id == cellValue)?.name
     },
     form: {
       value: userDept.id,
diff --git a/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/index.vue b/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/index.vue
index e24e5684b..aa96e316b 100644
--- a/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/index.vue
+++ b/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/index.vue
@@ -79,6 +79,7 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { OfflinesettlementRequestMain,OfflinesettlementRequestMainRules,OfflinesettlementRequestDetail,OfflinesettlementRequestDetailRules } from './offlinesettlementRequestMain.data'
 import * as OfflinesettlementRequestMainApi from '@/api/wms/offlinesettlementRequestMain'
 import * as OfflinesettlementRequestDetailApi from '@/api/wms/offlinesettlementRequestDetail'
@@ -236,9 +237,13 @@ const openForm =async (type: string, row?: number) => {
   formRef.value.open(type, row)
 }
 
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
   detailRef.value.openDetail(row, titleName, titleValue,'requestOfflinesettlementMain')
 }
 
diff --git a/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/offlinesettlementRequestMain.data.ts b/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/offlinesettlementRequestMain.data.ts
index 322aa819a..2f4aa5b6d 100644
--- a/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/offlinesettlementRequestMain.data.ts
+++ b/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/offlinesettlementRequestMain.data.ts
@@ -17,6 +17,8 @@ const queryParams = {
  import { TableColumn } from '@/types/table'
  const userStore = useUserStore()
  const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
  const userDeptArray:any = [userDept]
  
 /**
@@ -146,7 +148,7 @@ export const OfflinesettlementRequestMain = useCrudSchemas(reactive<CrudSchema[]
       width: 150
     },
     formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
-      return userDeptArray.find((account) => account.id === cellValue)?.name
+      return userDeptArray.find((account) => account.id == cellValue)?.name
     },
     form: {
       value: userDept.id,
diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue
index af46695f5..7d7535ab5 100644
--- a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue
+++ b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue
@@ -99,6 +99,7 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { ProductdismantleRequestMain,ProductdismantleRequestMainRules,ProductdismantleRequestDetaila,ProductdismantleRequestDetailaRules,BomDismantle } from './productdismantleRequestMain.data'
 import * as ProductdismantleRequestMainApi from '@/api/wms/productdismantleRequestMain'
 import * as ProductdismantleRequestDetailApi from '@/api/wms/productdismantleRequestDetaila'
@@ -463,6 +464,8 @@ const openForm =async (type: string, row?: number) => {
   formRef.value.open(type, row)
 }
 
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
@@ -473,6 +476,8 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
     defaultButtons.formSaveBtn({ hide : mainStatus.value != 1 }), // 保存
     defaultButtons.formCloseBtn(null) // 关闭
   ]
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
   detailRef.value.openDetail(row, titleName, titleValue,'requestProductdismantleMain')
 }
 
diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
index cd02eb2be..43eec67b2 100644
--- a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
+++ b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
@@ -42,6 +42,8 @@ const queryParams = {
  import { TableColumn } from '@/types/table'
  const userStore = useUserStore()
  const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
  const userDeptArray:any = [userDept]
  
 /**
@@ -268,7 +270,7 @@ export const ProductdismantleRequestMain = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
     formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
-      return userDeptArray.find((account) => account.id === cellValue)?.name
+      return userDeptArray.find((account) => account.id == cellValue)?.name
     },
     form: {
       value: userDept.id,
diff --git a/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue b/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue
index 02c7294ba..9a2f14715 100644
--- a/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue
+++ b/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue
@@ -78,6 +78,7 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { ProductputawayRequestMain,ProductputawayRequestMainRules,ProductputawayRequestDetail,ProductputawayRequestDetailRules } from './productputawayRequestMain.data'
 import * as ProductputawayRequestMainApi from '@/api/wms/productputawayRequestMain'
 import * as ProductputawayRequestDetailApi from '@/api/wms/productputawayRequestDetail'
@@ -289,9 +290,13 @@ const openForm =async (type: string, row?: number) => {
   formRef.value.open(type, row)
 }
 
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
   detailRef.value.openDetail(row, titleName, titleValue,'requestProductputawayMain')
 }
 
diff --git a/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts b/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts
index 25acb73e0..8c815f51a 100644
--- a/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts
+++ b/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts
@@ -22,6 +22,8 @@ const queryParams = {
 import { useUserStore } from '@/store/modules/user'
 const userStore = useUserStore()
 const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
 const userDeptArray:any = [userDept]
 
 /**
@@ -183,7 +185,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
-      return userDeptArray.find((account) => account.id === cellValue)?.name
+      return userDeptArray.find((account) => account.id == cellValue)?.name
     },
     form: {
       value: userDept.id,
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
index 8e1484f45..8ef78e0f9 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
@@ -116,6 +116,7 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { ProductreceiptRequestMain,ProductreceiptRequestMainRules,ProductreceiptRequestDetail,ProductreceiptRequestDetailRules, BackflushDetailRequest } from './productreceiptRequestMain.data'
 import {ProductionreturnRequestDetailLabel,ProductionreturnRequestDetailLabelRules} from '../../../issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data'
 import * as ProductreceiptRequestMainApi from '@/api/wms/productreceiptRequestMain'
@@ -461,9 +462,13 @@ const openForm =async (type: string, row?: number) => {
   formRef.value.open(type, row)
 }
 
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
   detailRef.value.openDetail(row, titleName, titleValue,'requestProductreceiptMain')
 }
 
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
index 0095b2fb5..4aece033c 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
@@ -42,6 +42,8 @@ const queryParams = {
  import { TableColumn } from '@/types/table'
  const userStore = useUserStore()
  const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
  const userDeptArray:any = [userDept]
  
 /**
@@ -278,7 +280,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
-      return userDeptArray.find((account) => account.id === cellValue)?.name
+      return userDeptArray.find((account) => account.id == cellValue)?.name
     },
     form: {
       value: userDept.id,
diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
index 26cf1d36d..87898cd4b 100644
--- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
+++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
@@ -103,6 +103,7 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { ProductrepairRequestMain,ProductrepairRequestMainRules,ProductrepairRequestDetaila,ProductrepairRequestDetailaRules, ConsumereRequestDetailb, BomDismantle,ProductrepairBomDismantleRules } from './productrepairRequestMain.data'
 import * as ProductrepairRequestMainApi from '@/api/wms/productrepairRequestMain'
 import * as ProductrepairRequestDetailApi from '@/api/wms/productrepairRequestDetaila'
@@ -474,6 +475,8 @@ const openForm =async (type: string, row?: number) => {
   formRef.value.open(type, row)
 }
 
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
 /** 详情操作 */
 const detailRef = ref()
 const mainStatus = ref()
@@ -486,6 +489,8 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
     defaultButtons.formCloseBtn(null) // 关闭
   ]
   lsBomSave.value = false
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
   detailRef.value.openDetail(row, titleName, titleValue,'requestProductrepairMain')
 }
 
diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
index e7a694d3a..8779257d1 100644
--- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
+++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
@@ -42,6 +42,8 @@ const queryParams = {
  import { TableColumn } from '@/types/table'
  const userStore = useUserStore()
  const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
  const userDeptArray:any = [userDept]
  
 /**
@@ -268,7 +270,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
-      return userDeptArray.find((account) => account.id === cellValue)?.name
+      return userDeptArray.find((account) => account.id == cellValue)?.name
     },
     form: {
       value: userDept.id,
diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
index 0b984a703..03af1d3f3 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
@@ -103,6 +103,7 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { ProductscrapRequestMain,ProductscrapRequestMainRules,ProductscrapRequestDetail,ProductscrapRequestDetailRules,ProdcutscrapBomDismantle } from './productscrapRequestMain.data'
 import * as ProductscrapRequestMainApi from '@/api/wms/productscrapRequestMain'
 import * as ProductscrapRequestDetailApi from '@/api/wms/productscrapRequestDetail'
@@ -483,6 +484,8 @@ const openForm =async (type: string, row?: number) => {
   formRef.value.open(type, row)
 }
 
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
 /** 详情操作 */
 const detailRef = ref()
 const mainStatus = ref()
@@ -494,6 +497,8 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
     defaultButtons.formSaveBtn({ hide : mainStatus.value != 1 }), // 保存
     defaultButtons.formCloseBtn(null) // 关闭
   ]
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
   detailRef.value.openDetail(row, titleName, titleValue,'requestProductscrapMain')
 }
 
diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
index 1c1ce43d2..50cad5b10 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
@@ -41,6 +41,8 @@ const queryParams = {
  import { TableColumn } from '@/types/table'
  const userStore = useUserStore()
  const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
  const userDeptArray:any = [userDept]
  
 
@@ -289,7 +291,7 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
-      return userDeptArray.find((account) => account.id === cellValue)?.name
+      return userDeptArray.find((account) => account.id == cellValue)?.name
     },
     form: {
       value: userDept.id,
diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue
index 5a561e7c3..a32d7fea1 100644
--- a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue
@@ -47,6 +47,7 @@
 
 <script setup lang="ts">
   import download from '@/utils/download'
+  import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
   import { InspectRequestMain, InspectRequestMainRules, InspectRequestDetail, InspectRequestDetailRules } from './inspectRequestMain.data'
   import * as InspectRequestMainApi from '@/api/wms/inspectRequestMain'
   import * as InspectRequestDetailApi from '@/api/wms/inspectRequestDetail'
@@ -263,9 +264,13 @@
     formRef.value.open(type, row)
   }
 
+  // 获取部门 用于详情 部门回显
+  const { wsCache } = useCache()
   /** 详情操作 */
   const detailRef = ref()
   const openDetail = (row : any, titleName : any, titleValue : any) => {
+    const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+    if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
     detailRef.value.openDetail(row, titleName, titleValue,'requestInspectMain')
   }
 
diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts
index 1a5af3d42..8dd05f90f 100644
--- a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts
@@ -28,6 +28,8 @@ const requestsettingData = data?.list[0] || {}
  import { TableColumn } from '@/types/table'
  const userStore = useUserStore()
  const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
  const userDeptArray:any = [userDept]
 
 /**
@@ -298,7 +300,7 @@ export const InspectRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
-      return userDeptArray.find((account) => account.id === cellValue)?.name
+      return userDeptArray.find((account) => account.id == cellValue)?.name
     },
     form: {
       value: userDept.id,
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
index 1d1b4e4a2..9e75ce8eb 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
@@ -78,6 +78,7 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { PurchasereceiptRequestMain,PurchasereceiptRequestMainRules,PurchasereceiptRequestDetail,PurchasereceiptRequestDetailRules } from './purchasereceiptRequestMain.data'
 import * as PurchasereceiptRequestMainApi from '@/api/wms/purchasereceiptRequestMain'
 import * as PurchasereceiptRequestDetailApi from '@/api/wms/purchasereceiptRequestDetail'
@@ -222,9 +223,13 @@ const openForm =async (type: string, row?: number) => {
   formRef.value.open(type, row)
 }
 
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
   detailRef.value.openDetail(row, titleName, titleValue,'requestPurchasereceiptMain')
 }
 
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
index 3766d6484..9b71b9ff1 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
@@ -25,6 +25,8 @@ import { PurchaseDetail, PurchaseMain } from '../../supplierdeliver/purchaseMain
  import { TableColumn } from '@/types/table'
  const userStore = useUserStore()
  const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
  const userDeptArray:any = [userDept]
  
 
@@ -281,7 +283,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
     formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
-      return userDeptArray.find((account) => account.id === cellValue)?.name
+      return userDeptArray.find((account) => account.id == cellValue)?.name
     },
     form: {
       value: userDept.id,
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
index 03d06ae84..3c4b19c7d 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
@@ -95,6 +95,7 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import {
   PurchasereturnRequestMain,
   PurchasereturnRequestMainRules,
@@ -440,11 +441,15 @@ const openForm = async (type: string, row?: number) => {
   formRef.value.open(type, row)
 }
 
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
 /** 详情操作 */
 const detailRef = ref()
 const purchaseReceiptRecordNumberRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
   purchaseReceiptRecordNumberRef.value = row.purchaseReceiptRecordNumber;
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
   detailRef.value.openDetail(row, titleName, titleValue,'requestPurchasereturnMain')
 }
 
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
index 3bfc7cdfd..194494102 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
@@ -28,6 +28,8 @@ const queryParams = {
  import { TableColumn } from '@/types/table'
  const userStore = useUserStore()
  const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
  const userDeptArray:any = [userDept]
  
 /**
@@ -270,7 +272,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
-      return userDeptArray.find((account) => account.id === cellValue)?.name
+      return userDeptArray.find((account) => account.id == cellValue)?.name
     },
     form: {
       value: userDept.id,
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue
index d9f6f3a0b..9196290e2 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue
@@ -79,6 +79,7 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { PutawayRequestMain,PutawayRequestMainRules,PutawayRequestDetail,PutawayRequestDetailRules } from './putawayRequestMain.data'
 import * as PutawayRequestMainApi from '@/api/wms/putawayRequestMain'
 import * as PutawayRequestDetailApi from '@/api/wms/putawayRequestDetail'
@@ -289,9 +290,13 @@ const handleSubmit = async (id: number) => {
     await getList()
 }
 
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
   detailRef.value.openDetail(row, titleName, titleValue,'requestPutawayMain')
 }
 
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
index 906c1cd73..3046105e3 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
@@ -38,6 +38,8 @@ const requestsettingData = data?.list[0] || {}
  import { TableColumn } from '@/types/table'
  const userStore = useUserStore()
  const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
  const userDeptArray:any = [userDept]
  
 /**
@@ -273,7 +275,7 @@ export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
-      return userDeptArray.find((account) => account.id === cellValue)?.name
+      return userDeptArray.find((account) => account.id == cellValue)?.name
     },
     form: {
       value: userDept.id,
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index f54fa7a35..66731287e 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -109,6 +109,7 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { getAccessToken } from '@/utils/auth'
 import {
   SupplierdeliverRequestMain,
@@ -320,9 +321,13 @@ const buttonTableClick = async (val, row) => {
   }
 }
 
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
   detailRef.value.openDetail(row, titleName, titleValue,'requestSupplierdeliverMain')
 }
 //添加/修改操作
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index a4923e7b5..8a8097903 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -29,6 +29,8 @@ const requestsettingData = data?.list[0] || {}
  import { TableColumn } from '@/types/table'
  const userStore = useUserStore()
  const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
  const userDeptArray:any = [userDept] 
 
 /**
@@ -328,7 +330,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
     formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
-      return userDeptArray.find((account) => account.id === cellValue)?.name
+      return userDeptArray.find((account) => account.id == cellValue)?.name
     },
     form: {
       value: userDept.id,
diff --git a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue
index bc05e81f2..353a11316 100644
--- a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue
+++ b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue
@@ -54,6 +54,7 @@
 
 <script setup lang="ts">
   import { getAccessToken } from '@/utils/auth'
+  import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
   import download from '@/utils/download'
   import * as PurchaseclaimRequestMainApi from '@/api/wms/purchaseclaimRequestMain'
   import * as SupplierdeliverRecordDetailApi from '@/api/wms/supplierdeliverRecordDetail'
@@ -258,9 +259,13 @@
     formRef.value.open(type, row)
   }
 
+  // 获取部门 用于详情 部门回显
+  const { wsCache } = useCache()
   /** 详情操作 */
   const detailRef = ref()
   const openDetail = (row : any, titleName : any, titleValue : any) => {
+    const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+    if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
     detailRef.value.openDetail(row, titleName, titleValue)
   }
 
diff --git a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts
index ca748404c..2929e770a 100644
--- a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts
+++ b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts
@@ -15,6 +15,8 @@ const { t } = useI18n() // 国际化
  import { TableColumn } from '@/types/table'
  const userStore = useUserStore()
  const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
  const userDeptArray:any = [userDept]
  
 
@@ -152,7 +154,7 @@ export const PurchaseclaimRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
-      return userDeptArray.find((account) => account.id === cellValue)?.name
+      return userDeptArray.find((account) => account.id == cellValue)?.name
     },
     form: {
       value: userDept.id,
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index f5a30181f..735ebd48a 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -48,6 +48,7 @@
 
 <script setup lang="ts">
   import download from '@/utils/download'
+  import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
   import { SupplierinvoiceRequestMain, SupplierinvoiceRequestMainRules, SupplierinvoiceRequestDetail, SupplierinvoiceRequestDetailRules } from './supplierinvoiceRequestMain.data'
   import * as SupplierinvoiceRequestMainApi from '@/api/wms/supplierinvoiceRequestMain'
   import * as SupplierinvoiceRequestDetailApi from '@/api/wms/supplierinvoiceRequestDetail'
@@ -215,9 +216,13 @@
     formRef.value.open(type, row)
   }
 
+  // 获取部门 用于详情 部门回显
+  const { wsCache } = useCache()
   /** 详情操作 */
   const detailRef = ref()
   const openDetail = (row : any, titleName : any, titleValue : any) => {
+    const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+    if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
     detailRef.value.openDetail(row, titleName, titleValue)
   }
 
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index 0b92ceac9..e94fa52fb 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -22,6 +22,8 @@ const requestsettingData = data?.list[0] || {}
  import { TableColumn } from '@/types/table'
  const userStore = useUserStore()
  const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
  const userDeptArray:any = [userDept]
  
 
@@ -133,7 +135,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
     formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
-      return userDeptArray.find((account) => account.id === cellValue)?.name
+      return userDeptArray.find((account) => account.id == cellValue)?.name
     },
     form: {
       value: userDept.id,