diff --git a/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts b/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts index 2765c0899..6bcc1d903 100644 --- a/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts +++ b/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts @@ -133,7 +133,7 @@ export const Location = useCrudSchemas(reactive([ // { // label: '类型', // field: 'type', - // dictType: DICT_TYPE.LOCATION_TYPE, + // dictType: DICT_TYPE.AREA_TYPE, // dictClass: 'string', // isSearch: true, // isTable: true, diff --git a/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts b/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts index 27c00d765..edaecb60f 100644 --- a/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts +++ b/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts @@ -143,7 +143,7 @@ export const CountJobMain = useCrudSchemas(reactive([ { 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([ { label: '到库区类型范围', field: 'toAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts index f566d2893..de3b7aadd 100644 --- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts @@ -180,7 +180,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive([ { 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([ { label: '到库区类型范围', field: 'toAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts index 833fec8bb..40799c9a6 100644 --- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts @@ -174,7 +174,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive( { 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( { label: '到库区类型范围', field: 'toAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts index cd973da77..b2b761c6c 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts @@ -181,7 +181,7 @@ export const CustomerreturnJobMain = useCrudSchemas(reactive([ { 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([ { label: '到库区类型范围', field: 'toAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts index aab1717c3..45e23fed6 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts @@ -189,7 +189,7 @@ export const CustomerreturnRecordMain = useCrudSchemas(reactive([ { 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([ { label: '到库区类型范围', field: 'toAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts index 3e024dcc9..9c12565bb 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts @@ -285,7 +285,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ { 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([ { label: '到库区类型范围', field: 'toAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', diff --git a/src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/customersettleRecordMain.data.ts b/src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/customersettleRecordMain.data.ts index 1480e7adc..c52dd9038 100644 --- a/src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/customersettleRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/customersettleRecordMain.data.ts @@ -141,7 +141,7 @@ export const CustomersettleRecordMain = useCrudSchemas(reactive([ { label: '从库区类型范围', field: 'fromAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE dictClass: 'string', isTable: true, sort: 'custom', diff --git a/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts b/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts index 07f3a3dae..63dccc27b 100644 --- a/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts @@ -134,7 +134,7 @@ export const CustomersettleRequestMain = useCrudSchemas(reactive([ { label: '从库区类型范围', field: 'fromAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', diff --git a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts index 3a538b354..db84960d1 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts @@ -180,7 +180,7 @@ export const DeliverJobMain = useCrudSchemas(reactive([ { 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([ { label: '到库区类型范围', field: 'toAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts index d3927c830..a11a3c3f1 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts @@ -189,7 +189,7 @@ export const DeliverRecordMain = useCrudSchemas(reactive([ { 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([ { label: '到库区类型范围', field: 'toAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts index 8d47784cd..5ae9992d7 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts @@ -272,7 +272,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ { 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([ { label: '到库区类型范围', field: 'toAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue index c1425e150..6fceca776 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue +++ b/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) => { diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts index b1b118996..ae116f734 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts @@ -210,7 +210,7 @@ export const StockupMainJob = useCrudSchemas(reactive([ { 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([ { label: '到库区类型范围', field: 'toAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/index.vue b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/index.vue index 168b9c9e1..6ba0203ae 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/index.vue +++ b/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') } /** 导出按钮操作 */ diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts index 0ea16712f..b44bd6867 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts @@ -63,7 +63,7 @@ export const StockupMainRecord = useCrudSchemas(reactive([ 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([ { 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([ { 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([ { label: '到库区类型范围', field: 'toAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts index d6146359e..d1f126201 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts @@ -119,7 +119,7 @@ export const StockupMainRequest = useCrudSchemas(reactive([ { 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([ { label: '到库区类型范围', field: 'toAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', diff --git a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts index c616db448..99effbbd7 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts +++ b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts @@ -116,7 +116,7 @@ export const ScrapJobMain = useCrudSchemas(reactive([ { 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([ { label: '到库区类型范围', field: 'toAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts index 7d8ae6095..f75a7d2ba 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts @@ -126,7 +126,7 @@ export const ScrapRecordMain = useCrudSchemas(reactive([ { label: '从库区类型范围', field: 'fromAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts index da1f498d4..1663c4e2c 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts @@ -145,7 +145,7 @@ export const ScrapRequestMain = useCrudSchemas(reactive([ { label: '从库区类型范围', field: 'fromAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/transferissueJobMain.data.ts b/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/transferissueJobMain.data.ts index 8a96b382a..38d3fd546 100644 --- a/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/transferissueJobMain.data.ts +++ b/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/transferissueJobMain.data.ts @@ -186,7 +186,7 @@ export const TransferissueJobMain = useCrudSchemas(reactive([ { 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([ { label: '到库区类型范围', field: 'toAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts b/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts index 7e996b6eb..32a7ed2ee 100644 --- a/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts @@ -158,7 +158,7 @@ export const TransferissueRecordMain = useCrudSchemas(reactive([ { 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([ { label: '到库区类型范围', field: 'toAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts index a0bfbb3d1..948b12065 100644 --- a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts @@ -228,7 +228,7 @@ export const TransferissueRequestMain = useCrudSchemas(reactive([ { 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([ { label: '到库区类型范围', field: 'toAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/transferreceiptJobMain.data.ts b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/transferreceiptJobMain.data.ts index 7e5236aff..e11a049d3 100644 --- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/transferreceiptJobMain.data.ts +++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/transferreceiptJobMain.data.ts @@ -141,7 +141,7 @@ export const TransferreceiptJobMain = useCrudSchemas(reactive([ { 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([ { label: '到库区类型范围', field: 'toAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/transferreceiptRecordMain.data.ts b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/transferreceiptRecordMain.data.ts index 290ae7d95..e9acb88d2 100644 --- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/transferreceiptRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/transferreceiptRecordMain.data.ts @@ -166,7 +166,7 @@ export const TransferreceiptRecordMain = useCrudSchemas(reactive([ { 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([ { label: '到库区类型范围', field: 'toAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts index 95a051c46..c8ea67d20 100644 --- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts @@ -138,7 +138,7 @@ export const TransferreceiptRequestMain = useCrudSchemas(reactive( { 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( { label: '到库区类型范围', field: 'toAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts index 96c9e6e94..8609deee4 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts @@ -124,7 +124,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive([ { 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([ { label: '到库区类型范围', field: 'toAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts index 783a7594e..75c83ba26 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts @@ -126,7 +126,7 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive([ { label: '从库区类型范围', field: 'fromAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts index bb579b5f0..2ead54f3f 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts @@ -112,7 +112,7 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive([ { label: '从库区类型范围', field: 'fromAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts index 167feec0e..1525201c3 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts @@ -124,7 +124,7 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive([ { 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([ { label: '到库区类型范围', field: 'toAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts index afcc31947..c875677b4 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts @@ -126,7 +126,7 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive( { label: '到库区类型范围', field: 'toAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts index ae6a278b8..f31cd9ecf 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts @@ -152,7 +152,7 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive { label: '到库区类型范围', field: 'toAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isSearch: true, isTable: true, diff --git a/src/views/wms/issueManage/issue/issueJobMain/index.vue b/src/views/wms/issueManage/issue/issueJobMain/index.vue index 551c2f5d8..3133dcd36 100644 --- a/src/views/wms/issueManage/issue/issueJobMain/index.vue +++ b/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) } diff --git a/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts b/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts index ee3014e28..6f4a919d9 100644 --- a/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts +++ b/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts @@ -236,7 +236,7 @@ export const IssueJobMain = useCrudSchemas(reactive([ { 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([ { label: '到库区类型范围', field: 'toAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', diff --git a/src/views/wms/issueManage/issue/issueRecordMain/index.vue b/src/views/wms/issueManage/issue/issueRecordMain/index.vue index 8ab7a62b8..011761bd5 100644 --- a/src/views/wms/issueManage/issue/issueRecordMain/index.vue +++ b/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) } diff --git a/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts b/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts index c232a91de..96b413cba 100644 --- a/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts +++ b/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts @@ -220,7 +220,7 @@ export const IssueRecordMain = useCrudSchemas(reactive([ { 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([ { label: '到库区类型范围', field: 'toAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', diff --git a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/index.vue b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/index.vue index 64f13dd2d..4dc6976d5 100644 --- a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/index.vue +++ b/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) } diff --git a/src/views/wms/issueManage/pick/pickJobMain/pickJobMain.data.ts b/src/views/wms/issueManage/pick/pickJobMain/pickJobMain.data.ts index 04280cab4..0a50534e2 100644 --- a/src/views/wms/issueManage/pick/pickJobMain/pickJobMain.data.ts +++ b/src/views/wms/issueManage/pick/pickJobMain/pickJobMain.data.ts @@ -229,7 +229,7 @@ export const PickJobMain = useCrudSchemas(reactive([ { 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([ { label: '到库区类型范围', field: 'toAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', diff --git a/src/views/wms/issueManage/pick/pickRecordMain/pickRecordMain.data.ts b/src/views/wms/issueManage/pick/pickRecordMain/pickRecordMain.data.ts index 85ea5f5ac..c0fff1c77 100644 --- a/src/views/wms/issueManage/pick/pickRecordMain/pickRecordMain.data.ts +++ b/src/views/wms/issueManage/pick/pickRecordMain/pickRecordMain.data.ts @@ -220,7 +220,7 @@ export const PickRecordMain = useCrudSchemas(reactive([ { 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([ { label: '到库区类型范围', field: 'toAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', diff --git a/src/views/wms/issueManage/pick/pickRequestMain/pickRequestMain.data.ts b/src/views/wms/issueManage/pick/pickRequestMain/pickRequestMain.data.ts index fa550e33d..450282624 100644 --- a/src/views/wms/issueManage/pick/pickRequestMain/pickRequestMain.data.ts +++ b/src/views/wms/issueManage/pick/pickRequestMain/pickRequestMain.data.ts @@ -48,7 +48,7 @@ export const PickRequestMain = useCrudSchemas(reactive([ { 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([ { label: '到库区类型范围', field: 'toAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue index ff0b642a2..660119199 100644 --- a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue +++ b/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) } diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts index d86bc636d..961dcab60 100644 --- a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts +++ b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts @@ -241,7 +241,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive([ { 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([ { label: '到库区类型范围', field: 'toAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/index.vue b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/index.vue index ef050f101..fc1c8413c 100644 --- a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/index.vue +++ b/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) } diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts index e4be38b7e..b1799c14d 100644 --- a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts +++ b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts @@ -212,7 +212,7 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive { 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 { label: '到库区类型范围', field: 'toAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', diff --git a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue index 9557fe216..1692e3476 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue +++ b/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) } diff --git a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/productionreturnJobMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/productionreturnJobMain.data.ts index f49676ca9..fb3413b72 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/productionreturnJobMain.data.ts +++ b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/productionreturnJobMain.data.ts @@ -245,7 +245,7 @@ export const ProductionreturnJobMain = useCrudSchemas(reactive([ { 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([ { label: '到库区类型范围', field: 'toAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue index 8f430742b..1e9458787 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue +++ b/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) } diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts index c29c76ce7..10db40ece 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts +++ b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts @@ -220,7 +220,7 @@ export const ProductionreturnRecordMain = useCrudSchemas(reactive( { 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( { label: '到库区类型范围', field: 'toAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts index cbe054bdc..edd1e9634 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts @@ -146,7 +146,7 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive { 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 { label: '到库区类型范围', field: 'toAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isSearch: true, isTable: true, diff --git a/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts index 3d305e1a0..eddd68caa 100644 --- a/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts +++ b/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts @@ -165,7 +165,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive([ { 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([ { label: '到库区类型范围', field: 'toAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: false, sort: 'custom', diff --git a/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts index 663260573..3de9f2a92 100644 --- a/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts +++ b/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts @@ -220,7 +220,7 @@ export const RepleinshRecordMain = useCrudSchemas(reactive([ { 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([ { label: '到库区类型范围', field: 'toAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts index d0fda520b..c29587068 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts @@ -149,7 +149,7 @@ export const InventorymoveJobMain = useCrudSchemas(reactive([ { 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([ { label: '到库区类型范围', field: 'toAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isSearch: true, isTable: true, diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts index d89084b67..28365764f 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts @@ -152,7 +152,7 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive([ { 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([ { label: '到库区类型范围', field: 'toAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts index f1739c2ed..603e01210 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts @@ -147,7 +147,7 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive([ { 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([ { label: '到库区类型范围', field: 'toAreaTypes', - // dictType: DICT_TYPE.LOCATION_TYPE, + // dictType: DICT_TYPE.AREA_TYPE, // dictClass: 'string', isTable: true, sort: 'custom', diff --git a/src/views/wms/productionManage/productdismantle/productdismantleJobMain/productdismantleJobMain.data.ts b/src/views/wms/productionManage/productdismantle/productdismantleJobMain/productdismantleJobMain.data.ts index 2cdff47aa..bdc4a04c4 100644 --- a/src/views/wms/productionManage/productdismantle/productdismantleJobMain/productdismantleJobMain.data.ts +++ b/src/views/wms/productionManage/productdismantle/productdismantleJobMain/productdismantleJobMain.data.ts @@ -253,7 +253,7 @@ export const ProductdismantleJobMain = useCrudSchemas(reactive([ { 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([ { label: '到库区类型范围', field: 'toAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/productdismantleRecordMain.data.ts b/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/productdismantleRecordMain.data.ts index c4aaa96ff..de6e44621 100644 --- a/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/productdismantleRecordMain.data.ts +++ b/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/productdismantleRecordMain.data.ts @@ -228,7 +228,7 @@ export const ProductdismantleRecordMain = useCrudSchemas(reactive( { label: '从库区类型范围', field: 'fromAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts index 204a4aae4..615d80fb3 100644 --- a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts +++ b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts @@ -146,7 +146,7 @@ export const ProductdismantleRequestMain = useCrudSchemas(reactive { label: '从库区类型范围', field: 'fromAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', diff --git a/src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts b/src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts index 904c49e0e..3cd26c74d 100644 --- a/src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts +++ b/src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts @@ -237,7 +237,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive([ { 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([ { label: '到库区类型范围', field: 'toAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isSearch: true, isTable: true, diff --git a/src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts b/src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts index f07a7dc7f..adecda095 100644 --- a/src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts +++ b/src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts @@ -228,7 +228,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive([ { 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([ { label: '到库区类型范围', field: 'toAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', diff --git a/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts b/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts index 17c7587e1..e7792a5fd 100644 --- a/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts +++ b/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts @@ -63,7 +63,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive([ { 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([ { label: '到库区类型范围', field: 'toAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isSearch: true, isTable: true, diff --git a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts index fe47f40c5..d88c730ec 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts @@ -261,7 +261,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ { 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([ { label: '到库区类型范围', field: 'toAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts index cbea20d07..6c3fc3bcf 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts @@ -244,7 +244,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ { label: '到库区类型范围', field: 'toAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts index 928430024..8a81f8428 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts @@ -162,7 +162,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ { label: '到库区类型范围', field: 'toAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', diff --git a/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts b/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts index cf4468e48..19d07630a 100644 --- a/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts +++ b/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts @@ -229,7 +229,7 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive([ { label: '从库区类型范围', field: 'fromAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts index cae44bc7a..c16250fdb 100644 --- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts +++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts @@ -146,7 +146,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive([ { label: '从库区类型范围', field: 'fromAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', diff --git a/src/views/wms/productionManage/productscrap/productscrapJobMain/productscrapJobMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapJobMain/productscrapJobMain.data.ts index 172a29b18..ad21962a7 100644 --- a/src/views/wms/productionManage/productscrap/productscrapJobMain/productscrapJobMain.data.ts +++ b/src/views/wms/productionManage/productscrap/productscrapJobMain/productscrapJobMain.data.ts @@ -229,7 +229,7 @@ export const ProductscrapJobMain = useCrudSchemas(reactive([ { 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([ { label: '到库区类型范围', field: 'toAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', diff --git a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts index 198fd8d69..5fddad79c 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts +++ b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts @@ -258,7 +258,7 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive([ { label: '从库区类型范围', field: 'fromAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts index 5f268e7db..a8590d18b 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts +++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts @@ -148,7 +148,7 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive([ { label: '从库区类型范围', field: 'fromAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/index.vue b/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/index.vue index 5f76c6c08..182b008ee 100644 --- a/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/index.vue +++ b/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/index.vue @@ -71,7 +71,7 @@ import { InspectJobMain,InspectJobMainRules,InspectJobDetail,InspectJobDetailRul import * as InspectJobMainApi from '@/api/wms/inspectJobMain' import * as InspectJobDetailApi from '@/api/wms/inspectJobDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' - +import { CACHE_KEY, useCache } from '@/hooks/web/useCache' // 检验任务主 defineOptions({ name: 'InspectJobMain' }) @@ -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,'jobInspectMain') } diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/inspectJobMain.data.ts b/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/inspectJobMain.data.ts index 33d2defa1..5282de81f 100644 --- a/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/inspectJobMain.data.ts +++ b/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/inspectJobMain.data.ts @@ -217,7 +217,7 @@ export const InspectJobMain = useCrudSchemas(reactive([ { label: '从库区类型范围', field: 'fromAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', @@ -228,7 +228,7 @@ export const InspectJobMain = useCrudSchemas(reactive([ { label: '到库区类型范围', field: 'toAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue b/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue index 5f867c3e1..fa9cac48e 100644 --- a/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue @@ -70,7 +70,7 @@ import * as InspectRecordMainApi from '@/api/wms/inspectRecordMain' import * as InspectRecordDetailApi from '@/api/wms/inspectRecordDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import Preview from '@/components/UploadFile/src/Preview.vue' - +import { CACHE_KEY, useCache } from '@/hooks/web/useCache' // 检验记录主 defineOptions({ name: 'InspectRecordMain' }) @@ -155,10 +155,13 @@ const handlePutawayRequest = async (number:string) => { tableObject.loading = false } } - +// 获取部门 用于详情 部门回显 +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,'recordInspectMain') } diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/inspectRecordMain.data.ts b/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/inspectRecordMain.data.ts index abe003386..a0928f3c5 100644 --- a/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/inspectRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/inspectRecordMain.data.ts @@ -363,7 +363,7 @@ export const InspectRecordMain = useCrudSchemas(reactive([ label: '从库区类型范围', field: 'fromAreaTypes', isTable: true, - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', sort: 'custom', table: { diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts index cfee6ab70..ead937f80 100644 --- a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts @@ -184,7 +184,7 @@ export const InspectRequestMain = useCrudSchemas(reactive([ { label: '从库区类型范围', field: 'fromAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', @@ -196,7 +196,7 @@ export const InspectRequestMain = useCrudSchemas(reactive([ { label: '到库区类型范围', field: 'toAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue index 2eb30d6e5..58a73593d 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue @@ -95,7 +95,7 @@ import { PurchasereceiptJobMain, import * as PurchasereceiptJobMainApi from '@/api/wms/purchasereceiptJobMain' import * as PurchasereceiptJobDetailApi from '@/api/wms/purchasereceiptJobDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' - +import { CACHE_KEY, useCache } from '@/hooks/web/useCache' // 采购收货任务主 defineOptions({ name: 'PurchasereceiptJobMain' }) @@ -241,10 +241,13 @@ const { tableObject: packingDetatableData, tableMethods: packDetatableMethods } getListApi: PurchasereceiptJobDetailApi.queryPurchaseceiptChildPackingNumber }) const { getList:queryDetailList } = packDetatableMethods - +// 获取部门 用于详情 部门回显 +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,'jobPurchasereceiptMain') } diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts index e669ff514..02bec99c8 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts @@ -301,7 +301,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ { label: '从库区类型范围', field: 'fromAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', @@ -312,7 +312,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ { label: '到库区类型范围', field: 'toAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue index dfd32837e..5792a4069 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue @@ -102,7 +102,7 @@ import * as PurchasereceiptRecordMainApi from '@/api/wms/purchasereceiptRecordMa import * as PurchasereceiptRecordDetailApi from '@/api/wms/purchasereceiptRecordDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import { PurchasereceiptRequestTabsList } from '@/utils/disposition/tabsList' - +import { CACHE_KEY, useCache } from '@/hooks/web/useCache' // 采购收货记录主 defineOptions({ name: 'PurchasereceiptRecordMain' }) @@ -213,10 +213,13 @@ const { tableObject: outStockPackingDetatableData, tableMethods: outStockPackDet getListApi: PurchasereceiptRecordDetailApi.queryPurchaseshortageChildPackingNumber }) const { getList:queryOutStockDetailList } = outStockPackDetatableMethods - +// 获取部门 用于详情 部门回显 +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,'recordPurchasereceiptMain') } diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index 8197a8b6e..621efb7ce 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -125,7 +125,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ { label: '从库区类型范围', field: 'fromAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', @@ -136,7 +136,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ { label: '到库区类型范围', field: 'toAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts index 9c51ae59c..b83102da5 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts @@ -178,7 +178,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive( { label: '从库区类型范围', field: 'fromAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', @@ -190,7 +190,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive( { label: '到库区类型范围', field: 'toAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', @@ -449,6 +449,8 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive( label: '标签状态', field: 'labelStatus', sort: 'custom', + dictType: DICT_TYPE.LABEL_STATUS, + dictClass: 'string', table: { width: 150 }, diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue index 699c042ff..2fb352085 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue @@ -71,6 +71,7 @@ import { PurchasereturnJobMain,PurchasereturnJobMainRules,PurchasereturnJobDetai import * as PurchasereturnJobMainApi from '@/api/wms/purchasereturnJobMain' import * as PurchasereturnJobDetailApi from '@/api/wms/purchasereturnJobDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' +import { CACHE_KEY, useCache } from '@/hooks/web/useCache' // 采购退货任务主 defineOptions({ name: 'PurchasereturnJobMain' }) @@ -209,10 +210,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,'jobPurchasereturnMain') } diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts index be0ad7436..8d947536b 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts @@ -107,7 +107,7 @@ export const PurchasereturnJobMain = useCrudSchemas(reactive([ { label: '从库区类型范围', field: 'fromAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isSearch: false, isTable: true, @@ -119,7 +119,7 @@ export const PurchasereturnJobMain = useCrudSchemas(reactive([ { label: '到库区类型范围', field: 'toAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue index c1e88d93a..c4b1b8e00 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue @@ -67,7 +67,7 @@ import * as PurchasereturnRecordMainApi from '@/api/wms/purchasereturnRecordMain import * as PurchasereturnRecordDetailApi from '@/api/wms/purchasereturnRecordDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import { getAccessToken } from '@/utils/auth' - +import { CACHE_KEY, useCache } from '@/hooks/web/useCache' // 采购退货记录主 defineOptions({ name: 'PurchasereturnRecordMain' }) @@ -144,10 +144,13 @@ const documentSrc = ref(BASE_URL + '/jmreport/view/920874172025987072?token=' + const handleDocumentPrint = async (id) => { window.open(documentSrc.value + '&id=' + 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,'recordPurchasereturnMain') } diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts index ad3562c9a..ee35586a8 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts @@ -132,7 +132,7 @@ export const PurchasereturnRecordMain = useCrudSchemas(reactive([ { label: '从库区类型范围', field: 'fromAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', @@ -143,7 +143,7 @@ export const PurchasereturnRecordMain = useCrudSchemas(reactive([ { label: '到库区类型范围', field: 'toAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts index 6cabf554e..711063c0c 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts @@ -156,7 +156,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive([ { label: '从库区类型范围', field: 'fromAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', @@ -168,7 +168,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive([ { label: '到库区类型范围', field: 'toAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue index c63ba5643..9a39229a8 100644 --- a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue +++ b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue @@ -94,7 +94,7 @@ import { PutawayJobMain, import * as PutawayJobMainApi from '@/api/wms/putawayJobMain' import * as PutawayJobDetailApi from '@/api/wms/putawayJobDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' - +import { CACHE_KEY, useCache } from '@/hooks/web/useCache' // 上架任务主 defineOptions({ name: 'PutawayJobMain' }) @@ -229,10 +229,13 @@ const { tableObject: packingDetatableData, tableMethods: packDetatableMethods } getListApi: PutawayJobDetailApi.getPutawayJobDetailPageChildPackingNumber }) const { getList:queryDetailList } = packDetatableMethods - +// 获取部门 用于详情 部门回显 +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,'jobPutawayMain') } diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue index 09a9480c7..c2cec817e 100644 --- a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue @@ -89,7 +89,7 @@ import { PutawayRecordMain, import * as PutawayRecordMainApi from '@/api/wms/putawayRecordMain' import * as PutawayRecordDetailApi from '@/api/wms/putawayRecordDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' - +import { CACHE_KEY, useCache } from '@/hooks/web/useCache' // 上架记录主 defineOptions({ name: 'PutawayRecordMain' }) @@ -162,10 +162,13 @@ const { tableObject: packingDetatableData, tableMethods: packDetatableMethods } getListApi: PutawayRecordDetailApi.getPutawayJobDetailPageChildPackingNumber }) const { getList:queryDetailList } = packDetatableMethods - +// 获取部门 用于详情 部门回显 +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,'recordPutawayMain') } diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts index 9f42208e2..6d3453d75 100644 --- a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts @@ -228,7 +228,7 @@ export const PutawayRecordMain = useCrudSchemas(reactive([ { 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 PutawayRecordMain = useCrudSchemas(reactive([ { label: '到库区类型范围', field: 'toAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts index 0384bbea6..95304ad1b 100644 --- a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts @@ -315,7 +315,7 @@ export const PutawayRequestMain = useCrudSchemas(reactive([ { label: '到库区类型范围', field: 'toAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue index cf4950cf8..e20fb51a8 100644 --- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue +++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue @@ -71,7 +71,7 @@ import { PurchasereceiptJobMain,PurchasereceiptJobMainRules,PurchasereceiptJobDe import * as PurchasereceiptJobMainApi from '@/api/wms/purchasereceiptJobMain' import * as PurchasereceiptJobDetailApi from '@/api/wms/purchasereceiptJobDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' - +import { CACHE_KEY, useCache } from '@/hooks/web/useCache' // 采购收货任务主 defineOptions({ name: 'PurchasereceiptJobMain' }) @@ -234,10 +234,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,'jobPurchasereceiptMain') } diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts index 1e5574de4..3ce781e10 100644 --- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts +++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts @@ -301,7 +301,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ { label: '从库区类型范围', field: 'fromAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', @@ -312,7 +312,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ { label: '到库区类型范围', field: 'toAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue index 67066e8ce..b28f7a874 100644 --- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue @@ -69,7 +69,7 @@ import * as PurchasereceiptRecordMainApi from '@/api/wms/purchasereceiptRecordMa import * as PurchasereceiptRecordDetailApi from '@/api/wms/purchasereceiptRecordDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import { PurchasereceiptRequestTabsList } from '@/utils/disposition/tabsList' - +import { CACHE_KEY, useCache } from '@/hooks/web/useCache' // 采购收货记录主 defineOptions({ name: 'PurchasereceiptRecordMain' }) @@ -135,11 +135,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,'recordPurchasereceiptMain') } diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts index 71eb3ce79..fe4fc4ed0 100644 --- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts @@ -125,7 +125,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ { label: '从库区类型范围', field: 'fromAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', @@ -136,7 +136,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ { label: '到库区类型范围', field: 'toAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts index 7f836ea17..ddc626775 100644 --- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts @@ -179,7 +179,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive( { 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 PurchasereceiptRequestMain = useCrudSchemas(reactive( { label: '到库区类型范围', field: 'toAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom', @@ -449,6 +449,8 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive( { label: '标签状态', field: 'labelStatus', + dictType: DICT_TYPE.LABEL_STATUS, + dictClass: 'string', sort: 'custom', table: { width: 150 diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue index 74d52a09b..8330d5564 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue @@ -71,6 +71,7 @@ import * as PurchasePlanDetailApi from '@/api/wms/purchasePlanDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as PurchaseDetailApi from '@/api/wms/purchaseDetail' + import { CACHE_KEY, useCache } from '@/hooks/web/useCache' // 要货计划 defineOptions({ name: 'PurchasePlanMain' }) @@ -261,11 +262,14 @@ tableData.value = [] // 重置明细数据 formRef.value.open(type, row) } - +// 获取部门 用于详情 部门回显 +const { wsCache } = useCache() /** 详情操作 */ const detailRef = ref() const openDetail = (row : any, titleName : any, titleValue : any) => { detailRef.value.openDetail(row, titleName, titleValue,'planPurchaseMain') + const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name + if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode)) } /** 删除按钮操作 */ diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue index e030597c7..5e1b2a07e 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue @@ -84,7 +84,7 @@ import * as SupplierdeliverRecordMainApi from '@/api/wms/supplierdeliverRecordMa import * as SupplierdeliverRecordDetailApi from '@/api/wms/supplierdeliverRecordDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import { getAccessToken } from '@/utils/auth' - +import { CACHE_KEY, useCache } from '@/hooks/web/useCache' // 供应商发货记录主 defineOptions({ name: 'SupplierdeliverRecordMain' }) @@ -187,10 +187,13 @@ const { tableObject: detatableData, tableMethods: detatableMethods } = useTable( getListApi: SupplierdeliverRecordDetailApi.queryChildPickingNumber }) const { getList:getDetailList } = detatableMethods - +// 获取部门 用于详情 部门回显 +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,'recordSupplierdeliverMain') } diff --git a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/index.vue b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/index.vue index 3074151eb..b7c14f4d9 100644 --- a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/index.vue +++ b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/index.vue @@ -66,7 +66,7 @@ import { PurchaseclaimRecordMain,PurchaseclaimRecordMainRules,PurchaseclaimRecor import * as PurchaseclaimRecordMainApi from '@/api/wms/purchaseclaimRecordMain' import * as PurchaseclaimRecordDetailApi from '@/api/wms/purchaseclaimRecordDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' - +import { CACHE_KEY, useCache } from '@/hooks/web/useCache' // 采购索赔记录主 defineOptions({ name: 'PurchaseclaimRecordMain' }) @@ -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) } diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue index b20a4b01c..64bc1145b 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue @@ -66,7 +66,7 @@ import { SupplierinvoiceRecordMain,SupplierinvoiceRecordMainRules,Supplierinvoic import * as SupplierinvoiceRecordMainApi from '@/api/wms/supplierinvoiceRecordMain' import * as SupplierinvoiceRecordDetailApi from '@/api/wms/supplierinvoiceRecordDeatil' import * as defaultButtons from '@/utils/disposition/defaultButtons' - +import { CACHE_KEY, useCache } from '@/hooks/web/useCache' // 供应商发票记录主 defineOptions({ name: 'SupplierinvoiceRecordMain' }) @@ -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) }