From 034a08a5ded1125a700d8d1c374beecb66c5fcae Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Thu, 22 May 2025 13:30:51 +0800 Subject: [PATCH] =?UTF-8?q?FWHL-45=E5=AD=97=E5=85=B8=E7=BF=BB=E8=AF=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../packagetuomergeMain/index.vue | 6 ++ .../packagetuomergeMain.data.ts | 72 ++++++++++++++++--- 2 files changed, 69 insertions(+), 9 deletions(-) diff --git a/src/views/wms/inventoryjobManage/packageManage/packagetuomergeMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packagetuomergeMain/index.vue index 782a9b021..2768be0e1 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packagetuomergeMain/index.vue +++ b/src/views/wms/inventoryjobManage/packageManage/packagetuomergeMain/index.vue @@ -73,6 +73,7 @@ import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' import { usePageLoading } from '@/hooks/web/usePageLoading' import { formatDate } from '@/utils/formatTime' +import { CACHE_KEY, useCache } from '@/hooks/web/useCache' const { loadStart, loadDone } = usePageLoading() defineOptions({ name: 'PackagetuomergeMain' }) @@ -185,9 +186,14 @@ const formsSuccess = async (formType,data) => { getList() } +// 获取部门 用于详情 部门回显 +const { wsCache } = useCache() + /** 详情操作 */ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { + const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name + if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode)) detailRef.value.openDetail(row, titleName, titleValue, 'basicPackagetuomergeMain') } diff --git a/src/views/wms/inventoryjobManage/packageManage/packagetuomergeMain/packagetuomergeMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packagetuomergeMain/packagetuomergeMain.data.ts index b560c00b8..87f45d934 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packagetuomergeMain/packagetuomergeMain.data.ts +++ b/src/views/wms/inventoryjobManage/packageManage/packagetuomergeMain/packagetuomergeMain.data.ts @@ -1,5 +1,12 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' + import { useUserStore } from '@/store/modules/user' + + const userStore = useUserStore() + const userDept = userStore.userSelfInfo.dept + // id 转str 否则form回显匹配不到 + userDept.id = userDept.id.toString() +const userDeptArray:any = [userDept] // 表单校验 export const PackagetuomergeMainRules = reactive({ @@ -114,6 +121,9 @@ export const PackagetuomergeMain = useCrudSchemas(reactive([ field: 'executeTime', sort: 'custom', formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, search: { component: 'DatePicker', componentProps: { @@ -125,8 +135,10 @@ export const PackagetuomergeMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', - valueFormat: 'x' + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', } }, isTable:false @@ -136,6 +148,9 @@ export const PackagetuomergeMain = useCrudSchemas(reactive([ field: 'activeDate', sort: 'custom', formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, search: { component: 'DatePicker', componentProps: { @@ -147,8 +162,10 @@ export const PackagetuomergeMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', - valueFormat: 'x' + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', } }, isTable:false @@ -157,13 +174,18 @@ export const PackagetuomergeMain = useCrudSchemas(reactive([ label: '是否可用', field: 'available', sort: 'custom', - isTable:false + isTable:false, + isForm:false, + isDetail:false, }, { label: '申请时间', field: 'requestTime', sort: 'custom', formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, search: { component: 'DatePicker', componentProps: { @@ -175,11 +197,15 @@ export const PackagetuomergeMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', - valueFormat: 'x' + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', } }, - isTable:false + isTable:false, + isForm:false, + isDetail:false, }, { label: '截止时间', @@ -201,19 +227,38 @@ export const PackagetuomergeMain = useCrudSchemas(reactive([ valueFormat: 'x' } }, - isTable:false + isTable:false, + isForm:false, + isDetail:false, }, { label: '部门', field: 'departmentCode', sort: 'custom', - isTable:false + isTable:false, + formatter: (_: Recordable, __: TableColumn, cellValue: number) => { + return userDeptArray.find((account) => account.id == cellValue)?.name + }, + form: { + value: userDept.id, + component: 'Select', + api: () => userDeptArray, + componentProps: { + disabled: true, + optionsAlias: { + labelField: 'name', + valueField: 'id' + } + } + } }, { label: '用户组', field: 'userGroupCode', sort: 'custom', - isTable:false + isTable:false, + isForm:false, + isDetail:false, }, { label: '接口类型', @@ -250,6 +295,9 @@ export const PackagetuomergeMain = useCrudSchemas(reactive([ table: { width: 200 }, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, }, { label: '扩展属性', @@ -334,6 +382,8 @@ export const PackagetuomergeDetail = useCrudSchemas(reactive([ label: '计量单位', field: 'uom', sort: 'custom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', table: { width: 120 }, @@ -450,6 +500,8 @@ export const PackagetuomergeDetail = useCrudSchemas(reactive([ { label: '从库存状态', field: 'fromInventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', sort: 'custom', table: { width: 120 @@ -458,6 +510,8 @@ export const PackagetuomergeDetail = useCrudSchemas(reactive([ { label: '到库存状态', field: 'toInventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', sort: 'custom', table: { width: 120