Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

src/views/wms/basicDataManage/factoryModeling/location/location.data.ts

@@ -133,7 +133,7 @@ export const Location = useCrudSchemas(reactive<CrudSchema[]>([
   // {
   //   label: '类型',
   //   field: 'type',
-  //   dictType: DICT_TYPE.LOCATION_TYPE,
+  //   dictType: DICT_TYPE.AREA_TYPE,
   //   dictClass: 'string',
   //   isSearch: true,
   //   isTable: true,

src/views/wms/countManage/count/countJobMain/countJobMain.data.ts

@@ -143,7 +143,7 @@ export const CountJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -154,7 +154,7 @@ export const CountJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',

src/views/wms/countManage/count/countJobMain/index.vue

@@ -71,7 +71,7 @@ import { CountJobMain,CountJobMainRules,CountJobDetail,CountJobDetailRules } fro
 import * as CountJobMainApi from '@/api/wms/countJobMain'
 import * as CountJobDetailApi from '@/api/wms/countJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 盘点任务主
 defineOptions({ name: 'CountJobMain' })
 
@@ -209,10 +209,13 @@ const handleClose = async (id: number) => {
     await getList()
   } catch {}
 }
-
+// 获取部门 用于详情 部门回显
+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)
 }
 

src/views/wms/countManage/count/countRecordMain/index.vue

@@ -66,7 +66,7 @@ import { CountRecordMain,CountRecordMainRules,CountRecordDetail,CountRecordDetai
 import * as CountRecordMainApi from '@/api/wms/countRecordMain'
 import * as CountRecordDetailApi from '@/api/wms/countRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 盘点记录主
 defineOptions({ name: 'CountRecordMain' })
 
@@ -147,10 +147,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)
 }
 

src/views/wms/countManage/countadjust/countadjustRecordMain/index.vue

@@ -66,7 +66,7 @@ import { CountadjustRecordMain,CountadjustRecordMainRules,CountadjustRecordDetai
 import * as CountadjustRecordMainApi from '@/api/wms/countadjustRecordMain'
 import * as CountadjustRecordDetailApi from '@/api/wms/countadjustRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 盘点调整记录主
 defineOptions({ name: 'CountadjustRecordMain' })
 
@@ -132,10 +132,13 @@ const butttondata = (row) => {
 // 列表-操作按钮事件
 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)
 }
 

src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts

@@ -180,7 +180,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -199,7 +199,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',

src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/index.vue

@@ -66,7 +66,7 @@ import { CustomerreceiptRecordMain,CustomerreceiptRecordMainRules,Customerreceip
 import * as CustomerreceiptRecordMainApi from '@/api/wms/customerreceiptRecordMain'
 import * as CustomerreceiptRecordDetailApi from '@/api/wms/customerreceiptRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 客户收货记录主
 defineOptions({ name: 'CustomerreceiptRecordMain' })
 
@@ -132,10 +132,13 @@ const butttondata = (row) => {
 // 列表-操作按钮事件
 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,'recordCustomerreceiptMain')
 }
 

src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts

@@ -174,7 +174,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     isForm: false,
@@ -186,7 +186,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',

src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts

@@ -181,7 +181,7 @@ export const CustomerreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -192,7 +192,7 @@ export const CustomerreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',

src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue

@@ -71,7 +71,7 @@ import { CustomerreturnJobMain,CustomerreturnJobMainRules,CustomerreturnJobDetai
 import * as CustomerreturnJobMainApi from '@/api/wms/customerreturnJobMain'
 import * as CustomerreturnJobDetailApi from '@/api/wms/customerreturnJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 客户退货任务主
 defineOptions({ name: 'CustomerreturnJobMain' })
 
@@ -327,10 +327,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,'jobCustomerreturnMain')
 }
 

src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts

@@ -189,7 +189,7 @@ export const CustomerreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -208,7 +208,7 @@ export const CustomerreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',

src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/index.vue

