Merge branch 'zuhuduan' of http://192.168.60.201/root/dsk-operate-sys into zuhuduan

dsk-operate-ui/src/views/enterpriseManagement/programme.vue

@@ -326,10 +326,8 @@
                 // menuOptions
 
                 checkedKeys.forEach((v) => {
-                    console.log(v)
                   v = v.trim()
                     let nodes = this.$refs.menu.getNode(v)
-                  // console.log(nodes)
                   if(nodes.isLeaf == true){
                     this.$refs.menu.setChecked(v,true,true);
                   }else{

dsk-operate-ui/src/views/system/dept/index.vue

@@ -358,7 +358,7 @@ export default {
       this.deptId = row.deptId
       let islast = true
       let txt = '是否确认删除名称为"' + row.deptName + '"的数据项？'
-      if(row.children && row.children.length>0){//该组织下还有数据
+      if((row.children && row.children.length>0) || row.existUsers == true){//该组织下还有数据
         islast = false
         txt='是否删除该组织及该组织包含的所有人员？'
       }
@@ -368,7 +368,6 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        console.log(islast)
         if(islast){
           delDept(row.deptId).then(res=>{
             if(res.code == 200){
@@ -417,6 +416,7 @@ export default {
                 type: 'success',
                 message: '删除成功!'
               });
+              this.getList()
             }else{
               this.$message.warning('删除失败!')
             }