yh-pub 1.0.1 → 1.0.2

package/layout/admin/home/homeIndex.vue

@@ -1,7 +1,7 @@
 <template>
   <iframe
     class="admin-home-index"
-    src="http://docs.js.sforcecon.com:5900/view/591"
+    src="http://docs.js.sforcecon.com:5900/view/589"
     frameborder="0"></iframe>
 </template>
 <script>
@@ -17,8 +17,8 @@ export default {
 
 <style>
 .main-container .admin-home-index {
-  margin: 0 -16px -20px -16px;
-  width: calc(100% + 32px);
+  margin: 0 0 -20px 0;
+  width: 100%;
   height: calc(100% + 10px);
   overflow: hidden;
 }

package/layout/main/login/login.vue

@@ -1,5 +1,5 @@
 <style lang="less">
-@import "./login.less";
+@import './login.less';
 </style>
 
 <template>
@@ -12,8 +12,8 @@
     </div>
     <div class="login-con">
       <div class="login-title">
-        <div class="login-title-cn">中控系统</div>
-        <div class="login-title-en">Central Control System</div>
+        <div class="login-title-cn">力控元海</div>
+        <div class="login-title-en">Li Kong Yuan Hai</div>
       </div>
       <div class="form-con">
         <el-form
@@ -91,21 +91,21 @@
 </template>
 
 <script>
-import { useUserStore } from "@/store/user";
-import { defineComponent } from "vue";
+import {useUserStore} from '@/store/user';
+import {defineComponent} from 'vue';
 
 export default defineComponent({
   data() {
     return {
-      errorMsg: "",
+      errorMsg: '',
       form: {
-        username: "",
-        password: "",
+        username: '',
+        password: '',
       },
       loading: false,
       rules: {
-        username: [{ required: true, message: "账号不能为空", trigger: "blur" }],
-        password: [{ required: true, message: "密码不能为空", trigger: "blur" }],
+        username: [{required: true, message: '账号不能为空', trigger: 'blur'}],
+        password: [{required: true, message: '密码不能为空', trigger: 'blur'}],
       },
     };
   },
@@ -124,7 +124,7 @@ export default defineComponent({
             .then(async (res) => {
               this.loading = false;
               if (res.data.result) {
-                this.$message.success("登录成功");
+                this.$message.success('登录成功');
                 userStore.getUserInfo().then(() => {
                   this.$router
                     .replace({

package/layout/main/system/roleManage.js

@@ -1,4 +1,4 @@
-import dict from "yh-pub/layout/main/system/dict.vue";
+import dict from "./dict.vue";
 import { deepClone } from "@/libs/util";
 
 export default {
@@ -6,11 +6,12 @@ export default {
   components: {
     dict,
   },
-  data() {
+  data () {
     return {
       maxHeight: 510,
       openTip: false,
       loading: true,
+      userLoading: false,
       treeLoading: true,
       submitPermLoading: false,
       submitDepLoading: false,
@@ -31,48 +32,23 @@ export default {
         key: "",
       },
       roleForm: {
-        ad_org_id: "",
+        adOrgId: "",
         name: "",
-        isAdmin: "",
+        isAdmin: "N",
         description: "",
-        ad_role_id: "",
+        adRoleId: "",
       },
       roleFormValidate: {
-        ad_org_id: [{ required: true, message: "组织机构不能为空", trigger: "change" }],
+        adOrgId: [{ required: true, message: "组织机构不能为空", trigger: "change" }],
         name: [{ required: true, message: "角色名称不能为空", trigger: "change" }],
       },
       submitLoading: false,
       selectList: [],
-      columns: [
-        {
-          title: "所属机构",
-          dataIndex: "org_name",
-          width: 150,
-          sortable: true,
-        },
-        {
-          title: "角色名称",
-          dataIndex: "name",
-          width: 300,
-          sortable: true,
-        },
-        {
-          title: "备注",
-          dataIndex: "description",
-          minWidth: 200,
-          sortable: true,
-        },
-        {
-          title: "操作",
-          dataIndex: "action",
-          fixed: "right",
-          width: 280,
-          scopedSlots: { customRender: "action", title: "操作" },
-        },
-      ],
       data: [],
+      userData: [],
+      paginationUser: { currentPage: 1, pageSize: 10, total: 0 },
       listLoading: false,
-      pagination: { currentPage: 1, pageSize: 15, total: 0 },
+      pagination: { currentPage: 1, pageSize: 10, total: 0 },
       permData: [],
       editRolePermId: "",
       selectAllFlag: false,
@@ -89,13 +65,19 @@ export default {
       halfSelectedNodes: [],
       deptCheckedKeys: [],
       timer: null,
+      queryOrgId: "",
+      queryRoteId: "",
+      queryUserList: [],
+      currentRow: null,
+      userIds: [],
+      userListVisible: false,
     };
   },
   methods: {
-    init() {
+    init () {
       this.getDataList();
     },
-    parseOrgTreeData(curLevelData, curLevel, roleOrgData) {
+    parseOrgTreeData (curLevelData, curLevel, roleOrgData) {
       let curVm = this;
       let newLevelData = curLevelData;
       newLevelData.key = curLevelData.adOrgId;
@@ -116,7 +98,7 @@ export default {
       }
       return newLevelData;
     },
-    async loadRoleOrg() {
+    async loadRoleOrg () {
       let roleOrgData = {};
       // 请求系统数据
       this.axios
@@ -124,7 +106,7 @@ export default {
           "/roleController/getRoleOrgAccess",
           this.$qs.stringify({
             roleId: this.editRolePermId,
-          })
+          }),
         )
         .then((response) => {
           if (response.data.result) {
@@ -137,17 +119,17 @@ export default {
         });
       return roleOrgData;
     },
-    async editOrg(v) {
-      this.editRolePermId = v.ad_role_id;
+    async editOrg (v) {
+      this.editRolePermId = v.adRoleId;
       this.modalTitle = "分配 " + v.name + " 的组织机构权限";
       let roleOrgData = await this.loadRoleOrg();
       this.roleOrgData = roleOrgData;
       // 请求系统数据
-      this.axios.post("/orgController/getOrgData", this.$qs.stringify({})).then((response) => {
+      this.axios.post("/orgController/getUserOrgTree", {}).then((response) => {
         if (response.data.result) {
           let newTreeData = [];
           this.deptCheckedKeys = [];
-          response.data.orgList.forEach((e) => {
+          response.data.list.forEach((e) => {
             newTreeData.push(this.parseOrgTreeData(e, 0, roleOrgData));
           });
           this.orgData = newTreeData;
@@ -158,7 +140,7 @@ export default {
       });
       this.orgModalVisible = true;
     },
-    checkOrgTree() {
+    checkOrgTree () {
       if (this.timer) {
         clearTimeout(this.timer);
       }
@@ -166,7 +148,7 @@ export default {
         this.deptCheckedKeys = this.$refs.depTree.getCheckedKeys();
       }, 300);
     },
-    submitRoleOrg() {
+    submitRoleOrg () {
       let selectedNodes = this.$refs.depTree.getCheckedKeys() || [];
       let curVm = this;
       let subRoleOrgData = [];
@@ -180,7 +162,7 @@ export default {
           this.$qs.stringify({
             roleId: curVm.editRolePermId,
             subJsonData: JSON.stringify(subRoleOrgData),
-          })
+          }),
         )
         .then((response) => {
           if (response.data.result) {
@@ -191,7 +173,7 @@ export default {
         });
       this.orgModalVisible = false;
     },
-    renderContent(h, { root, node, data }) {
+    renderContent (h, { root, node, data }) {
       let icon = "";
       if (data.level === 0) {
         icon = "ios-navigate";
@@ -231,10 +213,10 @@ export default {
             }),
             h("span", data.title),
           ]),
-        ]
+        ],
       );
     },
-    checkedMenuTree() {
+    checkedMenuTree () {
       if (this.timer) {
         clearTimeout(this.timer);
       }
@@ -243,7 +225,7 @@ export default {
         this.halfSelectedNodes = this.$refs.tree.getHalfCheckedKeys(true);
       }, 300);
     },
-    selectTree(data, node) {
+    selectTree (data, node) {
       if (data) {
         this.curSelectedMenuId = data.sysWindowId;
         // 加载目录树
@@ -267,10 +249,12 @@ export default {
               roleBtnData.forEach((item) => {
                 item["childs"] = tempQyBtnData[item.ID];
                 // e['checkAll'] = false
-                let checkChilds = this.roleSavedBtnPermMap[this.curSelectedMenuId] || [];
+                let roleSavedBtns = this.roleSavedBtnPermMap[this.curSelectedMenuId] || [];
+                let checkChilds = [];
                 let tcount = 0;
                 tempQyBtnData[item.ID].forEach((es) => {
-                  if (checkChilds.includes(es.ID)) {
+                  if (roleSavedBtns.includes(es.ID)) {
+                    checkChilds.push(es.ID);
                     tcount++;
                   }
                 });
@@ -293,12 +277,12 @@ export default {
           });
       }
     },
-    resetBtnPerData() {
+    resetBtnPerData () {
       this.roleSavedBtnPermMap = {};
       this.curWindowBtnList = [];
       this.saveWinBtnList = [];
     },
-    doWinBtnData(doType, btnId) {
+    doWinBtnData (doType, btnId) {
       if (!this.saveWinBtnList) {
         this.saveWinBtnList = [];
       }
@@ -320,7 +304,7 @@ export default {
         }
       }
     },
-    handleCheckAll(item, key) {
+    handleCheckAll (item, key) {
       let checkChilds = [];
       if (!item.checkAll) {
         // 已经全选取消全选状态
@@ -339,7 +323,7 @@ export default {
       this.updateBtnsToList();
       this.curWindowBtnList[key] = item;
     },
-    checkAllGroupChange(event, key) {
+    checkAllGroupChange (event, key) {
       let list = deepClone({}, this.curWindowBtnList);
       let currentItem = list[key];
       if (event.length > 0) {
@@ -376,7 +360,7 @@ export default {
       this.curWindowBtnList[key] = currentItem;
       this.updateBtnsToList();
     },
-    updateBtnsToList() {
+    updateBtnsToList () {
       let btns = new Set();
       this.curWindowBtnList.forEach((item) => {
         item.checkChilds.forEach((checkId) => {
@@ -386,16 +370,16 @@ export default {
       btns = Array.from(btns);
       this.roleSavedBtnPermMap[this.curSelectedMenuId] = btns;
     },
-    changePage(v) {
+    changePage (v) {
       this.searchForm.pageNumber = v;
       this.getDataList();
       this.clearSelectAll();
     },
-    changePageSize(v) {
+    changePageSize (v) {
       this.searchForm.pageSize = v;
       this.getDataList();
     },
-    changeSort(e) {
+    changeSort (e) {
       this.searchForm.sort = e.key;
       this.searchForm.order = e.order;
       if (e.order === "normal") {
@@ -403,26 +387,96 @@ export default {
       }
       this.getDataList();
     },
-    getDataList() {
+    getDataList () {
       this.loading = true;
-      this.axios
-        .post(
-          "/roleController/getRoleList",
+      this.axios.post("/roleController/getRoleList",
+        this.$qs.stringify({
+          name: this.searchForm.key,
+          pageSize: this.pagination.pageSize,
+          pageIndex: this.pagination.currentPage,
+        }),
+      ).then((response) => {
+        this.loading = false;
+        if (response.data.result) {
+          this.data = response.data.data.records;
+          this.pagination.total = response.data.data.total;
+        }
+      });
+    },
+    getUserDataList (val) {
+      if (val === undefined) {
+        this.userData = [];
+        return;
+      }
+      if (val != 1) {
+        this.currentRow = val;
+      }
+      this.userLoading = true;
+      this.userIds = [];
+      this.axios.post("/roteUser/getAdRoleUsers",
+        this.$qs.stringify({
+          roteId: this.currentRow.adRoleId,
+          orgId: this.currentRow.adOrgId,
+          pageSize: this.paginationUser.pageSize,
+          pageIndex: this.paginationUser.currentPage,
+        }),
+      ).then((response) => {
+        this.userLoading = false;
+        if (response.data.result) {
+          this.queryOrgId = this.currentRow.adOrgId;
+          this.queryRoteId = this.currentRow.adRoleId;
+          this.userData = response.data.data.records;
+          this.paginationUser.total = response.data.data.total;
+          this.userData.forEach(value => {
+            this.userIds.push(value.ad_user_id);
+          });
+        }
+      });
+    },
+    getUserList () {
+      this.userListVisible = true;
+      this.axios.post("/roteUser/getUserList",
+        this.$qs.stringify({
+          orgId: this.queryOrgId,
+        }),
+      ).then((response) => {
+        this.userLoading = false;
+        if (response.data.result) {
+          this.queryUserList = response.data.data;
+        }
+      });
+    },
+    addUserRote () {
+      this.axios.post("/roteUser/addUserRote",
+        this.$qs.stringify({
+          roteId: this.queryRoteId,
+          userIds: this.userIds.toString(),
+        }),
+      ).then((response) => {
+        this.userLoading = false;
+        this.userListVisible = false;
+        this.$message.success("操作成功");
+        this.getUserDataList(this.currentRow);
+      });
+    },
+    deleteUserRote (v) {
+      if (v && v.adRoleId && v.ad_user_id) {
+        this.axios.post("/roteUser/deleteUserRote",
           this.$qs.stringify({
-            name: this.searchForm.key,
-            pageSize: this.pagination.pageSize,
-            pageIndex: this.pagination.current,
-          })
-        )
-        .then((response) => {
-          this.loading = false;
-          if (response.data.result) {
-            this.data = response.data.data.records;
-            this.pagination.total = response.data.data.total;
-          }
+            roteId: v.adRoleId,
+            userId: v.ad_user_id,
+          }),
+        ).then((response) => {
+          this.userLoading = false;
+          this.$message.success("操作成功");
+          this.getUserDataList(this.currentRow);
         });
+      }
+    },
+    onCanael () {
+      this.userListVisible = false;
     },
-    parseTreeData(curLevelData, curLevel) {
+    parseTreeData (curLevelData, curLevel) {
       let newLevelData = curLevelData;
       newLevelData["id"] = curLevelData.adMenuId;
       newLevelData["key"] = curLevelData.adMenuId;
@@ -451,14 +505,13 @@ export default {
               roleMenuData[e.AD_MENU_ID] = e;
             });
           }
-        })
-        .catch((e) => {
+        }).catch((e) => {
           console.error(e);
         });
       return roleMenuData;
     },
     // 递归标记是否选中
-    calNewTreeData(newTreeData, roleMenuData) {
+    calNewTreeData (newTreeData, roleMenuData) {
       let checkedCount = 0;
       newTreeData.forEach((e) => {
         if (e.level === 0 || e.level === 1) {
@@ -493,7 +546,6 @@ export default {
           }
         } else {
           if (e.checked) {
-            // console.log('checked', e.adMenuId);
             this.selectedNodes.push(e.adMenuId);
           }
         }
@@ -521,7 +573,6 @@ export default {
 
           this.$nextTick(() => {
             let checked = this.selectedNodes.filter((item) => !this.halfSelectedNodes.includes(item));
-            console.log(this.selectedNodes.length, checked.length);
             this.$refs.tree.setCheckedKeys(checked);
           });
         }
@@ -529,7 +580,7 @@ export default {
       });
     },
     // 递归标记禁用节点
-    deleteDisableNode(permData) {
+    deleteDisableNode (permData) {
       let that = this;
       permData.forEach(function (e) {
         if (e.status === -1) {
@@ -541,14 +592,14 @@ export default {
         }
       });
     },
-    cancelRole() {
+    cancelRole () {
       this.roleModalVisible = false;
     },
-    submitRole() {
+    submitRole () {
       let that = this;
       let subForm = {
-        orgId: this.roleForm.ad_org_id,
-        adRoleId: this.roleForm.ad_role_id,
+        orgId: this.roleForm.adOrgId,
+        adRoleId: this.roleForm.adRoleId,
         name: this.roleForm.name,
         description: this.roleForm.description,
         isAdmin: this.roleForm.isAdmin,
@@ -556,6 +607,7 @@ export default {
       this.$refs.roleForm.validate((valid) => {
         if (valid) {
           this.submitLoading = true;
+          debugger;
           this.axios.post("/roleController/submitRole", this.$qs.stringify(subForm)).then((response) => {
             that.submitLoading = false;
             if (response.data.result) {
@@ -569,39 +621,39 @@ export default {
         }
       });
     },
-    addRole() {
+    addRole () {
       // 处理状态
       this.modalType = 0;
       this.modalTitle = "添加角色";
       // 清理表单
-      this.roleForm.ad_role_id = undefined;
+      this.roleForm.adRoleId = undefined;
       this.roleForm.name = "";
       this.roleForm.isAdmin = "N";
       this.roleForm.description = "";
-      this.roleForm.ad_role_id = "";
+      this.roleForm.adRoleId = "";
       // 显示弹窗
       this.roleModalVisible = true;
     },
-    edit(v) {
+    edit (v) {
       // 处理状态
       this.modalType = 1;
       this.modalTitle = "编辑角色";
       // 填充表单
-      this.roleForm.ad_org_id = v.ad_org_id;
+      this.roleForm.adOrgId = v.adOrgId;
       this.roleForm.name = v.name;
-      this.roleForm.isAdmin = v.is_admin == "Y";
+      this.roleForm.isAdmin = v.isAdmin;
       this.roleForm.description = v.description;
-      this.roleForm.ad_role_id = v.ad_role_id;
+      this.roleForm.adRoleId = v.adRoleId;
       // 显示弹窗
       this.roleModalVisible = true;
     },
-    deleteRole(delId) {
+    deleteRole (delId) {
       this.axios
         .post(
           "/roleController/delRoleByIds",
           this.$qs.stringify({
             ids: delId,
-          })
+          }),
         )
         .then((response) => {
           if (response.data.result) {
@@ -613,18 +665,18 @@ export default {
           }
         });
     },
-    remove(v) {
-      if (v && v.ad_role_id) {
-        this.deleteRole(v.ad_role_id);
+    remove (v) {
+      if (v && v.adRoleId) {
+        this.deleteRole(v.adRoleId);
       }
     },
-    clearSelectAll() {
+    clearSelectAll () {
       this.selectList = [];
     },
-    changeSelect(e) {
+    changeSelect (e) {
       this.selectList = e;
     },
-    delAll() {
+    delAll () {
       if (this.selectList.length <= 0) {
         this.$message.warning("您还未选择要删除的数据");
         return;
@@ -633,8 +685,8 @@ export default {
       // 删除按钮代码
       this.deleteRole(ids);
     },
-    editPerm(v) {
-      this.editRolePermId = v.ad_role_id;
+    editPerm (v) {
+      this.editRolePermId = v.adRoleId;
       // 获取所有菜单权限树
       this.getPermList();
       this.modalTitle = "分配 " + v.name + " 的菜单权限";
@@ -658,7 +710,7 @@ export default {
       this.permModalVisible = true;
     },
     // 递归判断子节点
-    checkPermTree(permData, rolePerms) {
+    checkPermTree (permData, rolePerms) {
       let that = this;
       permData.forEach(function (p) {
         if (that.hasPerm(p, rolePerms) && p.status !== -1) {
@@ -672,7 +724,7 @@ export default {
       });
     },
     // 判断角色拥有的权限节点勾选
-    hasPerm(p, rolePerms) {
+    hasPerm (p, rolePerms) {
       let flag = false;
       for (let i = 0; i < rolePerms.length; i++) {
         if (p.id === rolePerms[i].permissionId) {
@@ -686,13 +738,13 @@ export default {
       return false;
     },
     // 全选反选
-    selectTreeAll() {
+    selectTreeAll () {
       this.selectAllFlag = !this.selectAllFlag;
       let select = this.selectAllFlag;
       this.selectedTreeAll(this.permData, select);
     },
     // 递归全选节点
-    selectedTreeAll(permData, select) {
+    selectedTreeAll (permData, select) {
       let that = this;
       permData.forEach(function (e) {
         e.checked = select;
@@ -704,7 +756,7 @@ export default {
         }
       });
     },
-    async submitPermEdit() {
+    async submitPermEdit () {
       let curVm = this;
       this.submitPermLoading = true;
       let permMenuIds = "";
@@ -723,7 +775,7 @@ export default {
             roleId: this.editRolePermId,
             ids: permMenuIds,
             btns: JSON.stringify(permMenuBtnIds),
-          })
+          }),
         )
         .then((response) => {
           this.submitPermLoading = false;
@@ -737,7 +789,7 @@ export default {
           }
         });
     },
-    cancelPermEdit() {
+    cancelPermEdit () {
       this.selectedKeys = [];
       this.expandedKeys = [];
       this.selectedNodes = [];
@@ -748,7 +800,7 @@ export default {
       });
     },
   },
-  mounted() {
+  mounted () {
     this.maxHeight = Number(document.documentElement.clientHeight - 121) + "px";
     this.init();
   },

package/layout/main/system/roleManage.vue

@@ -1,339 +1,364 @@
 <template>
-  <div class="search">
-    <el-row class="operation">
-      <div style="padding: 5px 15px 5px 2px; font-size: 13px">角色名称</div>
-      <el-input
-        v-model="searchForm.key"
-        @search="getDataList"
-        placeholder="输入关键词搜索"
-        style="width: 300px; margin-left: 12px"
-        clearable
-        enter-button />
-    </el-row>
-    <el-row class="operation">
-      <div style="padding: 5px 15px 5px 2px; font-size: 18px; font-weight: bold">角色管理</div>
-      <el-button
-        @click="addRole"
-        type="primary">
-        <i class="iconfont icon-plus"></i>
-        添加角色
-      </el-button>
-      <el-popconfirm
-        title="确定要删除所选的角色吗？"
-        ok-text="删除"
-        cancel-text="取消"
-        @confirm="delAll"
-        style="margin-left: 12px">
-        <el-button>
-          <i class="iconfont icon-delete"></i>
-          批量删除
+  <div class="ver-container">
+    <div class="ver-col">
+      <div class="operation">
+        <div style="padding: 5px 15px 5px 2px; font-size: 13px">角色名称</div>
+        <el-input
+          v-model="searchForm.key"
+          @change="getDataList"
+          placeholder="输入关键词搜索"
+          style="width: 300px; margin-left: 12px"
+          clearable
+          enter-button />
+      </div>
+      <div class="operation">
+        <div style="padding: 5px 15px 5px 2px; font-size: 18px; font-weight: bold">角色管理</div>
+        <el-button
+          @click="addRole"
+          type="primary">
+          <i class="iconfont icon-plus"></i>
+          添加角色
+        </el-button>
+        <el-popconfirm
+          title="确定要删除所选的角色吗？"
+          ok-text="删除"
+          cancel-text="取消"
+          @confirm="delAll"
+          style="margin-left: 12px">
+          <el-button>
+            <i class="iconfont icon-delete"></i>
+            批量删除
+          </el-button>
+        </el-popconfirm>
+        <el-button
+          @click="getDataList"
+          style="margin-left: 12px">
+          <i class="iconfont icon-refresh"></i>
+          刷新
         </el-button>
-      </el-popconfirm>
-      <el-button
-        @click="init"
-        style="margin-left: 12px">
-        <i class="iconfont icon-refresh"></i>
-        查询
-      </el-button>
-    </el-row>
-    <el-table
-      v-loading="loading"
-      row-key="ad_role_id"
-      :data="data"
-      ref="table"
-      highlight-current-row
-      :header-cell-style="{ background: '#f8f8f8', color: '#606266', fontSize: '13px' }"
-      stripe>
-      <el-table-column
-        label="#"
-        width="50">
-        <template #default="scope">{{ scope.$index + 1 }}</template>
-      </el-table-column>
-      <el-table-column
-        label="所属机构"
-        min-width="150"
-        prop="org_name"></el-table-column>
-      <el-table-column
-        label="角色名称"
-        min-width="300"
-        prop="name"></el-table-column>
-      <el-table-column
-        label="角色管理员"
-        min-width="300"
-        prop="is_admin"></el-table-column>
-      <el-table-column
-        label="备注"
-        min-width="200"
-        prop="description"></el-table-column>
-      <el-table-column
-        width="300"
-        label="操作">
-        <template #default="{ row }">
+      </div>
+      <el-table
+        v-loading="loading"
+        row-key="adRoleId"
+        :data="data"
+        ref="table"
+        highlight-current-row
+        :header-cell-style="{background: '#f8f8f8', color: '#606266', fontSize: '13px'}"
+        stripe>
+        <el-table-column
+          label="#"
+          width="50">
+          <template #default="scope">{{ scope.$index + 1 }}</template>
+        </el-table-column>
+        <el-table-column
+          label="所属机构"
+          min-width="150"
+          prop="orgName"></el-table-column>
+        <el-table-column
+          label="角色名称"
+          min-width="200"
+          prop="name"></el-table-column>
+        <el-table-column
+          label="角色管理员"
+          width="150"
+          align="center"
+          prop="isAdmin"></el-table-column>
+        <el-table-column
+          label="备注"
+          min-width="300"
+          prop="description"></el-table-column>
+        <el-table-column
+          width="320"
+          align="center"
+          label="操作">
+          <template #default="{row}">
+            <el-button
+              size="small"
+              type="primary"
+              @click="editPerm(row)">
+              菜单权限
+            </el-button>
+            <el-button
+              size="small"
+              type="success"
+              @click="editOrg(row)">
+              角色机构
+            </el-button>
+            <el-button
+              size="small"
+              type="info"
+              @click="edit(row)">
+              编辑
+            </el-button>
+            <el-popconfirm
+              title="你确定要删除吗"
+              ok-text="确定"
+              cancel-text="取消"
+              @confirm="remove(row)">
+              <template #reference>
+                <el-button
+                  title="删除"
+                  size="small"
+                  type="danger">
+                  删除
+                </el-button>
+              </template>
+            </el-popconfirm>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        v-model:current-page="pagination.currentPage"
+        v-model:page-size="pagination.pageSize"
+        :page-sizes="[10, 30, 50, 100]"
+        layout="prev, pager, next, sizes, total, jumper"
+        :total="pagination.total"
+        @size-change="getDataList"
+        @current-change="getDataList" />
+      <!-- 编辑 -->
+      <el-dialog
+        :title="modalTitle"
+        v-model="roleModalVisible"
+        :mask-closable="false"
+        @cancel="cancelRole"
+        :width="500">
+        <el-form
+          ref="roleForm"
+          :model="roleForm"
+          :label-width="100"
+          :rules="roleFormValidate">
+          <el-form-item
+            label="组织机构"
+            prop="ad_org_id">
+            <dict
+              dict="ad_org_id"
+              url="/orgController/getGroupOrgs"
+              v-model="roleForm.adOrgId"
+              placeholder="请选择或输入搜索"
+              filterable
+              clearable />
+          </el-form-item>
+          <el-form-item
+            label="角色名称"
+            prop="name">
+            <el-input
+              v-model="roleForm.name"
+              placeholder="请输入" />
+          </el-form-item>
+          <el-form-item label="角色管理员">
+            <el-switch
+              v-model="roleForm.isAdmin"
+              active-value="Y"
+              inactive-value="N"
+              size="large">
+              <span slot="Y">Y</span>
+              <span slot="N">N</span>
+            </el-switch>
+          </el-form-item>
+          <el-form-item
+            label="备注"
+            prop="description">
+            <el-input v-model="roleForm.description" />
+          </el-form-item>
+        </el-form>
+        <div
+          slot="footer"
+          style="padding-left: 150px">
+          <el-button
+            text
+            @click="cancelRole">
+            取消
+          </el-button>
           <el-button
-            size="small"
             type="primary"
-            @click="editPerm(row)">
-            菜单权限
+            :loading="submitLoading"
+            @click="submitRole">
+            提交
           </el-button>
+        </div>
+      </el-dialog>
+      <!-- 菜单权限 -->
+      <el-drawer
+        :title="modalTitle"
+        v-model="permModalVisible"
+        :mask-closable="false"
+        :width="800"
+        @close="cancelPermEdit">
+        <el-row>
+          <el-col
+            :span="12"
+            style="overflow: auto; height: 100%">
+            <el-tree
+              ref="tree"
+              v-loading="treeLoading"
+              :data="permData"
+              :props="{label: 'title'}"
+              show-checkbox
+              default-expand-all
+              node-key="adMenuId"
+              @current-change="selectTree"
+              @check-change="checkedMenuTree"></el-tree>
+          </el-col>
+          <el-col :span="12">
+            <div class="ivu-card-head"><p style="margin-bottom: 0px">按钮权限</p></div>
+            <div style="height: 100%; overflow-y: auto; padding: 0 10px">
+              <el-card
+                v-for="(item, key) in curWindowBtnList"
+                :key="key"
+                shadow="never"
+                style="margin-top: 5px">
+                <template #header>
+                  {{ item.NAME }}
+                  <el-checkbox
+                    style="margin-left: 10px"
+                    :indeterminate="item.indeterminate"
+                    v-model="item.checkAll"
+                    :key="item.ID"
+                    @change="handleCheckAll(item, key)">
+                    全选
+                  </el-checkbox>
+                </template>
+                <el-checkbox-group
+                  v-model="item.checkChilds"
+                  :options="
+                    item.childs.map((item) => {
+                      return {value: item.ID, label: item.NAME};
+                    })
+                  "
+                  @change="checkAllGroupChange($event, key)">
+                  <el-checkbox
+                    v-for="child in item.childs"
+                    :key="child.ID"
+                    :label="child.ID">
+                    {{ child.NAME }}
+                  </el-checkbox>
+                </el-checkbox-group>
+              </el-card>
+              <el-empty
+                description="暂无按钮权限数据"
+                v-if="curWindowBtnList.length === 0"></el-empty>
+            </div>
+          </el-col>
+        </el-row>
+        <template #footer>
           <el-button
-            size="small"
-            type="success"
-            @click="editOrg(row)">
-            角色机构
+            type="primary"
+            :loading="submitPermLoading"
+            @click="submitPermEdit">
+            提交
           </el-button>
           <el-button
-            size="small"
-            type="info"
-            @click="edit(row)">
-            编辑
+            text
+            @click="cancelPermEdit">
+            取消
           </el-button>
-          <el-popconfirm
-            title="你确定要删除吗"
-            ok-text="确定"
-            cancel-text="取消"
-            @confirm="remove(row)">
-            <template #reference>
-              <el-button
-                title="删除"
-                size="small"
-                type="danger">
-                删除
-              </el-button>
-            </template>
-          </el-popconfirm>
         </template>
-      </el-table-column>
-    </el-table>
-    <el-pagination
-      v-model:current-page="pagination.currentPage"
-      v-model:page-size="pagination.pageSize"
-      :page-sizes="[15, 30, 50, 100]"
-      layout="prev, pager, next, sizes, total, jumper"
-      :total="pagination.total"
-      @size-change="getDataList"
-      @current-change="getDataList" />
-    <!-- 编辑 -->
-    <el-dialog
-      :title="modalTitle"
-      v-model="roleModalVisible"
-      :mask-closable="false"
-      @cancel="cancelRole"
-      :width="500">
-      <el-form
-        ref="roleForm"
-        :model="roleForm"
-        :label-width="100"
-        :rules="roleFormValidate">
-        <el-form-item
-          label="组织机构"
-          prop="ad_org_id">
-          <dict
-            dict="ad_org_id"
-            url="/orgController/getGroupOrgs"
-            _select_id="2E72E905E55540FA8D2C297A362A2677"
-            _field_id="FBDE07DC546E453EABBBA45046FF335A"
-            _region_id="0944A00F8A434099BA2D9B6FA46F35F9"
-            v-model="roleForm.ad_org_id"
-            placeholder="请选择或输入搜索"
-            filterable
-            clearable />
-        </el-form-item>
-        <el-form-item
-          label="角色名称"
-          prop="name">
-          <el-input
-            v-model="roleForm.name"
-            placeholder="请输入" />
-        </el-form-item>
-        <el-form-item label="角色管理员">
-          <el-switch
-            v-model="roleForm.isAdmin"
-            true-value="Y"
-            false-value="N"
-            size="large">
-            <span slot="Y">Y</span>
-            <span slot="N">N</span>
-          </el-switch>
-        </el-form-item>
-        <el-form-item
-          label="备注"
-          prop="description">
-          <el-input v-model="roleForm.description" />
-        </el-form-item>
-      </el-form>
-      <div
-        slot="footer"
-        style="padding-left: 150px">
-        <el-button
-          text
-          @click="cancelRole">
-          取消
-        </el-button>
-        <el-button
-          type="primary"
-          :loading="submitLoading"
-          @click="submitRole">
-          提交
-        </el-button>
-      </div>
-    </el-dialog>
-    <!-- 菜单权限 -->
-    <el-drawer
-      :title="modalTitle"
-      v-model="permModalVisible"
-      :mask-closable="false"
-      :width="800"
-      @close="cancelPermEdit">
-      <el-row>
-        <el-col
-          :span="12"
-          style="overflow: auto; height: 100%">
-          <el-tree
-            ref="tree"
-            v-loading="treeLoading"
-            :data="permData"
-            :props="{ label: 'title' }"
-            show-checkbox
-            default-expand-all
-            node-key="adMenuId"
-            @current-change="selectTree"
-            @check-change="checkedMenuTree"></el-tree>
-        </el-col>
-        <el-col :span="12">
-          <div class="ivu-card-head"><p style="margin-bottom: 0px">按钮权限</p></div>
-          <div style="height: 100%; overflow-y: auto; padding: 0 10px">
-            <el-card
-              v-for="(item, key) in curWindowBtnList"
-              :key="key"
-              shadow="never"
-              style="margin-top: 5px">
-              <template #header>
-                {{ item.NAME }}
-                <el-checkbox
-                  style="margin-left: 10px"
-                  :indeterminate="item.indeterminate"
-                  v-model="item.checkAll"
-                  :key="item.ID"
-                  @change="handleCheckAll(item, key)">
-                  全选
-                </el-checkbox>
-              </template>
-              <el-checkbox-group
-                v-model="item.checkChilds"
-                :options="
-                  item.childs.map((item) => {
-                    return { value: item.ID, label: item.NAME };
-                  })
-                "
-                @change="checkAllGroupChange($event, key)">
-                <el-checkbox
-                  v-for="child in item.childs"
-                  :key="child.ID"
-                  :label="child.ID">
-                  {{ child.NAME }}
-                </el-checkbox>
-              </el-checkbox-group>
-            </el-card>
-            <el-empty
-              description="暂无按钮权限数据"
-              v-if="curWindowBtnList.length === 0"></el-empty>
+      </el-drawer>
+      <!-- 角色机构所属 -->
+      <el-dialog
+        :title="modalTitle"
+        v-model="orgModalVisible"
+        :close-on-click-modal="false"
+        :width="400"
+        class="depModal yh-el-dialog">
+        <el-alert
+          show-icon
+          title="请勾选下方组织机构,选中复选框为角色管理员"></el-alert>
+        <div style="margin-top: 15px; min-height: 300px">
+          <div style="position: relative">
+            <el-tree
+              ref="depTree"
+              :data="orgData"
+              :props="{label: 'title'}"
+              show-checkbox
+              default-expand-all
+              node-key="adOrgId"
+              check-on-click-node
+              check-strictly
+              :selectedKeys.sync="selectedKeys"
+              v-model="deptCheckedKeys"
+              @check-change="checkOrgTree"></el-tree>
           </div>
-        </el-col>
-      </el-row>
-      <template #footer>
-        <el-button
-          type="primary"
-          :loading="submitPermLoading"
-          @click="submitPermEdit">
-          提交
-        </el-button>
-        <el-button
-          text
-          @click="cancelPermEdit">
-          取消
-        </el-button>
-      </template>
-    </el-drawer>
-    <!-- 角色机构所属 -->
-    <el-dialog
-      :title="modalTitle"
-      v-model="orgModalVisible"
-      :close-on-click-modal="false"
-      :width="500"
-      class="depModal yh-el-dialog">
-      <el-alert
-        show-icon
-        title="请勾选下方组织机构,选中复选框为角色管理员"></el-alert>
-      <div style="margin-top: 15px">
-        <div style="position: relative">
-          <el-tree
-            ref="depTree"
-            :data="orgData"
-            :props="{ label: 'title' }"
-            show-checkbox
-            default-expand-all
-            node-key="adOrgId"
-            check-on-click-node
-            :selectedKeys.sync="selectedKeys"
-            v-model="deptCheckedKeys"
-            @check-change="checkOrgTree"></el-tree>
         </div>
-      </div>
-      <template #footer>
-        <el-button
-          type="primary"
-          :loading="submitDepLoading"
-          @click="submitRoleOrg">
-          提交
-        </el-button>
-        <el-button
-          text
-          @click="orgModalVisible = false">
-          取消
-        </el-button>
-      </template>
-    </el-dialog>
+        <template #footer>
+          <el-button
+            type="primary"
+            :loading="submitDepLoading"
+            @click="submitRoleOrg">
+            提交
+          </el-button>
+          <el-button
+            text
+            @click="orgModalVisible = false">
+            取消
+          </el-button>
+        </template>
+      </el-dialog>
+    </div>
   </div>
 </template>
 
 <script src="./roleManage.js"></script>
 <style lang="scss">
-.search {
-  padding: 10px 0;
-  .operation {
-    margin-bottom: 2vh;
-  }
+.main-container:has(.ver-container) {
+  overflow: hidden;
+}
+.ver-container {
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+  height: 100%;
+  .ver-col {
+    flex: 1;
+    width: 100%;
+    overflow: hidden;
+    display: flex;
+    flex-direction: column;
+    .operation {
+      display: flex;
+      padding: 8px 16px;
+    }
+    .el-table {
+      flex: 1;
+      overflow: hidden;
+    }
 
-  .select-count {
-    font-weight: 600;
-    color: #40a9ff;
-  }
+    .select-count {
+      font-weight: 600;
+      color: #40a9ff;
+    }
 
-  .select-clear {
-    margin-left: 10px;
-  }
+    .select-clear {
+      margin-left: 10px;
+    }
 
-  .page {
-    margin-top: 2vh;
-  }
+    .page {
+      margin-top: 2vh;
+    }
 
-  .drop-down {
-    margin-left: 5px;
-  }
-  .el-pagination {
-    padding: 10px 0;
-    justify-content: flex-end;
-  }
-  .el-drawer__body {
-    overflow: hidden;
-    .el-row {
-      height: 100%;
+    .drop-down {
+      margin-left: 5px;
+    }
+
+    .el-pagination {
+      padding: 10px 0;
+      justify-content: flex-end;
+    }
+
+    .el-drawer__body {
       overflow: hidden;
-      .el-card__header {
-        padding: 5px 10px;
-      }
-      .el-card__body {
-        padding: 7px 10px;
+
+      .el-row {
+        height: 100%;
+        overflow: hidden;
+
+        .el-card__header {
+          padding: 5px 10px;
+        }
+
+        .el-card__body {
+          padding: 7px 10px;
+        }
       }
     }
   }

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "yh-pub",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "公共代码",
   "scripts": {
-    "pub:npm": "npm publish --registry https://registry.npmjs.org/ --no-git-checks"
+    "pub": "npm publish --registry https://registry.npmjs.org/ --no-git-checks && npm publish --registry https://packages.aliyun.com/60765e0161a945067837bb5f/npm/npm-registry/ --no-git-checks"
   },
   "peerDependencies": {
     "vue": "^3.0.0"
   },
   "author": "Liubin"
-}
+}