@@ -67,7 +67,7 @@ import { CustomerreturnRecordMain,CustomerreturnRecordMainRules,CustomerreturnRe
 import * as CustomerreturnRecordMainApi from '@/api/wms/customerreturnRecordMain'
 import * as CustomerreturnRecordDetailApi from '@/api/wms/customerreturnRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 客户退货记录主
 defineOptions({ name: 'CustomerreturnRecordMain' })
 
@@ -136,10 +136,13 @@ const buttonTableClick = async (val, row) => {
     handlePoint(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,'recordCustomerreturnMain')
 }
 

src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts

@@ -285,7 +285,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -297,7 +297,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',

src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/customersettleRecordMain.data.ts

@@ -141,7 +141,7 @@ export const CustomersettleRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE
     dictClass: 'string',
     isTable: true,
     sort: 'custom',

src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/index.vue

@@ -66,7 +66,7 @@ import { CustomersettleRecordMain,CustomersettleRecordMainRules,CustomersettleRe
 import * as CustomersettleRecordMainApi from '@/api/wms/customersettleRecordMain'
 import * as CustomersettleRecordDetailApi from '@/api/wms/customersettleRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 客户结算记录主
 defineOptions({ name: 'CustomersettleRecordMain' })
 
@@ -132,10 +132,13 @@ const butttondata = (row) => {
 // 列表-操作按钮事件
 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,'recordCustomersettleMain')
 }
 

src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts

@@ -134,7 +134,7 @@ export const CustomersettleRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',

src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts

@@ -180,7 +180,7 @@ export const DeliverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -191,7 +191,7 @@ export const DeliverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',

src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue

@@ -71,7 +71,7 @@ import { DeliverJobMain,DeliverJobMainRules,DeliverJobDetail,DeliverJobDetailRul
 import * as DeliverJobMainApi from '@/api/wms/deliverJobMain'
 import * as DeliverJobDetailApi from '@/api/wms/deliverJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 发货任务主
 defineOptions({ name: 'DeliverJobMain' })
 
@@ -297,10 +297,13 @@ const buttonTableClick = async (val, row) => {
     DeliverJobMainApi.acceptDeliverJobMain(row.id)
   }
 }
-
+// 获取部门 用于详情 部门回显
+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,'jobDeliverMain')
 }
 

src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts

@@ -189,7 +189,7 @@ export const DeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -200,7 +200,7 @@ export const DeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',

src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue

@@ -67,7 +67,7 @@ import { DeliverRecordMain,DeliverRecordMainRules,DeliverRecordDetail,DeliverRec
 import * as DeliverRecordMainApi from '@/api/wms/deliverRecordMain'
 import * as DeliverRecordDetailApi from '@/api/wms/deliverRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 发货记录主
 defineOptions({ name: 'DeliverRecordMain' })
 
@@ -136,10 +136,13 @@ const buttonTableClick = async (val, row) => {
     handlePoint(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,'recordDeliverMain')
 }
 

src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts

@@ -272,7 +272,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -284,7 +284,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',

src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue

@@ -71,6 +71,7 @@ import { StockupMainJob,StockupMainJobRules,StockupDetailJob,StockupDetailJobRul
 import * as StockupJobMainApi from '@/api/wms/stockupMainJob'
 import * as StockupJobDetailApi from '@/api/wms/stockupDetailJob'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 
 // 备货任务主
 defineOptions({ name: 'StockupJobMain' })
@@ -199,11 +200,14 @@ const buttonTableClick = async (val, row) => {
     StockupJobMainApi.acceptStockupMainJob(row.id)
   }
 }
-
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue,'jobStockupMain')
+  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,'stockupMainJob')
 }
 
 const handleHandle = async (data) => {

src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts

@@ -210,7 +210,7 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -222,7 +222,7 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',

src/views/wms/deliversettlementManage/stockup/stockupMainRecord/index.vue

@@ -66,6 +66,7 @@ import { StockupMainRecord,StockupMainRecordRules,StockupDetailRecord,StockupDet
 import * as StockupMainRecordApi from '@/api/wms/stockupMainRecord'
 import * as StockupDetailRecordApi from '@/api/wms/stockupDetailRecord'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 
 // 备货记录主
 defineOptions({ name: 'StockupMainRecord' })
@@ -132,11 +133,14 @@ const butttondata = (row) => {
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
 }
-
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue,'recordDeliverMain')
+  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,'stockupMainRecord')
 }
 
 /** 导出按钮操作 */

src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts

