From 5fb381e402fb874485e62eea892592c92f6cd904 Mon Sep 17 00:00:00 2001 From: chenfang Date: Wed, 13 Mar 2024 16:48:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E8=B4=A7=E5=B1=95=E7=A4=BA=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E9=A1=BA=E5=BA=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../packageunit/packageunit.data.ts | 6 +- .../stockup/stockupMainRequest/index.vue | 26 +-- .../stockupMainRequest.data.ts | 157 +++++++++--------- 3 files changed, 96 insertions(+), 93 deletions(-) diff --git a/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts b/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts index c81fe91d2..6e3fd6394 100644 --- a/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts +++ b/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts @@ -294,15 +294,11 @@ export const Packageunit = useCrudSchemas(reactive([ searchField: 'code', searchTitle: '包装规格信息', searchAllSchemas: PackageunitCopy.allSchemas, - searchPage: PackageunitApi.getCustomeritemPage, + searchPage: PackageunitApi.getPackageunitPage, searchCondition: [{ key: 'available', value: 'TRUE', isMainValue: false - },{ - key: 'customerCode', - value: 'customerCode', - isMainValue: true }] } } diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue index 3b61b0bac..7a77e7e45 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue @@ -324,19 +324,19 @@ const openForm = (type: string, row?: number) => { } // 获取部门 用于详情 部门回显 -// const { wsCache } = useCache() -// /** 详情操作 */ -// const detailRef = ref() -// const openDetail = (row: any, titleName: any, titleValue: any) => { -// if(row.deliverPlanNumber != null){ -// trueFalse.value = false -// }else { -// trueFalse.value = true -// } -// const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name -// if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode)) -// detailRef.value.openDetail(row, titleName, titleValue,'requestDeliverMain') -// } +const { wsCache } = useCache() +/** 详情操作 */ +const detailRef = ref() +const openDetail = (row: any, titleName: any, titleValue: any) => { + if(row.deliverPlanNumber != null){ + trueFalse.value = false + }else { + trueFalse.value = true + } + const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name + if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode)) + detailRef.value.openDetail(row, titleName, titleValue,'stockupMainRequest') +} /** 删除按钮操作 */ const handleDelete = async (id: number) => { diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts index 90a3c8f1e..309b4149b 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts @@ -464,6 +464,17 @@ export const StockupDetailRequestRules = reactive({ // //子表 export const StockupDetailRequest = useCrudSchemas(reactive([ + { + label: '单据号', + field: 'number', + sort: 'custom', + isSearch: true, + isForm: false, + isTableForm: false, + table: { + width: 100 + }, + }, { label: '包装号', field: 'packingNumber', @@ -511,6 +522,9 @@ export const StockupDetailRequest = useCrudSchemas(reactive([ label: '器具号', field: 'containerNumber', sort: 'custom', + table: { + width: 100 + }, isSearch: true, }, { @@ -535,7 +549,7 @@ export const StockupDetailRequest = useCrudSchemas(reactive([ isTable: true, sort: 'custom', table: { - width: 150 + width: 120 }, tableForm: { disabled: true, @@ -547,82 +561,14 @@ export const StockupDetailRequest = useCrudSchemas(reactive([ } } }, - { - label: '到货主代码', - field: 'toOwnerCode', - sort: 'custom', - isSearch: true, - isTableForm: false, - }, - { - label: '到库位代码', - field: 'toLocationCode', - sort: 'custom', - isSearch: true, - tableForm:{ - isInpuFocusShow: true, // 开启查询弹窗 - searchListPlaceholder: '请选择库位代码', - searchField: 'location', - searchTitle: '库位基础信息', - searchAllSchemas: Location.allSchemas, - searchPage: locationApi.getLocationPage, - searchCondition: [{ - key: 'available', - value: 'TRUE', - isMainValue: false - }] - }, - form: { - componentProps: { - isSearchList: true, - searchListPlaceholder: '请选择库位代码', - searchField: 'location', - searchTitle: '库位基础信息', - searchAllSchemas: Location.allSchemas, - searchPage: locationApi.getLocationPage, - searchCondition: [{ - key: 'available', - value: 'TRUE', - isMainValue: false - }] - } - } - }, - { - label: '主表ID', - field: 'masterId', - sort: 'custom', - isSearch: true, - isTableForm: false, - }, - { - label: '单据号', - field: 'number', - sort: 'custom', - isSearch: true, - isTableForm: false, - }, - { - label: '创建时间', - field: 'createTime', - sort: 'custom', - formatter: dateFormatter, - isSearch: true, - search: { - component: 'DatePicker', - componentProps: { - valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', - defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] - } - }, - isTableForm: false, - }, { label: '物品代码', field: 'itemCode', sort: 'custom', isSearch: true, + table: { + width: 120 + }, tableForm: { disabled: true }, @@ -638,6 +584,9 @@ export const StockupDetailRequest = useCrudSchemas(reactive([ sort: 'custom', isSearch: true, isTableForm: false, + table: { + width: 120 + }, }, { label: '物品描述1', @@ -645,6 +594,9 @@ export const StockupDetailRequest = useCrudSchemas(reactive([ sort: 'custom', isSearch: true, isTableForm: false, + table: { + width: 120 + }, }, { label: '物品描述2', @@ -652,6 +604,9 @@ export const StockupDetailRequest = useCrudSchemas(reactive([ sort: 'custom', isSearch: true, isTableForm: false, + table: { + width: 120 + }, }, { label: '项目代码', @@ -659,6 +614,9 @@ export const StockupDetailRequest = useCrudSchemas(reactive([ sort: 'custom', isSearch: true, isTableForm: false, + table: { + width: 120 + }, }, { label: '数量', @@ -685,6 +643,43 @@ export const StockupDetailRequest = useCrudSchemas(reactive([ } } }, + { + label: '到库位代码', + field: 'toLocationCode', + sort: 'custom', + isSearch: true, + table: { + width: 120 + }, + tableForm:{ + isInpuFocusShow: true, // 开启查询弹窗 + searchListPlaceholder: '请选择库位代码', + searchField: 'location', + searchTitle: '库位基础信息', + searchAllSchemas: Location.allSchemas, + searchPage: locationApi.getLocationPage, + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + }] + }, + form: { + componentProps: { + isSearchList: true, + searchListPlaceholder: '请选择库位代码', + searchField: 'location', + searchTitle: '库位基础信息', + searchAllSchemas: Location.allSchemas, + searchPage: locationApi.getLocationPage, + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + }] + } + } + }, { label: '备注', field: 'remark', @@ -692,11 +687,23 @@ export const StockupDetailRequest = useCrudSchemas(reactive([ isSearch: true, }, { - label: '从货主代码', - field: 'fromOwnerCode', + label: '创建时间', + field: 'createTime', sort: 'custom', + formatter: dateFormatter, isSearch: true, + table: { + width: 120 + }, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, isTableForm: false, - } + }, ]))