*

dsk-operate-ui/src/api/login.js

@@ -81,3 +81,21 @@ export function changeTenants(data) {
     method: 'post',
   })
 }
+
+//发送短信验证码
+export function captchaSms() {
+  return request({
+    url: '/getTempSmsCode',
+    method: 'get',
+  })
+}
+
+//验证短信验证码
+export function checkSmsCode(data) {
+  return request({
+    url: '/checkSmsCode',
+    method: 'POST',
+    params:data
+  })
+}
+

dsk-operate-ui/src/api/system/menu.js

@@ -24,6 +24,13 @@ export function treeselect() {
     method: 'get'
   })
 }
+// 查询菜单下拉树结构（企业管理专用）
+export function qytreeselect() {
+  return request({
+    url: '/system/menu/tenantPackageTreeSelect',
+    method: 'get'
+  })
+}
 
 // 根据角色ID查询菜单下拉树结构
 export function roleMenuTreeselect(roleId) {

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

@@ -218,7 +218,7 @@
   import { getTenantList,getTenant,selectTenant,editTenant,saveTenant,deleteTenant} from "@/api/enterpriseManagement/enterpriseManagement";
 
   export default {
-    name: "index",
+    name: "EnterpriseManagement",
     dicts: ['sys_user_status'],
     data() {
       return {
@@ -350,7 +350,7 @@
         this.disabled = false
         this.reset();
         this.open = true;
-        this.title = "添加角色";
+        this.title = "添加企业";
       },
       /** 修改按钮操作 */
       handleUpdate(row) {
@@ -373,6 +373,12 @@
       submitForm: function() {
         this.$refs["form"].validate(valid => {
           if (valid) {
+            const loading = this.$loading({
+              lock: true,
+              text: '数据处理中...',
+              spinner: 'el-icon-loading',
+              background: 'rgba(0, 0, 0, 0.7)'
+            });
             this.form.startTime = this.form.dateRange[0]
             this.form.expireTime = this.form.dateRange[1]
             if (this.form.id != undefined) {
@@ -380,12 +386,14 @@
                 this.$modal.msgSuccess("修改成功");
                 this.open = false;
                 this.getList();
+                loading.close();
               });
             } else {
               saveTenant(this.form).then(response => {
                 this.$modal.msgSuccess("新增成功");
                 this.open = false;
                 this.getList();
+                loading.close();
               });
             }
           }

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

@@ -147,13 +147,13 @@
 </template>
 
 <script>
-  import { treeselect as menuTreeselect} from "@/api/system/menu";
+  import { treeselect as qytreeselect} from "@/api/system/menu";
 
 
   import { addTenantPackage ,getTenantPackage,detailTenantPackage,saveTenantPackage,deleteTenantPackage} from "@/api/enterpriseManagement/enterpriseManagement";
 
   export default {
-    name: "programme",
+    name: "Programme",
     dicts: ['ent_pro_status'],
     data() {
       return {
@@ -230,7 +230,7 @@
       },
       /** 查询菜单树结构 */
       getMenuTreeselect() {
-        menuTreeselect().then(response => {
+        qytreeselect().then(response => {
           this.menuOptions = response.data;
         });
       },

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

@@ -181,6 +181,7 @@
 <script>
 import { listDept, getDept, delDept, addDept, updateDept, listDeptExcludeChild } from "@/api/system/dept";
 import Treeselect from "@riophae/vue-treeselect";
+import {captchaSms,checkSmsCode} from '@/api/login'
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
@@ -249,23 +250,6 @@ export default {
     this.phone = this.$store.state.user.phonenumber
   },
   methods: {
-    cancel1(){
-      this.yzm = ''
-      this.yanzheng = false
-    },
-    subyzm(){
-       delDept(row.deptId).then(res=>{
-         if(res.code == 200){
-           this.yzm = ''
-           this.yanzheng = false
-           this.$message({
-             type: 'success',
-             message: '删除成功!'
-           });
-         }
-       })
-
-    },
     /** 查询部门列表 */
     getList() {
       this.loading = true;
@@ -372,26 +356,80 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       this.deptId = row.deptId
-
-      this.$confirm('是否确认删除名称为"' + row.deptName + '"的数据项？', '系统提示', {
+      let islast = true
+      let txt = '是否确认删除名称为"' + row.deptName + '"的数据项？'
+      if(row.children && row.children.length>0){//该组织下还有数据
+        islast = false
+        txt='是否删除该组织及该组织包含的所有人员？'
+      }
+      let _this = this
+      this.$confirm(txt, '系统提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
+        console.log(islast)
+        if(islast){
+          delDept(row.deptId).then(res=>{
+            if(res.code == 200){
+              _this.getList();
+              _this.$modal.msgSuccess("删除成功");
+            }else{
+              this.$message.warning('删除失败!')
+            }
+          }).catch(res=>{
+            this.$message.warning(res.msg)
+          })
+        }else{
+          //发送验证码
+          captchaSms().then(res=>{
+            if(res.code == 200){
               this.yanzheng = true
+              this.$message.success('短信验证码已发送')
+            }else{
+              this.$message.warning('验证码发送失败')
+            }
+          })
+        }
       }).catch(() => {
         this.$message({
           type: 'info',
           message: '已取消删除'
         });
       });
-      // this.$modal.confirm('是否确认删除名称为"' + row.deptName + '"的数据项？').then(function() {
-      //
-      //   this.open()
-      // }).then(() => {
-      //   this.getList();
-      //   this.$modal.msgSuccess("删除成功");
-      // }).catch(() => {});
+    },
+    cancel1(){
+      this.yzm = ''
+      this.yanzheng = false
+    },
+    subyzm(){
+      //验证验证码
+      let param = {
+        smsCode:this.yzm
+      }
+      checkSmsCode(param).then(res=>{
+        if(res.code == 200){
+          delDept(this.deptId).then(res=>{
+            if(res.code == 200){
+              this.yzm = ''
+              this.yanzheng = false
+              this.$message({
+                type: 'success',
+                message: '删除成功!'
+              });
+            }else{
+              this.$message.warning('删除失败!')
+            }
+          }).catch(res=>{
+            this.$message.warning(res.msg)
+          })
+        }else{
+          this.$message.warning(res.msg)
+        }
+      }).catch(res=>{
+        this.$message.warning(res.msg)
+      })
+
     },
   }
 };