Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev

sgzb-ui/src/views/store/label/labelBinding.vue

@@ -26,6 +26,7 @@
               placeholder="请选择设备类型"
               clearable filterable
               style="width: 240px"
+              @change="selectDevice"
             >
               <el-option
                 v-for="typeItem in typeList"
@@ -39,7 +40,7 @@
             <el-select
               v-model="queryParams.modelId"
               placeholder="请选择规格型号"
-              clearable
+              clearable filterable
               style="width: 240px"
             >
               <el-option
@@ -365,7 +366,7 @@
         <el-button type="primary" @click="downloadCode">下 载</el-button>
       </div>
     </el-dialog>
-    <div style="background-color;: transparent">
+    <div style="background-color: transparent">
       <div
         id="qrCode"
         v-for="(codeItem, codeIndex) in checkboxModel"
@@ -391,6 +392,7 @@
 </template>
 
 <script>
+import {addMachine, delMachine, getMachine, listMachine, updateMachine,supplierInfoList,getListByMaType} from "@/api/store/tools";
 import { listType, getType, delType, addType, updateType, refreshCache, } from "@/api/system/dict/type";
 import { listLabelBind, addLabelBind, delLabelBind } from "@/api/store/label";
 import { getTypeList } from "@/api/store/warehousing";
@@ -517,6 +519,15 @@ export default {
       })
     },
 
+    //选择设备类型
+    selectDevice(id){
+      console.log(id)
+      getListByMaType({typeId:id}).then(response => {
+          this.modelList = response.data;
+        }
+      );
+    },
+
 
     /** 查询字典类型列表 */
     getList() {