From 9dedaa60ebafe85a4e29e0f89df0ef673f666ba3 Mon Sep 17 00:00:00 2001
From: xuhuajiao <13476289682@163.com>
Date: Wed, 29 Mar 2023 16:00:31 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E7=AE=A1=E7=90=86/=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E7=AE=A1=E7=90=86=2003-29?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/images/icon/tip-icon.png    | Bin 0 -> 6654 bytes
 src/assets/styles/archives-manage.scss |  10 +-
 src/assets/styles/yxk-admin.scss       | 407 ++++++++++++++++++-------
 src/components/Crud/CRUD.operation.vue |  68 +++--
 src/views/system/dept/index.vue        | 258 +++++++++-------
 src/views/system/role/index.vue        | 173 ++++++-----
 src/views/system/user/index.vue        | 101 +++---
 7 files changed, 620 insertions(+), 397 deletions(-)
 create mode 100644 src/assets/images/icon/tip-icon.png

diff --git a/src/assets/images/icon/tip-icon.png b/src/assets/images/icon/tip-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..8a2752678fb9beecd19c38fed94a1967ca6c37c0
GIT binary patch
literal 6654
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

literal 0
HcmV?d00001

diff --git a/src/assets/styles/archives-manage.scss b/src/assets/styles/archives-manage.scss
index 288c6c7..f7772f4 100644
--- a/src/assets/styles/archives-manage.scss
+++ b/src/assets/styles/archives-manage.scss
@@ -764,8 +764,8 @@
     color: #666;
   }
 }
-//其他
-.delMsg{
-  color: #fff;
-  font-size: 16px;
-}
\ No newline at end of file
+// //其他
+// .delMsg{
+//   color: #fff;
+//   font-size: 16px;
+// }
\ No newline at end of file
diff --git a/src/assets/styles/yxk-admin.scss b/src/assets/styles/yxk-admin.scss
index 9e55150..92e16d9 100644
--- a/src/assets/styles/yxk-admin.scss
+++ b/src/assets/styles/yxk-admin.scss
@@ -1,3 +1,40 @@
+.elect-cont-left{
+  width: 265px;
+  margin-right: 20px;
+  @include bg_color;
+  @include box_padding;
+  .head-container{
+    margin-bottom: 20px;
+  }
+  .container-left{
+    @include tree_height_min;
+  }
+}
+.elect-cont-right{
+  // padding: 20px;
+  @include bg_color;
+  @include box_padding;
+  .head-container{
+    margin-bottom: 20px;
+  }
+  .container-right{
+    @include table_height_min;
+  }
+}
+
+.hideSidebar{
+  // siderbar-收起 54 + 间距 60 + treeLeft 265
+  .elect-cont-right{
+    width: calc(100vw - 379px);
+  }
+}
+.openSidebar{
+  // siderbar-展开 256 + 间距 60 + treeLeft 265
+  .elect-cont-right{
+    width: calc(100vw - 581px);
+  }
+}
+
 
 .head-container {
   // padding: 20px;
@@ -27,6 +64,9 @@
     height: 30px !important;
     width: 230px !important;
   }
