From 80f0921d60f1fcaaa741ad47083c26883c07b125 Mon Sep 17 00:00:00 2001
From: zer0Black <694429613@qq.com>
Date: Sun, 17 Apr 2022 18:01:45 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=88=A0=E9=99=A4=E3=80=91=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E9=83=A8=E9=97=A8=E8=A7=92=E8=89=B2=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81=E7=9B=B4=E6=8E=A5=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/api/api.js                       |   2 -
 jero-web/src/views/system/DepartUserList.vue  |  17 --
 .../system/modules/DeptRoleAuthModal.vue      | 213 ------------------
 .../system/modules/DeptRoleDataruleModal.vue  | 122 ----------
 .../src/views/system/modules/DeptRoleInfo.vue | 191 ----------------
 .../system/modules/DeptRoleUserModal.vue      | 200 ----------------
 .../src/views/system/modules/DeptUserInfo.vue |  15 --
 7 files changed, 760 deletions(-)
 delete mode 100644 jero-web/src/views/system/modules/DeptRoleAuthModal.vue
 delete mode 100644 jero-web/src/views/system/modules/DeptRoleDataruleModal.vue
 delete mode 100644 jero-web/src/views/system/modules/DeptRoleInfo.vue
 delete mode 100644 jero-web/src/views/system/modules/DeptRoleUserModal.vue

