Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-aps into dengfei

src/views/productionPlan/components/EquipmentDialog.vue

@@ -145,7 +145,8 @@
           pageNum: page,
           size: limit,
           categoryLevelId: this.categoryLevelId,
-          isProduct: true
+          isProduct: true,
+          isEnable: 1
         };
         const data = await getList(params);
         this.tableList = data.list;

src/views/saleOrder/components/EquipmentDialog.vue

@@ -171,7 +171,8 @@
           pageNum: page,
           size: limit,
           categoryLevelId: this.categoryLevelId,
-          isProduct: true
+          isProduct: true,
+          isEnable: true
         };
         const data = await getList(params);
         this.tableList = data.list;