@@ -63,7 +63,7 @@ export const StockupMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
     label: '出库事务类型',
     field: 'outTransactionType',
     sort: 'custom',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     table: {
@@ -74,7 +74,7 @@ export const StockupMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '入库事务类型',
     field: 'inTransactionType',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -86,7 +86,7 @@ export const StockupMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -106,7 +106,7 @@ export const StockupMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',

src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts

@@ -119,7 +119,7 @@ export const StockupMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -373,7 +373,7 @@ export const StockupMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',

src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue

@@ -66,7 +66,7 @@ import { InventoryinitRecordMain,InventoryinitRecordMainRules,InventoryinitRecor
 import * as InventoryinitRecordMainApi from '@/api/wms/inventoryinitRecordMain'
 import * as InventoryinitRecordDetailApi from '@/api/wms/inventoryinitRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 库存初始化记录主
 defineOptions({ name: 'InventoryinitRecordMain' })
 
@@ -132,10 +132,13 @@ const butttondata = (row) => {
 // 列表-操作按钮事件
 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,'recordInventoryinitMain')
 }
 

src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/index.vue

@@ -72,7 +72,7 @@ import * as PackageoverJobDetailApi from '@/api/wms/packageoverJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 defineOptions({ name: 'PackageoverJobMain' })
 
 const message = useMessage() // 消息弹窗
@@ -182,10 +182,13 @@ const formsSuccess = async (formType,data) => {
   basicFormRef.value.dialogVisible = false
   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, 'basicPackageoverJobMain')
 }
 

src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue

@@ -71,7 +71,7 @@ import { ScrapJobMain,ScrapJobMainRules,ScrapJobDetail,ScrapJobDetailRules } fro
 import * as ScrapJobMainApi from '@/api/wms/scrapJobMain'
 import * as ScrapJobDetailApi from '@/api/wms/scrapJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 报废出库任务主
 defineOptions({ name: 'ScrapJobMain' })
 
@@ -199,10 +199,13 @@ const buttonTableClick = async (val, row) => {
     console.log('列表-操作按钮事件-承接')
   }
 }
-
+// 获取部门 用于详情 部门回显
+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,'jobScrapMain')
 }
 

src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts

@@ -116,7 +116,7 @@ export const ScrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -127,7 +127,7 @@ export const ScrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',

src/views/wms/inventoryjobManage/scrap/scrapRecordMain/index.vue

@@ -66,7 +66,7 @@ import { ScrapRecordMain,ScrapRecordMainRules,ScrapRecordDetail,ScrapRecordDetai
 import * as ScrapRecordMainApi from '@/api/wms/scrapRecordMain'
 import * as ScrapRecordDetailApi from '@/api/wms/scrapRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 报废出库记录主
 defineOptions({ name: 'ScrapRecordMain' })
 
@@ -132,10 +132,13 @@ const butttondata = (row) => {
 // 列表-操作按钮事件
 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,'recordScrapMain')
 }
 

src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts

@@ -126,7 +126,7 @@ export const ScrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',

src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts

@@ -145,7 +145,7 @@ export const ScrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',

src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/index.vue

@@ -73,6 +73,7 @@ import * as TransferissueJobDetailApi from '@/api/wms/transferissueJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as PurchasereceiptJobMainApi from "@/api/wms/purchasereceiptJobMain";
 import {acceptTransferissueJobMain} from "@/api/wms/transferissueJobMain";
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 
 // 调拨出库任务主
 defineOptions({ name: 'TransferissueJobMain' })
@@ -240,10 +241,13 @@ const handleAccept = async (id: number) => {
     await getList()
   } catch {}
 }
-
+// 获取部门 用于详情 部门回显
+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,'jobTransferissueMain')
 }
 

src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/transferissueJobMain.data.ts

@@ -186,7 +186,7 @@ export const TransferissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -198,7 +198,7 @@ export const TransferissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',

src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/index.vue

@@ -66,7 +66,7 @@ import { TransferissueRecordMain,TransferissueRecordMainRules,TransferissueRecor
 import * as TransferissueRecordMainApi from '@/api/wms/transferissueRecordMain'
 import * as TransferissueRecordDetailApi from '@/api/wms/transferissueRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 调拨出库记录主
 defineOptions({ name: 'TransferissueRecordMain' })
 
@@ -132,10 +132,13 @@ const butttondata = (row) => {
 // 列表-操作按钮事件
 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,'recordTransferissueMain')
 }
 

src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts

@@ -158,7 +158,7 @@ export const TransferissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -169,7 +169,7 @@ export const TransferissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',

src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts

