Merge branch 'master' of http://git.shengws.com/csx/Vue_New

config/dev.env.js

@@ -6,8 +6,8 @@
 module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
-  BASE_API:  '"http://api.xt.test.sgjyun.com"',// //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
-  //BASE_API:'"http://localhost:9529"',
+  BASE_API:  '"http://new_mobile.xt.api.sgjyun.com"',// //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
+  // BASE_API:'"http://localhost:9531"',
   SSO_HOST: '"http://testsso.sgjyun.com"',
   SRCM_HOST: '"http://test1.sgjyun.com"',
   XT_HOST: '"http://xt.test.sgjyun.com"',

config/index.js

@@ -20,7 +20,7 @@ module.exports = {
     // host: 'xt.test.sgjyun.com',
     // host: 'xt.kuyicloud.com',
     host: 'xt.test.sgjyun.com',
-    //host:'localhost',
+    // host:'localhost',
     port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,

config/sit.env.js

@@ -1,7 +1,7 @@
 module.exports = {
   NODE_ENV: '"production"',
   ENV_CONFIG: '"sit"',
-  BASE_API: '"http://api.xt.test.sgjyun.com"',
+  BASE_API: '"http://new_mobile.xt.api.sgjyun.com"',
 
   SSO_HOST: '"https://testsso.sgjyun.com"',
   SRCM_HOST: '"https://test1.sgjyun.com"',

src/api/config.js

@@ -90,5 +90,25 @@ export function updateSystemPrescription(id,params) {
 }
 
 
+export function getOrgs() {
+  return request({
+    url: '/api/public/orgs',
+    method: 'get',
+  })
+}
+
+
+
+export function changeOrg(params) {
+  return request({
+    url: '/api/org/change',
+    method: 'post',
+    params:params,
+  })
+}
+
+
+
+
 
 

src/api/role/role.js

@@ -1,106 +1,103 @@
 import request from '@/utils/request'
 
 export function getRoles(page) {
-    const params = {
-        page: page,
-    }
-    return request({
-        url: '/api/roles',
-        method: 'get',
-        params: params,
-    })
+  const params = {
+    page: page
+  }
+  return request({
+    url: '/api/roles',
+    method: 'get',
+    params: params
+  })
 }
 
 export function addRole(name, intro) {
-    const params = {
-        name: name,
-        intro: intro
-    }
-    return request({
-        url: '/api/role/create',
-        method: 'post',
-        params: params,
-    })
+  const params = {
+    name: name,
+    intro: intro
+  }
+  return request({
+    url: '/api/role/create',
+    method: 'post',
+    params: params
+  })
 }
 
 export function modifyRole(role_id, name, intro) {
-    const params = {
-        role_id: role_id,
-        name: name,
-        intro: intro
-    }
-    return request({
-        url: '/api/role/modify',
-        method: 'post',
-        params: params,
-    })
+  const params = {
+    role_id: role_id,
+    name: name,
+    intro: intro
+  }
+  return request({
+    url: '/api/role/modify',
+    method: 'post',
+    params: params
+  })
 }
 
 export function setRoleStatus(role_id, enable) {
-    const params = {
-        role_id: role_id,
-        enable: enable,
-    }
-    return request({
-        url: '/api/role/setstatus',
-        method: 'post',
-        params: params,
-    })
+  const params = {
+    role_id: role_id,
+    enable: enable
+  }
+  return request({
+    url: '/api/role/setstatus',
+    method: 'post',
+    params: params
+  })
 }
 
 export function getEditPurviewInitData(role_id) {
-    const params = {
-        role_id: role_id,
-    }
-    return request({
-        url: '/role/purview/editinit',
-        method: 'get',
-        params: params,
-    })
+  const params = {
+    role_id: role_id
+  }
+  return request({
+    url: '/role/purview/editinit',
+    method: 'get',
+    params: params
+  })
 }
 
-export function editPurview(role_id, purview_ids) {
-    const params = {
-        role_id: role_id,
-        purview_ids: purview_ids,
-    }
-    return request({
-        url: '/role/purview/edit',
-        method: 'post',
-        params: params,
-    })
+export function editPurview(role_id, purview_ids, func_purview_ids) {
+  const params = {
+    role_id: role_id,
+    purview_ids: purview_ids,
+    func_purview_ids: func_purview_ids
+  }
+  return request({
+    url: '/role/purview/edit',
+    method: 'post',
+    params: params
+  })
 }
 
-
 export function getRolesList() {
   return request({
     url: '/api/roles/list',
-    method: 'get',
+    method: 'get'
   })
 }
 
 export function getStaffsList() {
   return request({
     url: '/api/staff',
-    method: 'get',
+    method: 'get'
   })
 }
 
-
-export function AddUserRole(params){
+export function AddUserRole(params) {
   return request({
-    url:'/api/role/addStaff',
-    method:'post',
-    params:params,
+    url: '/api/role/addStaff',
+    method: 'post',
+    params: params
   })
 }
 
-
-
 export function getRoleStaff() {
   return request({
     url: '/api/role/staff',
-    method: 'get',
+    method: 'get'
   })
 }
 

src/router/modules/systems.js

@@ -59,14 +59,14 @@ export default {
     hidden: true,
     is_menu: false
   },
-  {
-    path: '/role/admin/specialpermission',
-    component: () => import('@/xt_pages/role/special_permission'),
-    name: 'special_permission_manage',
-    meta: {
-      title: 'special_permission_manage'
-    }
-  },
+  // {
+  //   path: '/role/admin/specialpermission',
+  //   component: () => import('@/xt_pages/role/special_permission'),
+  //   name: 'special_permission_manage',
+  //   meta: {
+  //     title: 'special_permission_manage'
+  //   }
+  // },
   {
     path: '/data/dictionary',
     component: () => import('@/xt_pages/data/index'),

src/views/layout/components/Navbar.vue

@@ -53,7 +53,7 @@
             </el-dropdown-item>
             <el-dropdown-item divided command="logout">
               {{$t('navbar.logOut')}}
-              
+
             </el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
@@ -64,23 +64,19 @@
       </div>
     </el-menu>-->
     <div class="dropdownBox">
-      <el-dropdown trigger="click">
+      <el-dropdown trigger="click" @command="handleOrgCommand">
         <span class="el-dropdown-link">
-          {{this.$store.getters.xt_user.org.org_name}}
+          {{ org_name }}
           <i class="el-icon-arrow-down el-icon--right"></i>
         </span>
         <el-dropdown-menu slot="dropdown">
-          <el-dropdown-item icon="el-icon-plus">黄金糕</el-dropdown-item>
-          <el-dropdown-item icon="el-icon-circle-plus">狮子头</el-dropdown-item>
-          <el-dropdown-item icon="el-icon-circle-plus-outline">螺蛳粉</el-dropdown-item>
-          <el-dropdown-item icon="el-icon-check">双皮奶</el-dropdown-item>
-          <el-dropdown-item icon="el-icon-circle-check">蚵仔煎</el-dropdown-item>
+          <el-dropdown-item   icon="el-icon-plus" v-for="(item,index) in orgs" :key="index"  :command="item.id">{{item.org_name}}</el-dropdown-item>
         </el-dropdown-menu>
       </el-dropdown>
     </div>
     <div class="navRight">
-      <el-input placeholder="搜索患者透析号/姓名/首拼" prefix-icon="el-icon-search" v-model="input2"></el-input>
-      <div style="color: #b2b2b3;">通知中心</div>
+      <!-- <el-input placeholder="搜索患者透析号/姓名/首拼" prefix-icon="el-icon-search" v-model="input2"></el-input>
+      <div style="color: #b2b2b3;">通知中心</div> -->
       <div class="right-menu">
         <el-dropdown
           class="avatar-container right-menu-item"
@@ -89,18 +85,30 @@
         >
           <div class="avatar-wrapper">
             <img class="user-avatar" :src="avater" />
-            <span class="user-title">{{ this.$store.getters.xt_user.user.user_name }}</span>
+            <span class="user-title">{{
+              this.$store.getters.xt_user.user.user_name
+            }}</span>
             <i class="el-icon-caret-bottom"></i>
           </div>
           <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item command="modifyUserInfoAction">修改个人信息</el-dropdown-item>
-            <el-dropdown-item command="modifyOrgInfoAction">机构信息</el-dropdown-item>
-            <el-dropdown-item divided command="logout">{{$t('navbar.logOut')}}</el-dropdown-item>
+            <el-dropdown-item command="modifyUserInfoAction"
+              >修改个人信息</el-dropdown-item
+            >
+            <el-dropdown-item command="modifyOrgInfoAction"
+              >机构信息</el-dropdown-item
+            >
+            <el-dropdown-item divided command="logout">{{
+              $t("navbar.logOut")
+            }}</el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
 
-        <modify-user-info-dialog ref="modify_user_info_dialog"></modify-user-info-dialog>
-        <modify-org-info-dialog ref="modify_org_info_dialog"></modify-org-info-dialog>
+        <modify-user-info-dialog
+          ref="modify_user_info_dialog"
+        ></modify-user-info-dialog>
+        <modify-org-info-dialog
+          ref="modify_org_info_dialog"
+        ></modify-org-info-dialog>
       </div>
       <div>
         <i class="el-icon-question"></i>
@@ -117,16 +125,26 @@ import { mapGetters } from "vuex";
 import Screenfull from "@/components/Screenfull";
 import ModifyUserInfoDialog from "@/xt_pages/home/modify_user_info_dialog";
 import ModifyOrgInfoDialog from "@/xt_pages/home/modifyOrgInfoDialog";
-
+import { getFiledConfigList, setFiledConfigList } from '@/utils/data_config' // getConfigList from sessionStorage
+import {
+  getAdminUserInfoCache,
+  cacheAdminUserInfo,
+  removeAdminUserInfoCache
+} from '@/utils/admin_info_cache'
+import {
+  getOrgs,changeOrg
+} from '@/api/config'
 export default {
   data() {
     return {
+      orgs:[],
+      org_id:this.$store.getters.xt_user.org.id,
+      org_name:this.$store.getters.xt_user.org.org_name,
+
       // scrm_role_exist: $store.getters.xt_user.scrm_role_exist
     };
   },
   components: {
-    // Breadcrumb,
-    // Hamburger,
     Screenfull,
     ModifyUserInfoDialog,
     ModifyOrgInfoDialog
@@ -141,9 +159,47 @@ export default {
     }
   },
   methods: {
-    // toggleSideBar() {
-    //   this.$store.dispatch("toggleSideBar");
-    // },
+    handleOrgCommand(org_id){
+      let params = {
+        org_id: org_id
+      }
+      changeOrg(params).then(response => {
+        if (response.data.state === 1) {
+          window.location.reload()
+
+          this.$message.success('切换成功')
+          let data = response.data.data
+          this.org_id = data.org.id
+          this.org_name = data.org.org_name
+
+          this.commit('SET_CURRENT_INFO', {
+            user: data.user,
+            cur_org_id: data.current_org_id,
+            cur_app_id: data.current_app_id,
+            org: data.org,
+            subscibe: data.subscibe,
+            template_info:data.template_info,
+          })
+
+          this.commit('SET_URLFORS', {
+            urlfors: data.urlfors
+          })
+
+          this.commit('SET_FILEDS', {
+            fileds: data.fileds
+          })
+          setFiledConfigList(JSON.stringify(data.fileds))
+          cacheAdminUserInfo(JSON.stringify(data))
+
+
+        }else{
+          this.$message.success(response.data.msg)
+        }
+      }).catch(e => {
+        // this.$message.success("网络异常")
+      });
+    },
+
     handleCommand(command) {
       switch (command) {
         case "modifyUserInfoAction":
@@ -190,7 +246,23 @@ export default {
       );
     }
   },
-  created() {}
+  created() {
+    this.org_id = 12
+
+    getOrgs().then(response => {
+      if (response.data.state === 1) {
+          this.orgs = response.data.data.orgs;
+          for (let i =0; i < this.orgs.length; i++){
+            if (this.orgs[i].id == this.org_id){
+              this.org_name = this.orgs[i].org_name
+            }
+          }
+      }
+    });
+
+
+
+  }
 };
 </script>
 
@@ -213,7 +285,7 @@ export default {
     display: flex;
     align-items: center;
     justify-content: space-between;
-    width: 540px;
+    width: 200px;
     margin-right: 10px;
     .right-menu {
       float: right;

src/xt_pages/role/components/AdminInfoForm.vue

@@ -138,7 +138,6 @@
         }
          // let localthis.$store.getters.xt_user.user.id
         let local_user_id = this.$store.getters.xt_user.user.id
-        local_user_id = 597
         this.form.id = this.admin_id
         if (this.admin_id === 0) {
           let tempForm = {
@@ -171,7 +170,7 @@
                 //如果当前用户是子管理员则，则需要将子管理员角色去除，因为子管理员不能添加子管理员
                 if(this.isSubSuperAdmin){
                   for (let i =0 ; i < this.roles.length; i++){
-                    if(this.roles[i].is_system == 1 && this.roles[i].role_name != "子管理员"){
+                    if(this.roles[i].is_system == 1 && this.roles[i].role_name == "子管理员"){
                       this.roles.splice(i, 1)
                       i--
                     }
@@ -181,6 +180,9 @@
 
 
 
+
+
+
                 // if (this.roles.length > 0) {
                 //   this.form.role = this.roles[0].id;
                 //   console.log("国庆快乐",this.form.role)
@@ -203,11 +205,17 @@
                 this.roles = []
                 this.roles.push(...resp.data.roles)
                 this.qntoken = resp.data.qntoken
+                var org = resp.data.org
+
 
                 var admin = resp.data.admin
                 this.form.name = admin.user_name
                 this.form.mobile = admin.admin.mobile
                 this.form.user_type = admin.user_type
+                if(admin.user_type == 1){
+
+                  this.form.user_type = ""
+                }
                 this.form.user_title = admin.user_title
                 this.form.role = admin.role_ids
                 this.form.role_ids = []
@@ -223,9 +231,9 @@
 
 
                 //如果当前用户是超级管理员而且编辑自己的信息
-                if(!this.isSubSuperAdmin && local_user_id == this.form.id){
+                if(this.isSubSuperAdmin || this.admin_id == org.creator){
                   for (let i =0 ; i < this.roles.length; i++){
-                    if(this.roles[i].is_system == 1 && this.roles[i].role_name != "子管理员"){
+                    if(this.roles[i].is_system == 1 && this.roles[i].role_name == "子管理员"){
                       this.roles.splice(i, 1)
                       i--
                     }
@@ -253,6 +261,11 @@
         }
         this.$refs.form.validate(valid => {
           if (valid) {
+            if(this.form.user_type == "" || this.form.user_type == 0 ){
+              this.$message.error("职称不能为空")
+              return
+            }
+
             this.loading = true
             if (this.form.id === 0) {
               this.form.role = this.form.role_ids.join(',')

src/xt_pages/role/components/EditRole.vue

@@ -18,7 +18,7 @@
       <el-radio v-model="checked" label="1">从已有员工中选择</el-radio>
       <el-radio v-model="checked" label="2">新增员工</el-radio>
     </div>
-    <div v-if="checked == '1'" class="roleContent">
+    <div v-if="checked == '1'"   v-loading="loading" class="roleContent">
       <div class="roleContentLeft">
         <p style="color:#303133">选择：</p>
         <div class="chooseBox">
@@ -49,7 +49,7 @@
         </div>
       </div>
 
-      <div class="roleContentRight">
+      <div class="roleContentRight" v-loading="loading">
         <p style="color:#303133">已选：</p>
         <div class="chooseBox">
           <div class="hasChoosedOne" v-for="(item,index) in is_check_admin_user" :key="index">
@@ -115,7 +115,7 @@
     </div>
     <div slot="footer" class="dialog-footer">
       <el-button @click="hide">取 消</el-button>
-      <el-button type="primary" @click="submitAction()">保 存</el-button>
+      <el-button type="primary" :loading="submitLoading" @click="submitAction()">保 存</el-button>
     </div>
   </el-dialog>
 </template>
@@ -146,6 +146,8 @@
       }
 
       return {
+        submitLoading:false,
+        loading:true,
         form: {
           id: 0,
           name: '',
@@ -268,9 +270,7 @@
           .then(rs => {
             var resp = rs.data
             if (resp.state === 1) {
-
               this.admin_user = resp.data.admins
-
               for (let i = 0; i < this.admin_user.length; i++) {
                 if (this.admin_user[i].role_ids.length > 0) {
                   let isExist = -1
@@ -279,12 +279,10 @@
                   if (isExist >= 0) {
                     this.is_check_admin_user.push(this.admin_user[i])
                     this.admin_user.splice(i, 1)
-
                     i = i - 1
                   }
                 }
               }
-
               for (let i = 0; i < this.admin_user.length; i++) {
                 if (this.admin_user[i].user_id == resp.data.org.creator) {
 
@@ -292,8 +290,12 @@
                   i = i - 1
                 }
               }
+              this.loading = false
+
             } else {
               this.$message.error(resp.msg)
+              this.loading = false
+
             }
           })
           .catch(err => {
@@ -312,6 +314,7 @@
       },
       show(role_id) {
         this.clear()
+        this.loading = true
         this.checked = '1'
         this.visible = true
         this.role_id = role_id
@@ -340,20 +343,30 @@
             id: this.role_id,
             ids: this.checkedCities.join(',')
           }
+          this.submitLoading = true
+
           AddUserRole(params).then(response => {
             if (response.data.state === 1) {
               this.$message.success('添加成功')
               this.$emit('did-edit-role')
               this.hide()
+              this.submitLoading = false
 
             } else {
+              this.submitLoading = false
+
               this.$message.error(response.data.msg)
 
             }
-          })
+          }).catch(e => {
+            this.submitLoading = false
+
+
+          });
         } else {
           this.$refs.form.validate(valid => {
             if (valid) {
+              this.submitLoading = true
               if (this.form.id === 0) {
                 this.ruleForm.role = this.role_id
                 addAdmin(
@@ -366,8 +379,11 @@
                   this.ruleForm.position
                 )
                   .then(rs => {
+                    this.submitLoading = false
+
                     var resp = rs.data
                     if (resp.state === 1) {
+
                       this.$store.dispatch('DidChangeAdmins')
                       var _this = this
                       setTimeout(() => {
@@ -387,11 +403,14 @@
                     }
                   })
                   .catch(err => {
+                    this.submitLoading = false
+
                     this.loading = false
                     this.$message.error(err)
                   })
               }
             } else {
+              this.submitLoading = false
               return false
             }
           })

src/xt_pages/role/components/PermissionSettings.vue

@@ -4,203 +4,343 @@
       <div class="roleName">
         <div class="roleNameLeft">
           <p>角色名称</p>
-          <el-input placeholder="请输入内容" v-model="input" :disabled="true"></el-input>
+          <el-input placeholder="请输入内容" v-model="role.name" :disabled="true"></el-input>
         </div>
-        <p style="color:#338AFB">删除该角色</p>
+        <p style="color:#338AFB" v-if="role.is_system == 0" @click="disableRoleAction(role.id)">删除该角色</p>
       </div>
-      <div class="roleMain">
-        <div class="roleMainLeft">
+      <div class="roleMain" >
+        <div class="roleMainLeft" >
           <p class="roletitle">选择权限</p>
           <div class="roleMainLeftBox">
             <!--<el-tree-->
-              <!--:props="defaultProps"-->
-              <!--:data="data"-->
-              <!--:default-checked-keys="data"-->
-              <!--node-key="id"-->
-              <!--ref="tree"-->
-              <!--default-expand-all-->
-              <!--show-checkbox-->
+            <!--:props="defaultProps"-->
+            <!--:data="data"-->
+            <!--:default-checked-keys="data"-->
+            <!--node-key="id"-->
+            <!--ref="tree"-->
+            <!--default-expand-all-->
+            <!--show-checkbox-->
             <!--&gt;-->
-              <!--&lt;!&ndash; <span class="custom-tree-node" slot-scope="{ node, data }">-->
-                                <!--<span>{{ data.name }}</span>-->
-              <!--</span>&ndash;&gt;-->
+            <!--&lt;!&ndash; <span class="custom-tree-node" slot-scope="{ node, data }">-->
+            <!--<span>{{ data.name }}</span>-->
+            <!--</span>&ndash;&gt;-->
             <!--</el-tree>-->
-            <el-tree :props="treeProps" :data="purviews" :default-checked-keys="default_checkeds" node-key="id" ref="tree" default-expand-all show-checkbox>
+            <el-tree  v-loading="loading" :props="treeProps" :data="purviews" :default-checked-keys="default_checkeds" node-key="id"
+                     ref="tree" default-expand-all show-checkbox>
                             <span class="custom-tree-node" slot-scope="{ node, data }">
                                 <span>{{ data.name }}</span>
                             </span>
             </el-tree>
           </div>
         </div>
-        <div class="roleMainRight">
-          <div class="hasChoose">已选择权限</div>
-          <el-tree :data="data" :props="defaultProps" @node-click="handleNodeClick"></el-tree>
-        </div>
+        <!--<div class="roleMainRight">-->
+        <!--<div class="hasChoose">已选择权限</div>-->
+        <!--<el-tree-->
+        <!--:props="treeProps" :data="check_purviews"   node-key="id" ref="tree" default-expand-all-->
+
+        <!--&gt;</el-tree>-->
+        <!--</div>-->
       </div>
     </div>
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="hide">取 消</el-button>
+      <el-button type="primary" @click="submitAction" :loading="submitLoading">保 存</el-button>
+    </div>
   </el-dialog>
 </template>
 
-
 <script>
-  import {getEditPurviewInitData, editPurview} from '@/api/role/role'
+  import { editPurview, getEditPurviewInitData, setRoleStatus } from '@/api/role/role'
 
   export default {
-  data() {
-    return {
-      visible: false,
-      role_id: 0,
-      purviews: [], // [{id, pid, name, childs}]
-      treeProps: {
-        label: "name",
-        children: "childs"
-      },
-      // role_purview_ids: '',
-      default_checkeds: [],
-      data: [
-        {
-          id: 1,
-          label: "一级 2",
-          children: [
-            {
-              id: 3,
-              label: "二级 2-1",
-              children: [
-                {
-                  id: 4,
-                  label: "三级 3-1-1"
-                },
-                {
-                  id: 5,
-                  label: "三级 3-1-2"
-                }
-              ]
-            },
-            {
-              id: 2,
-              label: "二级 2-2",
-              children: [
-                {
-                  id: 6,
-                  label: "三级 3-2-1"
-                },
-                {
-                  id: 7,
-                  label: "三级 3-2-2"
-                }
-              ]
-            }
-          ]
+    data() {
+      return {
+        visible: false,
+        loading: true,
+        submitLoading:false,
+        role_id: 0,
+        name: '',
+        role: {
+          name:"",
+        },
+        purviews: [],
+        treeProps: {
+          label: 'name',
+          children: 'childs'
+        },
+        default_checkeds: [],
+        check_purviews: [],
+        defaultProps: {
+          children: 'children',
+          label: 'label'
         }
-      ],
-      defaultProps: {
-        children: "children",
-        label: "label"
-      }
-    };
-  },
-  methods: {
-    show(role_id) {
-      this.visible = true;
-
-      var id = parseInt(role_id)
-      if (id <= 0) {
-        this.$message.error("参数错误")
-        return
       }
-      this.role_id = role_id
-      getEditPurviewInitData(this.role_id).then(rs => {
-        var resp = rs.data
-        if (resp.state === 1) {
-          this.purviews.push(...resp.data.purviews)
-          // 初始化默认选中项
-          var role_purview_ids = resp.data.role_purview_ids
-          var checkeds = []
-          if (role_purview_ids.length > 0) {
-            var ids = role_purview_ids.split(",")
-            this.purviews.forEach(purview => {
-              if (purview.childs != null && purview.childs.length > 0) {
-                purview.childs.forEach(child => {
-                  if (ids.indexOf(child.id+"") != -1) {
-                    checkeds.push(child.id)
+    },
+    methods: {
+      disableRoleAction: function(id) {
+        this.$msgbox({
+          title: '提示',
+          message: '是否确定要移除该角色',
+          showCancelButton: true,
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+          beforeClose: (action, instance, done) => {
+            if (action === "confirm") {
+
+              instance.confirmButtonLoading = true;
+              instance.confirmButtonText = "移除中...";
+              setRoleStatus(id, false)
+                .then(rs => {
+                  done();
+                  instance.confirmButtonLoading = false;
+                  const resp = rs.data
+                  if (resp.state === 1) {
+                    this.$emit('delete')
+                  } else {
+                    this.$message.error(resp.msg)
+                  }
+                })
+                .catch(err => {
+                  done();
+                  this.$message.error(err);
+                  instance.confirmButtonLoading = false;
+                })
+            }else{
+
+              done();
+            }
+          }
+        })
+      },
+
+      submitAction: function() {
+
+        if (this.role_id <= 0) {
+          return
+        }
+
+        var checkeds = this.$refs.tree.getCheckedKeys(true)
+
+        var ids = []
+        var func_ids = []
+
+        if (checkeds.length > 0) {
+          this.purviews.forEach(purview => {
+            if (purview.childs != null && purview.childs.length > 0) {
+              purview.childs.forEach(childs => {
+                if (childs.childs == null) {
+                  if (checkeds.indexOf(childs.id) != -1) {
+                    if (ids.indexOf(purview.id) == -1) {
+                      ids.push(purview.id)
+                    }
+                    ids.push(childs.id)
+
                   }
-                });
-              } else {
-                if (ids.indexOf(purview.id+"") != -1) {
-                  checkeds.push(purview.id)
+                } else {
+                  console.log(childs.name)
+                  if (childs.name == '透析记录') {
+
+                    childs.childs.forEach(child => {
+                      if (checkeds.indexOf(child.id) != -1) {
+                        if (func_ids.indexOf(childs.id) == -1) {
+                          func_ids.push(childs.id)
+                        }
+                        func_ids.push(child.id)
+                      }
+                    })
+                  } else {
+                    childs.childs.forEach(child => {
+                      if (checkeds.indexOf(child.id) != -1) {
+                        if (ids.indexOf(childs.id) == -1) {
+                          ids.push(childs.id)
+                        }
+                        ids.push(child.id)
+                      }
+                    })
+
+                  }
+
                 }
+              })
+
+            } else {
+              if (checkeds.indexOf(purview.id) != -1) {
+                ids.push(purview.id)
               }
-            });
+            }
+          })
+        }
+        var idsStr = ''
+        if (ids.length > 0) {
+          idsStr = ids.join(',')
+        }
+
+        var funcIdsStr = ''
+        if (func_ids.length > 0) {
+          funcIdsStr = func_ids.join(',')
+        }
+        this.submitLoading = true
+        editPurview(this.role_id, idsStr, funcIdsStr).then(rs => {
+          var resp = rs.data
+          this.submitLoading = false
+
+          if (resp.state === 1) {
+            this.hide()
+          } else {
+            this.$message.error(resp.msg)
           }
-          this.default_checkeds = checkeds
-        } else {
-          this.$message.error(resp.msg)
+        }).catch(err => {
+          this.submitLoading = false
+          this.$message.error(err)
+        })
+      },
+
+      show(role_id) {
+        this.loading = true
+        this.visible = true
+        this.default_checkeds = []
+        this.purviews = []
+
+
+
+        var id = parseInt(role_id)
+        if (id <= 0) {
+          this.$message.error('参数错误')
+          return
         }
-      }).catch(err => {
-        this.$message.error(err)
-      })
-    }
-  },created(){
+        this.role_id = role_id
+        getEditPurviewInitData(this.role_id).then(rs => {
+          var resp = rs.data
+          if (resp.state === 1) {
+            this.role = resp.data.role
+            this.purviews.push(...resp.data.purviews)
+            // 初始化默认选中项
+            var role_purview_ids = resp.data.role_purview_ids
+            var checkeds = []
+            if (role_purview_ids.length > 0) {
+              var ids = role_purview_ids.split(',')
+              this.purviews.forEach(purview => {
+                if (purview.childs != null && purview.childs.length > 0) {
+                  purview.childs.forEach(childs => {
+
+                    if (childs.childs != null && childs.childs.length > 0) {
+                      childs.childs.forEach(child => {
+                        if (ids.indexOf(child.id + '') != -1) {
+                          checkeds.push(child.id)
+                        }
+                      })
+
+                      }else{
+                      if (ids.indexOf(childs.id + '') != -1) {
+                        checkeds.push(childs.id)
+                      }
+                    }
+                  })
+
+                } else {
+                  if (ids.indexOf(purview.id + '') != -1) {
+                    checkeds.push(purview.id)
+                  }
+                }
+              })
+            }
+
+
+
+            this.$nextTick(() => {
+              this.default_checkeds = checkeds
+            })
+
+            this.loading = false
+
+          } else {
+            this.loading = false
+
+            this.$message.error(resp.msg)
+          }
+        }).catch(err => {
+          this.loading = false
+
+          this.$message.error(err)
+        })
+      },
+      hide() {
+        this.visible =false
 
+      }
+
+    }, created() {
 
-  },
-};
+    }
+  }
 </script>
 
 <style lang="scss" scoped>
-.roleSettings {
+  .roleSettings {
+
   .roleName {
     display: flex;
     align-items: center;
     justify-content: space-between;
   }
+
   .roleNameLeft {
     display: flex;
     align-items: center;
-    p {
-      width: 100px;
-    }
+
+  p {
+    width: 100px;
+  }
+
   }
   .roleMain {
     display: flex;
     justify-content: space-between;
     margin-top: 18px;
-    .roleMainLeft {
-      display: flex;
-      .roletitle {
-        width: 74px;
-      }
-      .roleMainLeftBox {
-        width: 300px;
-        height: 706px;
-        overflow-y: auto;
-        border: 1px solid rgba(234, 238, 240, 1);
-        border-radius: 4px;
-        padding: 20px 0 0 10px;
-      }
-    }
-    .roleMainRight {
-      width: 280px;
-      height: 706px;
-      overflow-y: auto;
-      border: 1px solid rgba(235, 238, 240, 1);
-      color: #303133;
-      .hasChoose {
-        height: 42px;
-        line-height: 42px;
-        padding-left: 20px;
-        background: #f6f8f9;
-      }
-    }
+
+  .roleMainLeft {
+    display: flex;
+
+  .roletitle {
+    width: 74px;
   }
-}
-</style>
 
+  .roleMainLeftBox {
+    width: 500px;
+    height: 706px;
+    overflow-y: auto;
+    border: 1px solid rgba(234, 238, 240, 1);
+    border-radius: 4px;
+    padding: 20px 0 0 10px;
+  }
+
+  }
+  .roleMainRight {
+    width: 280px;
+    height: 706px;
+    overflow-y: auto;
+    border: 1px solid rgba(235, 238, 240, 1);
+    color: #303133;
+
+  .hasChoose {
+    height: 42px;
+    line-height: 42px;
+    padding-left: 20px;
+    background: #f6f8f9;
+  }
+
+  }
+  }
+  }
+</style>
 
 <style lang="scss">
-.settingDialog {
+  .settingDialog {
+
   .el-dialog__body {
     max-height: 600px !important;
   }
-}
+
+  }
 </style>

src/xt_pages/role/components/UserManagement.vue

@@ -3,6 +3,7 @@
   <el-dialog class="userDialog" title="用户管理" width="660px" :visible.sync="visible">
     <div class="userManagement">
       <el-table
+        v-loading="loading"
         :row-style="{ color: '#303133' }"
         :header-cell-style="{
           backgroundColor: 'rgb(245, 247, 250)',
@@ -98,7 +99,7 @@
         admin_user: [],
         local_user_id: 0,
         org:null,
-
+        loading:false,
 
       }
     },
@@ -175,7 +176,11 @@
         return parseTime(time, format);
       },
       GetAllStaff: function() {
+        this.loading = true
+
         getRoleStaff().then(response => {
+          this.loading = false
+
           if (response.data.state === 1) {
             this.admin_user = response.data.data.admins
             this.org = response.data.data.org
@@ -192,10 +197,14 @@
               }
             }
           } else {
+
             this.$toast({
               message: response.data.msg
             })
           }
+        }).catch(err => {
+          this.loading = false
+          this.$message.error(err)
         })
       },
 

src/xt_pages/role/role.vue

@@ -11,7 +11,7 @@
         >新增</el-button
       >
     </div>
-    <div class="app-container">
+    <div class="app-container" v-loading="loading_roles">
       <!-- <el-table
         :data="roles"
         v-loading="loading_roles"
@@ -95,7 +95,7 @@
         @did-add-role="didAddRole"
       ></add-role>
 
-      <permission-settings ref="permission_settings"></permission-settings>
+      <permission-settings ref="permission_settings" @delete="deleteRole()"></permission-settings>
       <user-management ref="user_management"></user-management>
 
       <div class="roleTitle">
@@ -286,6 +286,9 @@ export default {
     },
     onClickManagement(role_id) {
       this.$refs.user_management.show(role_id);
+    },deleteRole(){
+      this.$refs.permission_settings.hide();
+      this.requestRoleWithPage(1);
     }
   }
 };

src/xt_permission.js

@@ -10,19 +10,19 @@ const permissionWhiteList = loginWhiteList.concat(["/"]); // 权限验证白名
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-    store.dispatch('VerifyConfigList', []).then(() => {
-      next()
-    })
-  }
-  if (store.getters.permission_routers === undefined) {
-    store.dispatch('xt_GenerateRoutes', []).then(() => {
-      next()
-    })
-  } else {
-    next()
-  }
-  return
+  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+  //   store.dispatch('VerifyConfigList', []).then(() => {
+  //     next()
+  //   })
+  // }
+  // if (store.getters.permission_routers === undefined) {
+  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
+  //     next()
+  //   })
+  // } else {
+  //   next()
+  // }
+  // return
   // 线上注释
 
   NProgress.start();