diff --git a/src/api/materialManagement/productionMaterial/mminventory.js b/src/api/materialManagement/productionMaterial/mminventory.js index 62d6bb8..7ac559b 100644 --- a/src/api/materialManagement/productionMaterial/mminventory.js +++ b/src/api/materialManagement/productionMaterial/mminventory.js @@ -125,3 +125,16 @@ export async function exportMmInventory(query) { // }) await downFile('/mes/productionMaterial/MmInventory/export', { ...query }) } + +/** + * 查询出/入库记录 + */ +export async function queryMmInventory(data) { + return request({ + url: 'mes/productionMaterial/MmInventory/GetInOrOutRecord', + method: 'post', + data: data + }) +} + + diff --git a/src/views/materialManagement/productionMaterial/MmInventory.vue b/src/views/materialManagement/productionMaterial/MmInventory.vue index 9732dbf..cf06b37 100644 --- a/src/views/materialManagement/productionMaterial/MmInventory.vue +++ b/src/views/materialManagement/productionMaterial/MmInventory.vue @@ -102,7 +102,7 @@ - + @@ -541,8 +542,8 @@ - - + + @@ -561,7 +562,8 @@ import { getMaterialOption, createInboundReceipt, getLocationOption, - createOutboundReceipt + createOutboundReceipt, + queryMmInventory } from '@/api/materialManagement/productionMaterial/mminventory.js' import { listMmTransactionType } from '@/api/materialManagement/productionMaterial/mmtransactiontype.js' import { warehouseOptions } from '@/utils/warehouse.js' @@ -667,6 +669,7 @@ const opertype = ref(0) const openStorage = ref(false) const openOutStorage = ref(false) const openUpdate = ref(false) +const openRecord = ref(false) const state = reactive({ single: true, multiple: true, @@ -699,10 +702,11 @@ const state = reactive({ options: {}, transactionOptions: {}, locationOptions: [], - inOrOut: '入库' + inOrOut: '入库', + recordData: [] }) -const { form, rules, rulesOut, rulesUpdate, options, transactionOptions, locationOptions, single, multiple, inOrOut } = toRefs(state) +const { form, rules, rulesOut, rulesUpdate, options, transactionOptions, locationOptions, single, multiple, inOrOut, recordData } = toRefs(state) // 关闭dialog function cancel() { @@ -774,6 +778,28 @@ function handleUpdate(row) { }) } +// 查看进出库记录 +function handleTickets(row) { + console.log(row, '==================') + queryMmInventory({ + searchType: 1, + materialCode: row.materialCode, + locationCode: row.locationCode, + supplierCode: row.supplierCode, + batchNo: row.batchNo + }).then((res) => { + + const { code, result } = res + console.log(res, '==================') + if (code == 200) { + openRecord.value = true + title.value = '查看进出库记录' + + state.recordData = result + } + }) +} + // 添加&修改 表单提交 function submitInboundForm() { proxy.$refs['formRef'].validate((valid) => { diff --git a/src/views/materialManagement/productionMaterial/MmRecordInbound.vue b/src/views/materialManagement/productionMaterial/MmRecordInbound.vue index 68a9132..f6e9664 100644 --- a/src/views/materialManagement/productionMaterial/MmRecordInbound.vue +++ b/src/views/materialManagement/productionMaterial/MmRecordInbound.vue @@ -91,16 +91,15 @@ - - + + @click="handleUpdate(scope.row)"> - + --> diff --git a/src/views/materialManagement/productionMaterial/MmRecordOutbound.vue b/src/views/materialManagement/productionMaterial/MmRecordOutbound.vue index 3c8b394..0a959b8 100644 --- a/src/views/materialManagement/productionMaterial/MmRecordOutbound.vue +++ b/src/views/materialManagement/productionMaterial/MmRecordOutbound.vue @@ -90,15 +90,15 @@ - + + @click="handleUpdate(scope.row)"> - + -->