等级调整更新

src/views/system/item-role.vue

@@ -121,6 +121,13 @@
               v-show="showButton(scope.row,'L3')"
               @click="openDialog(scope.row,'L3')"
             >升级次级负责人</el-button>
+            <el-button
+              class="button-text"
+              type="text"
+              size="small"
+              v-show="showButton(scope.row,'L3_2')"
+              @click="openDialog(scope.row,'L3_2')"
+            >降为次级负责人</el-button>
             <el-button
               class="button-text"
               type="text"
@@ -375,7 +382,10 @@ export default {
       tagsRegion: [],
       doctorId: "",
       allSelectedKeys: [],
-      attachRegionId: ""
+      attachRegionId: "",
+
+      creator: false,
+      hospitalMasterAdmin: false,
     };
   },
   created() {
@@ -420,7 +430,7 @@ export default {
         };
         let fileArray = [
           {
-            type: '',
+            type: "",
             base64: fileJson
           }
         ];
@@ -491,7 +501,14 @@ export default {
           vm.totalRows = res.data.total;
           vm.activeUser = res.data.activeUser;
           vm.creator = res.data.creator;
-          console.log("activeUser", vm.activeUser, "vm.creator", vm.creator);
+          vm.hospitalMasterAdmin = res.data.hospitalMasterAdmin;
+          console.log(
+            "activeUser",
+            vm.activeUser,
+            "vm.creator",
+            vm.creator,
+            vm.hospitalMasterAdmin
+          );
           //this.roleList = setRoleList(res.data.roleList);
           this.organizationList = res.data.organizationList;
           this.departmentsList = res.data.departmentsList;
@@ -519,7 +536,7 @@ export default {
             type: "success"
           });
         } else {
-          this.$message.error("设置失败！");
+          this.$message.error(res.message);
         }
       });
     },
@@ -554,7 +571,7 @@ export default {
       if (vm.activeUser == "L1") {
         //当前内部管理员
         if (row.projeceRole == "L2") {
-          if (projeceRole == "L0") {
+          if (projeceRole == "L0" || projeceRole == "L3_2") {
             flag = true;
           }
         } else if (row.projeceRole == "L3") {
@@ -568,6 +585,9 @@ export default {
         }
       } else if (vm.activeUser == "L2") {
         //当前项目负责人
+        //新规则
+        if (vm.creator == true) {
+          //项目负责人是：项目创建者
           if (row.projeceRole == "L3") {
             if (projeceRole == "L2" || projeceRole == "L0") {
               flag = true;
@@ -576,20 +596,36 @@ export default {
             if (projeceRole == "L2" || projeceRole == "L3") {
               flag = true;
             }
-        } else if (row.projeceRole == "L2" && vm.creator == true) {
+          } else if (row.projeceRole == "L2") {
             //创建项目项目管理员可以修改其他项目管理员
+            if (projeceRole == "L0" || projeceRole == "L3_2") {
+              flag = true;
+            }
+          }
+        } else {
+          //不是项目创建者
+          if (row.projeceRole == "L3") {
             if (projeceRole == "L0") {
               flag = true;
             }
+          } else if (row.projeceRole == "L0") {
+            if (projeceRole == "L3") {
+              flag = true;
+            }
+          }
         }
       } else if (vm.activeUser == "L3") {
         //当前次级负责人
+        //新规则
+        if (vm.hospitalMasterAdmin == true) {
+          //次级负责人是：构主管理员
           if (row.projeceRole == "L0") {
             if (projeceRole == "L3") {
               flag = true;
             }
           }
         }
+      }
       return flag;
     },
     showAppend(projeceRole) {
@@ -612,10 +648,15 @@ export default {
       this.dialog.name = row.userName;
       this.scopeRow = row;
       this.scopeRow.updateL = projeceRole;
+      if (projeceRole == "L3_2") {
+        this.scopeRow.updateL = "L3";
+      }
       if (row.projeceRole == "L2") {
         this.dialog.role = "项目负责人";
         if (projeceRole == "L0") {
           this.dialog.option = "降级为普通用户";
+        } else if (projeceRole == "L3_2") {
+          this.dialog.option = "降级为次级负责人";
         }
       } else if (row.projeceRole == "L3") {
         this.dialog.role = "次级负责人";
@@ -711,12 +752,23 @@ export default {
       //   allSelectedKeys = savedCheckedKeys.concat(savedHalfCheckedKeys);
 
       // vm.allSelectedKeys = allSelectedKeys;
-      console.log('getHalfCheckedKeys():',this.$refs.tree.getHalfCheckedKeys());
-      console.log('getSimpleCheckedNodes():',operationData.getSimpleCheckedNodes(this.$refs.tree.store));
-      let checkedTree = operationData.getSimpleCheckedNodes(this.$refs.tree.store);
-      let halfCheckedTree = this.$refs.tree.getHalfCheckedKeys()
-      vm.allSelectedKeys = operationData.setSelectedKeys(checkedTree,halfCheckedTree);
-      console.log('vm.allSelectedKeys',vm.allSelectedKeys);
+      console.log(
+        "getHalfCheckedKeys():",
+        this.$refs.tree.getHalfCheckedKeys()
+      );
+      console.log(
+        "getSimpleCheckedNodes():",
+        operationData.getSimpleCheckedNodes(this.$refs.tree.store)
+      );
+      let checkedTree = operationData.getSimpleCheckedNodes(
+        this.$refs.tree.store
+      );
+      let halfCheckedTree = this.$refs.tree.getHalfCheckedKeys();
+      vm.allSelectedKeys = operationData.setSelectedKeys(
+        checkedTree,
+        halfCheckedTree
+      );
+      console.log("vm.allSelectedKeys", vm.allSelectedKeys);
       vm.initCheckList(vm.allSelectedKeys);
     },
     getTreeCheck() {
@@ -733,9 +785,14 @@ export default {
       //     return { type: 2, key: key };
       //   }),
       //   allSelectedKeys = savedCheckedKeys.concat(savedHalfCheckedKeys);
-      let checkedTree = operationData.getSimpleCheckedNodes(this.$refs.tree.store);
-      let halfCheckedTree = this.$refs.tree.getHalfCheckedKeys()
-      let allSelectedKeys = operationData.setSelectedKeys(checkedTree,halfCheckedTree);
+      let checkedTree = operationData.getSimpleCheckedNodes(
+        this.$refs.tree.store
+      );
+      let halfCheckedTree = this.$refs.tree.getHalfCheckedKeys();
+      let allSelectedKeys = operationData.setSelectedKeys(
+        checkedTree,
+        halfCheckedTree
+      );
       vm.allSelectedKeys = allSelectedKeys;
       return allSelectedKeys;
     },