@@ -228,7 +228,7 @@ export const TransferissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -241,7 +241,7 @@ export const TransferissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',

src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/index.vue

@@ -71,7 +71,7 @@ import { TransferreceiptJobMain,TransferreceiptJobMainRules,TransferreceiptJobDe
 import * as TransferreceiptJobMainApi from '@/api/wms/transferreceiptJobMain'
 import * as TransferreceiptJobDetailApi from '@/api/wms/transferreceiptJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 调拨入库任务主
 defineOptions({ name: 'TransferreceiptJobMain' })
 
@@ -199,10 +199,13 @@ const buttonTableClick = async (val, row) => {
     console.log('列表-操作按钮事件-承接')
   }
 }
-
+// 获取部门 用于详情 部门回显
+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,'jobTransferreceiptMain')
 }
 

src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/transferreceiptJobMain.data.ts

@@ -141,7 +141,7 @@ export const TransferreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -152,7 +152,7 @@ export const TransferreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',

src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/index.vue

@@ -66,7 +66,7 @@ import { TransferreceiptRecordMain,TransferreceiptRecordMainRules,Transferreceip
 import * as TransferreceiptRecordMainApi from '@/api/wms/transferreceiptRecordMain'
 import * as TransferreceiptRecordDetailApi from '@/api/wms/transferreceiptRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 调拨入库记录主
 defineOptions({ name: 'TransferreceiptRecordMain' })
 
@@ -132,10 +132,13 @@ const butttondata = (row) => {
 // 列表-操作按钮事件
 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,'recordTransferreceiptMain')
 }
 

src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/transferreceiptRecordMain.data.ts

@@ -166,7 +166,7 @@ export const TransferreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -177,7 +177,7 @@ export const TransferreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',

src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts

@@ -138,7 +138,7 @@ export const TransferreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -149,7 +149,7 @@ export const TransferreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',

src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/index.vue

@@ -71,7 +71,7 @@ import { UnplannedissueJobMain,UnplannedissueJobMainRules,UnplannedissueJobDetai
 import * as UnplannedissueJobMainApi from '@/api/wms/unplannedissueJobMain'
 import * as UnplannedissueJobDetailApi from '@/api/wms/unplannedissueJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 计划外出库任务主
 defineOptions({ name: 'UnplannedissueJobMain' })
 
@@ -199,10 +199,13 @@ const buttonTableClick = async (val, row) => {
     console.log('列表-操作按钮事件-承接')
   }
 }
-
+// 获取部门 用于详情 部门回显
+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,'jobUnplannedissueMain')
 }
 

src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts

@@ -124,7 +124,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isSearch: true,
     isTable: true,
@@ -136,7 +136,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',

src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/index.vue

@@ -66,7 +66,7 @@ import { UnplannedissueRecordMain,UnplannedissueRecordMainRules,UnplannedissueRe
 import * as UnplannedissueRecordMainApi from '@/api/wms/unplannedissueRecordMain'
 import * as UnplannedissueRecordDetailApi from '@/api/wms/unplannedissueRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 计划外出库记录主
 defineOptions({ name: 'UnplannedissueRecordMain' })
 
@@ -132,10 +132,13 @@ const butttondata = (row) => {
 // 列表-操作按钮事件
 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,'recordUnplannedissueMain')
 }
 

src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts

@@ -126,7 +126,7 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',

src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts

@@ -112,7 +112,7 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',

src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/index.vue

@@ -71,7 +71,7 @@ import { UnplannedreceiptJobMain,UnplannedreceiptJobMainRules,UnplannedreceiptJo
 import * as UnplannedreceiptJobMainApi from '@/api/wms/unplannedreceiptJobMain'
 import * as UnplannedreceiptJobDetailApi from '@/api/wms/unplannedreceiptJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 计划外入库任务主
 defineOptions({ name: 'UnplannedreceiptJobMain' })
 
@@ -199,10 +199,13 @@ const buttonTableClick = async (val, row) => {
     console.log('列表-操作按钮事件-承接')
   }
 }
-
+// 获取部门 用于详情 部门回显
+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,'jobUnplannedreceiptMain')
 }
 

src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts

@@ -124,7 +124,7 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isSearch: true,
     isTable: true,
@@ -136,7 +136,7 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',

src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/index.vue