diff --git a/jero-web/src/api/api.js b/jero-web/src/api/api.js
index 9cd8bb71..969c1443 100644
--- a/jero-web/src/api/api.js
+++ b/jero-web/src/api/api.js
@@ -49,7 +49,6 @@ const queryDepartPermission = (params)=>getAction("/sys/permission/queryDepartPe
 const saveDepartPermission = (params)=>postAction("/sys/permission/saveDepartPermission",params);
 const queryTreeListForDeptRole = (params)=>getAction("/sys/sysDepartPermission/queryTreeListForDeptRole",params);
 const queryDeptRolePermission = (params)=>getAction("/sys/sysDepartPermission/queryDeptRolePermission",params);
-// const saveDeptRolePermission = (params)=>postAction("/sys/sysDepartPermission/saveDeptRolePermission",params);
 const queryMyDepartTreeList = (params)=>getAction("/sys/sysDepart/queryMyDeptTreeList",params);
 
 //日志管理
@@ -151,7 +150,6 @@ export {
   saveDepartPermission,
   queryTreeListForDeptRole,
   queryDeptRolePermission,
-  // saveDeptRolePermission,
   queryMyDepartTreeList,
   getUserNoticeInfo,
   getDictItemsFromCache
diff --git a/jero-web/src/views/system/DepartUserList.vue b/jero-web/src/views/system/DepartUserList.vue
index 61394f94..798f6220 100644
--- a/jero-web/src/views/system/DepartUserList.vue
+++ b/jero-web/src/views/system/DepartUserList.vue
@@ -38,9 +38,6 @@
           <a-tab-pane tab="用户信息" key="2">
             <Dept-User-Info ref="DeptUserInfo" @clearSelectedDepartKeys="clearSelectedDepartKeys"></Dept-User-Info>
           </a-tab-pane>
-<!--          <a-tab-pane tab="部门角色" key="3" forceRender>-->
-<!--            <dept-role-info ref="DeptRoleInfo" @clearSelectedDepartKeys="clearSelectedDepartKeys"/>-->
-<!--          </a-tab-pane>-->
         </a-tabs>
       </a-card>
     </a-col>
@@ -51,7 +48,6 @@
   import DeptUserInfo from './modules/DeptUserInfo'
   import { queryMyDepartTreeList, searchByKeywords } from '@/api/api'
   import { JeroListMixin } from '@/mixins/JeroListMixin'
-  // import DeptRoleInfo from './modules/DeptRoleInfo'
 
   export default {
     name: 'DepartUserList',
@@ -111,7 +107,6 @@
         this.selectedKeys = [];
         this.currentDeptId = '';
         this.$refs.DeptUserInfo.currentDeptId='';
-        // this.$refs.DeptRoleInfo.currentDeptId='';
       },
       loadTree() {
         var that = this
@@ -177,24 +172,14 @@
       },
       onCheck(checkedKeys, e) {
         let record = e.node.dataRef;
-        // console.log('onCheck', checkedKeys, e);
         this.checkedKeys = [];
-        // if (e.checked === true) {
         this.currentDeptId = record.id;
         this.checkedKeys.push(record.id);
 
         this.$refs.DeptBaseInfo.open(record);
         this.$refs.DeptUserInfo.open(record);
-        // this.$refs.DeptRoleInfo.open(record);
-        // }
-        // else {
-        //   this.checkedKeys = [];
-        //   this.$refs.DeptBaseInfo.clearForm();
-        //   this.$refs.DeptUserInfo.clearList();
-        // }
 
         this.hiding = false;
-        // this.checkedKeys = checkedKeys.checked
       },
       onSelect(selectedKeys, e) {
         if (this.selectedKeys[0] !== selectedKeys[0]) {
@@ -205,8 +190,6 @@
         this.$refs.DeptBaseInfo.open(record);
         this.$refs.DeptUserInfo.onClearSelected();
         this.$refs.DeptUserInfo.open(record);
-        // this.$refs.DeptRoleInfo.onClearSelected();
-        // this.$refs.DeptRoleInfo.open(record);
       },
     },
     created() {
diff --git a/jero-web/src/views/system/modules/DeptRoleAuthModal.vue b/jero-web/src/views/system/modules/DeptRoleAuthModal.vue
deleted file mode 100644
index 8449b8a8..00000000
--- a/jero-web/src/views/system/modules/DeptRoleAuthModal.vue
+++ /dev/null
@@ -1,213 +0,0 @@
-<!--<template>-->
-<!--  <a-drawer-->
-<!--    :title="title"-->
-<!--    :maskClosable="true"-->
-<!--    width=650-->
-<!--    placement="right"-->
-<!--    :closable="true"-->
-<!--    @close="close"-->
-<!--    :visible="visible"-->
-<!--    style="overflow: auto;padding-bottom: 53px;">-->
-
-<!--    <a-form>-->
-<!--      <a-form-item label='所拥有的部门权限'>-->
-
-<!--        <a-tree-->
-<!--          v-if="treeData.length>0"-->
-<!--          checkable-->
-<!--          @check="onCheck"-->
-<!--          :checkedKeys="checkedKeys"-->
-<!--          :treeData="treeData"-->
-<!--          @expand="onExpand"-->
-<!--          @select="onTreeNodeSelect"-->
-<!--          :selectedKeys="selectedKeys"-->
-<!--          :expandedKeys="expandedKeysss"-->
-<!--          :checkStrictly="checkStrictly">-->
-<!--          <span slot="hasDatarule" slot-scope="{slotTitle,ruleFlag}">-->
-<!--            {{ slotTitle }}<a-icon v-if="ruleFlag" type="align-left" style="margin-left:5px;color: red;"></a-icon>-->
-<!--          </span>-->
-<!--        </a-tree>-->
-<!--        <div v-else><h3>无可配置部门权限!</h3></div>-->
-<!--      </a-form-item>-->
-<!--    </a-form>-->
-
-<!--    <div class="drawer-bootom-button">-->
-<!--      <a-dropdown style="float: left" :trigger="['click']" placement="topCenter">-->
-<!--        <a-menu slot="overlay">-->
-<!--          <a-menu-item key="1" @click="switchCheckStrictly(1)">父子关联</a-menu-item>-->
-<!--          <a-menu-item key="2" @click="switchCheckStrictly(2)">取消关联</a-menu-item>-->
-<!--          <a-menu-item key="3" @click="checkALL">全部勾选</a-menu-item>-->
-<!--          <a-menu-item key="4" @click="cancelCheckALL">取消全选</a-menu-item>-->
-<!--          <a-menu-item key="5" @click="expandAll">展开所有</a-menu-item>-->
-<!--          <a-menu-item key="6" @click="closeAll">合并所有</a-menu-item>-->
-<!--        </a-menu>-->
-<!--        <a-button>-->
-<!--          树操作 <a-icon type="up" />-->
-<!--        </a-button>-->
-<!--      </a-dropdown>-->
-<!--      <a-popconfirm title="确定放弃编辑？" @confirm="close" okText="确定" cancelText="取消">-->
-<!--        <a-button style="margin-right: .8rem">取消</a-button>-->
-<!--      </a-popconfirm>-->
-<!--      <a-button @click="handleSubmit(false)" type="primary" :loading="loading" ghost style="margin-right: 0.8rem">仅保存</a-button>-->
-<!--      <a-button @click="handleSubmit(true)" type="primary" :loading="loading">保存并关闭</a-button>-->
-<!--    </div>-->
-<!--&lt;!&ndash;    <dept-role-datarule-modal ref="datarule"></dept-role-datarule-modal>&ndash;&gt;-->
-<!--  </a-drawer>-->
-
-<!--</template>-->
-<!--<script>-->
-<!--  import {queryTreeListForDeptRole,queryDeptRolePermission,saveDeptRolePermission} from '@/api/api'-->
-<!--  import RoleDataruleModal from './RoleDataruleModal.vue'-->
-<!--  // import DeptRoleDataruleModal from './DeptRoleDataruleModal'-->
-
-<!--  export default {-->
-<!--    name: "DeptRoleAuthModal",-->
-<!--    components:{-->
-<!--      // DeptRoleDataruleModal,-->
-<!--      RoleDataruleModal-->
-<!--    },-->
-<!--    data(){-->
-<!--      return {-->
-<!--        departId:"",-->
-<!--        roleId:"",-->
-<!--        treeData: [],-->
-<!--        defaultCheckedKeys:[],-->
-<!--        checkedKeys:[],-->
-<!--        halfCheckedKeys:[],-->
-<!--        expandedKeysss:[],-->
-<!--        allTreeKeys:[],-->
-<!--        autoExpandParent: true,-->
-<!--        checkStrictly: true,-->
-<!--        title:"部门角色权限配置",-->
-<!--        visible: false,-->
-<!--        loading: false,-->
-<!--        selectedKeys:[]-->
-<!--      }-->
-<!--    },-->
-<!--    methods: {-->
-<!--      switchCheckStrictly (v) {-->
-<!--        if(v==1){-->
-<!--          this.checkStrictly = false-->
-<!--        }else if(v==2){-->
-<!--          this.checkStrictly = true-->
-<!--        }-->
-<!--      },-->
-<!--      onTreeNodeSelect(id){-->
-<!--        if(id && id.length>0){-->
-<!--          this.selectedKeys = id-->
-<!--        }-->
-<!--        this.$refs.datarule.show(this.selectedKeys[0],this.departId,this.roleId)-->
-<!--      },-->
-<!--      onCheck (o) {-->
-<!--        if(this.checkStrictly){-->
-<!--          this.checkedKeys = o.checked;-->
-<!--        }else{-->
-<!--          this.checkedKeys = o-->
-<!--        }-->
-<!--      },-->
-<!--      show(roleId,departId){-->
-<!--        this.departId = departId-->
-<!--        this.roleId=roleId-->
-<!--        this.visible = true;-->
-<!--      },-->
-<!--      close () {-->
-<!--        this.reset()-->
-<!--        this.$emit('close');-->
-<!--        this.visible = false;-->
-<!--      },-->
-<!--      onExpand(expandedKeys){-->
-<!--        this.expandedKeysss = expandedKeys;-->
-<!--        this.autoExpandParent = false-->
-<!--      },-->
-<!--      reset () {-->
-<!--        this.expandedKeysss = []-->
-<!--        this.checkedKeys = []-->
-<!--        this.defaultCheckedKeys = []-->
-<!--        this.loading = false-->
-<!--      },-->
-<!--      expandAll () {-->
-<!--        this.expandedKeysss = this.allTreeKeys-->
-<!--      },-->
-<!--      closeAll () {-->
-<!--        this.expandedKeysss = []-->
-<!--      },-->
-<!--      checkALL () {-->
-<!--        this.checkedKeys = this.allTreeKeys-->
-<!--      },-->
-<!--      cancelCheckALL () {-->
-<!--        this.checkedKeys = []-->
-<!--      },-->
-<!--      handleCancel () {-->
-<!--        this.close()-->
-<!--      },-->
-<!--      handleSubmit(exit) {-->
-<!--        let that = this;-->
-<!--        let params =  {-->
-<!--          roleId:that.roleId,-->
-<!--          permissionIds:that.checkedKeys.join(","),-->
-<!--          lastpermissionIds:that.defaultCheckedKeys.join(","),-->
-<!--        };-->
-<!--        that.loading = true;-->
-<!--        console.log("请求参数：",params);-->
-<!--        saveDeptRolePermission(params).then((res)=>{-->
-<!--          if(res.success){-->
-<!--            that.$message.success(res.message);-->
-<!--            that.loading = false;-->
-<!--            if (exit) {-->
-<!--              that.close()-->
-<!--            }-->
-<!--          }else {-->
-<!--            that.$message.error(res.message);-->
-<!--            that.loading = false;-->
-<!--            if (exit) {-->
-<!--              that.close()-->
-<!--            }-->
-<!--          }-->
-<!--          this.loadData();-->
-<!--        })-->
-<!--      },-->
-<!--      convertTreeListToKeyLeafPairs(treeList, keyLeafPair = []) {-->
-<!--        for(const {key, isLeaf, children} of treeList) {-->
-<!--          keyLeafPair.push({key, isLeaf})-->
-<!--          if(children && children.length > 0) {-->
-<!--            this.convertTreeListToKeyLeafPairs(children, keyLeafPair)-->
-<!--          }-->
-<!--        }-->
-<!--        return keyLeafPair;-->
-<!--      },-->
-<!--      loadData(){-->
-<!--        queryTreeListForDeptRole({departId:this.departId}).then((res) => {-->
-<!--          this.treeData = res.result.treeList-->
-<!--          this.allTreeKeys = res.result.ids-->
-<!--          queryDeptRolePermission({roleId:this.roleId}).then((res)=>{-->
-<!--            this.checkedKeys = [...res.result];-->
-<!--            this.defaultCheckedKeys = [...res.result];-->
-<!--            this.expandedKeysss = this.allTreeKeys;-->
-<!--          })-->
-<!--        })-->
-<!--      }-->
-<!--    },-->
-<!--    watch: {-->
-<!--      visible () {-->
-<!--        if (this.visible ) {-->
-<!--          this.loadData();-->
-<!--        }-->
-<!--      }-->
-<!--    }-->
-<!--  }-->
-
-<!--</script>-->
-<!--<style lang="less" scoped>-->
-<!--  .drawer-bootom-button {-->
-<!--    position: absolute;-->
-<!--    bottom: 0;-->
-<!--    width: 100%;-->
-<!--    border-top: 1px solid #e8e8e8;-->
-<!--    padding: 10px 16px;-->
-<!--    text-align: right;-->
-<!--    left: 0;-->
-<!--    background: #fff;-->
-<!--    border-radius: 0 0 2px 2px;-->
-<!--  }-->
-
-<!--</style>-->
\ No newline at end of file
diff --git a/jero-web/src/views/system/modules/DeptRoleDataruleModal.vue b/jero-web/src/views/system/modules/DeptRoleDataruleModal.vue
deleted file mode 100644
index 01ff78a5..00000000
--- a/jero-web/src/views/system/modules/DeptRoleDataruleModal.vue
+++ /dev/null
@@ -1,122 +0,0 @@
-<!--<template>-->
-<!--  <a-drawer-->
-<!--    title="数据规则/按钮权限配置"-->
-<!--    width="365"-->
-<!--    :closable="false"-->
-<!--    @close="onClose"-->
-<!--    :visible="visible"-->
-<!--  >-->
-
-<!--    <a-tabs defaultActiveKey="1">-->
-<!--      <a-tab-pane tab="数据规则" key="1">-->
-
-<!--        <a-checkbox-group v-model="dataruleChecked" v-if="dataruleList.length>0">-->
-<!--          <a-row>-->
-<!--            <a-col :span="24" v-for="(item,index) in dataruleList" :key=" 'dr'+index ">-->
-<!--              <a-checkbox :value="item.id">{{ item.ruleName }}</a-checkbox>-->
-<!--            </a-col>-->
-
-<!--            <a-col :span="24">-->
-<!--              <div style="width: 100%;margin-top: 15px">-->
-<!--                <a-button @click="saveDataruleForRole" type="primary" size="small" icon="save">点击保存</a-button>-->
-<!--              </div>-->
-<!--            </a-col>-->
-<!--          </a-row>-->
-<!--        </a-checkbox-group>-->
-<!--        <div v-else><h3>无配置信息!</h3></div>-->
-
-<!--      </a-tab-pane>-->
-<!--      &lt;!&ndash;<a-tab-pane tab="按钮权限" key="2">敬请期待!!!</a-tab-pane>&ndash;&gt;-->
-<!--    </a-tabs>-->
-
-<!--  </a-drawer>-->
-<!--</template>-->
-
-<!--<script>-->
-<!--  import ARow from 'ant-design-vue/es/grid/Row'-->
-<!--  import ACol from 'ant-design-vue/es/grid/Col'-->
-<!--  import { getAction,postAction } from '@/api/manage'-->
-
-<!--  export default {-->
-<!--    name: 'DeptRoleDataruleModal',-->
-<!--    components: { ACol, ARow },-->
-<!--    data(){-->
-<!--      return {-->
-<!--        departId:'',-->
-<!--        functionId:'',-->
-<!--        roleId:'',-->
-<!--        visible:false,-->
-<!--        tabList: [{-->
-<!--          key: '1',-->
-<!--          tab: '数据规则',-->
-<!--        }, {-->
-<!--          key: '2',-->
-<!--          tab: '按钮权限',-->
-<!--        }],-->
-<!--        activeTabKey: '1',-->
-<!--        url:{-->
-<!--          datarule:"/sys/sysDepartRole/datarule",-->
-<!--        },-->
-<!--        dataruleList:[],-->
-<!--        dataruleChecked:[]-->
-<!--      }-->
-<!--    },-->
-<!--    methods:{-->
-<!--      loadData(){-->
-<!--        getAction(`${this.url.datarule}/${this.functionId}/${this.departId}/${this.roleId}`).then(res=>{-->
-<!--          console.log(res)-->
-<!--          if(res.success){-->
-<!--            this.dataruleList = res.result.datarule-->
-<!--            let drChecked = res.result.drChecked-->
-<!--            if(drChecked){-->
-<!--              this.dataruleChecked = drChecked.split(",")-->
-<!--            }-->
-<!--          }-->
-<!--        })-->
-<!--      },-->
-<!--      saveDataruleForRole(){-->
-<!--        if(!this.dataruleChecked || this.dataruleChecked.length==0){-->
-<!--          this.$message.warning("请注意，现未勾选任何数据权限!")-->
-<!--        }-->
-<!--        let params = {-->
-<!--          permissionId:this.functionId,-->
-<!--          roleId:this.roleId,-->
-<!--          dataRuleIds:this.dataruleChecked.join(",")-->
-<!--        }-->
-<!--        console.log("保存数据权限",params)-->
-<!--        postAction(this.url.datarule,params).then(res=>{-->
-<!--          if(res.success){-->
-<!--            this.$message.success(res.message)-->
-<!--          }else{-->
-<!--            this.$message.error(res.message)-->
-<!--          }-->
-<!--        })-->
-<!--      },-->
-<!--      show(functionId,departId,roleId){-->
-<!--        this.onReset()-->
-<!--        this.departId = departId-->
-<!--        this.functionId = functionId-->
-<!--        this.roleId = roleId-->
-<!--        this.visible=true-->
-<!--        this.loadData()-->
-<!--      },-->
-<!--      onClose(){-->
-<!--        this.visible=false-->
-<!--        this.onReset()-->
-<!--      },-->
-<!--      onTabChange (key) {-->
-<!--        this.activeTabKey = key-->
-<!--      },-->
-<!--      onReset(){-->
-<!--        this.functionId=''-->
-<!--        this.roleId=''-->
-<!--        this.dataruleList=[]-->
-<!--        this.dataruleChecked=[]-->
-<!--      }-->
-<!--    }-->
-<!--  }-->
-<!--</script>-->
-
-<!--<style scoped>-->
-
-<!--</style>-->
\ No newline at end of file
diff --git a/jero-web/src/views/system/modules/DeptRoleInfo.vue b/jero-web/src/views/system/modules/DeptRoleInfo.vue
deleted file mode 100644
index a20401d8..00000000
--- a/jero-web/src/views/system/modules/DeptRoleInfo.vue
+++ /dev/null
@@ -1,191 +0,0 @@
-<!--<template>-->
-<!--  <a-card :bordered="false">-->
-<!--    &lt;!&ndash; 查询区域 &ndash;&gt;-->
-<!--    <div class="table-page-search-wrapper">-->
-<!--      &lt;!&ndash; 搜索区域 &ndash;&gt;-->
-<!--      <a-form layout="inline">-->
-<!--        <a-row :gutter="10">-->
-<!--          <a-col :md="10" :sm="12">-->
-<!--            <a-form-item label="部门角色名称" style="margin-left:8px">-->
-<!--              <a-input placeholder="请输入部门角色" v-model="queryParam.roleName"></a-input>-->
-<!--            </a-form-item>-->
-<!--          </a-col>-->
-<!--          <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">-->
-<!--            <a-col :md="6" :sm="24">-->
-<!--              <a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 18px">查询</a-button>-->
-<!--              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>-->
-<!--            </a-col>-->
-<!--          </span>-->
-<!--        </a-row>-->
-<!--      </a-form>-->
-<!--    </div>-->
-<!--    &lt;!&ndash; 操作按钮区域 &ndash;&gt;-->
-<!--    <div class="table-operator" :md="24" :sm="24">-->
-<!--      <a-button @click="handleAdd" type="primary" icon="plus">新建部门角色</a-button>-->
-<!--      <a-dropdown v-if="selectedRowKeys.length > 0">-->
-<!--        <a-menu slot="overlay">-->
-<!--          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>-->
-<!--        </a-menu>-->
-<!--        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>-->
-<!--      </a-dropdown>-->
-<!--    </div>-->
-<!--    &lt;!&ndash; table区域-begin &ndash;&gt;-->
-<!--    <div>-->
-<!--      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
-<!--        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">-->
-<!--          {{selectedRowKeys.length }}</a>项-->
-<!--        <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
-<!--      </div>-->
-<!--      <a-table-->
-<!--        ref="table"-->
-<!--        size="middle"-->
-<!--        bordered-->
-<!--        rowKey="id"-->
-<!--        :columns="columns"-->
-<!--        :dataSource="dataSource"-->
-<!--        :pagination="ipagination"-->
-<!--        :loading="loading"-->
-<!--        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"-->
-<!--        @change="handleTableChange">-->
-<!--        <span slot="action" slot-scope="text, record">-->
-<!--          <a @click="handleEdit(record)">编辑</a>-->
-<!--          <a-divider type="vertical"/>-->
-<!--          <a-dropdown>-->
-<!--            <a class="ant-dropdown-link">-->
-<!--              更多 <a-icon type="down"/>-->
-<!--            </a>-->
-<!--            <a-menu slot="overlay">-->
-<!--              <a-menu-item>-->
-<!--                <a @click="handlePerssion(record)">授权</a>-->
-<!--              </a-menu-item>-->
-<!--              <a-menu-item>-->
-<!--                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">-->
-<!--                  <a>删除</a>-->
-<!--                </a-popconfirm>-->
-<!--              </a-menu-item>-->
-<!--             </a-menu>-->
-<!--          </a-dropdown>-->
-<!--        </span>-->
-<!--      </a-table>-->
-<!--    </div>-->
-<!--    &lt;!&ndash; table区域-end &ndash;&gt;-->
-<!--    &lt;!&ndash; 表单区域 &ndash;&gt;-->
-<!--    <sys-depart-role-modal ref="sysDepartRoleModalForm" @ok="modalFormOk"/>-->
-<!--    <dept-role-auth-modal ref="modalDeptRole" />-->
-<!--  </a-card>-->
-<!--</template>-->
-
-<!--<script>-->
-<!--  import {JeroListMixin} from '@/mixins/JeroListMixin'-->
-<!--  import {getAction} from '@/api/manage'-->
-<!--  import SysDepartRoleModal from './SysDepartRoleModal'-->
-<!--  import DeptRoleAuthModal from './DeptRoleAuthModal'-->
-
-<!--  export default {-->
-<!--    name: 'DeptRoleInfo',-->
-<!--    components: { DeptRoleAuthModal, SysDepartRoleModal },-->
-<!--    mixins: [JeroListMixin],-->
-<!--    data() {-->
-<!--      return {-->
-<!--        description: '部门角色信息',-->
-<!--        currentDeptId: '',-->
-<!--        // 表头-->
-<!--        columns: [{-->
-<!--          title: '部门角色名称',-->
-<!--          align: "center",-->
-<!--          dataIndex: 'roleName'-->
-<!--        },-->
-<!--        {-->
-<!--          title: '部门角色编码',-->
-<!--          align: "center",-->
-<!--          dataIndex: 'roleCode'-->
-<!--        },-->
-<!--        {-->
-<!--          title: '部门',-->
-<!--          align: "center",-->
-<!--          dataIndex: 'departId_dictText'-->
-<!--        },-->
-<!--        {-->
-<!--          title: '备注',-->
-<!--          align: "center",-->
-<!--          dataIndex: 'description'-->
-<!--        },-->
-<!--        {-->
-<!--          title: '操作',-->
-<!--          dataIndex: 'action',-->
-<!--          scopedSlots: {customRender: 'action'},-->
-<!--          align: "center",-->
-<!--          width: 170-->
-<!--        }],-->
-<!--        url: {-->
-<!--          list: "/sys/sysDepartRole/page",-->
-<!--          delete: "/sys/sysDepartRole/delete",-->
-<!--          deleteBatch: "/sys/sysDepartRole/deleteBatch",-->
-<!--        }-->
-<!--      }-->
-<!--    },-->
-<!--    created() {-->
-<!--    },-->
-<!--    methods: {-->
-<!--      searchReset() {-->
-<!--        this.queryParam = {}-->
-<!--        this.loadData(1);-->
-<!--      },-->
-<!--      loadData(arg) {-->
-<!--        if (!this.url.list) {-->
-<!--          this.$message.error("请设置url.list属性!")-->
-<!--          return-->
-<!--        }-->
-<!--        //加载数据 若传入参数1则加载第一页的内容-->
-<!--        if (arg === 1) {-->
-<!--          this.ipagination.current = 1;-->
-<!--        }-->
-<!--        let params = this.getQueryParams();//查询条件-->
-<!--        params.deptId = this.currentDeptId;-->
-<!--        getAction(this.url.list, params).then((res) => {-->
-<!--          if (res.success && res.result) {-->
-<!--            this.dataSource = res.result.records;-->
-<!--            this.ipagination.total = res.result.total;-->
-<!--          }-->
-<!--        })-->
-<!--      },-->
-<!--      open(record) {-->
-<!--        this.currentDeptId = record.id;-->
-<!--        this.loadData(1);-->
-<!--      },-->
-<!--      clearList() {-->
-<!--        this.currentDeptId = '';-->
-<!--        this.dataSource = [];-->
-<!--      },-->
-<!--      hasSelectDept() {-->
-<!--        if (this.currentDeptId == '') {-->
-<!--          this.$message.error("请选择一个部门!")-->
-<!--          return false;-->
-<!--        }-->
-<!--        return true;-->
-<!--      },-->
-<!--      handleEdit: function (record) {-->
-<!--        this.$refs.sysDepartRoleModalForm.title = "编辑";-->
-<!--        this.$refs.sysDepartRoleModalForm.departDisabled = true;-->
-<!--        this.$refs.sysDepartRoleModalForm.disableSubmit = false;-->
-<!--        this.$refs.sysDepartRoleModalForm.edit(record,record.departId);-->
-<!--      },-->
-<!--      handleAdd: function () {-->
-<!--        if (this.currentDeptId == '') {-->
-<!--          this.$message.error("请选择一个部门!")-->
-<!--        } else {-->
-<!--          this.$refs.sysDepartRoleModalForm.departDisabled = true;-->
-<!--          this.$refs.sysDepartRoleModalForm.add(this.currentDeptId);-->
-<!--          this.$refs.sysDepartRoleModalForm.title = "新增";-->
-<!--        }-->
-<!--      },-->
-<!--      handlePerssion: function(record){-->
-<!--        this.$refs.modalDeptRole.show(record.id,record.departId);-->
-<!--      },-->
-<!--    }-->
-<!--  }-->
-<!--</script>-->
-
-<!--<style scoped>-->
-
-<!--</style>-->
\ No newline at end of file
diff --git a/jero-web/src/views/system/modules/DeptRoleUserModal.vue b/jero-web/src/views/system/modules/DeptRoleUserModal.vue
deleted file mode 100644
index bfdc7ecf..00000000
--- a/jero-web/src/views/system/modules/DeptRoleUserModal.vue
+++ /dev/null
@@ -1,200 +0,0 @@
-<!--<template>-->
-<!--  <a-drawer-->
-<!--    :title="title"-->
-<!--    :maskClosable="true"-->
-<!--    width=600-->
-<!--    placement="right"-->
-<!--    :closable="true"-->
-<!--    @close="close"-->
-<!--    :visible="visible"-->
-<!--    style="overflow: auto;padding-bottom: 53px;">-->
-
-<!--    <a-spin :spinning="confirmLoading">-->
-
-<!--      <a-form :form="form" v-if="designNameOption.length>0">-->
-<!--        <a-form-item label=''>-->
-<!--          <a-col :xl="24" :lg="24" :md="24" :sm="24" :xs="24">-->
-<!--            <a-card :style="{ marginTop: '12px',height:'auto' }">-->
-<!--              <a-checkbox-group @change="designNameChange" v-model="designNameValue" style="width: 100%">-->
-<!--                <a-row>-->
-<!--                  <template v-for="(des) in designNameOption">-->
-<!--                    <a-col :span="6">-->
-<!--                      <a-checkbox :value="des.value">{{ des.text }}</a-checkbox>-->
-<!--                    </a-col>-->
-<!--                  </template>-->
-<!--                </a-row>-->
-<!--              </a-checkbox-group>-->
-<!--            </a-card>-->
-<!--          </a-col>-->
-<!--        </a-form-item>-->
-<!--      </a-form>-->
-<!--      <div v-else><h3>无可配置角色!</h3></div>-->
-<!--    </a-spin>-->
-<!--    <div class="drawer-bootom-button">-->
-<!--      <a-dropdown style="float: left" :trigger="['click']" placement="topCenter">-->
-<!--        <a-menu slot="overlay">-->
-<!--          <a-menu-item key="1" @click="checkALL">全部勾选</a-menu-item>-->
-<!--          <a-menu-item key="2" @click="cancelCheckALL">取消全选</a-menu-item>-->
-<!--        </a-menu>-->
-<!--        <a-button>-->
-<!--          操作 <a-icon type="up" />-->
-<!--        </a-button>-->
-<!--      </a-dropdown>-->
-<!--      <a-popconfirm  title="确定放弃编辑？" @confirm="close" okText="确定" cancelText="取消">-->
-<!--        <a-button style="margin-right: .8rem">取消</a-button>-->
-<!--      </a-popconfirm>-->
-<!--      <a-button @click="handleSubmit(true)" type="primary">保存</a-button>-->
-<!--    </div>-->
-<!--  </a-drawer>-->
-<!--</template>-->
-
-<!--<script>-->
-<!--  import {httpAction, getAction} from '@/api/manage'-->
-<!--  import  JEllipsis  from '@/components/jero/JEllipsis'-->
-<!--  import {initDictOptions} from '@/components/dict/JDictSelectUtil'-->
-
-<!--  export default {-->
-<!--    name: 'DeptRoleUserModal',-->
-<!--    components: {-->
-<!--      JEllipsis-->
-<!--    },-->
-<!--    data() {-->
-<!--      return {-->
-<!--        currentDeptId:"",-->
-<!--        title: "部门角色分配",-->
-<!--        visible: false,-->
-<!--        model: {},-->
-<!--        labelCol: {-->
-<!--          xs: {span: 24},-->
-<!--          sm: {span: 5},-->
-<!--        },-->
-<!--        wrapperCol: {-->
-<!--          xs: {span: 24},-->
-<!--          sm: {span: 16},-->
-<!--        },-->
-<!--        confirmLoading: false,-->
-<!--        form: this.$form.createForm(this),-->
-<!--        validatorRules: {},-->
-<!--        url: {-->
-<!--          add: "/sys/sysDepartRole/deptRoleUserAdd",-->
-<!--          getDeptRoleList:"/sys/sysDepartRole/getDeptRoleList",-->
-<!--          getDeptRoleByUserId:"/sys/sysDepartRole/getDeptRoleByUserId"-->
-<!--        },-->
-<!--        designNameOption: [],-->
-<!--        userId: "",-->
-<!--        newRoleId:"",-->
-<!--        oldRoleId:"",-->
-<!--        designNameValue:[],-->
-<!--        desformList: [],-->
-<!--      }-->
-<!--    },-->
-<!--    created() {-->
-
-<!--    },-->
-<!--    methods: {-->
-<!--      add(record,departId) {-->
-<!--        this.userId = record.id;-->
-<!--        this.currentDeptId = departId;-->
-<!--        this.loadDesformList();-->
-<!--        this.edit({});-->
-<!--      },-->
-<!--      edit(record) {-->
-<!--        this.form.resetFields();-->
-<!--        this.model = Object.assign({}, record);-->
-<!--        this.visible = true;-->
-<!--        getAction(this.url.getDeptRoleByUserId,{userId:this.userId,departId:this.currentDeptId}).then((res) => {-->
-<!--          if (res.success) {-->
-<!--            var designName = [];-->
-<!--            for (let value of res.result) {-->
-<!--              designName.push(value.droleId)-->
-<!--            }-->
-<!--            this.oldRoleId=designName.join(",");-->
-<!--            this.designNameValue = designName;-->
-<!--            this.newRoleId = designName.join(",");-->
-<!--          }-->
-<!--        });-->
-<!--      },-->
-<!--      close() {-->
-<!--        this.$emit('close');-->
-<!--        this.visible = false;-->
-<!--      },-->
-<!--      handleSubmit() {-->
-<!--        const that = this;-->
-<!--        // 触发表单验证-->
-<!--        that.confirmLoading = true;-->
-<!--        let  httpurl = this.url.add;-->
-<!--        let  method = 'post';-->
-<!--        let formData = Object.assign(this.model, {});-->
-<!--        //时间格式化-->
-<!--        formData.userId = this.userId;-->
-<!--        formData.newRoleId=this.newRoleId;-->
-<!--        formData.oldRoleId=this.oldRoleId;-->
-<!--        httpAction(httpurl, formData, method).then((res) => {-->
-<!--          if (res.success) {-->
-<!--            that.$message.success(res.message);-->
-<!--            that.$emit('reload');-->
-<!--            that.$emit('ok');-->
-<!--          } else {-->
-<!--            that.$message.warning(res.message);-->
-<!--          }-->
-<!--        }).finally(() => {-->
-<!--          that.confirmLoading = false;-->
-<!--          that.close();-->
-<!--        })-->
-<!--      },-->
-<!--      handleCancel() {-->
-<!--        this.designNameOption=[];-->
-<!--        this.designNameValue=[];-->
-<!--        this.close()-->
-<!--      },-->
-<!--      designNameChange(selectedValue) {-->
-<!--        this.newRoleId=selectedValue.join(",");-->
-<!--      },-->
-<!--      checkALL(){-->
-<!--        var designName = [];-->
-<!--        for (let value of this.desformList) {-->
-<!--          designName.push(-->
-<!--            value.id-->
-<!--          )-->
-<!--        }-->
-<!--        this.designNameValue = designName;-->
-<!--        this.newRoleId=designName.join(",");-->
-<!--      },-->
-<!--      cancelCheckALL(){-->
-<!--        this.designNameValue=[];-->
-<!--        this.newRoleId="";-->
-<!--      },-->
-<!--      /** 加载desform */-->
-<!--      loadDesformList() {-->
-<!--        getAction(this.url.getDeptRoleList, { departId: this.currentDeptId, userId:this.userId }).then((res) => {-->
-<!--          if (res.success) {-->
-<!--            this.desformList = res.result-->
-<!--            var designName = [];-->
-<!--            for (let value of this.desformList) {-->
-<!--              designName.push({-->
-<!--                value: value.id,-->
-<!--                text: value.roleName,-->
-<!--              })-->
-<!--            }-->
-<!--            this.designNameOption = designName;-->
-<!--          }-->
-<!--        });-->
-<!--      },-->
-<!--    }-->
-
-<!--  }-->
-<!--</script>-->
-
-<!--<style scoped>-->
-<!--  .drawer-bootom-button {-->
-<!--    position: absolute;-->
-<!--    bottom: 0;-->
-<!--    width: 100%;-->
-<!--    border-top: 1px solid #e8e8e8;-->
-<!--    padding: 10px 16px;-->
-<!--    text-align: right;-->
-<!--    left: 0;-->
-<!--    background: #fff;-->
-<!--    border-radius: 0 0 2px 2px;-->
-<!--  }-->
-<!--</style>-->
\ No newline at end of file
diff --git a/jero-web/src/views/system/modules/DeptUserInfo.vue b/jero-web/src/views/system/modules/DeptUserInfo.vue
index 96e74176..2016739b 100644
--- a/jero-web/src/views/system/modules/DeptUserInfo.vue
+++ b/jero-web/src/views/system/modules/DeptUserInfo.vue
@@ -70,9 +70,6 @@
               更多 <a-icon type="down"/>
             </a>
             <a-menu slot="overlay">
-<!--                <a-menu-item>-->
-<!--                <a href="javascript:;" @click="handleDeptRole(record)">部门角色</a>-->
-<!--              </a-menu-item>-->
 
               <a-menu-item>
                 <a href="javascript:;" @click="handleDetail(record)">用户详情</a>
@@ -95,7 +92,6 @@
     <!-- 表单区域 -->
     <user-modal ref="modalForm" @ok="modalFormOk"></user-modal>
     <Select-User-Modal ref="selectUserModal" @selectFinished="selectOK"></Select-User-Modal>
-<!--    <dept-role-user-modal ref="deptRoleUser"></dept-role-user-modal>-->
   </a-card>
 </template>
 
@@ -104,13 +100,11 @@
   import {getAction, postAction, deleteAction} from '@/api/manage'
   import SelectUserModal from './SelectUserModal'
   import UserModal from './UserModal'
-  // import DeptRoleUserModal from './DeptRoleUserModal'
 
   export default {
     name: "DeptUserInfo",
     mixins: [JeroListMixin],
     components: {
-      // DeptRoleUserModal,
       SelectUserModal,
       UserModal
     },
@@ -254,7 +248,6 @@
         });
       },
       open(record) {
-        //console.log(record);
         this.currentDeptId = record.id;
         this.currentDept = record;
         this.loadData(1);
@@ -311,14 +304,6 @@
           }
         })
       },
-      // handleDeptRole(record){
-      //   if(this.currentDeptId != ''){
-      //     this.$refs.deptRoleUser.add(record,this.currentDeptId);
-      //     this.$refs.deptRoleUser.title = "部门角色分配";
-      //   }else{
-      //     this.$message.warning("请先选择一个部门!");
-      //   }
-      // }
     }
   }
 </script>