diff --git a/src/api/wms/supplierdeliverRequestDetail/index.ts b/src/api/wms/supplierdeliverRequestDetail/index.ts index 64580a04e..832c9baca 100644 --- a/src/api/wms/supplierdeliverRequestDetail/index.ts +++ b/src/api/wms/supplierdeliverRequestDetail/index.ts @@ -43,6 +43,10 @@ export const getSupplierdeliverRequestDetailPage = async (params) => { return await request.get({ url: `/wms/supplierdeliver-request-detail/page`, params }) } } +// 查询供应商发货申请子列表 +export const getGenerateLabelList = async (params) => { + return await request.get({ url: `/wms/supplierdeliver-request-detail/generateLabelParentList`, params }) +} // 查询供应商发货申请子详情 export const getSupplierdeliverRequestDetail = async (id: number) => { diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue index d482568c7..51e46e76f 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue @@ -835,7 +835,7 @@ const handleExport = async () => { const isCreateLabel = ref(false) const formLabelRef = ref() const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({ - getListApi: SupplierdeliverRequestDetailApi.getSupplierdeliverRequestDetailPage + getListApi: SupplierdeliverRequestDetailApi.getGenerateLabelList }) detatableData.pageSize = 500 const { getList:getDetailList } = detatableMethods diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue index fc80a2a7c..42f72289b 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue @@ -5,13 +5,11 @@ border row-key="id" style="width: 1050px; max-height: 70vh; overflow-y: auto" - v-if="tableData.length > 0" > diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts index f534f2cac..8298b64d8 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts @@ -1597,174 +1597,24 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive userDeptArray, componentProps: { disabled: true, - isSearchList: true, - searchListPlaceholder: '请选择包装', - searchField: 'packUnit', - searchTitle: '物品包装信息', - searchAllSchemas: Itempackaging.allSchemas, - searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver, - 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.getItempackagingPageBySupplierdeliver, - searchCondition: [ - { - key: 'itemCode', - value: 'itemCode', - message: '请选择订单行', - isTableRowValue: true, - isMainValue:false - }, - { - key: 'available', - value: 'TRUE', - isMainValue: false - }] - } - }, - { - label: '包装名称2', - field: 'secondPackName', - sort: 'custom', - table: { - width: 150 - }, - form: { - componentProps: { - disabled: true + optionsAlias: { + labelField: 'name', + valueField: 'id' + } } - }, - tableForm: { - disabled: true - } - }, - { - label: '物料数量2', - field: 'secondPackQty', - sort: 'custom', - table: { - width: 150 - }, - form: { - componentProps: { - } - }, - tableForm: { } }, + { label: '物料名称', field: 'itemName',