@@ -66,7 +66,7 @@ import { UnplannedreceiptRecordMain,UnplannedreceiptRecordMainRules,Unplannedrec
 import * as UnplannedreceiptRecordMainApi from '@/api/wms/unplannedreceiptRecordMain'
 import * as UnplannedreceiptRecordDetailApi from '@/api/wms/unplannedreceiptRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 调拨入库记录主
 defineOptions({ name: 'UnplannedreceiptRecordMain' })
 
@@ -132,10 +132,13 @@ const butttondata = (row) => {
 // 列表-操作按钮事件
 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,'recordUnplannedreceiptMain')
 }
 

src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts

@@ -126,7 +126,7 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',

src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts

@@ -152,7 +152,7 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isSearch: true,
     isTable: true,

src/views/wms/issueManage/issue/issueJobMain/index.vue

@@ -72,7 +72,7 @@ import * as IssueJobMainApi from '@/api/wms/issueJobMain'
 import * as IssueJobDetailApi from '@/api/wms/issueJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { getDictLabel, DICT_TYPE } from '@/utils/dict'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 发料任务主
 defineOptions({ name: 'IssueJobMain' })
 
@@ -272,10 +272,13 @@ const buttonTableClick = async (val, row) => {
     IssueJobMainApi.acceptIssueMain(row.id)
   }
 }
-
+// 获取部门 用于详情 部门回显
+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)
 }
 

src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts

@@ -236,7 +236,7 @@ export const IssueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isSearch: true,
     isTable: true,
@@ -248,7 +248,7 @@ export const IssueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',

src/views/wms/issueManage/issue/issueRecordMain/index.vue

@@ -66,7 +66,7 @@ import { IssueRecordMain,IssueRecordMainRules,IssueRecordDetail,IssueRecordDetai
 import * as IssueRecordMainApi from '@/api/wms/issueRecordMain'
 import * as IssueRecordDetailApi from '@/api/wms/issueRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 发料记录主
 defineOptions({ name: 'IssueRecordMain' })
 
@@ -132,10 +132,13 @@ const butttondata = (row) => {
 // 列表-操作按钮事件
 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)
 }
 

src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts

@@ -220,7 +220,7 @@ export const IssueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -247,7 +247,7 @@ export const IssueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',

src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/index.vue

@@ -66,7 +66,7 @@ import { OnlinesettlementRecordMain,OnlinesettlementRecordMainRules,Onlinesettle
 import * as OnlinesettlementRecordMainApi from '@/api/wms/onlinesettlementRecordMain'
 import * as OnlinesettlementRecordDetailApi from '@/api/wms/onlinesettlementRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 上线结算记录主
 defineOptions({ name: 'OnlinesettlementRecordMain' })
 
@@ -132,10 +132,13 @@ const butttondata = (row) => {
 // 列表-操作按钮事件
 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)
 }
 

src/views/wms/issueManage/pick/pickJobMain/pickJobMain.data.ts

@@ -229,7 +229,7 @@ export const PickJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isSearch: true,
     isTable: true,
@@ -241,7 +241,7 @@ export const PickJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',

src/views/wms/issueManage/pick/pickRecordMain/pickRecordMain.data.ts

@@ -220,7 +220,7 @@ export const PickRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -239,7 +239,7 @@ export const PickRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',

src/views/wms/issueManage/pick/pickRequestMain/pickRequestMain.data.ts

@@ -48,7 +48,7 @@ export const PickRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -76,7 +76,7 @@ export const PickRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',

src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue

@@ -71,7 +71,7 @@ import { ProductionreceiptJobMain,ProductionreceiptJobMainRules,Productionreceip
 import * as ProductionreceiptJobMainApi from '@/api/wms/productionreceiptJobMain'
 import * as ProductionreceiptJobDetailApi from '@/api/wms/productionreceiptJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 生产收料任务主
 defineOptions({ name: 'ProductionreceiptJobMain' })
 
@@ -273,10 +273,13 @@ const buttonTableClick = async (val, row) => {
     ProductionreceiptJobMainApi.acceptIssueMain(row.id)
   }
 }
-
+// 获取部门 用于详情 部门回显
+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)
 }
 

src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts

@@ -241,7 +241,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -252,7 +252,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',

src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/index.vue

