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"',

package-lock.json

@@ -4740,8 +4740,7 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -4764,15 +4763,13 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "resolved": false,
           "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
           "dev": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -4788,22 +4785,19 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "concat-map": {
           "version": "0.0.1",
           "resolved": false,
           "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "resolved": false,
           "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -4933,8 +4927,7 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ini": {
           "version": "1.3.5",
@@ -4948,7 +4941,6 @@
           "resolved": false,
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
           "dev": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -4965,7 +4957,6 @@
           "resolved": false,
           "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
           "dev": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -4973,15 +4964,13 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "minipass": {
           "version": "2.3.5",
           "resolved": false,
           "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -5002,7 +4991,6 @@
           "resolved": false,
           "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
           "dev": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -5090,8 +5078,7 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -5105,7 +5092,6 @@
           "resolved": false,
           "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -5200,8 +5186,7 @@
         "safe-buffer": {
           "version": "5.1.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -5243,7 +5228,6 @@
           "resolved": false,
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
           "dev": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -5265,7 +5249,6 @@
           "resolved": false,
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
           "dev": true,
-          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -5313,15 +5296,13 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "yallist": {
           "version": "3.0.3",
           "resolved": false,
           "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },

src/api/advice.js

@@ -30,11 +30,12 @@ export function EditDoctorAdvice(patient, id, advice) {
   })
 }
 
-export function ExecDoctorAdvice(patient, id, time) {
+export function ExecDoctorAdvice(patient, id, time,mode) {
   var params = {
     id: id,
     patient: patient,
-    execution_time: time
+    execution_time: time,
+    mode:mode
   }
   return request({
     url: '/api/patients/advice/exec',
@@ -42,10 +43,11 @@ export function ExecDoctorAdvice(patient, id, time) {
     params: params
   })
 }
-export function CheckDoctorAdvice(patient, id) {
+export function CheckDoctorAdvice(patient, id,mode) {
   var params = {
     id: id,
-    patient: patient
+    patient: patient,
+    mode:mode
     // execution_time: time,
   }
   return request({

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/dialysis.js

@@ -149,6 +149,7 @@ export function postPrescription(params) {
     url: '/api/dialysis/prescription',
     method: 'Post',
     params: params,
+    headers:{"Permission":2},
   })
 }
 
@@ -156,7 +157,9 @@ export function postSoulution(params) {
   return request({
     url: '/api/dialysis/soulution',
     method: 'Post',
-    params: params
+    params: params,
+    headers:{"Permission":3},
+
   })
 }
 
@@ -164,7 +167,9 @@ export function postDoubleCheck(params) {
   return request({
     url: '/api/dialysis/dobule',
     method: 'Post',
-    params: params
+    params: params,
+    headers:{"Permission":2},
+
   })
 }
 
@@ -172,7 +177,9 @@ export function postAccepts(params) {
   return request({
     url: '/api/dialysis/accepts',
     method: 'Post',
-    params: params
+    params: params,
+    headers:{"Permission":2},
+
   })
 }
 
@@ -180,7 +187,9 @@ export function postAssessmentBeforeDislysis(params) {
   return request({
     url: '/api/dialysis/assessmentbeforedislysis',
     method: 'Post',
-    params: params
+    params: params,
+    headers:{"Permission":2},
+
   })
 }
 
@@ -188,7 +197,9 @@ export function postTreatmentsummary(params) {
   return request({
     url: '/api/dialysis/treatmentsummary',
     method: 'Post',
-    params: params
+    params: params,
+    headers:{"Permission":2},
+
   })
 }
 
@@ -197,7 +208,9 @@ export function postAssessmentAfterDislysis(params, data) {
     url: '/api/dialysis/assessmentafterdislysis',
     method: 'Post',
     params: params,
-    data: data
+    data: data,
+    headers:{"Permission":2},
+
   })
 }
 
@@ -214,7 +227,9 @@ export function CreateGroupAdvice(id, groupno, advices) {
   return request({
     url: '/api/advice_remind/create?id=' + id + '&groupno=' + groupno,
     method: 'post',
-    data: advices
+    data: advices,
+    headers:{"Permission":2},
+
   })
 }
 
@@ -230,6 +245,8 @@ export function CreateDryWeight(params) {
   return request({
     url: '/api/dryweight/commit',
     method: 'post',
-    params: params
+    params: params,
+    headers:{"Permission":2},
+
   })
 }

src/api/dialysis_record.js

@@ -30,20 +30,23 @@ export function getDialysisScheduleDetail(patient_id, ymd) {
   })
 }
 
-export function editMonitor(patient_id, schedule_date, data) {
+export function editMonitor(patient_id, schedule_date, data,mode) {
   var params = {
     patient_id: patient_id,
-    schedule_date: schedule_date
+    schedule_date: schedule_date,
+    mode:mode
   }
   return request({
     url: '/api/dislysis/monitor/edit',
     method: 'post',
     params: params,
-    data: data
+    data: data,
+    headers:{"Permission":2},
+
   })
 }
 
-export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, lood_drawing, puncture_nurse_id, start_time,schedual_type) {
+export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, lood_drawing, puncture_nurse_id, start_time,schedual_type,mode) {
   var params = {
     patient_id: patient_id,
     date: schedule_date,
@@ -53,25 +56,31 @@ export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, lood_
     start_time: start_time,
     lood_drawing: lood_drawing,
     schedual_type:schedual_type,
+    mode:mode,
   }
   return request({
     url: '/api/dialysis/start_record',
     method: 'post',
-    params: params
+    params: params,
+    headers:{"Permission":2},
+
   })
 }
 
-export function finishDialysis(patient_id, schedule_date,end_time, nurse_id) {
+export function finishDialysis(patient_id, schedule_date,end_time, nurse_id,mode) {
   var params = {
     patient_id: patient_id,
     date: schedule_date,
     nurse: nurse_id,
     end_time:end_time,
+    mode:mode,
   }
   return request({
     url: '/api/dialysis/finish',
     method: 'post',
-    params: params
+    params: params,
+    headers:{"Permission":2},
+
   })
 }
 
@@ -79,7 +88,9 @@ export function postDelMonitorInfo(params) {
   return request({
     url: '/api/dialysis/monitor/del',
     method: 'post',
-    params: params
+    params: params,
+    headers:{"Permission":2},
+
   })
 }
 
@@ -111,6 +122,8 @@ export function PostModifyStartDialysis(params) {
     url:'/api/start_dialysis/modify',
     method:'Post',
     params:params,
+    headers:{"Permission":2},
+
   })
 }
 
@@ -125,6 +138,8 @@ export function PostModifyFinishDialysis(params) {
     url:'/api/finish_dialysis/modify',
     method:'Post',
     params:params,
+    headers:{"Permission":2},
+
   })
 }
 

src/api/patient.js

@@ -57,19 +57,24 @@ export function fetchPatientDialysisSolutions(params) {
   })
 }
 
-export function createPatientDialysisSolution(id, solution) {
+export function createPatientDialysisSolution(id, solution,mode) {
   return request({
-    url: '/api/patients/dialysissolution/create?patient=' + id,
+    url: '/api/patients/dialysissolution/create?patient=' + id +"&mode="+mode,
     method: 'post',
-    data: solution
+    data: solution,
+    headers:{"Permission":2},
+
+
   })
 }
 
-export function editPatientDialysisSolution(patient, id, solution) {
+export function editPatientDialysisSolution(patient, id, solution,mode) {
   return request({
-    url: '/api/patients/dialysissolution/edit?patient=' + patient + '&id=' + id,
+    url: '/api/patients/dialysissolution/edit?patient=' + patient + '&id=' + id+"&mode="+mode,
     method: 'put',
-    data: solution
+    data: solution,
+    headers:{"Permission":2},
+
   })
 }
 

src/api/role/admin.js

@@ -25,14 +25,15 @@ export function getAddAdminInitData() {
     })
 }
 
-export function addAdmin(mobile, name, type, title, role, intro) {
+export function addAdmin(mobile, name, type, title, role, intro,user_title_name) {
     const params = {
         mobile: mobile,
-        name: name, 
-        type: type, 
-        title: title, 
-        role: role, 
+        name: name,
+        type: type,
+        title: title,
+        role: role,
         intro: intro,
+        user_title_name: user_title_name
     }
     return request({
         url: '/api/admin/add',
@@ -52,14 +53,16 @@ export function getModifyAdminInitData(uid) {
     })
 }
 
-export function modifyAdmin(uid, name, type, title, role, intro) {
+export function modifyAdmin(uid, name, type, title, role, intro,user_title_name) {
     const params = {
         uid: uid,
-        name: name, 
-        type: type, 
-        title: title, 
-        role: role, 
+        name: name,
+        type: type,
+        title: title,
+        role: role,
         intro: intro,
+      user_title_name: user_title_name
+
     }
     return request({
         url: '/api/admin/edit',
@@ -96,4 +99,4 @@ export function submitDialysisRecordPermissionUsers(ids_str) {
         method: 'post',
         params: params,
     })
-}
+}

src/api/role/role.js

@@ -1,72 +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, 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'
+  })
+}
+
+export function getStaffsList() {
+  return request({
+    url: '/api/staff',
+    method: 'get'
+  })
+}
+
+export function AddUserRole(params) {
+  return request({
+    url: '/api/role/addStaff',
+    method: 'post',
+    params: params
+  })
+}
+
+export function getRoleStaff() {
+  return request({
+    url: '/api/role/staff',
+    method: 'get'
+  })
 }
 
-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,
-    })
-}

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,21 +64,13 @@
       </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>
@@ -133,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
@@ -157,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":
@@ -206,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>
 

src/xt_pages/dialysis/details/dialog/AssessmentAfterDislysis.vue

@@ -582,6 +582,13 @@ export default {
 
         ParamsQuery['patient'] = this.patient.id
         ParamsQuery['record_date'] = this.record_date
+        ParamsQuery['mode'] = "1"
+        if(this.assessment_after_dislysis.creater > 0){
+          ParamsQuery['mode'] = "2"
+          if(this.assessment_after_dislysis.creater != this.$store.getters.xt_user.user.id){
+            ParamsQuery['mode'] = "3"
+          }
+        }
 
         const data = {}
         data['weight_after'] = this.form.weight_after ? parseFloat(this.form.weight_after) : 0

src/xt_pages/dialysis/details/dialog/DoctorAdviceDialog.vue

@@ -271,7 +271,6 @@
   import {
     CheckDoctorAdvice,
     CreateDoctorAdvice,
-    CreateGroupAdvice,
     DeleteDoctorAdvice,
     DeleteGroupAdvice,
     EditDoctorAdvice,
@@ -471,71 +470,71 @@
         })
       },
 
