Merge remote-tracking branch 'origin/main'

src/views/warehouseManage/machinery/coding-nw/index.vue

@@ -574,13 +574,13 @@
 
 <script>
 import {
-    addMachine,
+  addMachine,
-    delMachine,
+  delMachine,
-    getMachine,
+  getMachine,
-    listMachine,
+  listMachine,
-    updateMachine,
+  updateMachine,
-    supplierInfoList,
+  supplierInfoList,
-    getListByMaType,
+  getListByMaType, getListByMaTypePid,
 } from '@/api/store/tools'
 import { pushNotificationsApi } from '@/api/dataPush' // 推送至租赁平台
 import { getProLists } from '@/api/base/base'
@@ -714,14 +714,14 @@ export default {
         //选择物品种类
         selectItem(id) {
             console.log(id)
-            getListByMaType({ typeId: id, level: '3' }).then((response) => {
+            getListByMaTypePid({ typeId: id }).then((response) => {
                 this.typeList = response.data.rows
             })
         },
         //选择设备类型
         selectDevice(id) {
             console.log(id)
-            getListByMaType({ typeId: id, level: '0' }).then((response) => {
+            getListByMaTypePid({ typeId: id }).then((response) => {
                 this.modelList = response.data.rows
             })
         },

src/views/warehouseManage/machinery/coding/index.vue

@@ -515,13 +515,13 @@
 
 <script>
 import {
-    addMachine,
+  addMachine,
-    delMachine,
+  delMachine,
-    getMachine,
+  getMachine,
-    listMachine,
+  listMachine,
-    updateMachine,
+  updateMachine,
-    supplierInfoList,
+  supplierInfoList,
-    getListByMaType,
+  getListByMaType, getListByMaTypePid,
 } from '@/api/store/tools'
 import { getProLists } from '@/api/base/base'
 import { imgUpLoad } from '@/api/system/upload'
@@ -637,14 +637,14 @@ export default {
         //选择物品种类
         selectItem(id) {
             console.log(id)
-            getListByMaType({ typeId: id, level: '3' }).then((response) => {
+            getListByMaTypePid({ typeId: id }).then((response) => {
                 this.typeList = response.data.rows
             })
         },
         //选择设备类型
         selectDevice(id) {
             console.log(id)
-            getListByMaType({ typeId: id, level: '0' }).then((response) => {
+            getListByMaTypePid({ typeId: id }).then((response) => {
                 this.modelList = response.data.rows
             })
         },