@@ -66,7 +66,7 @@ import { ProductionreceiptRecordMain,ProductionreceiptRecordMainRules,Production
 import * as ProductionreceiptRecordMainApi from '@/api/wms/productionreceiptRecordMain'
 import * as ProductionreceiptRecordDetailApi from '@/api/wms/productionreceiptRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 生产收料记录主
 defineOptions({ name: 'ProductionreceiptRecordMain' })
 
@@ -132,10 +132,13 @@ const butttondata = (row) => {
 // 列表-操作按钮事件
 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)
 }
 

src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts

@@ -212,7 +212,7 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -239,7 +239,7 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',

src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue

@@ -71,7 +71,7 @@ import { ProductionreturnJobMain,ProductionreturnJobMainRules,ProductionreturnJo
 import * as ProductionreturnJobMainApi from '@/api/wms/productionreturnJobMain'
 import * as ProductionreturnJobDetailApi from '@/api/wms/productionreturnJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 生产退料任务主
 defineOptions({ name: 'ProductionreturnJobMain' })
 
@@ -245,10 +245,13 @@ const buttonTableClick = async (val, row) => {
     ProductionreturnJobMainApi.acceptProductionreturnMain(row.id)
   }
 }
-
+// 获取部门 用于详情 部门回显
+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)
 }
 

src/views/wms/issueManage/productionreturn/productionreturnJobMain/productionreturnJobMain.data.ts

@@ -245,7 +245,7 @@ export const ProductionreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -256,7 +256,7 @@ export const ProductionreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',

src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue

@@ -66,7 +66,7 @@ import { ProductionreturnRecordMain,ProductionreturnRecordMainRules,Productionre
 import * as ProductionreturnRecordMainApi from '@/api/wms/productionreturnRecordMain'
 import * as ProductionreturnRecordDetailApi from '@/api/wms/productionreturnRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 生产退料记录主
 defineOptions({ name: 'ProductionreturnRecordMain' })
 
@@ -132,10 +132,13 @@ const butttondata = (row) => {
 // 列表-操作按钮事件
 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)
 }
 

src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts

@@ -220,7 +220,7 @@ export const ProductionreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -247,7 +247,7 @@ export const ProductionreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',

src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts

@@ -146,7 +146,7 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -158,7 +158,7 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isSearch: true,
     isTable: true,

src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts

@@ -165,7 +165,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isSearch: true,
     isTable: false,
@@ -177,7 +177,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: false,
     sort: 'custom',

src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts

@@ -220,7 +220,7 @@ export const RepleinshRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -239,7 +239,7 @@ export const RepleinshRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',

src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/index.vue

@@ -66,7 +66,7 @@ import { InventorychangeRecordMain,InventorychangeRecordMainRules,Inventorychang
 import * as InventorychangeRecordMainApi from '@/api/wms/inventorychangeRecordMain'
 import * as InventorychangeRecordDetailApi from '@/api/wms/inventorychangeRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 库存修改记录主
 defineOptions({ name: 'InventorychangeRecordMain' })
 
@@ -178,10 +178,13 @@ const butttondata = (row) => {
 // 列表-操作按钮事件
 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)
 }
 

src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue

@@ -71,7 +71,7 @@ import { InventorymoveJobMain,InventorymoveJobMainRules,InventorymoveJobDetail,I
 import * as InventorymoveJobMainApi from '@/api/wms/inventorymoveJobMain'
 import * as InventorymoveJobDetailApi from '@/api/wms/inventorymoveJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 库存转移任务主
 defineOptions({ name: 'InventorymoveJobMain' })
 
@@ -252,10 +252,13 @@ const buttonTableClick = async (val, row) => {
     InventorymoveJobMainApi.acceptInventorymoveMain(row.id)
   }
 }
-
+// 获取部门 用于详情 部门回显
+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)
 }
 

src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts

@@ -149,7 +149,7 @@ export const InventorymoveJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isSearch: true,
     isTable: true,
@@ -161,7 +161,7 @@ export const InventorymoveJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isSearch: true,
     isTable: true,

src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue

@@ -66,7 +66,7 @@ import { InventorymoveRecordMain,InventorymoveRecordMainRules,InventorymoveRecor
 import * as InventorymoveRecordMainApi from '@/api/wms/inventorymoveRecordMain'
 import * as InventorymoveRecordDetailApi from '@/api/wms/inventorymoveRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 库存转移记录主
 defineOptions({ name: 'InventorymoveRecordMain' })
 
@@ -187,10 +187,13 @@ const butttondata = (row) => {
 // 列表-操作按钮事件
 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)
 }
 

