diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRecord/relegateRecordMain.data.ts b/src/views/wms/basicDataManage/itemManage/relegate/relegateRecord/relegateRecordMain.data.ts index 8dd1b54a5..bce38edda 100644 --- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRecord/relegateRecordMain.data.ts +++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRecord/relegateRecordMain.data.ts @@ -257,6 +257,14 @@ export const RelegateRecordDetail = useCrudSchemas(reactive([ width: 150 }, }, + { + label: '包装规格', + field: 'packUnit', + sort: 'custom', + table: { + width: 150 + }, + }, { label: '到包装号', field: 'toPackingNumber', diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue index 5a6e71b0a..a78524fba 100644 --- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue +++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue @@ -141,12 +141,12 @@ RelegateRequestDetail.allSchemas.tableFormColumns.map(item => { key: 'available', value: 'TRUE', isMainValue: false - },{ - message: '请选择从仓库代码!', - key: 'warehouseCode', - value: 'fromWarehouseCode', - isMainValue: true - } + },{ + message: '请选择从仓库代码!', + key: 'warehouseCode', + value: 'fromWarehouseCode', + isMainValue: true + } ] item.form.componentProps.searchCondition = [ { @@ -255,12 +255,12 @@ const butttondata = (row, $index) => { return [] } return [ - defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['2','3','4']),hasPermi:'wms:relegate-request-main:close'}), // 关闭 - defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:relegate-request-main:reAdd'}), //重新添加 - defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:relegate-request-main:submit'}), // 提交审批 - defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:relegate-request-main:refused'}), // 驳回 - defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:relegate-request-main:agree'}), // 审批通过 - defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:relegate-request-main:handle'}), // 处理 + defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['2','3','4']),hasPermi:'wms:relegate-request-main:close'}), // 关闭 + defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:relegate-request-main:reAdd'}), //重新添加 + defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:relegate-request-main:submit'}), // 提交审批 + defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:relegate-request-main:refused'}), // 驳回 + defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:relegate-request-main:agree'}), // 审批通过 + defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:relegate-request-main:handle'}), // 处理 defaultButtons.mainListEditBtn({ hide: isShowMainButton(row, ['1']), hasPermi: 'wms:relegate-request-main:update' }), // 编辑 // defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:relegate-request-main:delete' }), // 删除 ] diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts index 8c6bda653..31dbe345f 100644 --- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts +++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts @@ -13,6 +13,10 @@ import { Balance } from '@/views/wms/inventoryManage/balance/balance.data' import * as LocationApi from '@/api/wms/location' import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data' + +import * as ItempackageApi from '@/api/wms/itempackage' +import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data' + import * as confgiApi from '@/api/infra/config' // 获取自动提交自动通过自动执行,跳过任务直接删生成记录的默认值 const queryParams = { @@ -293,6 +297,7 @@ export const RelegateRequestDetailRules = reactive({ available: [required], departmentCode: [required], concurrencyStamp: [required], + packUnit: [required], }) export const RelegateRequestDetail = useCrudSchemas(reactive([ @@ -531,6 +536,60 @@ export const RelegateRequestDetail = useCrudSchemas(reactive([ width: 120 }, }, + { + label: '到库位代码', + field: 'toLocationCode', + sort: 'custom', + tableForm:{ + isInpuFocusShow: true, // 开启查询弹窗 + searchListPlaceholder: '请选择到库位代码', + searchField: 'code', + searchTitle: '库位信息', + searchAllSchemas: Location.allSchemas, + searchPage: LocationApi.selectBusinessTypeToLocation, + }, + form: { + // labelMessage: '信息提示说明!!!', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择到库位代码', + searchField: 'code', + searchTitle: '库位信息', + searchAllSchemas: Location.allSchemas, + searchPage: LocationApi.selectBusinessTypeToLocation, + } + }, + table: { + width: 120 + }, + }, + { + label: '包装规格', + field: 'packUnit', + sort: 'custom', + tableForm:{ + isInpuFocusShow: true, // 开启查询弹窗 + searchListPlaceholder: '请选择包装规格', + searchField: 'packUnit', + searchTitle: '包装规格', + searchAllSchemas: Itempackaging.allSchemas, + searchPage: ItempackageApi.getItempackagingPage, + }, + form: { + // labelMessage: '信息提示说明!!!', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择包装规格', + searchField: 'packUnit', + searchTitle: '包装规格', + searchAllSchemas: Itempackaging.allSchemas, + searchPage: ItempackageApi.getItempackagingPage, + } + }, + table: { + width: 120 + }, + }, { label: '到库区类型', field: 'toAreaTypes',