diff --git a/src/utils/disposition/defaultButtons.ts b/src/utils/disposition/defaultButtons.ts index 77d1d6bb5..522bd47f7 100644 --- a/src/utils/disposition/defaultButtons.ts +++ b/src/utils/disposition/defaultButtons.ts @@ -492,7 +492,19 @@ export function mainListOrderPubBtn(option:any) { hasPermi: '' }) } - +// 主列表-订单流程-批量发布按钮 +export function mainListSelectionOrderPubBtn(option:any) { + return __defaultBtnOption(option,{ + label: t(`ts.发布`).replace('ts.', ''), + name: 'mainOrderSelectionPub', + hide: false, + type: 'primary', + color: '', + float:'left', + link: false, // 文本展现按钮 + hasPermi: '' + }) +} // 主列表-订单流程-关闭按钮 export function mainListOrderCloBtn(option:any) { return __defaultBtnOption(option,{ diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts index 2034b0454..caf35f2c8 100644 --- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts @@ -14,6 +14,9 @@ import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/item import * as OwnerApi from '@/api/wms/owner' import { Owner } from '@/views/wms/basicDataManage/orderManage/owner/owner.data' +import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data' +import * as ItemPackageApi from '@/api/wms/itempackage/index' + const { t } = useI18n() // 国际化 // 获取自动提交自动通过自动执行,跳过任务直接删生成记录的默认值 @@ -747,6 +750,152 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( valueFormat: 'x', } }, + + { + label: '包装规格1', + field: 'packUnit', + isTable: true, + sort: 'custom', + table: { + width: 150, + componentProps: { + disabled: true, + isSearchList: true, + searchListPlaceholder: '请选择包装', + searchField: 'packUnit', + searchTitle: '物品包装信息', + searchAllSchemas: Itempackaging.allSchemas, + searchPage: ItemPackageApi.getItempackagingPage, + searchCondition: [ + { + key: 'itemCode', + value: 'itemCode', + message: '请选择订单行', + isMainValue: true + }, + { + key: 'available', + value: 'TRUE', + isMainValue: false + } + ] + + } + }, + tableForm: { + disabled: true, + isInpuFocusShow: true, + searchListPlaceholder: '请选择包装', + searchField: 'itemCode', + searchTitle: '物品包装信息', + searchAllSchemas: Itempackaging.allSchemas, + searchPage: ItemPackageApi.getItempackagingPage, + searchCondition: [ + { + key: 'itemCode', + value: 'itemCode', + message: '请选择订单行', + isTableRowValue: true, + isMainValue:false + }, + { + key: 'available', + value: 'TRUE', + isMainValue: false + }] + } + }, + { + label: '包装数量1', + field: 'packQty', + sort: 'custom', + table: { + width: 150 + }, + form: { + componentProps: { + } + }, + tableForm: { + } + }, + { + label: '包装规格2', + field: 'secondPackUnit', + isTable: true, + sort: 'custom', + table: { + width: 150, + componentProps: { + disabled: true, + isSearchList: true, + searchListPlaceholder: '请选择包装', + searchField: 'packUnit', + searchTitle: '物品包装信息', + searchAllSchemas: Itempackaging.allSchemas, + searchPage: ItemPackageApi.getItempackagingPage, + searchCondition: [ + { + key: 'itemCode', + value: 'itemCode', + message: '请选择订单行', + isMainValue: true + }, + { + key: 'available', + value: 'TRUE', + isMainValue: false + } + ] + + } + }, + tableForm: { + clearable: true, + disabled: true, + isInpuFocusShow: true, + searchListPlaceholder: '请选择包装', + searchField: 'packUnit', + searchTitle: '物品包装信息', + searchAllSchemas: Itempackaging.allSchemas, + searchPage: ItemPackageApi.getItempackagingPage, + searchCondition: [ + { + key: 'itemCode', + value: 'itemCode', + message: '请选择订单行', + isTableRowValue: true, + isMainValue:false + }, + { + key: 'available', + value: 'TRUE', + isMainValue: false + }] + } + }, + { + label: '包装数量2', + field: 'secondPackQty', + sort: 'custom', + table: { + width: 150 + }, + form: { + componentProps: { + } + }, + tableForm: { + } + }, + { + label: '入库存包装规格', + field: 'balancePackUnit', + sort: 'custom', + table: { + width: 150 + }, + }, { label: '备注', field: 'remark', diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue index 3641a4eb1..385e8b237 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue @@ -1,7 +1,7 @@