Merge branch 'test' into et86

@@ -355,7 +355,7 @@ export default {
           {
           {
             required: true,
             required: true,
             message: "原始重量（KG）不能为空",
             message: "原始重量（KG）不能为空",
-            trigger: "change",
+            trigger: ["change","blur"],
           },
           },
         ],
         ],
       },
       },

@@ -163,10 +163,12 @@ export default {
         let menuItem = {};
         let menuItem = {};
         menuItem.id = item.id;
         menuItem.id = item.id;
         menuItem.title = item.title;
         menuItem.title = item.title;
+        menuItem.disabled = this.roleFormDisabled;
         data.push(menuItem)
         data.push(menuItem)
         if (item.children && item.children.length) {
         if (item.children && item.children.length) {
+          menuItem.disabled = this.roleFormDisabled;
           menuItem.children = this.treeDataInfo(item.children);
           menuItem.children = this.treeDataInfo(item.children);
-          menuItem.children.unshift({ id: item.id, title: `${item.title}(菜单)` })
+          menuItem.children.unshift({ id: item.id, title: `${item.title}(菜单)`, disabled: this.roleFormDisabled  })
         }
         }
       });
       });
       return data;
       return data;

@@ -157,7 +157,7 @@ export default {
       status == 0
       status == 0
         ? (this.roleFormDisabled = true)
         ? (this.roleFormDisabled = true)
         : (this.roleFormDisabled = false);
         : (this.roleFormDisabled = false);
-      this.drawerTitle = "修改角色";
+      this.drawerTitle = status == 0 ? "查看角色" : "修改角色";
     },
     },
     //修改角色状态
     //修改角色状态
     roleStatus(row) {
     roleStatus(row) {

@@ -153,11 +153,11 @@ export default {
         });
         });
     },
     },
     //用户详情
     //用户详情
-    userDetail(id) {
+    userDetail(status, id) {
       detailUser(id)
       detailUser(id)
         .then((res) => {
         .then((res) => {
           this.drawer = true;
           this.drawer = true;
-          this.drawerTitle = "修改用户";
+          this.drawerTitle = status == 0 ? "查看用户" : "修改用户";
           if (res.code === 200) {
           if (res.code === 200) {
             this.userData = res.data;
             this.userData = res.data;
             this.userData.portName
             this.userData.portName
@@ -180,7 +180,7 @@ export default {
     },
     },
     //查询修改用户
     //查询修改用户
     buttonClick(row, status) {
     buttonClick(row, status) {
-      this.userDetail(row.row.id);
+      this.userDetail(status, row.row.id);
       status == 0
       status == 0
         ? (this.userFormDisabled = true)
         ? (this.userFormDisabled = true)
         : (this.userFormDisabled = false);
         : (this.userFormDisabled = false);