修改职员

src/components/organization/index.vue

@@ -14,6 +14,9 @@
         <div class="dptBox" v-show="active == 0">
           <el-scrollbar style="height: 100%">
             <el-tree :data="data" :check-strictly="true" show-checkbox @node-click="nodeClick" @check-change="currentChange" :props="defaultProps" default-expand-all :default-checked-keys="checkedKeys" :expand-on-click-node="false" :node-key="nodekey" ref="tree" highlight-current>
+              <span slot-scope="{ data }" :title="data.OrganName" class="org-data-tree-node">
+                {{ data.OrganName }}
+              </span>
             </el-tree>
           </el-scrollbar>
         </div>
@@ -178,6 +181,7 @@ export default {
   },
 };
 </script>
+
 <style lang="scss">
 @import "./organization.scss";
 .DBox {
@@ -185,5 +189,13 @@ export default {
 }
 .dptBox {
   height: 100%;
+  .org-data-tree-node {
+    font-size: 14px;
+    max-width: 12vw;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    margin-left: 10px;
+  }
 }
 </style>

src/views/organizationManagement/components/organizationHome.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-11-29 09:27:43
- * @LastEditTime: 2022-02-10 09:46:51
+ * @LastEditTime: 2022-02-16 16:19:46
  * @LastEditors: Please set LastEditors
  * @Description: 权限管理
  * @FilePath: \Foshan4A2.0\src\views\authorityManagement\components\home.vue
@@ -239,7 +239,7 @@ export default {
     renderMember (data) {
       this.$router.push({
         path: "/staff/staffAdd",
-        query: { OrganUpid: data.OrganUpid, OrganId: data.OrganId },
+        query: { OrganUpid: data.OrganUpid, OrganId: data.OrganId, orgType: 'org' },
       });
     },
     // 修改组织

src/views/staffManagement/compontents/staffAdd.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2022-02-10 14:49:20
- * @LastEditTime: 2022-02-16 14:35:13
+ * @LastEditTime: 2022-02-16 16:27:48
  * @LastEditors: Please set LastEditors
  * @Description: 编辑职员
  * @FilePath: \Foshan4A4.0\src\views\staffManagement\compontents\staffEdit.vue
@@ -192,6 +192,7 @@ export default {
       rulesObj: {}, //权限规则数据
       isMainJob: true, //是否主岗
       oldOrganId: "",
+      OrganId: null,
       onCheckedArr: [],//当前显示选中权限组
       alljobArr: [],//全部岗位
       GroupIds: [], //当前选中的用户组
@@ -206,6 +207,9 @@ export default {
     dataList: {
       handler (val) {
         this.data = [val];
+        if (this.orgTypes == 'org') {
+          this.orgCheckedKeys = [this.OrganId];
+        }
       },
       deep: true,
     },
@@ -225,7 +229,7 @@ export default {
     }
   },
   created () {
-    const { OrganId, Status, OfficerId } = this.$route.query;
+    const { OrganId, Status, OfficerId, orgType } = this.$route.query;
     const { OpenRole, PwdLengthBegin, PwdLengthEnd, PwdStruc, OpenGroup, UserOfficerMulti } =
       typeof this.systemSet === "string"
         ? JSON.parse(this.systemSet)
@@ -236,12 +240,14 @@ export default {
     this.openRole = OpenRole;
     this.OpenGroup = OpenGroup;
     this.OpenAuthData = UserOfficerMulti;
+    this.OrganId = OrganId;
+    this.orgTypes = orgType;
     if (OpenGroup || !OpenGroup && !OpenRole) {
       this.queryType = "all";
     }
   },
   mounted () {
-    if (this.openRole) {
+    if (this.openRole && !this.OpenGroup) {
       this.roleType = 'onlyRole';
     }
   },