diff --git a/src/views/materialManagement/productionMaterial/MmInventory.vue b/src/views/materialManagement/productionMaterial/MmInventory.vue
index 14fcf3a..c43dc02 100644
--- a/src/views/materialManagement/productionMaterial/MmInventory.vue
+++ b/src/views/materialManagement/productionMaterial/MmInventory.vue
@@ -83,6 +83,12 @@
+
+
+
+
+
+
@@ -96,11 +102,11 @@
-->
-
+
@@ -108,38 +114,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -149,6 +123,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -156,14 +150,8 @@
-
-
-
-
-
-
-
-
+
+
@@ -188,7 +176,7 @@
-->
-
+
diff --git a/src/views/materialManagement/productionMaterial/MmRecordInbound.vue b/src/views/materialManagement/productionMaterial/MmRecordInbound.vue
index b01e8b0..0b99475 100644
--- a/src/views/materialManagement/productionMaterial/MmRecordInbound.vue
+++ b/src/views/materialManagement/productionMaterial/MmRecordInbound.vue
@@ -82,7 +82,7 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('btn.cancel') }}
+ {{ $t('btn.submit') }}
+
@@ -222,7 +343,7 @@ import {
updateMmRecordInbound,
getMmRecordInbound
} from '@/api/materialManagement/productionMaterial/mmrecordinbound.js'
-import { getTransactionOption } from '@/api/materialManagement/productionMaterial/mminventory.js'
+import { getTransactionOption, getMaterialOption, getLocationOption } from '@/api/materialManagement/productionMaterial/mminventory.js'
const { proxy } = getCurrentInstance()
const ids = ref([])
const loading = ref(false)
@@ -321,7 +442,9 @@ const state = reactive({
},
options: {
// 入库类型 选项列表 格式 eg:{ dictLabel: '标签', dictValue: '0'}
- transactionTypeOptions: []
+ transactionTypeOptions: [],
+ materialCodeOptions: [],
+ locationOptions: []
}
})
@@ -335,6 +458,7 @@ function cancel() {
// 重置表单
function reset() {
+
form.value = {
unit: null,
createdTime: null,
@@ -439,5 +563,33 @@ function getTypeOfWarehousingList() {
}
}
+// 物料编码列表
+function getMaterialCodeList() {
+ try {
+ getMaterialOption('materialCode').then((res) => {
+ const { code, data } = res
+ if (code == 200) {
+ state.options.materialCodeOptions = data
+ }
+ })
+ } catch (error) {
+ proxy.$modal.msgError(error.message)
+ }
+}
+
+// 获取库位编码列表
+function getLocationOptionList() {
+ try {
+ getLocationOption('warehouseCode').then((res) => {
+ const { code, data } = res
+ if (code == 200) {
+ state.options.locationOptions = data
+ }
+ })
+ } catch (error) {
+ proxy.$modal.msgError(error.message)
+ }
+}
+
handleQuery()