Merge branch 'test' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-qms into lcw-dev

src/views/inspectionProject/components/ProductModal.vue

@@ -166,7 +166,6 @@
             label: '计量单位',
             prop: 'unit'
           },
-
           {
             label: '数量',
             prop: 'count'
@@ -174,6 +173,7 @@
         ];
       }
     },
+
     watch: {},
     methods: {
       /* 表格数据源 */
@@ -182,7 +182,8 @@
           ...where,
           pageNum: page,
           size: limit,
-          categoryLevelId: this.categoryLevelId
+          categoryLevelId: this.categoryLevelId,
+          isEnable: 1
         });
         return res;
       },
@@ -226,7 +227,7 @@
 
       /* 刷新表格 */
       reload(where) {
-        this.$refs.table.reload({ page: 1, where: where });
+        this.$refs.table.reload({ page: 1, where: where, isEnable: 1 });
       },
       // 单击获取id
       cellClick(row) {

src/views/sample/samplemanagement/components/equipmentDialog.vue

@@ -160,7 +160,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/unqualifiedProduct/unqualifiedList/components/EquipmentDialog.vue

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