From e12b216d7fd97de229b6bad71d2b9ac4298d35ff Mon Sep 17 00:00:00 2001 From: chenfang <1057876684@qq.com> Date: Tue, 29 Oct 2024 14:09:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=99=A8=E5=85=B7=E7=AE=A1=E7=90=86=E5=BC=80?= =?UTF-8?q?=E5=8F=91=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/containerMainRequest/index.ts | 7 +- .../createContainerMainRequest/index.vue | 3 +- .../initialContainerMainRequest/index.vue | 6 +- .../moveContainerMainRequest/index.vue | 16 +- .../returnContainerMainRequest/index.vue | 10 +- .../returnContainerMainRequest.data.ts | 24 +- .../scrapContainerMainRequest/index.vue | 5 +- .../scrapContainerMainRequest.data.ts | 253 +++++++++++------- 8 files changed, 216 insertions(+), 108 deletions(-) diff --git a/src/api/wms/containerMainRequest/index.ts b/src/api/wms/containerMainRequest/index.ts index 2d5bea0c1..681b93c3e 100644 --- a/src/api/wms/containerMainRequest/index.ts +++ b/src/api/wms/containerMainRequest/index.ts @@ -113,11 +113,16 @@ export const exportDeliverContainerMainRequest = async (params) => { } } -// 下载用户导入模板 +// 下载用户导入模板(器具初始化/新增) export const importTemplate = () => { return request.download({ url: '/wms/container-main-request/get-import-template' }) } +// 下载用户导入模板(器具返回/移动/报废) +export const importTemplateReturnAndMove = () => { + return request.download({ url: '/wms/container-main-request/get-import-template-returnAndMove' }) +} + // 关闭 export const close = (id) => { return request.put({ url: '/wms/container-main-request/close?id=' + id }) diff --git a/src/views/wms/inventoryjobManage/containermanage/createContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/createContainerMainRequest/index.vue index f3cc24da1..109951619 100644 --- a/src/views/wms/inventoryjobManage/containermanage/createContainerMainRequest/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/createContainerMainRequest/index.vue @@ -81,7 +81,7 @@ /> - + -./initialContainerMainRequest.data + \ No newline at end of file diff --git a/src/views/wms/inventoryjobManage/containermanage/moveContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/moveContainerMainRequest/index.vue index a608e02d3..89f39d8a3 100644 --- a/src/views/wms/inventoryjobManage/containermanage/moveContainerMainRequest/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/moveContainerMainRequest/index.vue @@ -81,7 +81,7 @@ /> - + diff --git a/src/views/wms/inventoryjobManage/containermanage/returnContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/returnContainerMainRequest/index.vue index b607db2c2..835adfc5f 100644 --- a/src/views/wms/inventoryjobManage/containermanage/returnContainerMainRequest/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/returnContainerMainRequest/index.vue @@ -81,7 +81,7 @@ /> - + diff --git a/src/views/wms/inventoryjobManage/containermanage/returnContainerMainRequest/returnContainerMainRequest.data.ts b/src/views/wms/inventoryjobManage/containermanage/returnContainerMainRequest/returnContainerMainRequest.data.ts index 99fe92c2d..fdb53d163 100644 --- a/src/views/wms/inventoryjobManage/containermanage/returnContainerMainRequest/returnContainerMainRequest.data.ts +++ b/src/views/wms/inventoryjobManage/containermanage/returnContainerMainRequest/returnContainerMainRequest.data.ts @@ -488,7 +488,29 @@ export const ContainerDetailRequest = useCrudSchemas(reactive([ } }, { - label: '库存状态', + label: '从库存状态', + field: 'fromInventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isForm: false, + isTableForm: false, + isTable: false, + sort: 'custom', + table: { + width: 150 + }, + tableForm: { + disabled: true, + type: 'Select' + }, + form: { + componentProps: { + disabled: true + } + } + }, + { + label: '到库存状态', field: 'toInventoryStatus', dictType: DICT_TYPE.INVENTORY_STATUS, dictClass: 'string', diff --git a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue index 302f86923..c8c79b8b8 100644 --- a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue @@ -81,7 +81,7 @@ /> - + diff --git a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts index 14e32f9a2..5d2c76d4b 100644 --- a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts +++ b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts @@ -9,6 +9,7 @@ import * as LocationApi from '@/api/wms/location' import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data' import * as getRequestsettingApi from '@/api/wms/requestsetting/index' +import * as getBusinessTypeApi from '@/api/wms/businesstype/index' // 表单校验 export const ContainerMainRequestRules = reactive({ @@ -27,6 +28,17 @@ const queryParams = { const data = await getRequestsettingApi.getRequestsettingPage(queryParams) const requestsettingData = data?.list[0] || {} + +const businessTypeQueryParams = { + pageSize:10, + pageNo:1, + code:'ScrapContainerManage', + name:'器具报废管理' +} + + const businessTypeValue = await getBusinessTypeApi.getBusinesstypePage(businessTypeQueryParams) + const businessTypeData =businessTypeValue?.list[0]||{} + // 获取当前操作人的部门 import { useUserStore } from '@/store/modules/user' const userStore = useUserStore() @@ -63,6 +75,49 @@ export const ContainerMainRequest = useCrudSchemas(reactive([ } } }, + // { + // label: '到库位代码', + // field: 'toLocationCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // tableForm:{ + // isInpuFocusShow: true, // 开启查询弹窗 + // searchListPlaceholder: '请选择到库位代码', + // searchField: 'code', + // searchTitle: '库位信息', + // searchAllSchemas: Location.allSchemas, + // searchPage: LocationApi.selectBusinessTypeToLocation, + // searchCondition: [{ + // key: 'businessType', + // value: businessTypeData.code, + // },{ + // key: 'isIn', + // value: 'in', + // isMainValue: false + // }] + // }, + // form: { + // // labelMessage: '信息提示说明！！！', + // componentProps: { + // isSearchList: true, // 开启查询弹窗 + // searchListPlaceholder: '请选择到库位代码', + // searchField: 'code', + // searchTitle: '库位信息', + // searchAllSchemas: Location.allSchemas, + // searchPage: LocationApi.selectBusinessTypeToLocation, + // searchCondition: [{ + // key: 'businessType', + // value: businessTypeData.code, + // },{ + // key: 'isIn', + // value: 'in', + // isMainValue: false + // }] + // } + // } + // }, { label: '类型', field: 'type', @@ -96,16 +151,18 @@ export const ContainerMainRequest = useCrudSchemas(reactive([ field: 'mainRemark', sort: 'custom', isSearch: false, - isTable: true + isForm: true, + isTable: false, }, { label: '部门', field: 'departmentCode', sort: 'custom', - isForm: false, table: { width: 150 }, + isSearch: false, + isForm: false, isTable: false, formatter: (_: Recordable, __: TableColumn, cellValue: number) => { return userDeptArray.find((account) => account.id == cellValue)?.name @@ -218,7 +275,9 @@ export const ContainerMainRequest = useCrudSchemas(reactive([ detail: { dateFormat : 'YYYY-MM-DD HH:mm:ss' }, - isSearch: true, + isSearch: false, + isForm: false, + isTable: false, search: { component: 'DatePicker', componentProps: { @@ -227,8 +286,6 @@ export const ContainerMainRequest = useCrudSchemas(reactive([ defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } }, - isTable: true, - isForm: false, }, { label: '创建者', @@ -236,8 +293,9 @@ export const ContainerMainRequest = useCrudSchemas(reactive([ table: { width: 130 }, + isSearch: false, isForm: false, - isTable: true + isTable: false, }, { label: '最后更新时间', @@ -267,6 +325,7 @@ export const ContainerMainRequest = useCrudSchemas(reactive([ label: '最后更新者', field: 'updater', isDetail: true, + isSearch: false, isForm: false, isTable: false, table: { @@ -277,8 +336,9 @@ export const ContainerMainRequest = useCrudSchemas(reactive([ label: '扩展属性', field: 'extraProperties', sort: 'custom', + isSearch: false, isForm: false, - isTable: false + isTable: false, }, { label: '并发乐观锁', @@ -288,13 +348,15 @@ export const ContainerMainRequest = useCrudSchemas(reactive([ component: 'InputNumber', value: 0 }, + isSearch: false, isForm: false, - isTable: false + isTable: false, }, { label: '地点ID', field: 'siteId', sort: 'custom', + isSearch: false, isForm: false, isTable: false, }, @@ -357,14 +419,14 @@ export const ContainerDetailRequest = useCrudSchemas(reactive([ label: '器具号', field: 'containerNumber', sort: 'custom', - tableForm: { - multiple: true, + tableForm:{ + multiple:true, isInpuFocusShow: true, // 开启查询弹窗 searchListPlaceholder: '请选择器具号', searchField: 'itemCode', searchTitle: '库存余额信息', searchAllSchemas: Balance.allSchemas, - searchPage: BalanceApi.selectConfigToBalance, + searchPage: BalanceApi.getBalanceByQJ, }, form: { // labelMessage: '信息提示说明！！！', @@ -374,7 +436,7 @@ export const ContainerDetailRequest = useCrudSchemas(reactive([ searchField: 'itemCode', searchTitle: '库存余额信息', searchAllSchemas: Balance.allSchemas, - searchPage: BalanceApi.selectConfigToBalance, + searchPage: BalanceApi.getBalanceByQJ, } } }, @@ -382,6 +444,9 @@ export const ContainerDetailRequest = useCrudSchemas(reactive([ label: '来源库位代码', field: 'fromLocationCode', sort: 'custom', + isForm: false, + isTableForm: false, + isTable: false, table: { width: 150 }, @@ -396,83 +461,70 @@ export const ContainerDetailRequest = useCrudSchemas(reactive([ } } }, - { - label: '目标库位代码', - field: 'toLocationCode', - sort: 'custom', - table: { - width: 150 - }, - tableForm: { - enterSearch:true, - isInpuFocusShow: true, // 开启查询弹窗 - searchListPlaceholder: '请选择到库位代码', - searchField: 'code', - searchTitle: '库位信息', - searchAllSchemas: Location.allSchemas, - searchPage: LocationApi.selectPageItemAreaToLocation, - // 失去焦点校验参数 - verificationParams: [{ - key: 'code', - action: '==', - value: '', - isMainValue: false, - isSearch: 'true', - isFormModel: true, - }] - }, - form: { - // labelMessage: '信息提示说明！！！', - componentProps: { - enterSearch: true, - isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择到库位代码', - searchField: 'code', - searchTitle: '库位信息', - searchAllSchemas: Location.allSchemas, - searchPage: LocationApi.selectPageItemAreaToLocation, - // 失去焦点校验参数 - verificationParams: [{ - key: 'code', - action: '==', - value: '', - isMainValue: false, - isSearch: 'true', - isFormModel: true, - }] - } - } - }, - { - label: '从库存状态', - field: 'fromInventoryStatus', - dictType: DICT_TYPE.INVENTORY_STATUS, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - tableForm: { - disabled: true, - type: 'Select' - }, - }, - { - label: '到库存状态', - field: 'toInventoryStatus', - dictType: DICT_TYPE.INVENTORY_STATUS, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - tableForm: { - type: 'Select', - disabled: true - }, - }, + // { + // label: '目标库位代码', + // field: 'toLocationCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // tableForm: { + // enterSearch:true, + // isInpuFocusShow: true, // 开启查询弹窗 + // searchListPlaceholder: '请选择到库位代码', + // searchField: 'code', + // searchTitle: '库位信息', + // searchAllSchemas: Location.allSchemas, + // searchPage: LocationApi.selectPageItemAreaToLocation, + // // 失去焦点校验参数 + // verificationParams: [{ + // key: 'code', + // action: '==', + // value: '', + // isMainValue: false, + // isSearch: 'true', + // isFormModel: true, + // }] + // }, + // form: { + // // labelMessage: '信息提示说明！！！', + // componentProps: { + // enterSearch: true, + // isSearchList: true, // 开启查询弹窗 + // searchListPlaceholder: '请选择到库位代码', + // searchField: 'code', + // searchTitle: '库位信息', + // searchAllSchemas: Location.allSchemas, + // searchPage: LocationApi.selectPageItemAreaToLocation, + // // 失去焦点校验参数 + // verificationParams: [{ + // key: 'code', + // action: '==', + // value: '', + // isMainValue: false, + // isSearch: 'true', + // isFormModel: true, + // }] + // } + // } + // }, + // { + // label: '从库存状态', + // field: 'fromInventoryStatus', + // dictType: DICT_TYPE.INVENTORY_STATUS, + // dictClass: 'string', + // isForm: false, + // isTableForm: false, + // isTable: false, + // sort: 'custom', + // table: { + // width: 150 + // }, + // tableForm: { + // disabled: true, + // type: 'Select' + // }, + // }, // { // label: '从数量', // field: 'fromQty', @@ -482,7 +534,7 @@ export const ContainerDetailRequest = useCrudSchemas(reactive([ // }, // }, { - label: '到数量', + label: '数量', field: 'toQty', sort: 'custom', form: { @@ -514,11 +566,30 @@ export const ContainerDetailRequest = useCrudSchemas(reactive([ type: 'Select' } }, + { + label: '到库存状态', + field: 'toInventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isForm: false, + isTableForm: false, + isTable: false, + sort: 'custom', + table: { + width: 150 + }, + tableForm: { + type: 'Select', + disabled: true + }, + }, { label: '子备注', field: 'remark', sort: 'custom', - isTable: true + isTable: true, + isForm: false, + isTableForm: false }, { label: '创建时间',