-      submitGroupAdvice() {
-        if (this.groupForm.start_time.length == 0) {
-          this.$message.error('请选择开始时间')
-          return
-        }
-        CreateGroupAdvice(this.patient.id, this.groupForm).then(response => {
-          if (response.data.state == 0) {
-            this.$message.error(response.data.msg)
-            return false
-          } else {
-            this.$notify({
-              title: '成功',
-              message: '新增成功',
-              type: 'success',
-              duration: 2000
-            })
-            this.currentIndex = -1
-            this.currentRow = null
-            this.setCurrent()
-            this.hideGroupForm()
-            for (const index in response.data.data.advices) {
-              this.doctor_advices.unshift(response.data.data.advices[index])
-            }
-            this.groupForm = {
-              advice_type: 2,
-              advice_date: '',
-              start_time: '',
-              adviceNames: [],
-              advice_doctor: '',
-              remark: '',
-              parent_id: 0
-            }
-            return false
-          }
-        })
-      },
-      submitTempForm() {
-        var _this = this
-        if (this.templateForm.id.length == 0) {
-          this.$message.error('请选择医嘱模板')
-          return
-        }
-        if (_this.templateForm.id in _this.adviceTemplateMaps) {
-          var mapid = _this.templateForm.id
-          for (const index in _this.adviceTemplateMaps[mapid].DoctorAdviceTemplate) {
-            var item = {
-              advice_name: _this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].advice_name,
-              single_dose: _this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].single_dose,
-              single_dose_unit: _this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].single_dose_unit,
-              drug_spec: _this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].drug_spec,
-              drug_spec_unit: _this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].drug_spec_unit,
-              prescribing_number: _this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].prescribing_number,
-              prescribing_number_unit: _this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].prescribing_number_unit,
-              delivery_way: _this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].delivery_way,
-              execution_frequency: _this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].execution_frequency,
-              isEdit: 0,
-              index: 0
-            }
-            _this.groupForm.adviceNames.push(item)
-          }
-        }
-        this.title = '新增医嘱'
-        this.showTemplateForm = false
-        this.showGroupForm = true
-      },
+      // submitGroupAdvice() {
+      //   if (this.groupForm.start_time.length == 0) {
+      //     this.$message.error('请选择开始时间')
+      //     return
+      //   }
+      //   CreateGroupAdvice(this.patient.id, this.groupForm).then(response => {
+      //     if (response.data.state == 0) {
+      //       this.$message.error(response.data.msg)
+      //       return false
+      //     } else {
+      //       this.$notify({
+      //         title: '成功',
+      //         message: '新增成功',
+      //         type: 'success',
+      //         duration: 2000
+      //       })
+      //       this.currentIndex = -1
+      //       this.currentRow = null
+      //       this.setCurrent()
+      //       this.hideGroupForm()
+      //       for (const index in response.data.data.advices) {
+      //         this.doctor_advices.unshift(response.data.data.advices[index])
+      //       }
+      //       this.groupForm = {
+      //         advice_type: 2,
+      //         advice_date: '',
+      //         start_time: '',
+      //         adviceNames: [],
+      //         advice_doctor: '',
+      //         remark: '',
+      //         parent_id: 0
+      //       }
+      //       return false
+      //     }
+      //   })
+      // },
+      // submitTempForm() {
+      //   var _this = this
+      //   if (this.templateForm.id.length == 0) {
+      //     this.$message.error('请选择医嘱模板')
+      //     return
+      //   }
+      //   if (_this.templateForm.id in _this.adviceTemplateMaps) {
+      //     var mapid = _this.templateForm.id
+      //     for (const index in _this.adviceTemplateMaps[mapid].DoctorAdviceTemplate) {
+      //       var item = {
+      //         advice_name: _this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].advice_name,
+      //         single_dose: _this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].single_dose,
+      //         single_dose_unit: _this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].single_dose_unit,
+      //         drug_spec: _this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].drug_spec,
+      //         drug_spec_unit: _this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].drug_spec_unit,
+      //         prescribing_number: _this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].prescribing_number,
+      //         prescribing_number_unit: _this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].prescribing_number_unit,
+      //         delivery_way: _this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].delivery_way,
+      //         execution_frequency: _this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].execution_frequency,
+      //         isEdit: 0,
+      //         index: 0
+      //       }
+      //       _this.groupForm.adviceNames.push(item)
+      //     }
+      //   }
+      //   this.title = '新增医嘱'
+      //   this.showTemplateForm = false
+      //   this.showGroupForm = true
+      // },
       openAdviceTemplate() {
         this.templateForm = { id: '' }
         this.title = '选择医嘱模板'
@@ -952,7 +951,9 @@
           type: 'warning'
         }).then(() => {
           this.deleLoading = true
-          CheckDoctorAdvice(this.patient.id, this.currentRow.id).then(response => {
+          let mode = "7"
+
+          CheckDoctorAdvice(this.patient.id, this.currentRow.id,mode).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)
 

src/xt_pages/dialysis/details/dialog/acceptsTreatmentDialog.vue

@@ -235,6 +235,15 @@
         let ParamsQuery = this.receiveTreatmentAsses
         ParamsQuery['patient'] = this.patient.id
         ParamsQuery['record_date'] = this.record_date
+        console.log(this.receiver_treatment_access)
+        ParamsQuery['mode'] = "1"
+        if(this.receiver_treatment_access.id > 0){
+          ParamsQuery['mode'] = "2"
+          if(this.$store.getters.xt_user.user.id != this.receiver_treatment_access.creater){
+            ParamsQuery['mode'] = "3"
+          }
+        }
+
         postAccepts(ParamsQuery).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)

src/xt_pages/dialysis/details/dialog/assessmentBeforeDislysisDialog.vue

@@ -761,6 +761,15 @@
         const ParamsQuery = this.assessmentBeforeDislysis
         ParamsQuery['patient'] = this.patient.id
         ParamsQuery['record_date'] = this.record_date
+        ParamsQuery['mode'] = 1
+        console.log(this.predialysis_evaluation)
+        if (this.predialysis_evaluation.creator > 0){
+          ParamsQuery['mode'] = 2
+          if(this.predialysis_evaluation.creator != this.$store.getters.xt_user.user.id){
+            ParamsQuery['mode'] = 3
+          }
+        }
+
         postAssessmentBeforeDislysis(ParamsQuery).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)

src/xt_pages/dialysis/details/dialog/computer_dialog.vue

@@ -5,26 +5,27 @@
 
         <el-form-item label="班次">
           <el-select v-model="schedual_type" placeholder="请选择班次" @change="changeSchedualType">
-            <el-option v-for="(item, index) in schedules_type" :key="index" :value="item.id" :label="item.name" ></el-option>
+            <el-option v-for="(item, index) in schedules_type" :key="index" :value="item.id"
+                       :label="item.name"></el-option>
           </el-select>
         </el-form-item>
 
         <el-form-item label="上机床位">
-          <el-select v-model="form.bed_id" placeholder="请选择上机床位" >
+          <el-select v-model="form.bed_id" placeholder="请选择上机床位">
             <el-option v-for="(bed, index) in zone_beds" :key="index" :value="bed.id" :label="bed.number"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="上机护士">
-          <el-select v-model="form.nurse_id" placeholder="请选择上机护士" >
+          <el-select v-model="form.nurse_id" placeholder="请选择上机护士">
             <el-option v-for="(admin, index) in admins" :key="index" :value="admin.id" :label="admin.name"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="穿刺护士">
-          <el-select v-model="form.puncture_nurse_id" placeholder="请选择穿刺护士" >
+          <el-select v-model="form.puncture_nurse_id" placeholder="请选择穿刺护士">
             <el-option v-for="(admin, index) in admins" :key="index" :value="admin.id" :label="admin.name"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="引血(ml/min)" v-if="template_id == 6" >
+        <el-form-item label="引血(ml/min)" v-if="template_id == 6">
           <el-input type="number" v-model="form.blood_drawing" style="width:200px;"></el-input>
         </el-form-item>
 
@@ -41,7 +42,10 @@
         <el-form-item>
           <el-button v-if="dialysis_order.id == 0" @click="submit" type="primary" :loading="loading">执行上机</el-button>
           <el-button v-else type="info" :disabled="true">已上机</el-button>
-          <el-button v-if="dialysis_order.id > 0 && (isPremission || this.$store.getters.xt_user.user.id == this.creator)" type="primary" @click="editOrder">修改上机</el-button>
+          <el-button
+            v-if="dialysis_order.id > 0 && (isPremission || this.$store.getters.xt_user.user.id == this.creator)"
+            type="primary" @click="editOrder">修改上机
+          </el-button>
 
         </el-form-item>
       </el-form>
@@ -51,21 +55,21 @@
 </template>
 
 <script>
-  import { startDialysis,GetSchedualNumber,PostModifyStartDialysis } from '@/api/dialysis_record'
+  import { GetSchedualNumber, PostModifyStartDialysis, startDialysis } from '@/api/dialysis_record'
   import { parseTime } from '@/utils'
 
   export default {
     name: 'ComputerDialog',
     data() {
       return {
-        zone_beds:[],
+        zone_beds: [],
         visible: false,
         loading: false,
         template_id: 0,
         patient_id: 0,
         schedule_date: 0,
         start_time: 0,
-        creator:0,
+        creator: 0,
         form: {
           bed_id: '',
           nurse_id: '',
@@ -73,13 +77,13 @@
           puncture_nurse_id: '',
           blood_drawing: 100
         },
-        schedual_type:0,
+        schedual_type: 0,
         schedules_type: [
-          {id: 1, name:"上午"},
-          {id: 2, name:"下午"},
-          {id: 3, name:"晚上"},
+          { id: 1, name: '上午' },
+          { id: 2, name: '下午' },
+          { id: 3, name: '晚上' }
         ], // 该排班的区里的床位
-        isPremission:false,
+        isPremission: false
       }
     },
     props: {
@@ -96,12 +100,9 @@
         type: Array
       },
       special_premission: {
-        type: Array,
-      },
-    },mounted(){
-
-
-
+        type: Array
+      }
+    }, mounted() {
 
     },
     created() {
@@ -115,20 +116,12 @@
         this.form.puncture_nurse_id = this.$store.getters.xt_user.user.id
       }
 
