diff --git a/src/components/XButton/src/ButtonBaseMore.vue b/src/components/XButton/src/ButtonBaseMore.vue index 9a4e459e2..0be296e6e 100644 --- a/src/components/XButton/src/ButtonBaseMore.vue +++ b/src/components/XButton/src/ButtonBaseMore.vue @@ -89,7 +89,7 @@ const getMoreList = computed(()=>{ }) const getButtonList = computed(()=>{ let list = showList() - if(list.length>3){ + if(list.length>props.showMoreLength){ console.log('list===',list) return list.slice(0, props.showMoreLength) } diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue index 38e2281b2..325922058 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue @@ -205,6 +205,7 @@ const searchTableRef = ref() const labelType = ref('') // 标签类别 采购还是制造等 //获取类型 const getLabelType = async (row,useToPackingNumber)=>{ + labelType.value = '' let resType = await PackageApi.getPackagePage(useToPackingNumber?{ number: row.toPackingNumber }:{ @@ -217,8 +218,11 @@ const getLabelType = async (row,useToPackingNumber)=>{ } else { labelType.value = 'cg' } + console.log('labelType',labelType.value) + await getLabelDetailPage(row,false) + }else{ - getLabelType(row,true) + await getLabelType(row,true) } } const getLabelDetailPage = async (row,useToPackingNumber)=>{ @@ -250,7 +254,6 @@ const labelPrint = async (row) => { tableObject.loading = true //获取类型 await getLabelType(row,false) - await getLabelDetailPage(row,false) } // 批量打印--预生产收货 diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue index c5a62bd99..51c0e2cc5 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue @@ -39,7 +39,10 @@ {{ row.differencePrice }}