diff --git a/src/pages/materialsStation/equipmentRecord/equipmentRecord.vue b/src/pages/materialsStation/equipmentRecord/equipmentRecord.vue index 10ae3cc..995e973 100644 --- a/src/pages/materialsStation/equipmentRecord/equipmentRecord.vue +++ b/src/pages/materialsStation/equipmentRecord/equipmentRecord.vue @@ -154,8 +154,8 @@ import { onLoad } from '@dcloudio/uni-app' import { onMounted, ref, reactive, computed } from 'vue' import { getBranchListApi,getImpUnitListApi, getDepartListByImpUnitApi, getProListByDepartApi } from '@/services/materialsStation' -import { getTypeListApi } from '@/services/inStorage/index.js' import { useMemberStore } from '@/stores' +import {getMaterialTypeList} from "../../../services/inStorage"; const memberStore = useMemberStore() const userInfo = ref(memberStore.userInfo || {}) @@ -289,7 +289,7 @@ const handleDepartChange= async () => { const getTypeList = async () => { try { - const res = await getTypeListApi({ level: 3, skipPermission: 1 }) + const res = await getMaterialTypeList({ level: 3, skipPermission: 1 }) console.log('🚀 ~ getTypeList ~ res:', res) typeList.value = [] if (res.data) { diff --git a/src/pages/materialsStation/toolsLease/toolsLeaseAdd.vue b/src/pages/materialsStation/toolsLease/toolsLeaseAdd.vue index 65d4c6a..ccb7942 100644 --- a/src/pages/materialsStation/toolsLease/toolsLeaseAdd.vue +++ b/src/pages/materialsStation/toolsLease/toolsLeaseAdd.vue @@ -108,7 +108,7 @@ @blur="fitNumChange" > --> - + { }) } + +// 获取类型 3级 4级(根据typeId)---无companyId +export const getMaterialTypeList = (data) => { + return http({ + method: 'GET', + url: '/material/ma_machine/getMaterialTypeList', + data, + }) +} + // OCR入库 export const addMaMachineApi = (data) => { return http({