diff --git a/src/views/materialManagement/productionMaterial/MmInventory.vue b/src/views/materialManagement/productionMaterial/MmInventory.vue index df64093..14fcf3a 100644 --- a/src/views/materialManagement/productionMaterial/MmInventory.vue +++ b/src/views/materialManagement/productionMaterial/MmInventory.vue @@ -587,7 +587,7 @@ function getMaterialCodeList() { } } -// 获取入库类型列表 +// 获取出入库类型列表 function getTypeOfWarehousingList() { try { getTransactionOption('typeOfWarehousing').then((res) => { diff --git a/src/views/materialManagement/productionMaterial/MmRecordInbound.vue b/src/views/materialManagement/productionMaterial/MmRecordInbound.vue index 2148f92..b01e8b0 100644 --- a/src/views/materialManagement/productionMaterial/MmRecordInbound.vue +++ b/src/views/materialManagement/productionMaterial/MmRecordInbound.vue @@ -13,7 +13,7 @@ - + {{ $t('btn.search') }} @@ -93,8 +93,7 @@ - - + @@ -124,15 +123,13 @@ - - + - - + @@ -147,9 +144,9 @@ + :key="item.value" + :label="item.label" + :value="item.value"> @@ -225,6 +222,7 @@ import { updateMmRecordInbound, getMmRecordInbound } from '@/api/materialManagement/productionMaterial/mmrecordinbound.js' +import { getTransactionOption } from '@/api/materialManagement/productionMaterial/mminventory.js' const { proxy } = getCurrentInstance() const ids = ref([]) const loading = ref(false) @@ -236,7 +234,7 @@ const queryParams = reactive({ sortType: 'asc', supplierCode: null, operator: null, - createdTime: null, + createdTime: null }) const columns = ref([ { visible: true, align: 'center', type: '', prop: 'unit', label: '计量单位', showOverflowTooltip: true }, @@ -367,6 +365,7 @@ function handleAdd() { open.value = true title.value = '添加入库记录表' opertype.value = 1 + getTypeOfWarehousingList() } // 修改按钮操作 function handleUpdate(row) { @@ -426,5 +425,19 @@ function handleDelete(row) { }) } +// 获取出入库类型列表 +function getTypeOfWarehousingList() { + try { + getTransactionOption('typeOfWarehousing').then((res) => { + const { code, data } = res + if (code == 200) { + state.options.transactionTypeOptions = data + } + }) + } catch (error) { + proxy.$modal.msgError(error.message) + } +} + handleQuery() diff --git a/src/views/materialManagement/productionMaterial/MmRecordOutbound.vue b/src/views/materialManagement/productionMaterial/MmRecordOutbound.vue index a02d8d4..8d3c74f 100644 --- a/src/views/materialManagement/productionMaterial/MmRecordOutbound.vue +++ b/src/views/materialManagement/productionMaterial/MmRecordOutbound.vue @@ -12,6 +12,9 @@ + + + {{ $t('btn.search') }} {{ $t('btn.reset') }} @@ -177,7 +180,7 @@ - +