src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts

@@ -152,7 +152,7 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -163,7 +163,7 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',

src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts

@@ -147,7 +147,7 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    // dictType: DICT_TYPE.LOCATION_TYPE,
+    // dictType: DICT_TYPE.AREA_TYPE,
     // dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -177,7 +177,7 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    // dictType: DICT_TYPE.LOCATION_TYPE,
+    // dictType: DICT_TYPE.AREA_TYPE,
     // dictClass: 'string',
     isTable: true,
     sort: 'custom',

src/views/wms/productionManage/offlinesettlement/offlinesettlementRecordMain/index.vue

@@ -66,7 +66,7 @@ import { OfflinesettlementRecordMain,OfflinesettlementRecordMainRules,Offlineset
 import * as OfflinesettlementRecordMainApi from '@/api/wms/offlinesettlementRecordMain'
 import * as OfflinesettlementRecordDetailApi from '@/api/wms/offlinesettlementRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 下线结算记录主
 defineOptions({ name: 'OfflinesettlementRecordMain' })
 
@@ -132,10 +132,13 @@ const butttondata = (row) => {
 // 列表-操作按钮事件
 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,'recordOfflinesettlementMain')
 }
 

src/views/wms/productionManage/productdismantle/productdismantleJobMain/index.vue

@@ -71,7 +71,7 @@ import { ProductdismantleJobMain,ProductdismantleJobMainRules,ProductdismantleJo
 import * as ProductdismantleJobMainApi from '@/api/wms/productdismantleJobMain'
 import * as ProductdismantleJobDetailApi from '@/api/wms/productdismantleJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 制品拆解任务主
 defineOptions({ name: 'ProductdismantleJobMain' })
 
@@ -199,10 +199,13 @@ const buttonTableClick = async (val, row) => {
     console.log('列表-操作按钮事件-承接')
   }
 }
-
+// 获取部门 用于详情 部门回显
+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,'jobProductdismantleMain')
 }
 

src/views/wms/productionManage/productdismantle/productdismantleJobMain/productdismantleJobMain.data.ts

@@ -253,7 +253,7 @@ export const ProductdismantleJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -264,7 +264,7 @@ export const ProductdismantleJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',

src/views/wms/productionManage/productdismantle/productdismantleRecordMain/index.vue

@@ -91,7 +91,7 @@ import * as ProductdismantleRecordMainApi from '@/api/wms/productdismantleRecord
 import * as ProductdismantleRecordDetailApi from '@/api/wms/productdismantleRecordDetaila'
 import * as DismantleRecordDetailbApi from '@/api/wms/dismantleRecordDetailb'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 制品拆解记录主
 defineOptions({ name: 'ProductdismantleRecordMain' })
 
@@ -202,10 +202,13 @@ const butttondata = (row) => {
 // 列表-操作按钮事件
 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,'recordProductdismantleMain')
 }
 

src/views/wms/productionManage/productdismantle/productdismantleRecordMain/productdismantleRecordMain.data.ts

@@ -228,7 +228,7 @@ export const ProductdismantleRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',

src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts

@@ -146,7 +146,7 @@ export const ProductdismantleRequestMain = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',

src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue

@@ -71,7 +71,7 @@ import { ProductputawayJobMain,ProductputawayJobMainRules,ProductputawayJobDetai
 import * as ProductputawayJobMainApi from '@/api/wms/productputawayJobMain'
 import * as ProductputawayJobDetailApi from '@/api/wms/productputawayJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 制品上架任务主
 defineOptions({ name: 'ProductputawayJobMain' })
 
@@ -238,10 +238,13 @@ const buttonTableClick = async (val, row) => {
     ProductputawayJobMainApi.acceptProductputawayMain(row.id)
   }
 }
-
+// 获取部门 用于详情 部门回显
+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,'jobProductputawayMain')
 }
 

src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts

@@ -237,7 +237,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -248,7 +248,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isSearch: true,
     isTable: true,

src/views/wms/productionManage/productputaway/productputawayRecordMain/index.vue