+  .icon-zhuangtai{
+    font-size: 14px;
+  }
 }
 
 .el-tabs{
@@ -136,27 +176,27 @@
 .el-button--mini{
   padding: 7px 10px;
 }
-.el-message-box,
-.el-popover{
-  .el-button{
-    border-color: #dcdfe6;
-    color: #606266;
-  }
+// .el-message-box,
+// .el-popover{
+//   .el-button{
+//     border-color: #dcdfe6;
+//     color: #606266;
+//   }
   
-  .el-button:focus, 
-  .el-button:hover {
-      color: #1890ff;
-      border-color: #badeff;
-      background-color: #e8f4ff;
-  }
-  .el-button--primary,
-  .el-button--primary:focus,
-  .el-button--primary:hover {
-    background: #46a6ff;
-    border-color: #46a6ff;
-    color: #fff;
-  }
-}
+//   .el-button:focus, 
+//   .el-button:hover {
+//       color: #1890ff;
+//       border-color: #badeff;
+//       background-color: #e8f4ff;
+//   }
+//   .el-button--primary,
+//   .el-button--primary:focus,
+//   .el-button--primary:hover {
+//     background: #46a6ff;
+//     border-color: #46a6ff;
+//     color: #fff;
+//   }
+// }
 
 .header-container-wrap{
   min-height: auto;
@@ -335,7 +375,8 @@
 }
 
 .el-icon-arrow-right:before{
-  color: #fff;
+  // color: #fff;
+  @include icon_color;
 }
 .el-picker-panel__icon-btn:before{
   color: #303133;
@@ -414,13 +455,22 @@
 
 // 弹框
 .el-dialog{
+  position: relative;
+  position: fixed;
+  left: 50%;
+  top: 50%;
+  transform: translate(-50%,-50%);
+  margin-top: 0 !important;
   width: 736px;
   padding: 0 20px;
+  border-radius: 6px;
+  box-shadow: 0px 14px 21px 0px rgba(0,0,0,0.17);
   .el-dialog__header{
     padding: 17px 0;
     border-bottom: 1px solid #E6E8ED;
     .el-dialog__title{
       font-size: 16px;
+      color: #000;
     }
     .el-dialog__close{
       font-family: "iconfont" !important;
@@ -437,6 +487,9 @@
   .el-dialog__body{
     padding: 30px 0;
     .el-form-item{
+      &:nth-child(odd){
+        margin-right: 40px;
+      }
       .el-form-item__label{
         color: #0C0E1E;
       }
@@ -458,6 +511,12 @@
             line-height: 32px;
           }
         }
+        .vue-treeselect--focused{
+          .vue-treeselect__control{
+            border-radius: 5px;
+            border-color: #0348F3;
+          }
+        }
         .el-icon-close{
           border-radius: 0;
           font-family: "iconfont" !important;
@@ -494,6 +553,9 @@
     }
     .selecct-dropdown{
       .el-select-dropdown{
+        position: absolute !important;
+        top: 36px !important;
+        left: 0 !important;
         padding: 6px 0;
         margin-top: 0;
         .el-select-dropdown__item{
@@ -502,28 +564,48 @@
         }
       }
     }
-  }
-  .dialog-footer{
-    display: flex;
-    justify-content: flex-end;
-    margin-top: 60px;
-    .el-button{
-      width: 76px;
-      height: 32px;
-      line-height: 32px;
-      padding: 0;
-      border-color: #E6E8ED;
-      background-color: transparent;
-      color: #545B65;
-      font-weight: normal;
-      &.el-button--primary{
-        color: #fff;
-        background-color: #0348F3;
-        border-color: #0348F3;
+    .el-input-number{
+      width: 225px;
+      .el-input__inner{
+        text-align: left;
+      }
+      .el-input-number__increase,
+      .el-input-number__decrease{
+        background-color: transparent !important;
+        &.is-disabled{
+          background-color: #E3E7EE !important;
+        }
+      }
+      .el-icon-arrow-down,
+      .el-icon-arrow-up{
+        font-family: "iconfont" !important;
+        font-style: normal;
+        -webkit-font-smoothing: antialiased;
+        -moz-osx-font-smoothing: grayscale;
+        font-size: 12px;
+        color: #545B65;
+        transform: scale(0.5);
+      }
+      .el-icon-arrow-down:before{
+        content: "\E629";
+      }
+      .el-icon-arrow-up:before{
+        content: "\E62c";
       }
     }
-    
+    // .el-input-number.is-controls-right {
+    //   .el-input-number__decrease,
+    //   .el-input-number__increase{
+    //     display: none;
+    //   }
+    //   .el-input__inner{
+    //     padding-left: 0;
+    //     padding-right: 0;
+    //   }
+    // }
   }
+ 
+
   // position: relative;
   // position: fixed;
   // width: 620px;
@@ -651,6 +733,29 @@
   //   }
   // }
 }
+
+.dialog-footer,
+.el-message-box__btns{
+  display: flex;
+  justify-content: flex-end;
+  margin-top: 60px;
+  .el-button{
+    width: 76px;
+    height: 32px;
+    line-height: 32px;
+    padding: 0;
+    border-color: #E6E8ED;
+    background-color: transparent;
+    color: #545B65;
+    font-weight: normal;
+    &.el-button--primary{
+      color: #fff;
+      background-color: #0348F3;
+      border-color: #0348F3;
+    }
+  }
+}
+
 // .el-dialog,
 // .right-preview{
 //   .el-form{
@@ -903,10 +1008,31 @@
     }
   }
 }
+// 提示框-dialog
+.tip-dialog{
+  .el-dialog{
+    width: 504px;
+    .setting-dialog{
+      padding: 0 10px;
+    }
+    .tip-content{
+      padding-left: 34px;
+      font-size: 14px;
+      line-height: 24px;
+      color: #0C0E1E;
+      background: url("~@/assets/images/icon/tip-icon.png") no-repeat left top;
+      background-size: 24px 24px;
+      span{
+        font-size: 12px;
+        color: #ED4A41;
+      }
+    }
+  }
+  .dialog-footer{
+    margin-top: 27px;
+  }
+}
 .setting-dialog{
-  z-index: 100;
-  position: relative;
-  color: #fff;
   .des-form{
     width: 100% !important;
     margin-top: 0 !important;
@@ -956,86 +1082,140 @@ input[type ='number'] {
 }
 
 // 弹框-删除等提示
-.setting-dialog{
-  .dialog-delt{
-    line-height: 26px;
-    color: #fff;
-    margin-bottom: 20px;
-  }
-  .delt-tip{
-    margin-top: 10px;
-    color: #EF3147;
-  }
-}
+// .setting-dialog{
+//   // .dialog-delt{
+//   //   line-height: 26px;
+//   //   color: #fff;
+//   //   margin-bottom: 20px;
+//   // }
+//   // .delt-tip{
+//   //   margin-top: 10px;
+//   //   color: #EF3147;
+//   // }
+// }
 
 // alert 样式
+// .el-message-box{
+//   position: relative;
+//   width: 588px;
+//   border: 2px solid $mainColor;
+//   border-bottom: none;
+//   border-radius: 4px 4px 0 0;
+//   background-color: $boxBg;
+//   overflow: visible;
+//   &::after{
+//     position: absolute;
+//     left: -2px;
+//     bottom: -30px;
+//     content: "";
+//     width: 589px;
+//     height: 30px;
+//     background:  url(~@/assets/images/alert_bottom.png) no-repeat;
+//     background-size: contain;
+//   }
+//   .el-message-box__header{
+//     padding: 18px 60px;
+//     background-color: $mainColor;
+//     .el-message-box__title{
+//       font-weight: bold;
+//       color: #fff;
+//     }
+//     .el-message-box__headerbtn{
+//       top: -36px;
+//       right: -16px;
+//     }
+//     .el-icon-close{
+//       font-family: "iconfont" !important;
+//       font-style: normal;
+//       -webkit-font-smoothing: antialiased;
+//       -moz-osx-font-smoothing: grayscale;
+//       font-size: 24px;
+//       color: $mainColor;
+//       &::before{
+//         content: "\E61b";
+//       }
+//     }
+//   }
+//   .el-message-box__content{
+//     height: 110px;
+//     padding: 35px 60px 15px 60px;
+//     color: #fff;
+//   }
+// }
+// .el-message-box .el-button, 
+// .el-popover .el-button{
+//   color: #fff;
+//   border-color: $mainColor;
+//   background-color: transparent;
+// }
+
+// .el-message-box .el-button:hover,
+// .el-popover .el-button:focus{
+//   color: #fff;
+//   background-color: #02255F;
+//   border-color: $mainColor;
+// }
+// .el-message-box .el-button--primary,
+// .el-message-box .el-button--primary:focus,
+// .el-message-box .el-button--primary:hover {
+//   background: #46a6ff;
+//   border-color: #46a6ff;
+//   color: #fff;
+// }
+
 .el-message-box{
-  position: relative;
-  width: 588px;
-  border: 2px solid $mainColor;
-  border-bottom: none;
-  border-radius: 4px 4px 0 0;
-  background-color: $boxBg;
-  overflow: visible;
-  &::after{
-    position: absolute;
-    left: -2px;
-    bottom: -30px;
-    content: "";
-    width: 589px;
-    height: 30px;
-    background:  url(~@/assets/images/alert_bottom.png) no-repeat;
-    background-size: contain;
-  }
+  width: 504px;
+  padding: 0 20px 30px 20px;
   .el-message-box__header{
-    padding: 18px 60px;
-    background-color: $mainColor;
+    
+    padding: 17px 0;
+    border-bottom: 1px solid #E6E8ED;
     .el-message-box__title{
-      font-weight: bold;
-      color: #fff;
+      font-size: 16px;
+      line-height: 24px;
+      color: #000;
     }
     .el-message-box__headerbtn{
-      top: -36px;
-      right: -16px;
-    }
-    .el-icon-close{
-      font-family: "iconfont" !important;
-      font-style: normal;
-      -webkit-font-smoothing: antialiased;
-      -moz-osx-font-smoothing: grayscale;
-      font-size: 24px;
-      color: $mainColor;
-      &::before{
-        content: "\E61b";
+      top: 20px;
+      right: 0;
+      .el-icon-close{
+        font-family: "iconfont" !important;
+        font-style: normal;
+        -webkit-font-smoothing: antialiased;
+        -moz-osx-font-smoothing: grayscale;
+        font-size: 16px;
+        color: #545b65;
+        &::before{
+          content: "\E61b";
+        }
       }
     }
   }
   .el-message-box__content{
-    height: 110px;
-    padding: 35px 60px 15px 60px;
-    color: #fff;
+    padding: 26px 10px 10px 10px;
+    .el-message-box__status{
+      top: 12px;
+      &.el-icon-warning{
+        color: #ED4A41;
+      }
+    }
+    .el-message-box__message{
+      p{
+        color: #0C0E1E;
+        span{
+          display: block;
+          font-size: 12px;
+          color: #ED4A41;
+        }
+      }
+    }
+  }
+  .el-message-box__btns{
+    padding: 0;
+    margin-top: 27px;
   }
-}
-.el-message-box .el-button, 
-.el-popover .el-button{
-  color: #fff;
-  border-color: $mainColor;
-  background-color: transparent;
 }
 
-.el-message-box .el-button:hover,
-.el-popover .el-button:focus{
-  color: #fff;
-  background-color: #02255F;
-  border-color: $mainColor;
-}
-.el-message-box .el-button--primary,
-.el-message-box .el-button--primary:focus,
-.el-message-box .el-button--primary:hover {
-  background: #46a6ff;
-  border-color: #46a6ff;
-  color: #fff;
-}
 .el-table__header-wrapper{
   @include elTable-style;
 }
@@ -1315,6 +1495,9 @@ input[type ='number'] {
     background: url('~@/assets/images/warehouse_arrow_right.png') no-repeat;
   }
 }
+.el-switch .el-switch__core{
+  @include switch-disabled;
+}
 
 .el-switch.is-checked .el-switch__core{
   @include switch-style;
@@ -1324,6 +1507,8 @@ input[type ='number'] {
   @include switch-disabled;
 }
 
+
+
 .vue-treeselect--open-below .vue-treeselect__menu{
   padding: 6px 0;
   top: 4px !important;
@@ -1346,5 +1531,5 @@ input[type ='number'] {
       }
     }
   }
-  
-}
\ No newline at end of file
+}
+
diff --git a/src/components/Crud/CRUD.operation.vue b/src/components/Crud/CRUD.operation.vue
index 4da7464..412613a 100644
--- a/src/components/Crud/CRUD.operation.vue
+++ b/src/components/Crud/CRUD.operation.vue
@@ -9,20 +9,26 @@
         新增
       </el-button>
       <!-- type="success" -->
-      <el-button v-if="crud.optShow.edit" v-permission="permission.edit" size="mini" icon="el-icon-edit" :disabled="crud.selections.length !== 1" @click="crud.toEdit(crud.selections[0])">
-        修改
+      <el-button v-if="crud.optShow.edit" v-permission="permission.edit" size="mini" :disabled="crud.selections.length !== 1" @click="crud.toEdit(crud.selections[0])">
+        <i class="iconfont icon-bianji" />
+        编辑
       </el-button>
+      <slot name="middle" />
       <!-- type="danger" -->
-      <el-button v-if="crud.optShow.del" slot="reference" v-permission="permission.del" icon="el-icon-delete" size="mini" :loading="crud.delAllLoading" :disabled="crud.selections.length === 0" @click="delVisible=true">
+      <el-button v-if="crud.optShow.del" slot="reference" v-permission="permission.del" size="mini" :loading="crud.delAllLoading" :disabled="crud.selections.length === 0" @click="toDelete(crud.selections)">
+        <i class="iconfont icon-shanchu" />
         删除
       </el-button>
       <!-- type="warning" -->
-      <el-button v-if="crud.optShow.download" :loading="crud.downloadLoading" :disabled="!crud.data.length" size="mini" icon="el-icon-download" @click="crud.doExport">导出</el-button>
+      <el-button v-if="crud.optShow.download" :loading="crud.downloadLoading" :disabled="!crud.data.length" size="mini" @click="exportVisible=true">
+        <i class="iconfont icon-daochu" />
+        导出
+      </el-button>
       <!--右侧-->
       <slot name="right" />
     </div>
     <!-- 删除弹窗 -->
-    <el-dialog :visible.sync="delVisible" title="确认删除">
+    <!-- <el-dialog :visible.sync="delVisible" title="确认删除">
       <span class="dialog-right-top" />
       <span class="dialog-left-bottom" />
       <div class="setting-dialog">
@@ -31,6 +37,19 @@
           <el-button type="primary" :loading="crud.delAllLoading" @click="toDelete(crud.selections)">确定</el-button>
         </div>
       </div>
+    </el-dialog> -->
+    <!-- 导出dialog -->
+    <el-dialog class="tip-dialog" :visible.sync="exportVisible" :modal-append-to-body="false" :close-on-click-modal="false" title="提示">
+      <div class="setting-dialog">
+        <div class="tip-content">
+          <p class="tipMsg">此操作将导出所选数据</p>
+          <span>你是否还要继续?</span>
+        </div>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="text" @click="exportVisible = false">取消</el-button>
+          <el-button type="primary" @click="toExport(crud.selections)">继续</el-button>
+        </div>
+      </div>
     </el-dialog>
     <!-- <el-button-group v-if="crud.optShow.group" class="crud-opts-right">
       <el-button size="mini" plain type="info" icon="el-icon-search" @click="toggleSearch()" />
@@ -92,8 +111,8 @@ export default {
       tableUnwatcher: null,
       // 忽略下次表格列变动
       ignoreNextTableColumnsChange: false,
-      delVisible: false
-
+      // delVisible: false,
+      exportVisible: false
     }
   },
   watch: {
@@ -142,15 +161,23 @@ export default {
       this.tableColumns = columns
     },
     toDelete(datas) {
-      // this.$confirm(this.crud.confirmDeleteMsg ? this.crud.confirmDeleteMsg : `确认删除选中的${datas.length}条数据?`, '提示', {
-      //   confirmButtonText: '确定',
-      //   cancelButtonText: '取消'
-      // }).then(() => {
-      this.crud.delAllLoading = true
-      this.delVisible = false
-      this.crud.doDelete(datas)
-      // }).catch(() => {
-      // })
+      // his.crud.confirmDeleteMsg ? this.crud.confirmDeleteMsg : `确认删除选中的${datas.length}条数据?`,
+      console.log(this.crud)
+      this.$confirm('此操作将删除当前所选' + this.crud.title + '<span>你是否还要继续？</span>', '提示', {
+        confirmButtonText: '继续',
+        cancelButtonText: '取消',
+        type: 'warning',
+        dangerouslyUseHTMLString: true
+      }).then(() => {
+        this.crud.delAllLoading = true
+        this.crud.doDelete(datas)
+      }).catch(() => {
+      })
+    },
+    toExport() {
+      this.crud.downloadLoading = true
+      this.exportVisible = false
+      this.crud.doExport()
     },
     handleCheckAllChange(val) {
       if (val === false) {
@@ -222,11 +249,10 @@ export default {
 .crud-opts .crud-opts-right span {
   float: left;
 }
-.delMsg{
-  color: #fff;
-  font-size: 16px;
-}
 .iconfont{
-  font-size: 12px !important;
+  font-weight: normal;
+}
+.icon-xinzeng{
+  font-size: 14px !important;
 }
 </style>
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index c932ab8..8223dc4 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -1,109 +1,137 @@
 <template>
-  <div>
-
-    <!--工具栏-->
-    <div class="head-container">
-      <div v-if="crud.props.searchToggle" class="head-search">
-        <!-- 搜索 -->
-        <el-input v-model="query.name" clearable size="small" placeholder="输入部门名称搜索" prefix-icon="el-icon-search" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
-        <date-range-picker v-model="query.createTime" class="date-item" />
-        <el-select v-model="query.enabled" clearable size="small" placeholder="状态" class="filter-item" style="width: 100px" @change="crud.toQuery">
-          <i slot="prefix" class="iconfont icon-zhuangtai-fanbai" />
-          <el-option v-for="item in enabledTypeOptions" :key="item.key" :label="item.display_name" :value="item.key" />
-        </el-select>
-        <rrOperation />
+  <div class="app-container">
+    <div class="container-main" style="justify-content: flex-start;">
+      <!--侧边部门数据-->
+      <div class="elect-cont-left">
+        <div class="head-container">
+          <el-input v-model="deptName" clearable size="small" placeholder="输入部门名称搜索" prefix-icon="el-icon-search" class="filter-item" @input="getDeptDatas" />
+        </div>
+        <!-- <div class="container-left">
+          <span class="right-top-line" />
+          <span class="left-bottom-line" />
+          <el-tree :data="deptDatas" :load="getDeptDatas" :props="defaultProps" :expand-on-click-node="false" lazy @node-click="handleNodeClick" />
+        </div> -->
       </div>
-      <crudOperation :permission="permission" />
-    </div>
-    <!--表单组件-->
-    <el-dialog append-to-body :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title">
-      <span class="dialog-right-top" />
-      <span class="dialog-left-bottom" />
-      <div class="setting-dialog">
-        <el-form ref="form" inline :model="form" :rules="rules" size="small" label-width="80px">
-          <el-form-item label="部门名称" prop="name">
-            <el-input v-model="form.name" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="部门排序" prop="deptSort">
-            <el-input-number
-              v-model.number="form.deptSort"
-              :min="0"
-              :max="999"
-              controls-position="right"
-              style="width: 370px;"
-            />
-          </el-form-item>
-          <el-form-item label="顶级部门">
-            <el-radio-group v-model="form.isTop" style="width: 140px">
-              <el-radio label="1">是</el-radio>
-              <el-radio label="0">否</el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item label="状态" prop="enabled">
-            <el-radio v-for="item in dict.dept_status" :key="item.id" v-model="form.enabled" :label="item.value">{{ item.label }}</el-radio>
-          </el-form-item>
-          <el-form-item v-if="form.isTop === '0'" style="margin-bottom: 0;" label="上级部门" prop="pid">
-            <treeselect
-              v-model="form.pid"
-              :load-options="loadDepts"
-              :options="depts"
-              style="width: 370px;"
-              placeholder="选择上级类目"
-            />
-          </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">取消</el-button>
-          <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+      <!--用户数据-->
+      <div class="elect-cont-right">
+        <!--工具栏-->
+        <div class="head-container">
+          <div class="head-search">
+            <!-- 搜索 -->
+            <el-input v-model="query.name" clearable size="small" placeholder="输入部门名称搜索" prefix-icon="el-icon-search" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
+            <date-range-picker v-model="query.createTime" class="date-item" />
+            <el-select v-model="query.enabled" clearable size="small" placeholder="状态" class="filter-item" style="width: 100px" @change="crud.toQuery">
+              <i slot="prefix" class="iconfont icon-zhuangtai" />
+              <el-option v-for="item in enabledTypeOptions" :key="item.key" :label="item.display_name" :value="item.key" />
+            </el-select>
+            <rrOperation />
+          </div>
+          <crudOperation :permission="permission" />
+        </div>
+        <!--表单组件-->
+        <el-dialog append-to-body :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title">
+          <span class="dialog-right-top" />
+          <span class="dialog-left-bottom" />
+          <div class="setting-dialog">
+            <el-form ref="form" inline :model="form" :rules="rules" size="small" label-width="90px">
+              <el-form-item label="所属全宗" prop="dept">
+                <treeselect v-model="form.dept" :options="depts" placeholder="选择全宗" />
+              </el-form-item>
+              <el-form-item label="部门编码" prop="name">
+                <el-input v-model="form.name" />
+              </el-form-item>
+              <el-form-item label="部门名称" prop="name">
+                <el-input v-model="form.name" />
+              </el-form-item>
+              <el-form-item label="部门简称" prop="name">
+                <el-input v-model="form.name" />
+              </el-form-item>
+
+              <el-form-item label="顶级部门">
+                <el-radio-group v-model="form.isTop">
+                  <el-radio label="1">是</el-radio>
+                  <el-radio label="0">否</el-radio>
+                </el-radio-group>
+              </el-form-item>
+              <el-form-item label="排序" prop="deptSort">
+                <el-input-number
+                  v-model.number="form.deptSort"
+                  :min="0"
+                  :max="999"
+                  controls-position="right"
+                />
+              </el-form-item>
+              <el-form-item v-if="form.isTop === '0'" label="上级部门" prop="pid">
+                <treeselect
+                  v-model="form.pid"
+                  :load-options="loadDepts"
+                  :options="depts"
+                  placeholder="选择上级类目"
+                />
+              </el-form-item>
+              <el-form-item label="状态" prop="enabled" :style="form.isTop === '0'? 'margin-left:0': 'margin:0 0 0 360px'">
+                <el-radio v-for="item in dict.dept_status" :key="item.id" v-model="form.enabled" :label="item.value">{{ item.label }}</el-radio>
+              </el-form-item>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+              <el-button type="text" @click="crud.cancelCU">取消</el-button>
+              <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+            </div>
+          </div>
+        </el-dialog>
+        <!--表格渲染-->
+        <div class="container-right">
+          <span class="right-top-line" />
+          <span class="left-bottom-line" />
+          <el-table
+            ref="table"
+            v-loading="crud.loading"
+            lazy
+            :load="getDeptDatas"
+            :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+            :data="crud.data"
+            row-key="id"
+            @select="crud.selectChange"
+            @select-all="crud.selectAllChange"
+            @selection-change="crud.selectionChangeHandler"
+          >
+            <el-table-column :selectable="checkboxT" type="selection" align="center" width="55" />
+            <el-table-column label="部门名称" prop="name" />
+            <el-table-column label="部门编码" prop="name" />
+            <el-table-column label="部门人数" prop="name" />
+            <el-table-column label="排序" prop="deptSort" />
+            <el-table-column label="所属全宗" prop="deptSort" />
+            <el-table-column label="状态" align="center" prop="enabled">
+              <template slot-scope="scope">
+                <el-switch
+                  v-model="scope.row.enabled"
+                  :disabled="scope.row.id === 1"
+                  active-color="#409EFF"
+                  inactive-color="#F56C6C"
+                  @change="changeEnabled(scope.row, scope.row.enabled,)"
+                />
+              </template>
+            </el-table-column>
+            <el-table-column prop="createTime" label="创建日期">
+              <template slot-scope="scope">
+                <div>{{ scope.row.createTime | parseTime }}</div>
+              </template>
+            </el-table-column>
+            <!-- <el-table-column v-if="checkPer(['admin','dept:edit','dept:del'])" label="操作" width="130px" align="center" fixed="right">
+              <template slot-scope="scope">
+                <udOperation
+                  :data="scope.row"
+                  :permission="permission"
+                  :disabled-dle="scope.row.id === 1"
+                  msg="确定删除吗,如果存在下级节点则一并删除，此操作不能撤销！"
+                />
+              </template>
+            </el-table-column> -->
+          </el-table>
+          <!--分页组件-->
+          <pagination />
         </div>
       </div>
-    </el-dialog>
-    <!--表格渲染-->
-    <div class="app-container  container-wrap" style="margin-top:0;min-height: calc(100vh - 292px);">
-      <span class="right-top-line" />
-      <span class="left-bottom-line" />
-      <el-table
-        ref="table"
-        v-loading="crud.loading"
-        lazy
-        :load="getDeptDatas"
-        :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
-        :data="crud.data"
-        row-key="id"
-        @select="crud.selectChange"
-        @select-all="crud.selectAllChange"
-        @selection-change="crud.selectionChangeHandler"
-      >
-        <el-table-column :selectable="checkboxT" type="selection" align="center" width="55" />
-        <el-table-column label="名称" prop="name" />
-        <el-table-column label="排序" prop="deptSort" />
-        <el-table-column label="状态" align="center" prop="enabled">
-          <template slot-scope="scope">
-            <el-switch
-              v-model="scope.row.enabled"
-              :disabled="scope.row.id === 1"
-              active-color="#409EFF"
-              inactive-color="#F56C6C"
-              @change="changeEnabled(scope.row, scope.row.enabled,)"
-            />
-          </template>
-        </el-table-column>
-        <el-table-column prop="createTime" label="创建日期">
-          <template slot-scope="scope">
-            <div>{{ scope.row.createTime | parseTime }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column v-if="checkPer(['admin','dept:edit','dept:del'])" label="操作" width="130px" align="center" fixed="right">
-          <template slot-scope="scope">
-            <udOperation
-              :data="scope.row"
-              :permission="permission"
-              :disabled-dle="scope.row.id === 1"
-              msg="确定删除吗,如果存在下级节点则一并删除，此操作不能撤销！"
-            />
-          </template>
-        </el-table-column>
-      </el-table>
     </div>
   </div>
 </template>
@@ -116,13 +144,14 @@ import { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
 import CRUD, { presenter, header, form, crud } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
-import udOperation from '@crud/UD.operation'
+// import udOperation from '@crud/UD.operation'
 import DateRangePicker from '@/components/DateRangePicker'
+import pagination from '@crud/Pagination'
 
 const defaultForm = { id: null, name: null, isTop: '1', subCount: 0, pid: null, deptSort: 999, enabled: 'true' }
 export default {
   name: 'Dept',
-  components: { Treeselect, crudOperation, rrOperation, udOperation, DateRangePicker },
+  components: { Treeselect, crudOperation, rrOperation, DateRangePicker, pagination },
   cruds() {
     return CRUD({ title: '部门', url: 'api/dept', crudMethod: { ...crudDept }})
   },
@@ -140,6 +169,9 @@ export default {
           { required: true, message: '请输入序号', trigger: 'blur', type: 'number' }
         ]
       },
+      deptName: '', deptDatas: [], jobs: [], level: 3, roles: [],
+      jobDatas: [], roleDatas: [], // 多选时使用
+      defaultProps: { children: 'children', label: 'name', isLeaf: 'leaf' },
       permission: {
         add: ['admin', 'dept:add'],
         edit: ['admin', 'dept:edit'],
@@ -233,10 +265,11 @@ export default {
     },
     // 改变状态
     changeEnabled(data, val) {
-      this.$confirm('此操作将 "' + this.dict.label.dept_status[val] + '" ' + data.name + '部门, 是否继续？', '提示', {
-        confirmButtonText: '确定',
+      this.$confirm('此操作将禁用 / 启用部门 “' + data.name + '”' + '<span>你是否还要继续？</span>', '提示', {
+        confirmButtonText: '继续',
         cancelButtonText: '取消',
-        type: 'warning'
+        type: 'warning',
+        dangerouslyUseHTMLString: true
       }).then(() => {
         crudDept.edit(data).then(res => {
           this.crud.notify(this.dict.label.dept_status[val] + '成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
@@ -255,14 +288,5 @@ export default {
 }
 </script>
 
-<style rel="stylesheet/scss" lang="scss" scoped>
- ::v-deep .vue-treeselect__control,::v-deep .vue-treeselect__placeholder,::v-deep .vue-treeselect__single-value {
-    height: 30px;
-    line-height: 30px;
-  }
-</style>
-<style rel="stylesheet/scss" lang="scss" scoped>
- ::v-deep .el-input-number .el-input__inner {
-    text-align: left;
-  }
+<style lang="scss" scoped>
 </style>
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index cc30064..85151fc 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -1,94 +1,91 @@
 <template>
   <div class="app-container">
-    <!--工具栏-->
-    <div class="head-container">
-      <div v-if="crud.props.searchToggle" class="head-search">
-        <!-- 搜索 -->
-        <el-input v-model="query.blurry" size="small" clearable placeholder="输入名称或者描述搜索" prefix-icon="el-icon-search" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
-        <date-range-picker v-model="query.createTime" class="date-item" />
-        <rrOperation />
-      </div>
-      <crudOperation :permission="permission" />
-    </div>
-    <!-- 表单渲染 -->
-    <el-dialog append-to-body :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title">
-      <span class="dialog-right-top" />
-      <span class="dialog-left-bottom" />
-      <div class="setting-dialog">
-        <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="80px">
-          <el-form-item label="角色名称" prop="name">
-            <el-input v-model="form.name" style="width: 380px;" />
-          </el-form-item>
-          <el-form-item label="角色级别" prop="level">
-            <el-input-number v-model.number="form.level" :min="1" controls-position="right" style="width: 145px;" />
-          </el-form-item>
-          <el-form-item label="数据范围" prop="dataScope">
-            <el-select v-model="form.dataScope" style="width: 140px" placeholder="请选择数据范围" @change="changeScope">
-              <el-option
-                v-for="item in dateScopes"
-                :key="item"
-                :label="item"
-                :value="item"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item v-if="form.dataScope === '自定义'" label="数据权限" prop="depts">
-            <treeselect
-              v-model="deptDatas"
-              :load-options="loadDepts"
-              :options="depts"
-              multiple
-              style="width: 380px"
-              placeholder="请选择"
-            />
-          </el-form-item>
-          <el-form-item label="描述信息" prop="description">
-            <el-input v-model="form.description" style="width: 380px;" rows="5" type="textarea" />
-          </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">取消</el-button>
-          <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+    <div class="container-main" style="justify-content: flex-start;">
+      <!--侧边部门数据-->
+      <div class="elect-cont-right">
+        <!--工具栏-->
+        <div class="head-container">
+          <div v-if="crud.props.searchToggle" class="head-search">
+            <!-- 搜索 -->
+            <el-input v-model="query.blurry" size="small" clearable placeholder="输入部门名称搜索" prefix-icon="el-icon-search" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
+            <date-range-picker v-model="query.createTime" class="date-item" />
+            <rrOperation />
+          </div>
+          <crudOperation :permission="permission" />
         </div>
-      </div>
-    </el-dialog>
-    <el-row :gutter="15">
-      <!--角色管理-->
-      <el-col :xs="15" :sm="17" :md="18" :lg="19" :xl="19">
-        <el-card class="box-card" shadow="never">
+        <div class="container-right">
           <span class="right-top-line" />
           <span class="left-bottom-line" />
-          <div slot="header" class="clearfix">
-            <span class="role-span">角色列表</span>
-          </div>
-          <el-table ref="table" v-loading="crud.loading" highlight-current-row style="width: 100%;" height="calc(100vh - 400px)" :data="crud.data" @selection-change="crud.selectionChangeHandler" @current-change="handleCurrentChange">
+          <!-- 表单渲染 -->
+          <el-dialog append-to-body :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title">
+            <span class="dialog-right-top" />
+            <span class="dialog-left-bottom" />
+            <div class="setting-dialog">
+              <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="80px">
+                <el-form-item label="角色名称" prop="name">
+                  <el-input v-model="form.name" style="width: 380px;" />
+                </el-form-item>
+                <el-form-item label="角色级别" prop="level">
+                  <el-input-number v-model.number="form.level" :min="1" controls-position="right" style="width: 145px;" />
+                </el-form-item>
+                <el-form-item label="数据范围" prop="dataScope">
+                  <el-select v-model="form.dataScope" style="width: 140px" placeholder="请选择数据范围" @change="changeScope">
+                    <el-option
+                      v-for="item in dateScopes"
+                      :key="item"
+                      :label="item"
+                      :value="item"
+                    />
+                  </el-select>
+                </el-form-item>
+                <el-form-item v-if="form.dataScope === '自定义'" label="数据权限" prop="depts">
+                  <treeselect
+                    v-model="deptDatas"
+                    :load-options="loadDepts"
+                    :options="depts"
+                    multiple
+                    style="width: 380px"
+                    placeholder="请选择"
+                  />
+                </el-form-item>
+                <el-form-item label="描述信息" prop="description">
+                  <el-input v-model="form.description" style="width: 380px;" rows="5" type="textarea" />
+                </el-form-item>
+              </el-form>
+              <div slot="footer" class="dialog-footer">
+                <el-button type="text" @click="crud.cancelCU">取消</el-button>
+                <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+              </div>
+            </div>
+          </el-dialog>
+          <el-table ref="table" v-loading="crud.loading" highlight-current-row style="width: 100%;" :data="crud.data" @selection-change="crud.selectionChangeHandler" @current-change="handleCurrentChange">
             <el-table-column :selectable="checkboxT" type="selection" align="center" width="55" />
-            <el-table-column prop="name" label="名称" />
-            <el-table-column prop="dataScope" label="数据权限" />
-            <el-table-column prop="level" label="角色级别" />
-            <el-table-column :show-overflow-tooltip="true" prop="description" label="描述" />
-            <el-table-column :show-overflow-tooltip="true" width="135px" prop="createTime" label="创建日期">
+            <el-table-column prop="name" label="角色名称" />
+            <!-- <el-table-column prop="dataScope" label="数据权限" /> -->
+            <!-- <el-table-column prop="level" label="角色级别" /> -->
+            <el-table-column :show-overflow-tooltip="true" prop="description" label="描述信息" />
+            <el-table-column prop="number" label="人数" />
+            <el-table-column :show-overflow-tooltip="true" prop="createTime" label="创建日期">
               <template slot-scope="scope">
                 <div>{{ scope.row.createTime | parseTime }}</div>
               </template>
             </el-table-column>
-            <el-table-column v-if="checkPer(['admin','roles:edit','roles:del'])" label="操作" width="130px" align="center" fixed="right">
-              <template slot-scope="scope">
-                <udOperation
-                  v-if="scope.row.level >= level"
-                  :data="scope.row"
-                  :permission="permission"
-                />
-              </template>
-            </el-table-column>
+          <!-- <el-table-column v-if="checkPer(['admin','roles:edit','roles:del'])" label="操作" width="130px" align="center" fixed="right">
+            <template slot-scope="scope">
+              <udOperation
+                v-if="scope.row.level >= level"
+                :data="scope.row"
+                :permission="permission"
+              />
+            </template>
+          </el-table-column> -->
           </el-table>
           <!--分页组件-->
           <pagination />
-        </el-card>
-      </el-col>
-      <!-- 菜单授权 -->
-      <el-col :xs="9" :sm="7" :md="6" :lg="5" :xl="5">
-        <el-card class="box-card" shadow="never" style="min-height:calc(100vh - 292px)">
+        </div>
+      </div>
+      <div class="elect-cont-left" style="margin: 0 0 0 20px;">
+        <div class="container-left">
           <span class="right-top-line" />
           <span class="left-bottom-line" />
           <div slot="header" class="clearfix">
@@ -118,9 +115,9 @@
             node-key="id"
             @check="menuChange"
           />
-        </el-card>
-      </el-col>
-    </el-row>
+        </div>
+      </div>
+    </div>
   </div>
 </template>
 
@@ -131,7 +128,7 @@ import { getMenusTree, getChild } from '@/api/system/menu'
 import CRUD, { presenter, header, form, crud } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
-import udOperation from '@crud/UD.operation'
+// import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
@@ -141,7 +138,7 @@ import DateRangePicker from '@/components/DateRangePicker'
 const defaultForm = { id: null, name: null, depts: [], description: null, dataScope: '全部', level: 3 }
 export default {
   name: 'Role',
-  components: { Treeselect, pagination, crudOperation, rrOperation, udOperation, DateRangePicker },
+  components: { Treeselect, pagination, crudOperation, rrOperation, DateRangePicker },
   cruds() {
     return CRUD({ title: '角色', url: 'api/roles', sort: 'level,asc', crudMethod: { ...crudRoles }})
   },
@@ -350,14 +347,14 @@ export default {
 }
 </script>
 
-<style rel="stylesheet/scss" lang="scss">
+<!-- <style rel="stylesheet/scss" lang="scss">
   .role-span {
     font-weight: bold;color: #303133;
     font-size: 15px;
   }
-</style>
+</style> -->
 
-<style rel="stylesheet/scss" lang="scss" scoped>
+<!-- <style rel="stylesheet/scss" lang="scss" scoped>
 .head-container{
   padding: 0 0 20px 0;
 }
@@ -377,5 +374,5 @@ export default {
 }
 ::v-deep .el-table__header{
   border-top: 1px solid #113D72;
-}
-</style>
+} -->
+<!-- </style> -->
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index d3639af..1be534d 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -4,7 +4,7 @@
       <!--侧边部门数据-->
       <div class="elect-cont-left">
         <div class="head-container">
-          <el-input v-model="deptName" clearable size="small" placeholder="输入部门名称搜索" prefix-icon="el-icon-search" class="filter-item" @input="getDeptDatas" />
+          <el-input v-model="deptName" clearable size="small" placeholder="输入全宗名称搜索" prefix-icon="el-icon-search" class="filter-item" @input="getDeptDatas" />
         </div>
         <div class="container-left">
           <span class="right-top-line" />
@@ -16,7 +16,7 @@
       <div class="elect-cont-right">
         <!--工具栏-->
         <div class="head-container">
-          <div v-if="crud.props.searchToggle" class="head-search">
+          <div class="head-search">
             <!-- 搜索 -->
             <el-input v-model="query.blurry" clearable size="small" placeholder="输入名称或者邮箱搜索" prefix-icon="el-icon-search" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
             <date-range-picker v-model="query.createTime" class="date-item" />
@@ -26,8 +26,8 @@
             </el-select>
             <rrOperation />
           </div>
-          <crudOperation show="" :permission="permission">
-            <el-button slot="right" icon="el-icon-refresh-left" size="mini" :disabled="!crud.selections.length" @click="handlePwdReset(crud.selections)">密码重置</el-button>
+          <crudOperation :permission="permission">
+            <el-button slot="right" icon="el-icon-refresh-left" size="mini" :disabled="crud.selections.length !== 1" @click="handlePwdReset(crud.selections)">密码重置</el-button>
           </crudOperation>
         </div>
         <div class="container-right">
@@ -74,7 +74,7 @@
                   </el-radio-group>
                 </el-form-item>
                 <el-form-item style="margin-bottom: 0;" label="角色" prop="roles" class="is-required selecct-dropdown">
-                  <el-select v-model="roleDatas" style="width: 558px" multiple placeholder="请选择" :popper-append-to-body="false" @remove-tag="deleteTag" @change="changeRole">
+                  <el-select v-model="roleDatas" style="width: 584x" multiple placeholder="请选择" :popper-append-to-body="false" @remove-tag="deleteTag" @change="changeRole">
                     <el-option v-for="item in roles" :key="item.name" :disabled="level !== 1 && item.level <= level" :label="item.name" :value="item.id" />
                   </el-select>
                 </el-form-item>
@@ -85,14 +85,29 @@
               </div>
             </div>
           </el-dialog>
-          <!-- 密码 -->
-          <el-dialog :visible.sync="resetVisible" title="确认密码重置">
-            <span class="dialog-right-top" />
-            <span class="dialog-left-bottom" />
+          <!-- 删除dialog -->
+          <!-- <el-dialog class="tip-dialog" :visible.sync="delVisible" :modal-append-to-body="false" :close-on-click-modal="false" title="提示">
             <div class="setting-dialog">
-              <p class="delMsg">确认重置所选{{ crud.selections.length }}个用户的密码（用户默认密码为：123456）？</p>
+              <div class="tip-content">
+                <p class="tipMsg">此操作将删除当前所选用户</p>
+                <span>你是否还要继续?</span>
+              </div>
+              <div slot="footer" class="dialog-footer">
+                <el-button type="text" @click="delVisible = false">取消</el-button>
+                <el-button type="primary" @click="handleDelConfirm">继续</el-button>
+              </div>
+            </div>
+          </el-dialog> -->
+          <!-- 密码重置dialog -->
+          <el-dialog class="tip-dialog" :visible.sync="resetVisible" :modal-append-to-body="false" :close-on-click-modal="false" title="提示">
+            <div class="setting-dialog">
+              <div class="tip-content">
+                <p class="tipMsg">此操作将重置所选用户密码为"123456"</p>
+                <span>你是否还要继续?</span>
+              </div>
               <div slot="footer" class="dialog-footer">
-                <el-button v-loading="btnLoading" type="primary" @click="pwdReset(crud.selections)">确定</el-button>
+                <el-button type="text" @click="resetVisible = false">取消</el-button>
+                <el-button v-loading="btnLoading" type="primary" @click="pwdReset(crud.selections)">继续</el-button>
               </div>
             </div>
           </el-dialog>
@@ -130,6 +145,7 @@
         </div>
       </div>
     </div>
+
   </div>
 </template>
 
@@ -187,6 +203,8 @@ export default {
       },
       btnLoading: false,
       resetVisible: false,
+      // delVisible: false,
+      // deleteData: {},
       height: document.documentElement.clientHeight - 180 + 'px;',
       deptName: '', depts: [], deptDatas: [], jobs: [], level: 3, roles: [],
       jobDatas: [], roleDatas: [], // 多选时使用
@@ -434,10 +452,12 @@ export default {
     },
     // 改变状态
     changeEnabled(data, val) {
-      this.$confirm('此操作将 "' + this.dict.label.user_status[val] + '" ' + data.username + ', 是否继续？', '提示', {
-        confirmButtonText: '确定',
+      // '此操作将 "' + this.dict.label.user_status[val] + '" ' + data.username + ', 你是否继续？',
+      this.$confirm('此操作将禁用 / 启用用户 “' + data.username + '”' + '<span>你是否还要继续？</span>', '提示', {
+        confirmButtonText: '继续',
         cancelButtonText: '取消',
-        type: 'warning'
+        type: 'warning',
+        dangerouslyUseHTMLString: true
       }).then(() => {
         crudUser.edit(data).then(res => {
           this.crud.notify(this.dict.label.user_status[val] + '成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
@@ -469,50 +489,21 @@ export default {
     checkboxT(row, rowIndex) {
       return row.id !== this.user.id
     }
+    // handleClose() {
+    //   this.delVisible = false
+    // },
+    // toDelete(data) {
+    //   this.deleteData = data
+    //   this.delVisible = true
+    // },
+    // handleDelConfirm() {
+    //   this.delVisible = false
+    //   this.crud.delAllLoading = true
+    //   this.crud.doDelete(this.deleteData)
+    // }
   }
 }
 </script>
 
 <style lang="scss" scoped>
-@import "~@/assets/styles/mixin.scss";
-@import "~@/assets/styles/variables.scss";
-.elect-cont-left{
-  width: 265px;
-  margin-right: 20px;
-  @include bg_color;
-  @include box_padding;
-  .head-container{
-    margin-bottom: 20px;
-  }
-  .container-left{
-    @include tree_height_min;
-  }
-}
-.elect-cont-right{
-  // padding: 20px;
-  @include bg_color;
-  @include box_padding;
-  .head-container{
-    margin-bottom: 20px;
-  }
-  .container-right{
-    @include table_height_min;
-  }
-}
-
-.hideSidebar{
-  // siderbar-收起 54 + 间距 60 + treeLeft 265
-  .elect-cont-right{
-    width: calc(100vw - 379px);
-  }
-}
-.openSidebar{
-  // siderbar-展开 256 + 间距 60 + treeLeft 265
-  .elect-cont-right{
-    width: calc(100vw - 581px);
-  }
-}
-.icon-zhuangtai{
-  font-size: 14px;
-}
 </style>