-
-
-
-
-
-
     },
     watch: {
       'schedule.id': function() {
       },
       'dialysis_order.id': function() {
 
-
-
         this.form.nurse_id = this.dialysis_order.id == 0 ? this.$store.getters.xt_user.user.id : this.dialysis_order.start_nurse
         this.form.puncture_nurse_id = this.dialysis_order.id == 0 ? this.$store.getters.xt_user.user.id : this.dialysis_order.puncture_nurse
 
@@ -147,28 +140,11 @@
           (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + (nowHours < 10 ? '0' + nowHours : nowHours) + ':' + (nowMinutes < 10 ? '0' + nowMinutes : nowMinutes)
         this.form.start_time = this.dialysis_order.id == 0 ? time : this.getTime(this.dialysis_order.start_time, '{y}-{m}-{d} {h}:{i}')
 
-
-
-
-
-
-
-
       }
     },
-    computed: {
-      // zone_beds: function() {
-      //   var beds = []
-      //   for (let index = 0; index < this.device_numbers.length; index++) {
-      //     const device_number = this.device_numbers[index]
-      //     beds.push(device_number)
-      //   }
-      //   console.log(this.device_numbers)
-      //   return beds
-      // }
-    },
+    computed: {},
     methods: {
-      changeSchedualType:function(schedual_type){
+      changeSchedualType: function(schedual_type) {
         let ParamsQuery = {}
         ParamsQuery['schedual_type'] = schedual_type
         GetSchedualNumber(ParamsQuery).then(response => {
@@ -178,7 +154,7 @@
             this.temp_device_numbers = response.data.data.number
             for (let index = 0; index < this.temp_device_numbers.length; index++) {
               const device_number = this.temp_device_numbers[index]
-              this.temp_device_numbers[index]['number'] = device_number['zone_name']+'-'+device_number['number']
+              this.temp_device_numbers[index]['number'] = device_number['zone_name'] + '-' + device_number['number']
             }
             this.zone_beds = this.temp_device_numbers
             this.form.bed_id = this.zone_beds[0].id
@@ -187,7 +163,7 @@
         })
 
       },
-      GetSchedualNumber:function(){
+      GetSchedualNumber: function() {
         let ParamsQuery = {}
         ParamsQuery['schedual_type'] = this.schedual_type
         GetSchedualNumber(ParamsQuery).then(response => {
@@ -198,32 +174,32 @@
             this.temp_device_numbers = response.data.data.number
             for (let index = 0; index < this.temp_device_numbers.length; index++) {
               const device_number = this.temp_device_numbers[index]
-              this.temp_device_numbers[index]['number'] = device_number['zone_name']+'-'+device_number['number']
+              this.temp_device_numbers[index]['number'] = device_number['zone_name'] + '-' + device_number['number']
             }
             this.zone_beds = this.temp_device_numbers
 
             this.form.bed_id = this.dialysis_order.id == 0 ? this.schedule.bed_id : this.dialysis_order.bed_id
-            if(this.dialysis_order.id == 0) {
+            if (this.dialysis_order.id == 0) {
               let isFilter = true
               for (let i = 0; i < this.zone_beds.length; i++) {
-                if(this.zone_beds[i].id == this.schedule.bed_id ){
+                if (this.zone_beds[i].id == this.schedule.bed_id) {
                   isFilter = false
 
                 }
               }
-              if(isFilter){
+              if (isFilter) {
                 this.form.bed_id = this.zone_beds[0].id
               }
-            }else{
-              for (let i = 0; i < this.device_numbers.length; i++){
-                if (this.device_numbers[i].id == this.dialysis_order.bed_id){
+            } else {
+              for (let i = 0; i < this.device_numbers.length; i++) {
+                if (this.device_numbers[i].id == this.dialysis_order.bed_id) {
                   let obj = {}
                   obj = this.device_numbers[i]
-                  if(obj['number'].indexOf(this.device_numbers[i]['zone_name']) == -1) {
-                    obj['number'] = this.device_numbers[i]['zone_name'] + "-" + this.device_numbers[i]['number']
+                  if (obj['number'].indexOf(this.device_numbers[i]['zone_name']) == -1) {
+                    obj['number'] = this.device_numbers[i]['zone_name'] + '-' + this.device_numbers[i]['number']
                   }
                   this.zone_beds.unshift(obj)
-                  this.zone_beds.sort((a, b) => a.id -b.id)
+                  this.zone_beds.sort((a, b) => a.id - b.id)
                 }
               }
             }
@@ -261,15 +237,14 @@
         if (this.dialysis_order.id == 0) {
           let now = new Date()
           let hour = now.getHours()
-          if (hour >= 6 && hour < 12){
+          if (hour >= 6 && hour < 12) {
             this.schedual_type = 1
 
-          }else if(hour >= 12 && hour < 18){
+          } else if (hour >= 12 && hour < 18) {
 
             this.schedual_type = 2
 
-
-          }else if(hour >= 18){
+          } else if (hour >= 18) {
             this.schedual_type = 3
           }
         } else {
@@ -277,7 +252,6 @@
           this.schedual_type = this.dialysis_order.schedual_type
         }
 
-
         if (this.dialysis_order.id > 0) {
           for (let i = 0; i < this.special_premission.length; i++) {
             if (this.$store.getters.xt_user.user.id == this.special_premission[i].admin_user_id) {
@@ -300,12 +274,15 @@
         this.visible = false
       },
       submit: function() {
-        if(this.form.start_time == "" || this.form.start_time == null){
-          this.$message.error("开始时间不能为空")
+        if (this.form.start_time == '' || this.form.start_time == null) {
+          this.$message.error('开始时间不能为空')
           return
         }
+        console.log(this.dialysis_order)
         this.loading = true
-        startDialysis(this.patient_id, parseTime(this.schedule_date, '{y}-{m}-{d}'), this.form.nurse_id, this.form.bed_id, this.form.lood_drawing, this.form.puncture_nurse_id, this.form.start_time,this.schedual_type).then(rs => {
+        let mode = '1'
+
+        startDialysis(this.patient_id, parseTime(this.schedule_date, '{y}-{m}-{d}'), this.form.nurse_id, this.form.bed_id, this.form.lood_drawing, this.form.puncture_nurse_id, this.form.start_time, this.schedual_type, mode).then(rs => {
           this.loading = false
           var resp = rs.data
           if (resp.state == 1) {
@@ -315,24 +292,29 @@
               this.$set(this_order, key, resp_dialysis_order[key])
             }
             this.hide()
-            this.$emit('monitor',  resp.data.monitor)
-            this.$message.success("上机成功")
+            this.$emit('monitor', resp.data.monitor)
+            this.$message.success('上机成功')
           } else {
             this.$message.error(resp.msg)
           }
         })
-      }, editOrder(){
+      }, editOrder() {
         let ParamsQuery = {}
         ParamsQuery['schedual_type'] = this.schedual_type
         ParamsQuery['id'] = this.dialysis_order.id
         ParamsQuery['nurse'] = this.form.nurse_id
         ParamsQuery['bed'] = this.form.bed_id
-        ParamsQuery['start_time'] =  this.form.start_time
+        ParamsQuery['start_time'] = this.form.start_time
         ParamsQuery['puncture_nurse'] = this.form.puncture_nurse_id
+
+        ParamsQuery['mode'] = "2"
+        if (this.dialysis_order.creator != this.$store.getters.xt_user.user.id) {
+          ParamsQuery['mode'] = "3"
+        }
         PostModifyStartDialysis(ParamsQuery).then(rs => {
           var resp = rs.data
           if (resp.state == 1) {
-            this.$message.success("修改成功")
+            this.$message.success('修改成功')
 
             var resp_dialysis_order = resp.data.dialysis_order
             var this_order = this.dialysis_order
@@ -346,7 +328,7 @@
             this.$message.error(resp.msg)
           }
         })
-      },
+      }
 
     }
   }

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -836,7 +836,10 @@
 
           no_anticoagulant_shouji: '0',
           no_anticoagulant_weichi: '0',
-          no_anticoagulant_zongliang: '0'
+          no_anticoagulant_zongliang: '0',
+
+
+          creater:0,
 
         },
 
@@ -995,6 +998,15 @@
             ParamsQuery['patient'] = this.patient.id
             ParamsQuery['record_date'] = this.record_date
 
+            console.log(this.prescription)
+
+            if(this.prescription.creater <= 0){
+              mode = 1
+            }else {
+              mode = 2
+            }
+
+
             postPrescription(ParamsQuery).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
@@ -1105,6 +1117,14 @@
             const ParamsQuery = this.dialysisPrescription
             ParamsQuery['patient'] = this.patient.id
             ParamsQuery['record_date'] = this.record_date
+            console.log(this.prescription)
+
+            if(this.prescription.creater <= 0){
+              mode = 1
+            }else {
+              mode = 2
+            }
+
 
             postPrescription(ParamsQuery).then(response => {
               if (response.data.state == 0) {
@@ -1243,6 +1263,14 @@
             const ParamsQuery = this.dialysisPrescription
             ParamsQuery['patient'] = this.patient.id
             ParamsQuery['record_date'] = this.record_date
+            console.log(this.prescription)
+
+            if(this.prescription.creater <= 0){
+              mode = 1
+            }else {
+              mode = 2
+            }
+
 
             postPrescription(ParamsQuery).then(response => {
               if (response.data.state == 0) {
@@ -1280,6 +1308,14 @@
               const ParamsQuery = this.dialysisPrescription
               ParamsQuery['patient'] = this.patient.id
               ParamsQuery['record_date'] = this.record_date
+              console.log(this.prescription)
+
+              if(this.prescription.creater <= 0){
+                mode = 1
+              }else {
+                mode = 2
+              }
+
 
               postPrescription(ParamsQuery).then(response => {
                 if (response.data.state == 0) {
@@ -1333,6 +1369,14 @@
               const ParamsQuery = this.dialysisPrescription
               ParamsQuery['patient'] = this.patient.id
               ParamsQuery['record_date'] = this.record_date
+              console.log(this.prescription)
+
+              if(this.prescription.creater <= 0){
+                mode = 1
+              }else {
+                mode = 2
+              }
+
 
               postPrescription(ParamsQuery).then(response => {
                 if (response.data.state == 0) {
@@ -1365,6 +1409,14 @@
               const ParamsQuery = this.dialysisPrescription
               ParamsQuery['patient'] = this.patient.id
               ParamsQuery['record_date'] = this.record_date
+              console.log(this.prescription)
+
+              if(this.prescription.creater <= 0){
+                mode = 1
+              }else {
+                mode = 2
+              }
+
 
               postPrescription(ParamsQuery).then(response => {
                 if (response.data.state == 0) {
@@ -1401,6 +1453,14 @@
               const ParamsQuery = this.dialysisPrescription
               ParamsQuery['patient'] = this.patient.id
               ParamsQuery['record_date'] = this.record_date
+              console.log(this.prescription)
+
+              if(this.prescription.creater <= 0){
+                mode = 1
+              }else {
+                mode = 2
+              }
+
 
               postPrescription(ParamsQuery).then(response => {
                 if (response.data.state == 0) {
@@ -1438,6 +1498,14 @@
                 const ParamsQuery = this.dialysisPrescription
                 ParamsQuery['patient'] = this.patient.id
                 ParamsQuery['record_date'] = this.record_date
+                console.log(this.prescription)
+
+                if(this.prescription.creater <= 0){
+                  mode = 1
+                }else {
+                  mode = 2
+                }
+
 
                 postPrescription(ParamsQuery).then(response => {
                   if (response.data.state == 0) {
@@ -1491,6 +1559,14 @@
                 const ParamsQuery = this.dialysisPrescription
                 ParamsQuery['patient'] = this.patient.id
                 ParamsQuery['record_date'] = this.record_date
+                console.log(this.prescription)
+
+                if(this.prescription.creater <= 0){
+                  mode = 1
+                }else {
+                  mode = 2
+                }
+
 
                 postPrescription(ParamsQuery).then(response => {
                   if (response.data.state == 0) {
@@ -1523,6 +1599,14 @@
                 const ParamsQuery = this.dialysisPrescription
                 ParamsQuery['patient'] = this.patient.id
                 ParamsQuery['record_date'] = this.record_date
+                console.log(this.prescription)
+
+                if(this.prescription.creater <= 0){
+                  mode = 1
+                }else {
+                  mode = 2
+                }
+
 
                 postPrescription(ParamsQuery).then(response => {
                   if (response.data.state == 0) {
@@ -1557,6 +1641,14 @@
             const ParamsQuery = this.dialysisPrescription
             ParamsQuery['patient'] = this.patient.id
             ParamsQuery['record_date'] = this.record_date
+            console.log(this.prescription)
+
+            if(this.prescription.creater <= 0){
+              mode = 1
+            }else {
+              mode = 2
+            }
+
 
             postPrescription(ParamsQuery).then(response => {
               if (response.data.state == 0) {
@@ -1708,6 +1800,14 @@
               const ParamsQuery = this.dialysisPrescription
               ParamsQuery['patient'] = this.patient.id
               ParamsQuery['record_date'] = this.record_date
+              console.log(this.prescription)
+
+              if(this.prescription.creater <= 0){
+                mode = 1
+              }else {
+                mode = 2
+              }
+
 
               postPrescription(ParamsQuery).then(response => {
                 if (response.data.state == 0) {

src/xt_pages/dialysis/details/dialog/finish_dialog.vue

@@ -169,6 +169,10 @@
         ParamsQuery["id"] = this.dialysis_order.id;
         ParamsQuery["nurse"] = this.form.nurse_id;
         ParamsQuery["end_time"] = this.end_time;
+        ParamsQuery["mode"] = "2"
+        if(this.dialysis_order.finish_creator  != this.$store.getters.xt_user.user.id){
+          ParamsQuery["mode"] = "3"
+        }
         PostModifyFinishDialysis(ParamsQuery).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
@@ -189,7 +193,8 @@
       },
       submit: function() {
         this.loading = true
-        finishDialysis(this.patient_id, parseTime(this.schedule_date, '{y}-{m}-{d}'), this.end_time, this.form.nurse_id).then(rs => {
+        let mode = "1"
+        finishDialysis(this.patient_id, parseTime(this.schedule_date, '{y}-{m}-{d}'), this.end_time, this.form.nurse_id,mode).then(rs => {
           this.loading = false
           var resp = rs.data
           if (resp.state == 1) {

src/xt_pages/dialysis/details/dialog/monitor_dialog.vue

@@ -961,11 +961,18 @@ export default {
         parseFloat(this.form.ktv) == NaN ? 0 : parseFloat(this.form.ktv);
       this.form.monitoring_date = parseInt(this.form.monitoring_date);
 
-      editMonitor(this.patient_id, this.schedule_date, this.form).then(rs => {
+
+      let mode = "1"
+       if(this.form.id > 0){
+         mode = "2"
+         if(this.form.creator > 0 && this.form.creator != this.$store.getters.xt_user.user.id){
+          mode = "3"
+         }
+      }
+      editMonitor(this.patient_id, this.schedule_date, this.form,mode).then(rs => {
         var resp = rs.data;
         if (resp.state == 1) {
           var monitor = resp.data.monitor;
-          console.log("monitor-----", monitor);
           if (this.isAdd) {
             this.monitors.unshift(monitor);
             this.monitors.sort((a, b) => b.operate_time - a.operate_time);

src/xt_pages/dialysis/details/dialog/treatmentSummaryDialog.vue

@@ -118,6 +118,13 @@ export default {
         const ParamsQuery = this.treatmentSummary
         ParamsQuery['patient'] = this.patient.id
         ParamsQuery['record_date'] = this.record_date
+        ParamsQuery['mode'] = "1"
+        if(this.treatment_summary.id > 0){
+          ParamsQuery['mode'] = "2"
+          if(this.treatment_summary.creater != this.$store.getters.xt_user.user.id){
+            ParamsQuery['mode'] = "3"
+          }
+        }
         postTreatmentsummary(ParamsQuery).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)

src/xt_pages/role/admin.vue

@@ -104,7 +104,7 @@
                 type="danger"
                 size="small"
                 icon="el-icon-delete"
-                v-if="scope.row.status == 1"
+                v-if="scope.row.status == 1 && org.creator != scope.row.user_id && (scope.row.user_id != local_user_id )"
                 @click="disableAdminAction(scope.row)"
               ></el-button>
             </el-tooltip>
@@ -118,7 +118,7 @@
                 size="small"
                 type="info"
                 icon="el-icon-refresh"
-                v-if="scope.row.status == 0"
+                v-if="scope.row.status == 0 && org.creator != scope.row.user_id  && (scope.row.user_id != local_user_id )"
                 @click="recoverAdminAction(scope.row)"
               ></el-button>
             </el-tooltip>
@@ -144,6 +144,8 @@
 
 <script>
 import { adminMainView, getAdmins, setAdminStatus } from "@/api/role/admin";
+import { getRoles } from "@/api/role/role";
+
 import { parseTime } from "@/utils";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import AdminInfoForm from "./components/AdminInfoForm";
@@ -160,7 +162,12 @@ export default {
       admins: [], // [{user_id, user_name, role_name, title_name, ip, last_login_time, status}]
       admin_total_count: 0,
       current_page: 1,
-      is_exist_role: false
+      roles:[],
+      is_exist_role: false,
+      org: null,
+      isSubSuperAdmin:false,
+
+      local_user_id: 0,
     };
   },
   components: {
@@ -168,15 +175,44 @@ export default {
     AdminInfoForm
   },
   created: function() {
+    this.local_user_id = this.$store.getters.xt_user.user.id
+    this.local_user_id = 597
+    let page = 1
+    this.getRoles(page)
     adminMainView()
       .then(rs => {
         this.is_loading_admins = false;
         var resp = rs.data;
         if (resp.state === 1) {
+
           this.admins.push(...resp.data.admins);
           this.admin_total_count = resp.data.total_count;
           this.is_exist_role = resp.data.is_exist_role;
           this.current_page = 1;
+          this.org = resp.data.org
+          this.isSubSuperAdmin = resp.data.isSubSuperAdmin
+
+          //能进入当前页面的角色只有超级管理员和子管理员，如果当前角色是子管理员，需要把超级管理员和其他子管理员的信息去除，子管理员不能编辑超级管理员和其他子管理员信息，
+          if(this.isSubSuperAdmin) {
+            //去除管理员信息
+            for (let i = 0; i < this.admins.length; i++){
+              if (this.admins[i].user_id == this.org.creator) {
+                this.admins.splice(i, 1)
+                i--
+              }
+            }
+
+            //去除其他子管理员信息
+            for (let i = 0; i < this.admins.length; i++){
+              if (this.admins[i].user_id  != this.local_user_id && this.admins[i].is_sub_super_admin) { //将自己排除在外
+                console.log(this.admins[i])
+
+                this.admins.splice(i, 1)
+                i--
+              }
+            }
+
+          }
         } else {
           this.$message.error(resp.msg);
         }
@@ -192,8 +228,24 @@ export default {
     }
   },
   methods: {
+    getRoles(page){
+      getRoles(page)
+        .then(rs => {
+          this.loading_roles = false;
+          const resp = rs.data;
+          if (resp.state === 1) {
+            this.roles.push(...resp.data.roles);
+          } else {
+            this.$message.error(resp.msg);
+          }
+        })
+        .catch(err => {
+          this.loading_roles = false;
+          this.$message.error(err);
+        });
+    },
     openForm(adminId) {
-      this.$refs["admininfoform"].open(adminId);
+      this.$refs["admininfoform"].open(adminId,this.roles);
     },
     _parseTime(time, format) {
       return parseTime(time, format);

src/xt_pages/role/components/AddRole.vue

@@ -0,0 +1,252 @@
+<template>
+  <el-dialog
+    title="新增用户"
+    width="660px"
+    :visible.sync="visible"
+    :before-close="_close"
+  >
+    <el-form :model="form" :rules="rules" ref="form" label-width="90px">
+      <el-form-item label="角色名称 : " prop="name">
+        <el-input v-model="form.name" placeholder="" maxlength="30"></el-input>
+      </el-form-item>
+      <el-form-item label="角色描述 : " >
+        <el-input type="textarea" v-model="form.intro" placeholder="" resize="none" rows="4"></el-input>
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="hide">取 消</el-button>
+      <el-button type="primary" @click="submitAction()">保 存</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+  import { addRole, modifyRole } from '@/api/role/role'
+
+  export default {
+    name: 'AddRole',
+    data() {
+      return {
+        form: {
+          id: 0,
+          name: '',
+          intro: ''
+        },
+        visible: false,
+        rules: {
+          name: [
+            { required: true, message: '请输入角色名称', trigger: 'blur' },
+            { max: 10, message: '10个字以内', trigger: 'blur' }
+          ],
+          // intro: [{ required: true, message: '请输入角色说明', trigger: 'blur' }]
+        },
+
+        //
+        checked: '1',
+        checkAll: false,
+        checkedCities: [],
+        cities: ['上海', '北京', '广州', '深圳'],
+        isIndeterminate: true,
+        ruleForm: {
+          name: '',
+          phone: '',
+          position: ''
+        },
+        newrules: {
+          name: [
+            { required: true, message: '请输入角色名称', trigger: 'blur' },
+            { max: 10, message: '10个字以内', trigger: 'blur' }
+          ],
+          phone: [{ required: true, message: '请输入手机号', trigger: 'blur' }]
+        }
+      }
+    },
+    methods: {
+      _close: function(done) {
+        this.clear()
+        done()
+      },
+      clear: function() {
+        this.form.id = 0
+        this.form.name = ''
+        this.form.intro = ''
+      },
+      show() {
+        this.clear()
+        this.visible = true
+      },
+      hide() {
+        this.clear()
+        this.visible = false
+      },
+      modify(id, name, intro) {
+        this.form.id = id
+        this.form.name = name
+        this.form.intro = intro
+        this.visible = true
+      },
+      submitAction() {
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            // 验证通过
+            if (this.form.id === 0) {
+              // 新增 role
+              addRole(this.form.name, this.form.intro)
+                .then(rs => {
+                  var resp = rs.data
+                  if (resp.state === 1) {
+                    var new_id = resp.data.id
+                    var new_name = resp.data.name
+                    var new_intro = resp.data.intro
+                    var new_status = resp.data.status
+                    var staff_number = 0
+                    this.$emit(
+                      'did-add-role',
+                      new_id,
+                      new_name,
+                      new_intro,
+                      new_status,
+                      staff_number
+                    )
+
+                    this.hide()
+                  } else {
+                    this.$message.error(resp.msg)
+                  }
+                })
+                .catch(err => {
+                  this.$message.error(err)
+                })
+            } else {
+              // 修改 role
+              modifyRole(this.form.id, this.form.name, this.form.intro)
+                .then(rs => {
+                  var resp = rs.data
+                  if (resp.state === 1) {
+                    this.$emit(
+                      'did-edit-role',
+                      this.form.id,
+                      this.form.name,
+                      this.form.intro
+                    )
+                    this.hide()
+                  } else {
+                    this.$message.error(resp.msg)
+                  }
+                })
+                .catch(err => {
+                  this.$message.error(err)
+                })
+            }
+          } else {
+            // 验证失败
+            return false
+          }
+        })
+      },
+      handleCheckAllChange(val) {
+        this.checkedCities = val ? this.cities : []
+        this.isIndeterminate = false
+      },
+      handleCheckedCitiesChange(value) {
+        let checkedCount = value.length
+        this.checkAll = checkedCount === this.cities.length
+        this.isIndeterminate =
+          checkedCount > 0 && checkedCount < this.cities.length
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .roleContent {
+    margin-top: 20px;
+    display: flex;
+    justify-content: space-between;
+
+  .roleContentLeft {
+
+  .chooseBox {
+    width: 280px;
+    height: 320px;
+    overflow-y: auto;
+    border: 1px solid rgba(235, 238, 240, 1);
+    margin-top: 26px;
+    padding: 20px;
+
+  .checkone {
+    display: flex;
+    align-items: center;
+    height: 50px;
+  }
+
+  .el-checkbox__label {
+    display: flex;
+    align-items: center;
+
+  img {
+    width: 30px;
+    height: 30px;
+    margin-right: 10px;
+  }
+
+  }
+  }
+  }
+  .roleContentRight {
+
+  .chooseBox {
+    width: 280px;
+    height: 320px;
+    overflow-y: auto;
+    border: 1px solid rgba(235, 238, 240, 1);
+    margin-top: 26px;
+    padding: 20px;
+
+  .hasChoosedOne {
+    display: flex;
+    align-items: center;
+    height: 50px;
+
+  img {
+    width: 30px;
+    height: 30px;
+    margin-right: 10px;
+  }
+
+  }
+  }
+  }
+  }
+  .newStaff {
+    margin-top: 26px;
+
+  .newItem {
+    display: flex;
+    align-items: center;
+  }
+
+  }
+</style>
+
+<style lang="scss">
+  .roleContent {
+
+  .roleContentLeft {
+
+  .chooseBox {
+
+  .el-checkbox {
+    display: flex;
+    align-items: center;
+  }
+
+  .el-checkbox__label {
+    display: flex;
+    align-items: center;
+  }
+
+  }
+  }
+  }
+</style>

src/xt_pages/role/components/AdminInfoForm.vue

@@ -2,22 +2,18 @@
   <el-dialog :title="formTitle" :visible.sync="dialogFormVisible">
     <el-form :model="form" ref="form" :rules="rules" label-width="60px">
       <el-form-item label="账号 : " prop="mobile">
-        <el-input v-model="form.mobile" placeholder="用户手机号" :disabled="form.id !==  0"></el-input>
+        <el-input v-model="form.mobile" placeholder="用户手机号"         maxlength="11"
+                  :disabled="form.id !==  0"></el-input>
       </el-form-item>
 
       <el-form-item label="姓名 : " prop="name">
         <el-input v-model="form.name" placeholder="用户姓名"></el-input>
       </el-form-item>
 
-      <el-form-item label="角色 : " prop="role">
-        <el-checkbox-group v-model="checkList">
-          <el-checkbox label="复选框 A"></el-checkbox>
-          <el-checkbox label="复选框 B"></el-checkbox>
-          <el-checkbox label="复选框 C"></el-checkbox>
-          <el-checkbox label="复选框 C"></el-checkbox>
-          <el-checkbox label="复选框 C"></el-checkbox>
-          <el-checkbox label="禁用"></el-checkbox>
-          <el-checkbox label="选中且禁用"></el-checkbox>
+      <el-form-item label="角色 : " prop="role_ids">
+        <el-checkbox-group v-model="form.role_ids">
+          <el-checkbox v-for="( item,index) in roles" :key="index" :label="item.id" :value="item.id">{{item.name}}
+          </el-checkbox>
         </el-checkbox-group>
       </el-form-item>
 
@@ -41,12 +37,12 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="职位 : " prop="name">
-        <el-input v-model="form.name" placeholder="输入职位"></el-input>
+      <el-form-item label="职位 : ">
+        <el-input v-model="form.user_title_name" placeholder="输入职位"></el-input>
       </el-form-item>
 
       <el-form-item label="介绍 : ">
-        <Tinymce :height="400" menubar ref="editor" v-model="form.intro" :show_upload_img="false" />
+        <Tinymce :height="400" menubar ref="editor" v-model="form.intro" :show_upload_img="false"/>
       </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">
@@ -57,217 +53,286 @@
 </template>
 
 <script>
-import Tinymce from "@/components/Tinymce";
-import {
-  getAddAdminInitData,
-  addAdmin,
-  getModifyAdminInitData,
-  modifyAdmin
-} from "@/api/role/admin";
-export default {
-  name: "AdminInfoForm",
-  components: {
-    Tinymce
-  },
-  // props: {
-  //     admin_id: {
-  //         type: Number,
-  //         require: true
-  //     }
-  // },
-  data() {
-    var checkMobile = (rule, value, callback) => {
-      if (!value || value.length == 0) {
-        return callback(new Error("手机号不能为空"));
-      }
-      if (/^1\d{10}$/.test(value) == false) {
-        return callback(new Error("手机号格式错误"));
-      } else {
-        callback();
-      }
-    };
-    var checkName = (rule, value, callback) => {
-      if (!value || value.length == 0) {
-        return callback(new Error("姓名不能为空"));
-      } else {
-        callback();
+  import Tinymce from '@/components/Tinymce'
+  import { addAdmin, getAddAdminInitData, getModifyAdminInitData, modifyAdmin } from '@/api/role/admin'
+
+  export default {
+    name: 'AdminInfoForm',
+    components: {
+      Tinymce
+    },
+    data() {
+      var checkMobile = (rule, value, callback) => {
+        if (!value || value.length == 0) {
+          return callback(new Error('手机号不能为空'))
+        }
+        if (/^1\d{10}$/.test(value) == false) {
+          return callback(new Error('手机号格式错误'))
+        } else {
+          callback()
+        }
       }
-    };
-    return {
-      checkList: [],
-      admin_id: 0,
-      dialogFormVisible: false,
-
-      user_types: [
-        { index: 2, name: "医生" },
-        { index: 3, name: "护士" }
-      ],
-      user_titles: [
-        { index: 1, name: "医士" },
-        { index: 2, name: "医师" },
-        { index: 3, name: "住院医师" },
-        { index: 4, name: "主治医师" },
-        { index: 5, name: "副主任医师" },
-        { index: 6, name: "主任医师" },
-        { index: 7, name: "护士" },
-        { index: 8, name: "护师" },
-        { index: 9, name: "主管护师" },
-        { index: 10, name: "副主任护师" },
-        { index: 11, name: "主任护师" },
-        { index: 12, name: "运营专员" },
-        { index: 13, name: "运营主管" }
-      ],
-      roles: [], // [{id, name, intro, status}]
-      loading: true,
-      qntoken: "",
-      formTitle: "",
-      form: {
-        id: 0,
-        mobile: "",
-        name: "",
-        user_type: "",
-        user_title: "",
-        role: "", // 其实应该是 int 类型
-        intro: ""
-      },
-      rules: {
-        mobile: [{ required: true, validator: checkMobile, trigger: "blur" }],
-        name: [{ required: true, validator: checkName, trigger: "blur" }],
-        role: [{ required: true, message: "请选择角色", trigger: "change" }]
+      var checkName = (rule, value, callback) => {
+        if (!value || value.length == 0) {
+          return callback(new Error('姓名不能为空'))
+        } else {
+          callback()
+        }
       }
-    };
-  },
-  methods: {
-    open: function(adminId) {
-      this.admin_id = adminId;
-      if (this.admin_id < 0) {
-        this.$message.error("参数错误");
-        this.loading = false;
-        return;
+      return {
+        admin_id: 0,
+        dialogFormVisible: false,
+
+        user_types: [
+          { index: 2, name: '医生' },
+          { index: 3, name: '护士' }
+        ],
+        user_titles: [
+          { index: 1, name: '医士' },
+          { index: 2, name: '医师' },
+          { index: 3, name: '住院医师' },
+          { index: 4, name: '主治医师' },
+          { index: 5, name: '副主任医师' },
+          { index: 6, name: '主任医师' },
+          { index: 7, name: '护士' },
+          { index: 8, name: '护师' },
+          { index: 9, name: '主管护师' },
+          { index: 10, name: '副主任护师' },
+          { index: 11, name: '主任护师' },
+          { index: 12, name: '运营专员' },
+          { index: 13, name: '运营主管' }
+        ],
+        roles: [], // [{id, name, intro, status}]
+        loading: true,
+        qntoken: '',
+        formTitle: '',
+        isSubSuperAdmin:false,
+        org:null,
+        form: {
+          role_ids: [],
+          user_title_name: '',
+          id: 0,
+          mobile: '',
+          name: '',
+          user_type: '',
+          user_title: '',
+          role: '', // 其实应该是 int 类型
+          intro: ''
+        },
+        rules: {
+          mobile: [{ required: true, validator: checkMobile, trigger: 'blur' }],
+          name: [{ required: true, validator: checkName, trigger: 'blur' }],
+          role_ids: [
+            { type: 'array', required: true, message: '请至少选择一个角色', trigger: 'change' }
+          ]
+        }
       }
+    },
+    methods: {
+      open: function(adminId) {
+        this.admin_id = adminId
+        if (this.admin_id < 0) {
+          this.$message.error('参数错误')
+          this.loading = false
+          return
+        }
+         // let localthis.$store.getters.xt_user.user.id
+        let local_user_id = this.$store.getters.xt_user.user.id
+        this.form.id = this.admin_id
+        if (this.admin_id === 0) {
+          let tempForm = {
+            role_ids: [],
+            user_title_name: '',
+            id: 0,
+            mobile: '',
+            name: '',
+            user_type: '',
+            user_title: '',
+            role: '', // 其实应该是 int 类型
+            intro: ''
+          }
+          this.form = tempForm
+          this.formTitle = '新增员工'
+          this.form.user_type = this.user_types[0].index
+          this.form.user_title = this.user_titles[0].index
+          getAddAdminInitData()
+            .then(rs => {
+              this.loading = false
+              var resp = rs.data
+              if (resp.state === 1) {
+                // this.roles.push(...resp.data.roles)
+                this.roles = resp.data.roles
+                this.qntoken = resp.data.qntoken
 
-      this.form.id = this.admin_id;
-      if (this.admin_id === 0) {
-        this.formTitle = "新增员工";
-        this.form.user_type = this.user_types[0].index;
-        this.form.user_title = this.user_titles[0].index;
-        getAddAdminInitData()
-          .then(rs => {
-            this.loading = false;
-            var resp = rs.data;
-            if (resp.state === 1) {
-              // this.roles.push(...resp.data.roles)
-              this.roles = resp.data.roles;
-              this.qntoken = resp.data.qntoken;
-              // if (this.roles.length > 0) {
-              //   this.form.role = this.roles[0].id;
-              //   console.log("国庆快乐",this.form.role)
-              // }
-            } else {
-              this.$message.error(resp.msg);
+                this.isSubSuperAdmin = resp.data.isSubSuperAdmin
+                this.org = resp.data.org
+
+                //如果当前用户是子管理员则，则需要将子管理员角色去除，因为子管理员不能添加子管理员
+                if(this.isSubSuperAdmin){
+                  for (let i =0 ; i < this.roles.length; i++){
+                    if(this.roles[i].is_system == 1 && this.roles[i].role_name == "子管理员"){
+                      this.roles.splice(i, 1)
+                      i--
+                    }
+                  }
+                }
+
+
+
+
+
+
+
+                // if (this.roles.length > 0) {
+                //   this.form.role = this.roles[0].id;
+                //   console.log("国庆快乐",this.form.role)
+                // }
+              } else {
+                this.$message.error(resp.msg)
+              }
+            })
+            .catch(err => {
+              this.loading = false
+              this.$message.error(err)
+            })
+        } else {
+          this.formTitle = '编辑用户'
+          getModifyAdminInitData(this.form.id)
+            .then(rs => {
+              this.loading = false
+              var resp = rs.data
+              if (resp.state === 1) {
+                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 = []
+                for (let i = 0; i < this.form.role.split(",").length; i++) {
+                  if (this.form.role.split(',')[i].length > 0) {
+                    this.form.role_ids.push(parseInt(this.form.role.split(',')[i]))
+                  }
+                }
+
+                this.form.intro = admin.intro
+                this.form.user_title_name = admin.user_title_name
+
+
+
+                //如果当前用户是超级管理员而且编辑自己的信息
+                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 == "子管理员"){
+                      this.roles.splice(i, 1)
+                      i--
+                    }
+                  }
+                }
+
+
+
+
+              } else {
+                this.$message.error('该用户不存在')
+              }
+            })
+            .catch(err => {
+              this.loading = false
+              this.$message.error('该用户不存在')
+            })
+        }
+
+        this.dialogFormVisible = true
+      },
+      submitAction: function() {
+        if (this.admin_id < 0) {
+          return
+        }
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            if(this.form.user_type == "" || this.form.user_type == 0 ){
+              this.$message.error("职称不能为空")
+              return
             }
-          })
-          .catch(err => {
-            this.loading = false;
-            this.$message.error(err);
-          });
-      } else {
-        this.formTitle = "编辑用户";
-        getModifyAdminInitData(this.form.id)
-          .then(rs => {
-            this.loading = false;
-            var resp = rs.data;
-            if (resp.state === 1) {
-              this.roles.push(...resp.data.roles);
-              this.qntoken = resp.data.qntoken;
-
-              var admin = resp.data.admin;
-              this.form.name = admin.user_name;
-              this.form.mobile = admin.mobile;
-              this.form.user_type = admin.user_type;
-              this.form.user_title = admin.user_title;
-              this.form.role = admin.role_id;
-              this.form.intro = admin.intro;
+
+            this.loading = true
+            if (this.form.id === 0) {
+              this.form.role = this.form.role_ids.join(',')
+              addAdmin(
+                this.form.mobile,
+                this.form.name,
+                this.form.user_type,
+                this.form.user_title,
+                this.form.role,
+                this.form.intro,
+                this.form.user_title_name
+              )
+                .then(rs => {
+                  this.loading = false
+                  var resp = rs.data
+                  if (resp.state === 1) {
+                    this.$store.dispatch('DidChangeAdmins')
+                    var _this = this
+                    setTimeout(() => {
+                      _this.$store.dispatch('RecoverAdminsChangeState')
+                    }, 500)
+                    this.dialogFormVisible = false
+                  } else {
+                    this.$message.error(resp.msg)
+                  }
+                })
+                .catch(err => {
+                  this.loading = false
+                  this.$message.error(err)
+                })
             } else {
-              this.$message.error("该用户不存在");
-            }
-          })
-          .catch(err => {
-            this.loading = false;
-            this.$message.error("该用户不存在");
-          });
-      }
+              this.form.role = this.form.role_ids.join(',')
 
-      this.dialogFormVisible = true;
-    },
-    submitAction: function() {
-      if (this.admin_id < 0) {
-        return;
-      }
-      this.$refs.form.validate(valid => {
-        if (valid) {
-          this.loading = true;
-          if (this.form.id === 0) {
-            addAdmin(
-              this.form.mobile,
-              this.form.name,
-              this.form.user_type,
-              this.form.user_title,
-              this.form.role,
-              this.form.intro
-            )
-              .then(rs => {
-                this.loading = false;
-                var resp = rs.data;
-                if (resp.state === 1) {
-                  this.$store.dispatch("DidChangeAdmins");
-                  var _this = this;
-                  setTimeout(() => {
-                    _this.$store.dispatch("RecoverAdminsChangeState");
-                  }, 500);
-                  this.dialogFormVisible = false;
-                } else {
-                  this.$message.error(resp.msg);
-                }
-              })
-              .catch(err => {
-                this.loading = false;
-                this.$message.error(err);
-              });
+              modifyAdmin(
+                this.form.id,
+                this.form.name,
+                this.form.user_type,
+                this.form.user_title,
+                this.form.role,
+                this.form.intro,
+                this.form.user_title_name
+              )
+                .then(rs => {
+                  this.loading = false
+                  var resp = rs.data
+                  if (resp.state === 1) {
+                    this.$store.dispatch('DidChangeAdmins')
+                    var _this = this
+                    setTimeout(() => {
+                      _this.$store.dispatch('RecoverAdminsChangeState')
+                    }, 500)
+
+                    this.dialogFormVisible = false
+                  } else {
+                    this.$message.error(resp.msg)
+                  }
+                })
+                .catch(err => {
+                  this.loading = false
+                  this.$message.error(err)
+                })
+            }
           } else {
-            modifyAdmin(
-              this.form.id,
-              this.form.name,
-              this.form.user_type,
-              this.form.user_title,
-              this.form.role,
-              this.form.intro
-            )
-              .then(rs => {
-                this.loading = false;
-                var resp = rs.data;
-                if (resp.state === 1) {
-                  this.$store.dispatch("DidChangeAdmins");
-                  var _this = this;
-                  setTimeout(() => {
-                    _this.$store.dispatch("RecoverAdminsChangeState");
-                  }, 500);
-
-                  this.dialogFormVisible = false;
-                } else {
-                  this.$message.error(resp.msg);
-                }
-              })
-              .catch(err => {
-                this.loading = false;
-                this.$message.error(err);
-              });
+            return false
           }
-        } else {
-          return false;
-        }
-      });
+        })
+      }
     }
   }
-};
 </script>

src/xt_pages/role/components/AdminRoleInfoForm.vue

@@ -0,0 +1,257 @@
+<template>
+  <el-dialog :title="formTitle" :visible.sync="dialogFormVisible">
+    <el-form :model="form" ref="form" :rules="rules" label-width="60px">
+      <el-form-item label="账号 : " prop="mobile">
+        <el-input v-model="form.mobile" placeholder="用户手机号" maxlength="11"
+                  :disabled="form.id !==  0"></el-input>
+      </el-form-item>
+
+      <el-form-item label="姓名 : " prop="name">
+        <el-input v-model="form.name" placeholder="用户姓名"></el-input>
+      </el-form-item>
+
+      <el-form-item label="职称 : ">
+        <el-select v-model="form.user_type" placeholder="用户类型">
+          <el-option
+            v-for="item in user_types"
+            :label="item.name"
+            :value="item.index"
+            :key="item.index"
+          ></el-option>
+        </el-select>
+
+        <el-select v-model="form.user_title" placeholder="用户职称">
+          <el-option
+            v-for="item in user_titles"
+            :label="item.name"
+            :value="item.index"
+            :key="item.index"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="职位 : ">
+        <el-input v-model="form.user_title_name" placeholder="输入职位"></el-input>
+      </el-form-item>
+
+      <el-form-item label="介绍 : ">
+        <Tinymce :height="400" menubar ref="editor" v-model="form.intro" :show_upload_img="false"/>
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="dialogFormVisible = false">取 消</el-button>
+      <el-button type="primary" @click="submitAction">保 存</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+  import Tinymce from '@/components/Tinymce'
+  import { addAdmin, getAddAdminInitData, getModifyAdminInitData, modifyAdmin } from '@/api/role/admin'
+
+  export default {
+    name: 'AdminRoleInfoForm',
+    components: {
+      Tinymce
+    },
+    data() {
+      var checkMobile = (rule, value, callback) => {
+        if (!value || value.length == 0) {
+          return callback(new Error('手机号不能为空'))
+        }
+        if (/^1\d{10}$/.test(value) == false) {
+          return callback(new Error('手机号格式错误'))
+        } else {
+          callback()
+        }
+      }
+      var checkName = (rule, value, callback) => {
+        if (!value || value.length == 0) {
+          return callback(new Error('姓名不能为空'))
+        } else {
+          callback()
+        }
+      }
+      return {
+        admin_id: 0,
+        dialogFormVisible: false,
+
+        user_types: [
+          { index: 2, name: '医生' },
+          { index: 3, name: '护士' }
+        ],
+        user_titles: [
+          { index: 1, name: '医士' },
+          { index: 2, name: '医师' },
+          { index: 3, name: '住院医师' },
+          { index: 4, name: '主治医师' },
+          { index: 5, name: '副主任医师' },
+          { index: 6, name: '主任医师' },
+          { index: 7, name: '护士' },
+          { index: 8, name: '护师' },
+          { index: 9, name: '主管护师' },
+          { index: 10, name: '副主任护师' },
+          { index: 11, name: '主任护师' },
+          { index: 12, name: '运营专员' },
+          { index: 13, name: '运营主管' }
+        ],
+        roles: [], // [{id, name, intro, status}]
+        loading: true,
+        qntoken: '',
+        formTitle: '',
+        isSubSuperAdmin: false,
+        org: null,
+        form: {
+          role_ids: [],
+          user_title_name: '',
+          id: 0,
+          mobile: '',
+          name: '',
+          user_type: '',
+          user_title: '',
+          role: '', // 其实应该是 int 类型
+          intro: ''
+        },
+        rules: {
+          mobile: [{ required: true, validator: checkMobile, trigger: 'blur' }],
+          name: [{ required: true, validator: checkName, trigger: 'blur' }]
+
+        }
+      }
+    },
+    methods: {
+      open: function(adminId,role_id) {
+        this.admin_id = adminId
+        this.roles.push(role_id)
+        if (this.admin_id < 0) {
+          this.$message.error('参数错误')
+          this.loading = false
+          return
+        }
+        let local_user_id = this.$store.getters.xt_user.user.id
+        local_user_id = 597
+        this.form.id = this.admin_id
+        this.formTitle = '编辑用户'
+        getModifyAdminInitData(this.form.id)
+          .then(rs => {
+            this.loading = false
+            var resp = rs.data
+            if (resp.state === 1) {
+              this.roles = []
+              this.roles.push(...resp.data.roles)
+              this.qntoken = resp.data.qntoken
+              var admin = resp.data.admin
+              this.form.name = admin.user_name
+              this.form.mobile = admin.admin.mobile
+              this.form.user_type = admin.user_type
+              this.form.user_title = admin.user_title
+              this.form.role = admin.role_ids
+              this.form.role_ids = []
+              for (let i = 0; i < this.form.role.split(",").length; i++) {
+                if (this.form.role.split(',')[i].length > 0) {
+                  this.form.role_ids.push(parseInt(this.form.role.split(',')[i]))
+                }
+              }
+
+              this.form.intro = admin.intro
+              this.form.user_title_name = admin.user_title_name
+
+              //如果当前用户是超级管理员而且编辑自己的信息
+              if (!this.isSubSuperAdmin && local_user_id == this.form.id) {
+                for (let i = 0; i < this.roles.length; i++) {
+                  if (this.roles[i].is_system == 1 && this.roles[i].role_name != '子管理员') {
+                    this.roles.splice(i, 1)
+                    i--
+                  }
+                }
+              }
+
+            } else {
+              this.$message.error('该用户不存在')
+            }
+          })
+          .catch(err => {
+            this.loading = false
+            this.$message.error('该用户不存在')
+          })
+
+        this.dialogFormVisible = true
+      },
+      submitAction: function() {
+        if (this.admin_id < 0) {
+          return
+        }
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            this.loading = true
+            if (this.form.id === 0) {
+              this.form.role = this.form.role_ids.join(',')
+              addAdmin(
+                this.form.mobile,
+                this.form.name,
+                this.form.user_type,
+                this.form.user_title,
+                this.form.role,
+                this.form.intro,
+                this.form.user_title_name
+              )
+                .then(rs => {
+                  this.loading = false
+                  var resp = rs.data
+                  if (resp.state === 1) {
+                    this.$store.dispatch('DidChangeAdmins')
+                    var _this = this
+                    setTimeout(() => {
+                      _this.$store.dispatch('RecoverAdminsChangeState')
+                    }, 500)
+
+                    this.$emit('did-edit-admin')
+
+                  } else {
+                    this.$message.error(resp.msg)
+                  }
+                })
+                .catch(err => {
+                  this.loading = false
+                  this.$message.error(err)
+                })
+            } else {
+              this.form.role = this.form.role_ids.join(',')
+
+              modifyAdmin(
+                this.form.id,
+                this.form.name,
+                this.form.user_type,
+                this.form.user_title,
+                this.form.role,
+                this.form.intro,
+                this.form.user_title_name
+              )
+                .then(rs => {
+                  this.loading = false
+                  var resp = rs.data
+                  if (resp.state === 1) {
+                   console.log("11111111")
+                    this.$emit('did-edit-admin')
+
+                  } else {
+                    this.$message.error(resp.msg)
+                  }
+                })
+                .catch(err => {
+                  this.loading = false
+                  this.$message.error(err)
+                })
+            }
+          } else {
+            return false
+          }
+        })
+      },
+      close:function() {
+        this.dialogFormVisible= false
+
+      }
+    }
+  }
+</script>

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">
@@ -27,29 +27,39 @@
               :indeterminate="isIndeterminate"
               v-model="checkAll"
               @change="handleCheckAllChange"
-              >全选</el-checkbox
+            >全选
+            </el-checkbox
             >
           </div>
           <el-checkbox-group
             v-model="checkedCities"
-            @change="handleCheckedCitiesChange"
           >
-            <!-- <el-checkbox v-for="city in cities" :label="city" :key="city">{{city}}</el-checkbox> -->
-            <div class="checkone" v-for="city in cities" :key="city">
-              <el-checkbox :label="city">
-                <img src="https://kuyi.shengws.com/S1.png" alt />
-                <span>名字</span>
+            <div class="checkone" v-for="(item,index) in admin_user" :key="index">
+              <el-checkbox :label="item.id" :value="item.id" @change="change">
+                <img v-if="item.avatar.length > 0" :src="item.avatar" alt=""/>
+                <img
+                  v-if="item.avatar.length == 0"
+                  src="https://kuyi.shengws.com/S1.png"
+                  alt=""
+                />
+                <span>{{item.user_name}}</span>
               </el-checkbox>
             </div>
           </el-checkbox-group>
         </div>
       </div>
-      <div class="roleContentRight">
+
+      <div class="roleContentRight" v-loading="loading">
         <p style="color:#303133">已选：</p>
         <div class="chooseBox">
-          <div class="hasChoosedOne">
-            <img src="https://kuyi.shengws.com/S1.png" alt />
-            <span>名字</span>
+          <div class="hasChoosedOne" v-for="(item,index) in is_check_admin_user" :key="index">
+            <img v-if="item.avatar.length > 0" :src="item.avatar" alt=""/>
+            <img
+              v-if="item.avatar.length == 0"
+              src="https://kuyi.shengws.com/S1.png"
+              alt=""
+            />
+            <span>{{item.user_name}}</span>
           </div>
         </div>
       </div>
@@ -58,18 +68,39 @@
       <el-form
         :model="ruleForm"
         :rules="newrules"
-        label-position="right"
-        label-width="80px"
-        style="width:40%"
+        ref="form"
+        label-position="left"
       >
-        <el-form-item label="姓名" prop="name">
+        <el-form-item label="姓名" prop="name" label-width="50px">
           <el-input v-model="ruleForm.name"></el-input>
         </el-form-item>
-        <el-form-item label="手机号" prop="phone">
-          <el-input v-model="ruleForm.phone"></el-input>
+        <el-form-item label="手机号" prop="phone" label-width="70px">
+
+          <el-input  v-model="ruleForm.phone"  maxlength="11"></el-input>
+        </el-form-item>
+
+        <el-form-item label="职称 : " label-width="50px">
+          <el-select v-model="ruleForm.user_type" placeholder="用户类型">
+            <el-option
+              v-for="item in user_types"
+              :label="item.name"
+              :value="item.index"
+              :key="item.index"
+            ></el-option>
+          </el-select>
+
+          <el-select v-model="ruleForm.user_title" placeholder="用户职称">
+            <el-option
+              v-for="item in user_titles"
+              :label="item.name"
+              :value="item.index"
+              :key="item.index"
+            ></el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="职位">
-          <el-input></el-input>
+
+        <el-form-item label="职位" label-width="50px">
+          <el-input v-model="ruleForm.position"></el-input>
         </el-form-item>
       </el-form>
       <div class="newItem">
@@ -79,224 +110,480 @@
             style="font-size:20px;color:#338AFB"
           ></i>
         </p>
-        <p style="color:#409FFF">继续新增员工</p>
+        <p style="color:#409FFF" @click="continueAddStaff()">继续新增员工</p>
       </div>
     </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>
 
 <script>
-import { addRole, modifyRole } from "@/api/role/role";
-
-export default {
-  name: "EditRole",
-  data() {
-    return {
-      form: {
-        id: 0,
-        name: "",
-        intro: ""
-      },
-      visible: false,
-      rules: {
-        name: [
-          { required: true, message: "请输入角色名称", trigger: "blur" },
-          { max: 10, message: "10个字以内", trigger: "blur" }
-        ],
-        intro: [{ required: true, message: "请输入角色说明", trigger: "blur" }]
-      },
+  import { addRole, AddUserRole, getStaffsList, modifyRole } from '@/api/role/role'
+  import { addAdmin, getAddAdminInitData, getModifyAdminInitData, modifyAdmin } from '@/api/role/admin'
 
-      //
-      checked: "1",
-      checkAll: false,
-      checkedCities: [],
-      cities: ["上海", "北京", "广州", "深圳"],
-      isIndeterminate: true,
-      ruleForm: {
-        name: "",
-        phone: "",
-        position: ""
-      },
-      newrules: {
-        name: [
-          { required: true, message: "请输入角色名称", trigger: "blur" },
-          { max: 10, message: "10个字以内", trigger: "blur" }
+  export default {
+    name: 'EditRole',
+    data() {
+      var checkMobile = (rule, value, callback) => {
+        if (!value || value.length == 0) {
+          return callback(new Error('手机号不能为空'))
+        }
+        if (/^1\d{10}$/.test(value) == false) {
+          return callback(new Error('手机号格式错误'))
+        } else {
+          callback()
+        }
+      }
+      var checkName = (rule, value, callback) => {
+        if (!value || value.length == 0) {
+          return callback(new Error('姓名不能为空'))
+        } else {
+          callback()
+        }
+      }
+
+      return {
+        submitLoading:false,
+        loading:true,
+        form: {
+          id: 0,
+          name: '',
+          intro: ''
+        },
+        role_id: 0,
+        visible: false,
+        rules: {
+          phone: [{ required: true, validator: checkMobile, trigger: 'blur' }],
+          name: [{ required: true, validator: checkName, trigger: 'blur' }],
+          intro: [{ required: true, message: '请输入角色说明', trigger: 'blur' }]
+        },
+        admin_user: [],
+        is_check_admin_user: [],
+        user_types: [
+          { index: 2, name: '医生' },
+          { index: 3, name: '护士' }
         ],
-        phone: [{ required: true, message: "请输入手机号", trigger: "blur" }]
+        user_titles: [
+          { index: 1, name: '医士' },
+          { index: 2, name: '医师' },
+          { index: 3, name: '住院医师' },
+          { index: 4, name: '主治医师' },
+          { index: 5, name: '副主任医师' },
+          { index: 6, name: '主任医师' },
+          { index: 7, name: '护士' },
+          { index: 8, name: '护师' },
+          { index: 9, name: '主管护师' },
+          { index: 10, name: '副主任护师' },
+          { index: 11, name: '主任护师' },
+          { index: 12, name: '运营专员' },
+          { index: 13, name: '运营主管' }
+        ],
+        //
+        checked: '1',
+        checkAll: false,
+        checkedCities: [],
+        isIndeterminate: true,
+        ruleForm: {
+          name: '',
+          phone: '',
+          position: '',
+          user_type: 2,
+          user_title: 1,
+          role: ''
+        },
+        newrules: {
+          phone: [{ required: true, validator: checkMobile, trigger: 'blur' }],
+
+          name: [
+            { required: true, message: '请输入用户名字', trigger: 'blur' },
+            { max: 10, message: '10个字以内', trigger: 'blur' }
+          ]
+        }
       }
-    };
-  },
-  methods: {
-    _close: function(done) {
-      this.clear();
-      done();
-    },
-    clear: function() {
-      this.form.id = 0;
-      this.form.name = "";
-      this.form.intro = "";
-    },
-    show() {
-      this.clear();
-      this.visible = true;
-    },
-    hide() {
-      this.clear();
-      this.visible = false;
     },
-    modify(id, name, intro) {
-      this.form.id = id;
-      this.form.name = name;
-      this.form.intro = intro;
-      this.visible = true;
-    },
-    submitAction() {
-      this.$refs.form.validate(valid => {
-        if (valid) {
-          // 验证通过
-          if (this.form.id === 0) {
-            // 新增 role
-            addRole(this.form.name, this.form.intro)
-              .then(rs => {
-                var resp = rs.data;
-                if (resp.state === 1) {
-                  var new_id = resp.data.id;
-                  var new_name = resp.data.name;
-                  var new_intro = resp.data.intro;
-                  var new_status = resp.data.status;
-                  this.$emit(
-                    "did-add-role",
-                    new_id,
-                    new_name,
-                    new_intro,
-                    new_status
-                  );
-
-                  this.hide();
-                } else {
-                  this.$message.error(resp.msg);
-                }
-              })
-              .catch(err => {
-                this.$message.error(err);
-              });
+    methods: {
+      continueAddStaff(){
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            if (this.form.id === 0) {
+              this.ruleForm.role = this.role_id
+              addAdmin(
+                this.ruleForm.phone,
+                this.ruleForm.name,
+                this.ruleForm.user_type,
+                this.ruleForm.user_title,
+                this.ruleForm.role,
+                '',
+                this.ruleForm.position
+              )
+                .then(rs => {
+                  var resp = rs.data
+                  if (resp.state === 1) {
+                    this.$store.dispatch('DidChangeAdmins')
+                    var _this = this
+                    setTimeout(() => {
+                      _this.$store.dispatch('RecoverAdminsChangeState')
+                    }, 500)
+                    this.$emit('did-edit-role')
+                    this.ruleForm.phone = ''
+
+                    this.ruleForm.name = ''
+                    this.ruleForm.user_type = 2
+                    this.ruleForm.user_title = 1
+                    this.ruleForm.role = ''
+                    this.ruleForm.position = ''
+                  } else {
+                    this.$message.error(resp.msg)
+                  }
+                })
+                .catch(err => {
+                  this.loading = false
+                  this.$message.error(err)
+                })
+            }
           } else {
-            // 修改 role
-            modifyRole(this.form.id, this.form.name, this.form.intro)
-              .then(rs => {
-                var resp = rs.data;
-                if (resp.state === 1) {
-                  this.$emit(
-                    "did-edit-role",
-                    this.form.id,
-                    this.form.name,
-                    this.form.intro
-                  );
-                  this.hide();
-                } else {
-                  this.$message.error(resp.msg);
+            return false
+          }
+        })
+
+
+
+      },
+      change(val) {
+
+        if (this.checkedCities.length == this.admin_user.length) {
+
+          this.checkAll = true
+        } else {
+          this.checkAll = false
+
+        }
+
+      }
+
+      ,
+      GetAllStaff: function() {
+        getStaffsList()
+          .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
+                  let ids = this.admin_user[i].role_ids.split(',')
+                  isExist = ids.indexOf(this.role_id.toString())
+                  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) {
+
+                  this.admin_user.splice(i, 1)
+                  i = i - 1
                 }
-              })
-              .catch(err => {
-                this.$message.error(err);
-              });
+              }
+              this.loading = false
+
+            } else {
+              this.$message.error(resp.msg)
+              this.loading = false
+
+            }
+          })
+          .catch(err => {
+            this.$message.error(err)
+          })
+
+      },
+      _close: function(done) {
+        this.clear()
+        done()
+      },
+      clear: function() {
+        this.form.id = 0
+        this.form.name = ''
+        this.form.intro = ''
+      },
+      show(role_id) {
+        this.clear()
+        this.loading = true
+        this.checked = '1'
+        this.visible = true
+        this.role_id = role_id
+        this.admin_user = []
+        this.is_check_admin_user = []
+        this.checkedCities = []
+        this.GetAllStaff()
+      },
+      hide() {
+        this.clear()
+        this.visible = false
+      },
+      modify(id, name, intro) {
+        this.form.id = id
+        this.form.name = name
+        this.form.intro = intro
+        this.visible = true
+      },
+      submitAction() {
+        if (this.checked == '1') {
+          if (this.checkedCities.length == 0) {
+            this.$message.error('至少选择一个用户')
+            return
+          }
+          let params = {
+            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(
+                  this.ruleForm.phone,
+                  this.ruleForm.name,
+                  this.ruleForm.user_type,
+                  this.ruleForm.user_title,
+                  this.ruleForm.role,
+                  '',
+                  this.ruleForm.position
+                )
+                  .then(rs => {
+                    this.submitLoading = false
+
+                    var resp = rs.data
+                    if (resp.state === 1) {
+
+                      this.$store.dispatch('DidChangeAdmins')
+                      var _this = this
+                      setTimeout(() => {
+                        _this.$store.dispatch('RecoverAdminsChangeState')
+                      }, 500)
+                      this.$emit('did-edit-role')
+                      this.hide()
+
+                      this.ruleForm.phone = ''
+                      this.ruleForm.name = ''
+                      this.ruleForm.user_type = 2
+                      this.ruleForm.user_title = 1
+                      this.ruleForm.role = ''
+                      this.ruleForm.position = ''
+                    } else {
+                      this.$message.error(resp.msg)
+                    }
+                  })
+                  .catch(err => {
+                    this.submitLoading = false
+
+                    this.loading = false
+                    this.$message.error(err)
+                  })
+              }
+            } else {
+              this.submitLoading = false
+              return false
+            }
+          })
+
+        }
+
+        // this.$refs.form.validate(valid => {
+        //   if (valid) {
+        //     // 验证通过
+        //     if (this.form.id === 0) {
+        //       // 新增 role
+        //       addRole(this.form.name, this.form.intro)
+        //         .then(rs => {
+        //           var resp = rs.data;
+        //           if (resp.state === 1) {
+        //             var new_id = resp.data.id;
+        //             var new_name = resp.data.name;
+        //             var new_intro = resp.data.intro;
+        //             var new_status = resp.data.status;
+        //             this.$emit(
+        //               "did-add-role",
+        //               new_id,
+        //               new_name,
+        //               new_intro,
+        //               new_status
+        //             );
+        //
+        //             this.hide();
+        //           } else {
+        //             this.$message.error(resp.msg);
+        //           }
+        //         })
+        //         .catch(err => {
+        //           this.$message.error(err);
+        //         });
+        //     } else {
+        //       // 修改 role
+        //       modifyRole(this.form.id, this.form.name, this.form.intro)
+        //         .then(rs => {
+        //           var resp = rs.data;
+        //           if (resp.state === 1) {
+        //             this.$emit(
+        //               "did-edit-role",
+        //               this.form.id,
+        //               this.form.name,
+        //               this.form.intro
+        //             );
+        //             this.hide();
+        //           } else {
+        //             this.$message.error(resp.msg);
+        //           }
+        //         })
+        //         .catch(err => {
+        //           this.$message.error(err);
+        //         });
+        //     }
+        //   } else {
+        //     // 验证失败
+        //     return false;
+        //   }
+        // });
+      },
+      handleCheckAllChange(val) {
+        this.checkedCities = []
+        if (val) {
+          for (let i = 0; i < this.admin_user.length; i++) {
+            this.checkedCities.push(this.admin_user[i].id)
           }
         } else {
-          // 验证失败
-          return false;
+          this.checkedCities = []
         }
-      });
-    },
-    handleCheckAllChange(val) {
-      this.checkedCities = val ? this.cities : [];
-      this.isIndeterminate = false;
-    },
-    handleCheckedCitiesChange(value) {
-      let checkedCount = value.length;
-      this.checkAll = checkedCount === this.cities.length;
-      this.isIndeterminate =
-        checkedCount > 0 && checkedCount < this.cities.length;
+
+        this.isIndeterminate = false
+      },
+      handleCheckedCitiesChange(value) {
+        let checkedCount = value.length
+        this.checkAll = checkedCount === this.cities.length
+        this.isIndeterminate =
+          checkedCount > 0 && checkedCount < this.cities.length
+      }
     }
   }
-};
 </script>
 
 <style lang="scss" scoped>
-.roleContent {
-  margin-top: 20px;
-  display: flex;
-  justify-content: space-between;
+  .roleContent {
+    margin-top: 20px;
+    display: flex;
+    justify-content: space-between;
+
   .roleContentLeft {
-    .chooseBox {
-      width: 280px;
-      height: 320px;
-      overflow-y: auto;
-      border: 1px solid rgba(235, 238, 240, 1);
-      margin-top: 26px;
-      padding: 20px;
-      .checkone {
-        display: flex;
-        align-items: center;
-        height: 50px;
-      }
-      .el-checkbox__label {
-        display: flex;
-        align-items: center;
-        img {
-          width: 30px;
-          height: 30px;
-          margin-right: 10px;
-        }
-      }
-    }
+
+  .chooseBox {
+    width: 280px;
+    height: 320px;
+    overflow-y: auto;
+    border: 1px solid rgba(235, 238, 240, 1);
+    margin-top: 26px;
+    padding: 20px;
+
+  .checkone {
+    display: flex;
+    align-items: center;
+    height: 50px;
+  }
+
+  .el-checkbox__label {
+    display: flex;
+    align-items: center;
+
+  img {
+    width: 30px;
+    height: 30px;
+    margin-right: 10px;
+  }
+
+  }
+  }
   }
   .roleContentRight {
-    .chooseBox {
-      width: 280px;
-      height: 320px;
-      overflow-y: auto;
-      border: 1px solid rgba(235, 238, 240, 1);
-      margin-top: 26px;
-      padding: 20px;
-      .hasChoosedOne {
-        display: flex;
-        align-items: center;
-        height: 50px;
-        img {
-          width: 30px;
-          height: 30px;
-          margin-right: 10px;
-        }
-      }
-    }
+
+  .chooseBox {
+    width: 280px;
+    height: 320px;
+    overflow-y: auto;
+    border: 1px solid rgba(235, 238, 240, 1);
+    margin-top: 26px;
+    padding: 20px;
+
+  .hasChoosedOne {
+    display: flex;
+    align-items: center;
+    height: 50px;
+
+  img {
+    width: 30px;
+    height: 30px;
+    margin-right: 10px;
+  }
+
+  }
+  }
+  }
   }
-}
-.newStaff {
-  margin-top: 26px;
+  .newStaff {
+    margin-top: 26px;
+
   .newItem {
     display: flex;
     align-items: center;
   }
-}
+
+  }
 </style>
 
 <style lang="scss">
-.roleContent {
+  .roleContent {
+
   .roleContentLeft {
-    .chooseBox {
-      .el-checkbox {
-        display: flex;
-        align-items: center;
-      }
-      .el-checkbox__label {
-        display: flex;
-        align-items: center;
-      }
-    }
+
+  .chooseBox {
+
+  .el-checkbox {
+    display: flex;
+    align-items: center;
+  }
+
+  .el-checkbox__label {
+    display: flex;
+    align-items: center;
+  }
+
+  }
+  }
   }
-}
 </style>

src/xt_pages/role/components/PermissionSettings.vue

@@ -1,169 +1,346 @@
 <template>
-  <el-dialog
-    class="settingDialog"
-    title="角色权限配置"
-    width="750px"
-    :visible.sync="visible"
-  >
+  <el-dialog class="settingDialog" title="角色权限配置" width="750px" :visible.sync="visible">
     <div class="roleSettings">
       <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
-            >
-              <!-- <span class="custom-tree-node" slot-scope="{ node, data }">
+            <!--<el-tree-->
+            <!--: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;-->
+            <!--</el-tree>-->
+            <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>-->
+                            </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">保 存</el-button>
+      <el-button type="primary" @click="submitAction" :loading="submitLoading">保 存</el-button>
     </div>
   </el-dialog>
 </template>
 
 <script>
-export default {
-  data() {
-    return {
-      visible: false,
-      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"
+  import { editPurview, getEditPurviewInitData, setRoleStatus } from '@/api/role/role'
+
+  export default {
+    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'
+        }
+      }
+    },
+    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 {
+                  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)
+          }
+        }).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
         }
-      ],
-      defaultProps: {
-        children: "children",
-        label: "label"
+        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
+
       }
-    };
-  },
-  methods: {
-    show() {
-      this.visible = true;
-    },
-    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;
+  }
+
+  .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

@@ -1,7 +1,9 @@
 <template>
+  <div>
   <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)',
@@ -10,75 +12,231 @@
         style="width:100%;"
         ref="table"
         border
-        :data="data"
+        :data="admin_user"
       >
-        <el-table-column type="selection" label="禁用" width="55"></el-table-column>
         <el-table-column prop="name" label="员工姓名" width="120">
-          <template slot-scope="scope"></template>
-        </el-table-column>
-        <el-table-column prop="date" label="登录账号" width="120">
-          <template slot-scope="scope"></template>
+          <template slot-scope="scope">
+            {{scope.row.user_name}}
+          </template>
         </el-table-column>
+        <!--<el-table-column prop="date" label="登录账号" width="120">-->
+          <!--<template slot-scope="scope">-->
+            <!--{{}}-->
+          <!--</template>-->
+        <!--</el-table-column>-->
         <el-table-column prop="date" label="最后登录时间" width="180">
-          <template slot-scope="scope"></template>
+          <template slot-scope="scope">
+             <span>{{
+              scope.row.last_login_time == 0
+                ? ""
+                : _parseTime(scope.row.last_login_time, "{y}-{m}-{d} {h}:{i}")
+            }}</span>
+          </template>
+
         </el-table-column>
-        <el-table-column label="操作" width="130">
+        <el-table-column label="操作" >
           <template slot-scope="scope" style="text-align: center">
             <el-tooltip class="item" effect="dark" content="编辑" placement="top">
-              <el-button type="primary" icon="el-icon-edit-outline" size="small"></el-button>
+              <el-button  type="primary" icon="el-icon-edit-outline" size="small"
+                         v-if="org.creator != scope.row.user_id && (scope.row.user_id != local_user_id) && !scope.row.is_sub_super_admin"
+                         @click="openForm(scope.row.user_id, role_id)" ></el-button>
             </el-tooltip>
-            <!-- </router-link> -->
-            <el-tooltip class="item" effect="dark" content="移除" placement="top">
-              <el-button type="danger" size="small" icon="el-icon-delete"></el-button>
+
+            <el-tooltip
+              class="item"
+              effect="dark"
+              content="移除"
+              placement="top"
+            >
+              <el-button
+                type="danger"
+                size="small"
+                icon="el-icon-delete"
+                v-if="scope.row.status == 1 && org.creator != scope.row.user_id && (scope.row.user_id != local_user_id) && !scope.row.is_sub_super_admin"
+                @click="disableAdminAction(scope.row)"
+              ></el-button>
+            </el-tooltip>
+
+            <el-tooltip
+              class="item"
+              effect="dark"
+              content="恢复"
+              placement="top"
+            >
+              <el-button
+                size="small"
+                type="info"
+                icon="el-icon-refresh"
+                v-if="scope.row.status == 0 && org.creator != scope.row.user_id  && (scope.row.user_id != local_user_id ) && !scope.row.is_sub_super_admin"
+                @click="recoverAdminAction(scope.row)"
+              ></el-button>
             </el-tooltip>
+
           </template>
         </el-table-column>
       </el-table>
     </div>
   </el-dialog>
+  <!--<admin-info-form ref="admininfoform"></admin-info-form>-->
+    <admin-role-info-form ref="admininfoform"  @did-edit-admin="didModifyAdmin"></admin-role-info-form>
+  </div>
 </template>
 
 
 <script>
-export default {
-  data() {
-    return {
-      visible: false,
-      data: [
-        {
-          date: "2016-05-03",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1518 弄"
-        },
-        {
-          date: "2016-05-03",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1518 弄"
-        }
-      ]
-    };
-  },
-  methods: {
-    show() {
-      this.visible = true;
+  import { getRoleStaff } from '@/api/role/role'
+  import { parseTime } from "@/utils";
+  import { setAdminStatus } from "@/api/role/admin";
+  // import AdminInfoForm from './AdminInfoForm'
+  import AdminRoleInfoForm from './AdminRoleInfoForm'
+
+  export default {
+    components: { AdminRoleInfoForm },
+    data() {
+      return {
+        visible: false,
+        role_id: 0,
+        admin_user: [],
+        local_user_id: 0,
+        org:null,
+        loading:false,
+
+      }
+    },
+    methods: {
+      didModifyAdmin(){
+        this.GetAllStaff()
+        this.$refs["admininfoform"].close();
+
+      },
+      openForm(adminId,role_id) {
+        this.$refs["admininfoform"].open(adminId,role_id);
+      },
+      disableAdminAction: function(row) {
+        this.$msgbox({
+          title: "提示",
+          message: "是否确定要移除该用户",
+          showCancelButton: true,
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+          beforeClose: (action, instance, done) => {
+            if (action === "confirm") {
+              instance.confirmButtonLoading = true;
+              instance.confirmButtonText = "删除中...";
+
+              setAdminStatus(row.user_id, false)
+                .then(rs => {
+                  done();
+                  instance.confirmButtonLoading = false;
+
+                  const resp = rs.data;
+                  if (resp.state === 1) {
+                    row.status = 0;
+                  } else {
+                    this.$message.error(resp.msg);
+                  }
+                })
+                .catch(err => {
+                  done();
+                  instance.confirmButtonLoading = false;
+                  this.$message.error(err);
+                });
+            } else {
+              done();
+            }
+          }
+        });
+      },
+      recoverAdminAction: function(row) {
+        const loading = this.$loading({
+          lock: true,
+          text: "正在恢复管理员...",
+          spinner: "el-icon-loading",
+          background: "rgba(0, 0, 0, 0.7)"
+        });
+
+        setAdminStatus(row.user_id, true)
+          .then(rs => {
+            loading.close();
+
+            const resp = rs.data;
+            if (resp.state === 1) {
+              row.status = 1;
+            } else {
+              this.$message.error(resp.msg);
+            }
+          })
+          .catch(err => {
+            loading.close();
+            this.$message.error(err);
+          });
+      },
+      _parseTime(time, format) {
+        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
+
+            for (let i = 0; i < this.admin_user.length; i++) {
+              if (this.admin_user[i].role_ids.length > 0) {
+                let isExist = -1
+                let ids = this.admin_user[i].role_ids.split(',')
+                isExist = ids.indexOf(this.role_id.toString())
+                if (isExist < 0) {
+                  this.admin_user.splice(i, 1)
+                  i = i - 1
+                }
+              }
+            }
+          } else {
+
+            this.$toast({
+              message: response.data.msg
+            })
+          }
+        }).catch(err => {
+          this.loading = false
+          this.$message.error(err)
+        })
+      },
+
+      show(role_id) {
+        this.visible = true
+        this.role_id = role_id
+        this.admin_user = []
+        this.local_user_id = this.$store.getters.xt_user.user.id
+        this.local_user_id = 597
+        this.GetAllStaff()
+      }
     }
   }
-};
 </script>
 
 <style lang="scss" scoped>
-.userManagement {
+  .userManagement {
+
   .cell {
     text-align: center;
   }
-}
+
+  }
 </style>
 
 
 <style lang="scss">
-.userManagement {
+  .userManagement {
+
   .cell {
     text-align: center;
   }
-}
+
+  }
 </style>

src/xt_pages/role/role.vue

@@ -8,9 +8,10 @@
         icon="el-icon-circle-plus"
         style="float:right;"
         @click="addRoleAction"
-      >新增</el-button>
+        >新增</el-button
+      >
     </div>
-    <div class="app-container">
+    <div class="app-container" v-loading="loading_roles">
       <!-- <el-table
         :data="roles"
         v-loading="loading_roles"
@@ -84,148 +85,58 @@
         </el-col>
       </el-row>-->
 
-      <edit-role ref="edit_role" @did-add-role="didAddRole" @did-edit-role="didModifyRole"></edit-role>
-      <permission-settings ref="permission_settings"></permission-settings>
+      <edit-role
+        ref="edit_role"
+        @did-edit-role="didModifyRole"
+      ></edit-role>
+
+      <add-role
+        ref="add_role"
+        @did-add-role="didAddRole"
+      ></add-role>
+
+      <permission-settings ref="permission_settings" @delete="deleteRole()"></permission-settings>
       <user-management ref="user_management"></user-management>
 
       <div class="roleTitle">
         <i class="el-icon-warning warn"></i>
-        <p>根据员工的职能选择角色，然后新增账号，可以自定义角色，进行权限配置</p>
+        <p>
+          根据员工的职能选择角色，然后新增账号，可以自定义角色，进行权限配置
+        </p>
       </div>
       <div class="roleBox">
-        <div class="roleOne">
-          <div class="setting">
-            <i class="el-icon-setting"></i>
-            <span style="margin-right:20px" @click="onClick">权限配置</span>
-          </div>
-          <div class="avatar">
-            <img src="../../assets/img/pc1.png" alt />
-            <p class="avatarname">子管理员</p>
-          </div>
-          <div class="roleTip">子管理员角色具备平台全部功能的使用权限,请谨慎配置...</div>
-          <div class="roleTxt">
-            该角色目前已配置
-            <span style="color:#4A8AF3">0</span> 个员工
-          </div>
-          <div class="btnBox">
-            <el-button>新增用户</el-button>
-            <el-button @click="onClick1">用户管理</el-button>
-          </div>
-        </div>
-        <div class="roleOne">
-          <div class="setting">
-            <i class="el-icon-setting"></i>
-            <span style="margin-right:20px">权限配置</span>
-          </div>
-          <div class="avatar">
-            <img src="../../assets/img/pc2.png" alt />
-            <p class="avatarname">医生</p>
-          </div>
-          <div class="roleTip">医生角色能够进行建立患者档案，制定和调整患者透析治疗方案，定期评价病人的透析质量等...</div>
-          <div class="roleTxt">
-            该角色目前已配置
-            <span style="color:#4A8AF3">0</span> 个员工
-          </div>
-          <div class="btnBox">
-            <el-button>新增用户</el-button>
-            <el-button>用户管理</el-button>
-          </div>
-        </div>
-        <div class="roleOne">
-          <div class="setting">
-            <i class="el-icon-setting"></i>
-            <span style="margin-right:20px">权限配置</span>
-          </div>
-          <div class="avatar">
-            <img src="../../assets/img/pc3.png" alt />
-            <p class="avatarname">护士</p>
-          </div>
-          <div class="roleTip">护士角色能够进行病人透析管理，以及医院的感染控制与消毒记录等...</div>
-          <div class="roleTxt">
-            该角色目前已配置
-            <span style="color:#4A8AF3">0</span> 个员工
-          </div>
-          <div class="btnBox">
-            <el-button>新增用户</el-button>
-            <el-button>用户管理</el-button>
-          </div>
-        </div>
-        <div class="roleOne">
-          <div class="setting">
-            <i class="el-icon-setting"></i>
-            <span style="margin-right:20px">权限配置</span>
-          </div>
-          <div class="avatar">
-            <img src="../../assets/img/pc7.png" alt />
-            <p class="avatarname">技师</p>
-          </div>
-          <div class="roleTip">技师角色能够进行设备的管理，日常维护维修记录等...</div>
-          <div class="roleTxt">
-            该角色目前已配置
-            <span style="color:#4A8AF3">0</span> 个员工
-          </div>
-          <div class="btnBox">
-            <el-button>新增用户</el-button>
-            <el-button>用户管理</el-button>
-          </div>
-        </div>
-        <div class="roleOne">
-          <div class="setting">
-            <i class="el-icon-setting"></i>
-            <span style="margin-right:20px">权限配置</span>
-          </div>
-          <div class="avatar">
-            <img src="../../assets/img/pc6.png" alt />
-            <p class="avatarname">运营</p>
-          </div>
-          <div class="roleTip">运营角色能够在SCRM中管理微网站、使用营销工具、做会员管理和分销商品经营的操作...</div>
-          <div class="roleTxt">
-            该角色目前已配置
-            <span style="color:#4A8AF3">0</span> 个员工
-          </div>
-          <div class="btnBox">
-            <el-button>新增用户</el-button>
-            <el-button>用户管理</el-button>
-          </div>
-        </div>
-        <div class="roleOne">
+        <div class="roleOne" v-for="item in this.roles">
           <div class="setting">
             <i class="el-icon-setting"></i>
-            <span style="margin-right:20px">权限配置</span>
+            <span style="margin-right:20px" @click="onClick(item.id)">权限配置</span>
           </div>
           <div class="avatar">
-            <img src="../../assets/img/pc4.png" alt />
-            <p class="avatarname">库存</p>
-          </div>
-          <div class="roleTip">库存角色负责透析耗材的日常管理，对耗材的入库、出库、退库的登记操作...</div>
-          <div class="roleTxt">
-            该角色目前已配置
-            <span style="color:#4A8AF3">0</span> 个员工
-          </div>
-          <div class="btnBox">
-            <el-button>新增用户</el-button>
-            <el-button>用户管理</el-button>
-          </div>
-        </div>
-        <div class="roleOne">
-          <div class="setting">
-            <i class="el-icon-setting"></i>
-            <span style="margin-right:20px">权限配置</span>
+            <img v-if="item.name == '子管理员'" src="../../assets/img/pc1.png" alt=""/>
+            <img v-else-if="item.name == '医生'" src="../../assets/img/pc2.png" alt=""/>
+            <img v-else-if="item.name == '护士'" src="../../assets/img/pc3.png" alt=""/>
+            <img v-else-if="item.name == '库存'" src="../../assets/img/pc4.png" alt=""/>
+            <img v-else-if="item.name == '院长'" src="../../assets/img/pc5.png" alt=""/>
+            <img v-else-if="item.name == '运营'"  src="../../assets/img/pc6.png" alt=""/>
+            <img v-else-if="item.name == '技师'"  src="../../assets/img/pc7.png" alt=""/>
+            <img v-else  src="../../assets/img/pc1.png" alt=""/>
+
+
+
+            <p class="avatarname">{{item.name}}</p>
           </div>
-          <div class="avatar">
-            <img src="../../assets/img/pc5.png" alt />
-            <p class="avatarname">院长</p>
+          <div class="roleTip">
+           {{item.intro}}
           </div>
-          <div class="roleTip">院长角色了解血透患者血液透析质量和相关的大数据，以及掌握透析中心整体运营情况</div>
           <div class="roleTxt">
             该角色目前已配置
-            <span style="color:#4A8AF3">0</span> 个员工
+            <span style="color:#4A8AF3">{{item.staff_number}}</span> 个员工
           </div>
           <div class="btnBox">
-            <el-button>新增用户</el-button>
-            <el-button>用户管理</el-button>
+            <el-button @click="addStaff(item.id)">新增用户</el-button>
+            <el-button @click="onClickManagement(item.id)">用户管理</el-button>
           </div>
         </div>
+
       </div>
     </div>
   </div>
@@ -234,12 +145,14 @@
 <script>
 import EditRole from "./components/EditRole.vue";
 import PermissionSettings from "./components/PermissionSettings.vue";
+import { getRoles, setRoleStatus,getRolesList } from "@/api/role/role";
 import UserManagement from "./components/UserManagement.vue";
-import { getRoles, setRoleStatus } from "@/api/role/role";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
+import AddRole from './components/AddRole'
 
 export default {
   components: {
+    AddRole,
     EditRole,
     BreadCrumb,
     PermissionSettings,
@@ -261,16 +174,25 @@ export default {
     this.requestRoleWithPage(1);
   },
   methods: {
+    addStaff(role_id){
+      this.$refs.edit_role.show(role_id);
+
+    },
     requestRoleWithPage: function(page) {
       this.roles.splice(0, this.roles.length);
       this.loading_roles = true;
-      getRoles(page)
+      getRolesList(page)
         .then(rs => {
           this.loading_roles = false;
           const resp = rs.data;
           if (resp.state === 1) {
-            this.roles.push(...resp.data.roles);
-            this.role_total_count = resp.data.total_count;
+
+            for (let i = 0; i < resp.data.roles.length; i++) {
+              if (!resp.data.roles[i].is_super_admin) {
+                this.roles.push(resp.data.roles[i])
+              }
+            }
+            // this.roles.push(...resp.data.roles);
           } else {
             this.$message.error(resp.msg);
           }
@@ -282,7 +204,7 @@ export default {
     },
     addRoleAction: function() {
       // 父组件调用子组件方法 https://segmentfault.com/a/1190000009525355
-      this.$refs.edit_role.show();
+      this.$refs.add_role.show();
     },
     modifyRoleAction: function(row) {
       this.$refs.edit_role.modify(row.id, row.name, row.intro);
@@ -347,28 +269,26 @@ export default {
           this.$message.error(err);
         });
     },
-    didAddRole: function(id, name, intro, status) {
-      this.roles.push({ id: id, name: name, intro: intro, status: status });
+    didAddRole: function(id, name, intro, status,staff_number) {
+      this.roles.push({ id: id, name: name, intro: intro, status: status ,staff_number: staff_number});
     },
-    didModifyRole: function(id, name, intro) {
-      this.roles.forEach(role => {
-        if (role.id === id) {
-          role.name = name;
-          role.intro = intro;
-          return false;
-        }
-      });
+    didModifyRole: function() {
+      this.requestRoleWithPage(1);
+
     },
     pageChange: function(nextPage) {
       this.requestRoleWithPage(nextPage);
     },
     ///
 
-    onClick() {
-      this.$refs.permission_settings.show();
+    onClick(role_id) {
+      this.$refs.permission_settings.show(role_id);
     },
-    onClick1() {
-      this.$refs.user_management.show();
+    onClickManagement(role_id) {
+      this.$refs.user_management.show(role_id);
+    },deleteRole(){
+      this.$refs.permission_settings.hide();
+      this.requestRoleWithPage(1);
     }
   }
 };