@@ -66,7 +66,7 @@ import { ProductputawayRecordMain,ProductputawayRecordMainRules,ProductputawayRe
 import * as ProductputawayRecordMainApi from '@/api/wms/productputawayRecordMain'
 import * as ProductputawayRecordDetailApi from '@/api/wms/productputawayRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 制品上架记录主
 defineOptions({ name: 'ProductputawayRecordMain' })
 
@@ -132,10 +132,13 @@ const butttondata = (row) => {
 // 列表-操作按钮事件
 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,'recordProductputawayMain')
 }
 

src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts

@@ -228,7 +228,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -247,7 +247,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',

src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts

@@ -63,7 +63,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -260,7 +260,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isSearch: true,
     isTable: true,

src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue

@@ -71,7 +71,7 @@ import { ProductreceiptJobMain,ProductreceiptJobMainRules,ProductreceiptJobDetai
 import * as ProductreceiptJobMainApi from '@/api/wms/productreceiptJobMain'
 import * as ProductreceiptJobDetailApi from '@/api/wms/productreceiptJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 制品收货任务主
 defineOptions({ name: 'ProductreceiptJobMain' })
 
@@ -259,10 +259,13 @@ const buttonTableClick = async (val, row) => {
     ProductreceiptJobMainApi.acceptProductreceiptMain(row.id)
   }
 }
-
+// 获取部门 用于详情 部门回显
+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,'jobProductreceiptMain')
 }
 

src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts

@@ -261,7 +261,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -272,7 +272,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',

src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue

@@ -90,7 +90,7 @@ import * as ProductreceiptRecordMainApi from '@/api/wms/productreceiptRecordMain
 import * as ProductreceiptRecordDetailApi from '@/api/wms/productreceiptRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as BackflushRecordDetailbApi from '@/api/wms/backflushRecordDetailb'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 制品收货记录主
 defineOptions({ name: 'ProductreceiptRecordMain' })
 
@@ -175,10 +175,13 @@ const butttondata = (row) => {
 // 列表-操作按钮事件
 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,'recordProductreceiptMain')
 }
 

src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts

@@ -244,7 +244,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',

src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts

@@ -162,7 +162,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',

src/views/wms/productionManage/productrepair/productrepairRecordMain/index.vue

@@ -94,7 +94,7 @@ import * as ProductrepairRecordDetailApi from '@/api/wms/productrepairRecordDeta
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as BomDismantleApi from "@/api/wms/bomDismantle";
 import {getBomDismantleRecordPage} from "@/api/wms/bomDismantle";
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 制品返修记录主
 defineOptions({ name: 'ProductrepairRecordMain' })
 
@@ -241,10 +241,13 @@ const butttondata = (row) => {
 // 列表-操作按钮事件
 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,'recordProductrepairMain')
 }
 

src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts

@@ -229,7 +229,7 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',

src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts

@@ -146,7 +146,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',

src/views/wms/productionManage/productscrap/productscrapJobMain/index.vue

@@ -71,7 +71,7 @@ import { ProductscrapJobMain,ProductscrapJobMainRules,ProductscrapJobDetail,Prod
 import * as ProductscrapJobMainApi from '@/api/wms/productscrapJobMain'
 import * as ProductscrapJobDetailApi from '@/api/wms/productscrapJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 制品报废任务主
 defineOptions({ name: 'ProductscrapJobMain' })
 
@@ -199,10 +199,13 @@ const buttonTableClick = async (val, row) => {
     console.log('列表-操作按钮事件-承接')
   }
 }
-
+// 获取部门 用于详情 部门回显
+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,'jobProductscrapMain')
 }
 

src/views/wms/productionManage/productscrap/productscrapJobMain/productscrapJobMain.data.ts

@@ -229,7 +229,7 @@ export const ProductscrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -240,7 +240,7 @@ export const ProductscrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',

src/views/wms/productionManage/productscrap/productscrapRecordMain/index.vue

@@ -93,7 +93,7 @@ import * as ProductscrapRecordDetailApi from '@/api/wms/productscrapRecordDetail
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as BomDismantleApi from "@/api/wms/bomDismantle";
 import {getProductscrapBomDismantleRecordPage} from "@/api/wms/bomDismantle";
-
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 制品报废记录主
 defineOptions({ name: 'ProductscrapRecordMain' })
 
@@ -240,10 +240,13 @@ const butttondata = (row) => {
 // 列表-操作按钮事件
 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,'recordProductscrapMain')
 }