huang_an 2 лет назад
Родитель
Сommit
6544c4c440

+ 9 - 7
src/views/ledgerAssets/equipment/components/equipment-list.vue

@@ -322,13 +322,15 @@
       },
       },
 
 
       // 跳转到详情页
       // 跳转到详情页
-      handleView({ id }) {
-        this.$router.push({
-          path: '/ledgerAssets/equipment/detail',
-          query: {
-            id
-          }
-        });
+      handleView({ id }, column) {
+        if (column.label !== '操作') {
+          this.$router.push({
+            path: '/ledgerAssets/equipment/detail',
+            query: {
+              id
+            }
+          });
+        }
       },
       },
       // 跳转到编辑
       // 跳转到编辑
       handEdit({ id }) {
       handEdit({ id }) {

+ 6 - 0
src/views/maintenance/components/programRulesDialog.vue

@@ -688,6 +688,8 @@
                     equiLocation: item.position[0].pathName,
                     equiLocation: item.position[0].pathName,
                     equiLocationCode: item.position[0].pathIds,
                     equiLocationCode: item.position[0].pathIds,
                     workItems: ruleItem.ruleItems ? ruleItem.ruleItems : []
                     workItems: ruleItem.ruleItems ? ruleItem.ruleItems : []
+                    // categoryId: item.category.categoryLevelId,
+                    // categoryName: item.category.categoryLevelName
                     // sparePart: ruleItem.sparePart ? obj.sparePart : []
                     // sparePart: ruleItem.sparePart ? obj.sparePart : []
                   };
                   };
                 });
                 });
@@ -800,6 +802,10 @@
                   id: item.substance.id,
                   id: item.substance.id,
                   fixCode: item.substance.fixCode,
                   fixCode: item.substance.fixCode,
                   codeNumber: item.substance.codeNumber
                   codeNumber: item.substance.codeNumber
+                  // category: {
+                  //   categoryLevelId: item.categoryId,
+                  //   categoryLevelName: item.categoryName
+                  // }
                 };
                 };
               }),
               }),
               ruleItems: res.data.planDeviceList[0].workItems
               ruleItems: res.data.planDeviceList[0].workItems