diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue index 91eabd141..1a15570de 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue @@ -225,9 +225,7 @@ const openDetail = async (row: any, titleName: any, titleValue: any) => { requestTableObject.params.number = row.requestNumber await requestGetList() if(requestTableObject.tableList.length>0){ - // row.annexMasterId = requestTableObject.tableList[0].masterId - row.annexMasterId = row.id - + row.annexMasterId = requestTableObject.tableList[0].masterId } diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue index fc389e9d7..003d4a688 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue @@ -342,6 +342,8 @@ const searchTableSuccessDetail = async (formField, searchField, val, formRef,sea newRow['deliveryDate'] = item['prhRcpDate'] newRow['arrivalQty'] = item['prhRcvd'] newRow['id'] = item['id'] + newRow['currency'] = item['currency'] + } tableData.value.push(newRow) }) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts index a7b0900af..265581d6c 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts @@ -117,6 +117,10 @@ export const PurchaseReceiptOrReturnRecordDetail = useCrudSchemas(reactive( // } // }, { - label: '调整价差', + label: '折扣金额', field: 'discountAmount1', formatter: accountantFormart, table: { @@ -1438,21 +1442,21 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive