材料站页面，类型和规格型号更换接口

src/api/ma/device.js

@@ -27,6 +27,15 @@ export function getDeviceType(query) {
   })
 }
 
+// 物资名称下拉框---无companyId
+export function getMaterialTypeList(query) {
+  return request({
+    url: '/material/ma_machine/getMaterialTypeList',
+    method: 'get',
+    params: query
+  })
+}
+
 // 资产属性下拉框-
 export function getZichanType(query) {
   return request({

src/views/material/report/reportQuery.vue

@@ -366,7 +366,7 @@
 import vueEasyPrint from "vue-easy-print";
 import {batchDownloadFileApi, downloadFileApi, getReportList} from "@/api/report/report";
 import {getDepartListByImpUnitApi, getImpUnitListApi, getProListByDepartApi} from "@/api/materialsStation";
-import {getDeviceType} from "@/api/ma/device";
+import {getMaterialTypeList} from "@/api/ma/device";
 import {getCheckInfo} from "@/api/lease/apply";
 import printJS from "print-js";
 import QRCode from "qrcodejs2";
@@ -565,7 +565,7 @@ export default {
       }
     },
     getDeviceType() {
-      getDeviceType({level: 3, skipPermission: 1}).then(response => {
+      getMaterialTypeList({level: 3, skipPermission: 1}).then(response => {
         let matNameRes = response.data
         this.materialNameList = matNameRes.map((item) => {
           return {
@@ -574,7 +574,7 @@ export default {
           }
         })
       })
-      getDeviceType({level: 4, skipPermission: 1}).then(response => {
+      getMaterialTypeList({level: 4, skipPermission: 1}).then(response => {
         let matModelRes = response.data
         this.materialModelList = matModelRes.map((item) => {
           return {
@@ -594,7 +594,7 @@ export default {
       } else {
         typeId = this.materialNameList.find(item => item.label == e).value
       }
-      getDeviceType({level: 4, skipPermission: 1, typeId}).then(response => {
+      getMaterialTypeList({level: 4, skipPermission: 1, typeId}).then(response => {
         let matModelRes = response.data
         this.materialModelList = matModelRes.map((item) => {
           return {

src/views/materialsStation/equipment/equipmentRecord/index.vue

@@ -362,7 +362,7 @@ import {
   getRetainedEquipmentListApi,
   getImpUnitListApi, getDepartListByImpUnitApi, getProListByDepartApi, getTeamList, getSubUnitList
 } from '@/api/materialsStation'
-import {getDeviceType} from "@/api/ma/device";
+import {getMaterialTypeList} from "@/api/ma/device";
 export default {
   name: 'EquipmentRecord',
   dicts: [],
@@ -588,7 +588,7 @@ export default {
       }
     },
     getDeviceType() {
-      getDeviceType({ level: 3, skipPermission: 1 }).then(response => {
+      getMaterialTypeList({ level: 3, skipPermission: 1 }).then(response => {
         let matNameRes = response.data
         this.materialNameList = matNameRes.map((item) => {
           return {
@@ -597,7 +597,7 @@ export default {
           }
         })
       })
-      getDeviceType({ level: 4, skipPermission: 1 }).then(response => {
+      getMaterialTypeList({ level: 4, skipPermission: 1 }).then(response => {
         let matModelRes = response.data
         this.materialModelList = matModelRes.map((item) => {
           return {
@@ -618,7 +618,7 @@ export default {
         typeId = this.materialNameList.find(item => item.label == e).value
       }
       console.log('🚀 ~ handleMaModel ~ typeId:', typeId)
-      getDeviceType({ level: 4, skipPermission: 1, typeId }).then(response => {
+      getMaterialTypeList({ level: 4, skipPermission: 1, typeId }).then(response => {
         let matModelRes = response.data
         this.materialModelList = matModelRes.map((item) => {
           return {

src/views/materialsStation/equipment/equipmentRecord/supplyDemandBalance.vue

@@ -264,7 +264,7 @@ import {
   getDemandAndSupplyApi,
   getDemandAndSupplyNoPageApi
 } from '@/api/materialsStation'
-import { getDeviceType } from '@/api/ma/device'
+import {getMaterialTypeList} from '@/api/ma/device'
 
 export default {
   name: 'SupplyDemandBalance',
@@ -483,7 +483,7 @@ export default {
       }
     },
     getDeviceType() {
-      getDeviceType({ level: 3, skipPermission: 1 }).then(response => {
+      getMaterialTypeList({ level: 3, skipPermission: 1 }).then(response => {
         let matNameRes = response.data
         this.materialNameList = matNameRes.map(item => {
           return {
@@ -492,7 +492,7 @@ export default {
           }
         })
       })
-      getDeviceType({ level: 4, skipPermission: 1 }).then(response => {
+      getMaterialTypeList({ level: 4, skipPermission: 1 }).then(response => {
         let matModelRes = response.data
         this.materialModelList = matModelRes.map(item => {
           return {
@@ -513,7 +513,7 @@ export default {
         typeId = this.materialNameList.find(item => item.label == e).value
       }
       console.log('🚀 ~ handleMaModel ~ typeId:', typeId)
-      getDeviceType({ level: 4, skipPermission: 1, typeId }).then(response => {
+      getMaterialTypeList({ level: 4, skipPermission: 1, typeId }).then(response => {
         let matModelRes = response.data
         this.materialModelList = matModelRes.map(item => {
           return {

src/views/materialsStation/equipment/safetyWarn/index.vue

@@ -250,7 +250,7 @@
 import TreeSelect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import {getSafetyListApi,getSafeNumListApi,getAgreementIdApi,getImpUnitListApi, getDepartListByImpUnitApi, getProListByDepartApi,getTeamList, getSubUnitList  } from '@/api/materialsStation'
-import {getDeviceType} from "@/api/ma/device";
+import {getMaterialTypeList} from "@/api/ma/device";
 import QRCodeView from '@/components/QRCodeView'
 import { formatTime } from '@/utils/bonus.js'
 
@@ -332,7 +332,7 @@ export default {
     },
 
     getDeviceType() {
-      getDeviceType({ level: 3, skipPermission: 1 }).then(response => {
+      getMaterialTypeList({ level: 3, skipPermission: 1 }).then(response => {
         let matNameRes = response.data
         this.materialNameList = matNameRes.map((item) => {
           return {

src/views/materialsStation/equipment/totalLeaseRecord/index.vue

@@ -479,7 +479,7 @@ import { getTotalListApi, getDetailsListApi,getPickListApi, addRemarkApi,
   getImpUnitListApi, getDepartListByImpUnitApi, getProListByDepartApi,
  } from '@/api/materialsStation'
 import { getClzApplyInfo,  } from '@/api/lease/apply'
-import {getDeviceType} from "@/api/ma/device";
+import {getMaterialTypeList} from "@/api/ma/device";
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import vueEasyPrint from 'vue-easy-print'
@@ -636,7 +636,7 @@ export default {
     },
 
     getDeviceType() {
-      getDeviceType({ level: 3, skipPermission: 1 }).then(response => {
+      getMaterialTypeList({ level: 3, skipPermission: 1 }).then(response => {
         let matNameRes = response.data
         this.materialNameList = matNameRes.map((item) => {
           return {

src/views/materialsStation/equipment/totalReturnRecord/index.vue

@@ -240,7 +240,7 @@ import { getBackTotalListApi, getBackDetailsListApi,
   getImpUnitListApi, getDepartListByImpUnitApi, getProListByDepartApi,
  } from '@/api/materialsStation'
 import dialogFormByClz from '@/views/materialsStation/equipment/totalReturnRecord/dialogFormByClz.vue'
-import {getDeviceType} from "@/api/ma/device";
+import {getMaterialTypeList} from "@/api/ma/device";
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import StraightforwardBills from '@/views/materialsStation/straight/straightTransferReview/components/StraightforwardBills.vue'
@@ -381,7 +381,7 @@ export default {
     },
 
     getDeviceType() {
-      getDeviceType({ level: 3, skipPermission: 1 }).then(response => {
+      getMaterialTypeList({ level: 3, skipPermission: 1 }).then(response => {
         let matNameRes = response.data
         this.materialNameList = matNameRes.map((item) => {
           return {

src/views/materialsStation/toolsBack/back/component/home.vue

@@ -297,7 +297,7 @@ import {
   getImpUnitListApi, getDepartListByImpUnitApi, getProListByDepartApi, getTeamList, getSubUnitList
 } from '@/api/materialsStation'
 import dialogFormByCq from './dialogFormByCq.vue'
-import {getDeviceType} from "@/api/ma/device";
+import {getMaterialTypeList} from "@/api/ma/device";
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import StraightforwardBills from '@/views/materialsStation/straight/straightTransferReview/components/StraightforwardBills.vue'
@@ -601,7 +601,7 @@ export default {
     },
 
     getDeviceType() {
-      getDeviceType({ level: 3, skipPermission: 1 }).then(response => {
+      getMaterialTypeList({ level: 3, skipPermission: 1 }).then(response => {
         let matNameRes = response.data
         this.materialNameList = matNameRes.map((item) => {
           return {

src/views/materialsStation/toolsLease/apply/component/homeApply.vue

@@ -398,7 +398,7 @@
 import { getListLeaseApply, getPickListApi, applyRemove,
   getImpUnitListApi, getDepartListByImpUnitApi, getProListByDepartApi, getTeamList, getSubUnitList
  } from '@/api/materialsStation'
- import {getDeviceType} from "@/api/ma/device";
+import {getMaterialTypeList} from "@/api/ma/device";
 import vueEasyPrint from 'vue-easy-print'
 import printJS from 'print-js'
 import StraightforwardBills from '@/views/materialsStation/straight/straightTransferReview/components/StraightforwardBills.vue'
@@ -698,7 +698,7 @@ export default {
     },
 
     getDeviceType() {
-      getDeviceType({ level: 3, skipPermission: 1 }).then(response => {
+      getMaterialTypeList({ level: 3, skipPermission: 1 }).then(response => {
         let matNameRes = response.data
         this.materialNameList = matNameRes.map((item) => {
           return {

src/views/materialsStation/toolsLease/outBound/component/homeApply.vue

@@ -156,7 +156,7 @@
         />
       </el-form-item>
 
-      
+
 
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -386,7 +386,7 @@
 import { getListLeaseApply, getPickListApi, applyRemove,
   getImpUnitListApi, getDepartListByImpUnitApi, getProListByDepartApi, getTeamList, getSubUnitList
  } from '@/api/materialsStation'
-import {getDeviceType} from "@/api/ma/device";
+import {getMaterialTypeList} from "@/api/ma/device";
 import vueEasyPrint from 'vue-easy-print'
 import printJS from 'print-js'
 import StraightforwardBills from '@/views/materialsStation/straight/straightTransferReview/components/StraightforwardBills.vue'
@@ -547,7 +547,7 @@ export default {
     },
 
     getDeviceType() {
-      getDeviceType({ level: 3, skipPermission: 1 }).then(response => {
+      getMaterialTypeList({ level: 3, skipPermission: 1 }).then(response => {
         let matNameRes = response.data
         this.materialNameList = matNameRes.map((item) => {
           return {