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://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"',
+  // 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

@@ -19,8 +19,8 @@ module.exports = {
 
     // host: 'xt.test.sgjyun.com',
     // host: 'xt.kuyicloud.com',
-    host: 'xt.test.sgjyun.com',
-    // host:'localhost',
+    // host: 'xt.test.sgjyun.com',
+    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,

src/api/advice.js

@@ -14,19 +14,23 @@ export function getAllAdviceConfig() {
   })
 }
 
-export function CreateDoctorAdvice(id, advice) {
+export function CreateDoctorAdvice(id, advice,mode) {
   return request({
-    url: '/api/patients/advice/create?id=' + id,
+    url: '/api/patients/advice/create?id=' + id+"&mode="+mode,
     method: 'post',
-    data: advice
+    data: advice,
+    headers:{"Permission":3},
+
   })
 }
 
-export function EditDoctorAdvice(patient, id, advice) {
+export function EditDoctorAdvice(patient, id, advice,mode) {
   return request({
-    url: '/api/patients/advice/edit?id=' + id + '&patient=' + patient,
+    url: '/api/patients/advice/edit?id=' + id + '&patient=' + patient+"&mode="+mode,
     method: 'Put',
-    data: advice
+    data: advice,
+    headers:{"Permission":2},
+
   })
 }
 
@@ -40,7 +44,9 @@ export function ExecDoctorAdvice(patient, id, time,mode) {
   return request({
     url: '/api/patients/advice/exec',
     method: 'Post',
-    params: params
+    params: params,
+    headers:{"Permission":2},
+
   })
 }
 export function CheckDoctorAdvice(patient, id,mode) {
@@ -53,17 +59,22 @@ export function CheckDoctorAdvice(patient, id,mode) {
   return request({
     url: '/api/patients/advice/check',
     method: 'Post',
-    params: params
+    params: params,
+    headers:{"Permission":2},
+
   })
 }
-export function CheckGroupAdvice(groupno) {
+export function CheckGroupAdvice(groupno,mode) {
   var params = {
-    groupno: groupno
+    groupno: groupno,
+    mode: mode,
   }
   return request({
     url: '/api/patients/advice/checkgroup',
     method: 'Post',
-    params: params
+    params: params,
+    headers:{"Permission":2},
+
   })
 }
 
@@ -98,10 +109,12 @@ export function ExecGroupAdvice(groupno, time) {
   })
 }
 
-export function DeleteDoctorAdvice(id) {
+export function DeleteDoctorAdvice(id,mode) {
   return request({
-    url: '/api/patients/advice/delete?id=' + id,
-    method: 'Delete'
+    url: '/api/patients/advice/delete?id=' + id+"&mode="+mode,
+    method: 'Delete',
+    headers:{"Permission":2},
+
   })
 }
 
@@ -199,25 +212,31 @@ export function postAdviceTemplate(params, name, advice_type) {
   })
 }
 
-export function CreateGroupAdvice(id, groupno, advices) {
+export function CreateGroupAdvice(id, groupno, advices,mode) {
   if (advices.remind > 0) {
     return request({
-      url: '/api/patients/advice/creategroup?id=' + id + '&groupno=' + groupno,
+      url: '/api/patients/advice/creategroup?id=' + id + '&groupno=' + groupno+"&mode="+mode,
       method: 'post',
-      data: advices
+      data: advices,
+      headers:{"Permission":2},
+
     })
   } else {
     return request({
-      url: '/api/patients/advice/creategroup?id=' + id + '&groupno=' + groupno,
+      url: '/api/patients/advice/creategroup?id=' + id + '&groupno=' + groupno+"&mode="+mode,
       method: 'post',
-      data: advices
+      data: advices,
+      headers:{"Permission":2},
+
     })
   }
 }
-export function DeleteGroupAdvice(groupno) {
+export function DeleteGroupAdvice(groupno,mode) {
   return request({
-    url: '/api/patients/advice/deletegroup?groupno=' + groupno,
-    method: 'delete'
+    url: '/api/patients/advice/deletegroup?groupno=' + groupno+"&mode="+mode,
+    method: 'delete',
+    headers:{"Permission":3},
+
   })
 }
 

src/api/role/role.js

@@ -101,3 +101,15 @@ export function getRoleStaff() {
   })
 }
 
+
+
+export function getRoleInfo(params) {
+  return request({
+    url: '/api/role',
+    method: 'get',
+    params:params
+  })
+}
+
+
+

src/store/modules/xt_user.js

@@ -1,14 +1,7 @@
-import {
-  verifyToken,
-  modifyAdminInfo
-} from '@/api/login/login'
+import { modifyAdminInfo, verifyToken } from '@/api/login/login'
 // import { mapGetters } from 'vuex'
 // import { getToken, setToken, removeToken } from '@/utils/auth'
-import {
-  getAdminUserInfoCache,
-  cacheAdminUserInfo,
-  removeAdminUserInfoCache
-} from '@/utils/admin_info_cache'
+import { cacheAdminUserInfo, getAdminUserInfoCache, removeAdminUserInfoCache } from '@/utils/admin_info_cache'
 import { getFiledConfigList, setFiledConfigList } from '@/utils/data_config' // getConfigList from sessionStorage
 
 const xt_user = {
@@ -26,10 +19,10 @@ const xt_user = {
       user_type: 0, // 用户类型（1.管理员；2.医生；3.护士；4.运营）
       user_title: 0 // 用户职称（1.医士；2.医师；3.住院医师；4.主治医师；5.副主任医师；6.主任医师；7.护士；8.护师；9.主管护师；10.副主任护师；11.主任护师；12.运营专员；13.运营主管）
     },
-    template_info:{
+    template_info: {
       id: 0,
-      org_id:0,
-      template_id:0,
+      org_id: 0,
+      template_id: 0
     },
 
     org: {
@@ -57,7 +50,7 @@ const xt_user = {
 
     // 示例: ['', '',]
     urlfors: [],
-    fileds:[],
+    fileds: []
   },
 
   mutations: {
@@ -102,19 +95,16 @@ const xt_user = {
       state.cdm_role_exist = cur_info.cdm_role_exist
       state.mall_role_exist = cur_info.mall_role_exist
 
-
       state.template_info.id = cur_info.template_info.id
       state.template_info.org_id = cur_info.template_info.org_id
       state.template_info.template_id = cur_info.template_info.template_id
 
-
     },
 
     SET_FILEDS: (state, payload) => {
       state.fileds = payload.fileds
     },
 
-
     SET_URLFORS: (state, payload) => {
       state.urlfors = payload.urlfors
     },
@@ -123,7 +113,7 @@ const xt_user = {
       state.user.user_name = payload.user_name
       state.user.avatar = payload.avatar
     },
-    MODIFY_ORG_INFO:(state, payload) => {
+    MODIFY_ORG_INFO: (state, payload) => {
       state.org.org_name = payload.org_name
       state.org.org_short_name = payload.org_short_name
     },
@@ -180,23 +170,23 @@ const xt_user = {
   },
 
   actions: {
-    SetScheduleTypeSelected({commit }, schedule_type_selected) {
+    SetScheduleTypeSelected({ commit }, schedule_type_selected) {
       commit('SET_SCHEDULE_TYPE_SELECTED', schedule_type_selected)
     },
     SetZoneSelected({ commit }, zone_selected) {
       commit('SET_ZONE_SELECTED', zone_selected)
     },
     SetSubscibePatients({
-      commit,
-      state
-    }) {
+                          commit,
+                          state
+                        }) {
       commit('SET_SUBSCIBE_PATIENT')
     },
 
     VerifyToken({
-      commit,
-      state
-    }, token) {
+                  commit,
+                  state
+                }, token) {
 
       // console.log('验证 token 之前：token = ' + token)
       return new Promise((resolve, reject) => {
@@ -218,7 +208,7 @@ const xt_user = {
             cur_app_id: infoJSON.current_app_id,
             org: infoJSON.org,
             subscibe: infoJSON.subscibe,
-            template_info:infoJSON.template_info,
+            template_info: infoJSON.template_info,
             scrm_role_exist: infoJSON.scrm_role_exist,
             cdm_role_exist: infoJSON.cdm_role_exist,
             mall_role_exist: infoJSON.mall_role_exist
@@ -228,7 +218,6 @@ const xt_user = {
             urlfors: infoJSON.urlfors
           })
 
-
           resolve(infoJSON.user.user_id)
         } else {
           verifyToken(token).then(response => {
@@ -242,10 +231,10 @@ const xt_user = {
                 cur_app_id: data.current_app_id,
                 org: data.org,
                 subscibe: data.subscibe,
-                template_info:data.template_info,
+                template_info: data.template_info,
                 scrm_role_exist: data.scrm_role_exist,
                 cdm_role_exist: data.cdm_role_exist,
-                mall_role_exist: data.mall_role_exist,
+                mall_role_exist: data.mall_role_exist
               })
 
               this.commit('SET_URLFORS', {
@@ -271,9 +260,9 @@ const xt_user = {
       })
     },
     ModifyAdminUserInfo({
-      commit,
-      state
-    }, params) {
+                          commit,
+                          state
+                        }, params) {
       commit('MODIFY_USER_INFO', {
         user_name: params.user_name,
         avatar: params.avatar
@@ -286,17 +275,17 @@ const xt_user = {
           current_app_id: state.app_id,
           urlfors: state.urlfors,
           subscibe: state.subscibe,
-          template_info:state.template_info,
+          template_info: state.template_info,
           scrm_role_exist: state.scrm_role_exist,
           cdm_role_exist: state.cdm_role_exist,
-          mall_role_exist: state.mall_role_exist,
+          mall_role_exist: state.mall_role_exist
         })
       )
     },
     ModifyOrgInfo({
-      commit,
-      state
-    }, params) {
+                    commit,
+                    state
+                  }, params) {
       commit('MODIFY_ORG_INFO', {
         org_name: params.org_name,
         org_short_name: params.org_short_name
@@ -309,7 +298,7 @@ const xt_user = {
           current_app_id: state.app_id,
           urlfors: state.urlfors,
           subscibe: state.subscibe,
-          template_info:state.template_info,
+          template_info: state.template_info,
           scrm_role_exist: state.scrm_role_exist,
           cdm_role_exist: state.cdm_role_exist,
           mall_role_exist: state.mall_role_exist
@@ -337,8 +326,8 @@ const xt_user = {
     // }
     // 登出
     FrontendLogout({
-      commit
-    }) {
+                     commit
+                   }) {
       commit('CLEAR_USER_INFO')
       removeAdminUserInfoCache()
     }, updateFiledConfigList({ commit }, object) {
@@ -346,9 +335,9 @@ const xt_user = {
       var oldFiledList = getFiledConfigList()
       var infoJSON = JSON.parse(oldFiledList)
       console.log(object)
-      return new Promise((resolve, reject) =>{
-        for (let i = 0; i < infoJSON.length; i++){
-          if(infoJSON[i].id == object.id){
+      return new Promise((resolve, reject) => {
+        for (let i = 0; i < infoJSON.length; i++) {
+          if (infoJSON[i].id == object.id) {
             infoJSON[i].is_show = object.is_show
           }
         }
@@ -357,16 +346,22 @@ const xt_user = {
         commit('SET_FILEDS_LIST', infoJSON)
         resolve()
       })
-    },updateAllFiledConfigList({ commit }, object) {
+    }, updateAllFiledConfigList({ commit }, object) {
       var oldFiledList = getFiledConfigList()
       var infoJSON = JSON.parse(oldFiledList)
 
-      return new Promise((resolve, reject) =>{
+      return new Promise((resolve, reject) => {
         infoJSON = object
         setFiledConfigList(JSON.stringify(infoJSON))
         commit('SET_FILEDS_LIST', infoJSON)
         resolve()
       })
+    }, ModifyAdminUserOrgInfo({ commit, state }, obj) {
+        this.commit('SET_CURRENT_INFO',obj)
+    },ModifyUrlInfo({ commit, state }, obj) {
+      this.commit('SET_URLFORS', obj)
+    },ModifyFiled({ commit, state }, obj) {
+      commit('SET_FILEDS', obj)
     }
   }
 }

src/views/layout/components/Navbar.vue

@@ -64,15 +64,17 @@
       </div>
     </el-menu>-->
     <div class="dropdownBox">
-      <el-dropdown trigger="click" @command="handleOrgCommand">
+      <!--<el-dropdown trigger="click" @command="handleOrgCommand">-->
         <span class="el-dropdown-link">
           {{ 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" v-for="(item,index) in orgs" :key="index"  :command="item.id">{{item.org_name}}</el-dropdown-item>
-        </el-dropdown-menu>
-      </el-dropdown>
+        <!--<el-dropdown-menu slot="dropdown">-->
+          <!--&lt;!&ndash;<el-dropdown-item   icon="el-icon-plus">{{item.org_name}}</el-dropdown-item>&ndash;&gt;-->
+
+          <!--<el-dropdown-item   icon="el-icon-plus" v-for="(item,index) in orgs" :key="index"  :command="item.id">{{item.org_name}}</el-dropdown-item>-->
+        <!--</el-dropdown-menu>-->
+      <!--</el-dropdown>-->
     </div>
     <div class="navRight">
       <!-- <el-input placeholder="搜索患者透析号/姓名/首拼" prefix-icon="el-icon-search" v-model="input2"></el-input>
@@ -165,33 +167,51 @@ export default {
       }
       changeOrg(params).then(response => {
         if (response.data.state === 1) {
-          window.location.reload()
+          // 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', {
+          this.$store.dispatch("ModifyAdminUserOrgInfo", {
             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', {
+          this.$store.dispatch("ModifyUrlInfo", {
             urlfors: data.urlfors
-          })
 
-          this.commit('SET_FILEDS', {
+          });
+
+          this.$store.dispatch("ModifyFiled", {
             fileds: data.fileds
-          })
+
+
+          });
+
+
+
+
           setFiledConfigList(JSON.stringify(data.fileds))
           cacheAdminUserInfo(JSON.stringify(data))
 
 
+          this.$store.dispatch('xt_GenerateRoutes', this.$store.getters.current_role_urls).then(() => {
+            this.$store.dispatch('VerifyConfigList').then(() => {
+              // alert('token 验证成功')
+              // console.log(this.$store.getters.xt_permission.addRouters)
+              this.$router.addRoutes(this.$store.getters.xt_permission.addRouters) // 动态添加可访问路由表
+              //        next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+              this.$router.replace({ path: '/' })
+            })
+          })
+
+
         }else{
           this.$message.success(response.data.msg)
         }

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

@@ -9,33 +9,33 @@
     >
       <div class="txsj" v-show="showAdvicePanel">
         <el-button round @click="openGroupFrom" :loading="deleLoading"
-                   v-if="this.$store.getters.xt_user.user.user_type == 1 || this.$store.getters.xt_user.user.user_type == 2">
+                   >
           新增医嘱
         </el-button>
         <el-button round @click="openGroupFrom" :loading="deleLoading"
-                   v-if="this.$store.getters.xt_user.user.user_type == 3" disabled>新增医嘱
+                   disabled>新增医嘱
         </el-button>
 
 
-        <el-button v-if="currentRow != null && this.$store.getters.xt_user.user.user_type == 3" round
+        <el-button v-if="currentRow != null" round
                    @click="execAdvice" :loading="deleLoading">执行医嘱
         </el-button>
         <el-button v-else disabled round @click="execAdvice" :loading="deleLoading">执行医嘱</el-button>
 
-        <el-button v-if="currentRow != null && this.$store.getters.xt_user.user.user_type == 3" round
+        <el-button v-if="currentRow != null" round
                    @click="checkAdvice" :loading="deleLoading">医嘱核对
         </el-button>
         <el-button v-else disabled round @click="checkAdvice" :loading="deleLoading">医嘱核对</el-button>
 
         <el-button
-          v-if="groupSelectRow != null&& (this.$store.getters.xt_user.user.user_type == 1  || this.$store.getters.xt_user.user.user_type == 2)"
+          v-if="groupSelectRow != null"
           round @click="openEditGroupAdvice" :loading="deleLoading">修改医嘱
         </el-button>
         <el-button v-else disabled round @click="openEditGroupAdvice" :loading="deleLoading">修改医嘱</el-button>
 
 
         <el-button
-          v-if="groupSelectRow != null&& (this.$store.getters.xt_user.user.user_type == 1  || this.$store.getters.xt_user.user.user_type == 2)"
+          v-if="groupSelectRow != null"
           round @click="openDeleteGroupAdvice" :loading="deleLoading">删除医嘱
         </el-button>
         <el-button v-else disabled round @click="openDeleteGroupAdvice" :loading="deleLoading">删除医嘱</el-button>
@@ -61,7 +61,7 @@
 
         </el-table-column>
         <el-table-column prop="advice_name" min-width="50px" label="医嘱内容" align="center"
-                         v-if="(this.$store.getters.xt_user.user.user_type == 1 || this.$store.getters.xt_user.user.user_type == 2)">
+                         >
           <template slot-scope="scope">
 
             <el-dropdown trigger="click" v-if="scope.row.parent_id == 0 ">
@@ -89,14 +89,14 @@
           </template>
         </el-table-column>
 
-        <el-table-column prop="advice_name" min-width="50px" label="医嘱内容" align="center"
-                         v-else>
-          <template slot-scope="scope">
-            <span v-if="scope.row.parent_id == 0 " class="el-dropdown-link">{{getAdviceContent(scope.row,1)}}</span>
-            <span v-if="scope.row.parent_id > 0 "
-                  class="el-dropdown-link">&emsp;{{getAdviceContent(scope.row,2)}}</span>
-          </template>
-        </el-table-column>
+        <!--<el-table-column prop="advice_name" min-width="50px" label="医嘱内容" align="center"-->
+                         <!--v-else>-->
+          <!--<template slot-scope="scope">-->
+            <!--<span v-if="scope.row.parent_id == 0 " class="el-dropdown-link">{{getAdviceContent(scope.row,1)}}</span>-->
+            <!--<span v-if="scope.row.parent_id > 0 "-->
+                  <!--class="el-dropdown-link">&emsp;{{getAdviceContent(scope.row,2)}}</span>-->
+          <!--</template>-->
+        <!--</el-table-column>-->
 
         <el-table-column prop="execution_time" align="center" min-width="30px" label="执行时间">
           <template slot-scope="scope">
@@ -436,7 +436,9 @@
           this.$message.error('没有选择患者')
           return false
         }
-        EditDoctorAdvice(this.patient.id, this.form.id, this.form).then(response => {
+        console.log(this.form)
+        let mode = 2
+        EditDoctorAdvice(this.patient.id, this.form.id, this.form,mode).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
             return false
@@ -668,8 +670,9 @@
           return false
         }
         this.exceLoading = true
+        let mode = "6"
 
-        ExecDoctorAdvice(this.patient.id, this.currentRow.id, this.execTime).then(response => {
+        ExecDoctorAdvice(this.patient.id, this.currentRow.id, this.execTime,mode).then(response => {
           if (response.data.state == 0) {
             this.$message.error('执行失败！')
             this.exceLoading = false
@@ -722,8 +725,9 @@
           this.$message.error('没有选择患者')
           return false
         }
+        let mode ="1"
 
-        CreateDoctorAdvice(this.patient.id, this.form).then(response => {
+        CreateDoctorAdvice(this.patient.id, this.form,mode).then(response => {
           this.loading = false
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
@@ -1021,7 +1025,8 @@
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          DeleteGroupAdvice(groupno).then(response => {
+          let mode ="4"
+          DeleteGroupAdvice(groupno,mode).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)
               return false
@@ -1054,7 +1059,8 @@
           type: 'warning'
         }).then(() => {
           this.deleLoading = true
-          DeleteDoctorAdvice(this.currentRow.id).then(response => {
+          let mode = "4"
+          DeleteDoctorAdvice(this.currentRow.id,mode).then(response => {
             this.deleLoading = false
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)
@@ -1087,7 +1093,8 @@
           type: 'warning'
         }).then(() => {
           this.deleLoading = true
-          DeleteDoctorAdvice(this.currentRow.id).then(response => {
+          let mode ="4"
+          DeleteDoctorAdvice(this.currentRow.id,mode).then(response => {
             this.deleLoading = false
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)

src/xt_pages/dialysis/details/dialog/adviceDialog/AddGroupAdvice.vue

@@ -674,7 +674,9 @@ export default {
             adviceNames.unshift(this.groupForm.adviceNames[index]);
           }
           submitForm.adviceNames = adviceNames;
-          CreateGroupAdvice(this.patientID, 0, submitForm).then(response => {
+          let mode = "1"
+
+          CreateGroupAdvice(this.patientID, 0, submitForm,mode).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg);
               return false;

src/xt_pages/dialysis/details/dialog/adviceDialog/EditGroupAdvice.vue

@@ -594,6 +594,7 @@ export default {
         }
         console.log(this.groupSelectRow)
         var content = ''
+
         if (this.groupSelectRow.children.length > 0) {
           content = '确认删除此医嘱内容,包括它的子药？'
         } else {
@@ -607,7 +608,8 @@ export default {
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          DeleteDoctorAdvice(this.groupSelectRow.id).then(response => {
+          let mode = "4"
+          DeleteDoctorAdvice(this.groupSelectRow.id,mode).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)
               return false
@@ -700,7 +702,9 @@ export default {
                 parent_id: _this.groupSelectRow.parent_id,
                 groupno: _this.groupForm.groupno
               }
-              EditDoctorAdvice(this.patientID, this.groupSelectRow.id, submitForm).then(response => {
+              let mode = "2"
+
+              EditDoctorAdvice(this.patientID, this.groupSelectRow.id, submitForm,mode).then(response => {
                 if (response.data.state == 0) {
                   this.$message.error(response.data.msg)
                   return false
@@ -799,8 +803,9 @@ export default {
                   parent_id: _this.groupSelectRow.id,
                   groupno: _this.groupForm.groupno
                 }
+                let mode = "1"
 
-                CreateDoctorAdvice(this.patientID, submitForm).then(response => {
+                CreateDoctorAdvice(this.patientID, submitForm,mode).then(response => {
                   if (response.data.state == 0) {
                     this.$message.error(response.data.msg)
                     return false
@@ -871,7 +876,9 @@ export default {
                   remark: _this.groupForm.remark,
                   parent_id: 0
                 }
-                CreateGroupAdvice(_this.patientID, _this.groupForm.groupno, _this.submitGroupForm).then(response => {
+                let mode = "1"
+
+                CreateGroupAdvice(_this.patientID, _this.groupForm.groupno, _this.submitGroupForm, mode).then(response => {
                   if (response.data.state == 0) {
                     _this.$message.error(response.data.msg)
                     return false
@@ -1371,8 +1378,10 @@ export default {
           }
           this.submitGroupForm.adviceNames.unshift(item)
         }
+        let mode = "1"
 
-        CreateGroupAdvice(this.patientID, this.groupForm.groupno, this.submitGroupForm).then(response => {
+
+        CreateGroupAdvice(this.patientID, this.groupForm.groupno, this.submitGroupForm,mode).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
             return false
@@ -1537,8 +1546,10 @@ export default {
 
                 _this.submitGroupForm.adviceNames.push(item)
               }
+              let mode = "1"
+
 
-              CreateGroupAdvice(_this.patientID, _this.groupForm.groupno, _this.submitGroupForm).then(response => {
+              CreateGroupAdvice(_this.patientID, _this.groupForm.groupno, _this.submitGroupForm,mode).then(response => {
                 if (response.data.state == 0) {
                   _this.$message.error(response.data.msg)
                   return false

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

@@ -810,6 +810,7 @@
           dry_weight: this.weight_adjust.weight,
           remark: this.weight_adjust.remark,
           doctor_id: this.weight_adjust.doctor,
+          mode : "1",
         };
         CreateDryWeight(params).then(response => {
           if (response.data.state == 0) {

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

@@ -838,8 +838,7 @@
           no_anticoagulant_weichi: '0',
           no_anticoagulant_zongliang: '0',
 
-
-          creater:0,
+          creater: 0
 
         },
 
@@ -1000,13 +999,12 @@
 
             console.log(this.prescription)
 
-            if(this.prescription.creater <= 0){
+            if (this.prescription.creater <= 0) {
               mode = 1
-            }else {
+            } else {
               mode = 2
             }
 
-
             postPrescription(ParamsQuery).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
@@ -1119,13 +1117,12 @@
             ParamsQuery['record_date'] = this.record_date
             console.log(this.prescription)
 
-            if(this.prescription.creater <= 0){
+            if (this.prescription.creater <= 0) {
               mode = 1
-            }else {
+            } else {
               mode = 2
             }
 
-
             postPrescription(ParamsQuery).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
@@ -1263,14 +1260,7 @@
             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
-            }
-
+            ParamsQuery['mode'] = '1'
 
             postPrescription(ParamsQuery).then(response => {
               if (response.data.state == 0) {
@@ -1308,14 +1298,7 @@
               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
-              }
-
+              ParamsQuery['mode'] = '1'
 
               postPrescription(ParamsQuery).then(response => {
                 if (response.data.state == 0) {
@@ -1369,14 +1352,7 @@
               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
-              }
-
+              ParamsQuery['mode'] = '1'
 
               postPrescription(ParamsQuery).then(response => {
                 if (response.data.state == 0) {
@@ -1411,13 +1387,12 @@
               ParamsQuery['record_date'] = this.record_date
               console.log(this.prescription)
 
-              if(this.prescription.creater <= 0){
+              if (this.prescription.creater <= 0) {
                 mode = 1
-              }else {
+              } else {
                 mode = 2
               }
 
-
               postPrescription(ParamsQuery).then(response => {
                 if (response.data.state == 0) {
                   this.$message.error(response.data.msg)
@@ -1453,14 +1428,7 @@
               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
-              }
-
+              ParamsQuery['mode'] = '1'
 
               postPrescription(ParamsQuery).then(response => {
                 if (response.data.state == 0) {
@@ -1498,14 +1466,7 @@
                 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
-                }
-
+                ParamsQuery['mode'] = '1'
 
                 postPrescription(ParamsQuery).then(response => {
                   if (response.data.state == 0) {
@@ -1559,14 +1520,7 @@
                 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
-                }
-
+                ParamsQuery['mode'] = '1'
 
                 postPrescription(ParamsQuery).then(response => {
                   if (response.data.state == 0) {
@@ -1599,13 +1553,7 @@
                 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
-                }
+                ParamsQuery['mode'] = '1'
 
 
                 postPrescription(ParamsQuery).then(response => {
@@ -1641,15 +1589,12 @@
             const ParamsQuery = this.dialysisPrescription
             ParamsQuery['patient'] = this.patient.id
             ParamsQuery['record_date'] = this.record_date
-            console.log(this.prescription)
+            ParamsQuery['mode'] = "2"
 
-            if(this.prescription.creater <= 0){
-              mode = 1
-            }else {
-              mode = 2
+            if (this.$store.getters.xt_user.user.id  != this.dialysisPrescription.creater){
+              ParamsQuery['mode'] = "3"
             }
 
-
             postPrescription(ParamsQuery).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
@@ -1701,6 +1646,8 @@
             const ParamsQuery = this.dialysisPrescription
             ParamsQuery['patient'] = this.patient.id
             ParamsQuery['record_date'] = this.record_date
+            ParamsQuery['mode'] = "1"
+
             postSoulution(ParamsQuery).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
@@ -1742,6 +1689,8 @@
               const ParamsQuery = this.dialysisPrescription
               ParamsQuery['patient'] = this.patient.id
               ParamsQuery['record_date'] = this.record_date
+              ParamsQuery['mode'] = "1"
+
               postSoulution(ParamsQuery).then(response => {
                 if (response.data.state == 0) {
                   this.$message.error(response.data.msg)
@@ -1802,11 +1751,7 @@
               ParamsQuery['record_date'] = this.record_date
               console.log(this.prescription)
 
-              if(this.prescription.creater <= 0){
-                mode = 1
-              }else {
-                mode = 2
-              }
+              ParamsQuery['mode'] = "1"
 
 
               postPrescription(ParamsQuery).then(response => {
@@ -1839,6 +1784,8 @@
               const ParamsQuery = this.dialysisPrescription
               ParamsQuery['patient'] = this.patient.id
               ParamsQuery['record_date'] = this.record_date
+              ParamsQuery['mode'] = "1"
+
               postSoulution(ParamsQuery).then(response => {
                 if (response.data.state == 0) {
                   this.$message.error(response.data.msg)
@@ -1879,6 +1826,8 @@
               const ParamsQuery = this.dialysisPrescription
               ParamsQuery['patient'] = this.patient.id
               ParamsQuery['record_date'] = this.record_date
+              ParamsQuery['mode'] = "1"
+
               postSoulution(ParamsQuery).then(response => {
                 if (response.data.state == 0) {
                   this.$message.error(response.data.msg)
@@ -1920,6 +1869,8 @@
                 const ParamsQuery = this.dialysisPrescription
                 ParamsQuery['patient'] = this.patient.id
                 ParamsQuery['record_date'] = this.record_date
+                ParamsQuery['mode'] = "1"
+
                 postSoulution(ParamsQuery).then(response => {
                   if (response.data.state == 0) {
                     this.$message.error(response.data.msg)
@@ -1977,6 +1928,8 @@
                 const ParamsQuery = this.dialysisPrescription
                 ParamsQuery['patient'] = this.patient.id
                 ParamsQuery['record_date'] = this.record_date
+                ParamsQuery['mode'] = "1"
+
                 postSoulution(ParamsQuery).then(response => {
                   if (response.data.state == 0) {
                     this.$message.error(response.data.msg)
@@ -2013,6 +1966,8 @@
                 const ParamsQuery = this.dialysisPrescription
                 ParamsQuery['patient'] = this.patient.id
                 ParamsQuery['record_date'] = this.record_date
+                ParamsQuery['mode'] = "1"
+
                 postSoulution(ParamsQuery).then(response => {
                   if (response.data.state == 0) {
                     this.$message.error(response.data.msg)
@@ -2051,6 +2006,8 @@
             const ParamsQuery = this.dialysisPrescription
             ParamsQuery['patient'] = this.patient.id
             ParamsQuery['record_date'] = this.record_date
+            ParamsQuery['mode'] = "1"
+
             postSoulution(ParamsQuery).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)

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

@@ -1052,9 +1052,14 @@ export default {
         type: "warning"
       })
         .then(() => {
+          let mode = "4"
+          // if(this.table_current_row)
+
+
           const params = {
             patient_id: this.patient_id,
             record_id: this.table_current_row.id
+
           };
 
           postDelMonitorInfo(params).then(response => {

src/xt_pages/role/admin.vue

@@ -176,7 +176,6 @@ export default {
   },
   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()

src/xt_pages/role/components/AdminInfoForm.vue

@@ -177,16 +177,6 @@
                   }
                 }
 
-
-
-
-
-
-
-                // if (this.roles.length > 0) {
-                //   this.form.role = this.roles[0].id;
-                //   console.log("国庆快乐",this.form.role)
-                // }
               } else {
                 this.$message.error(resp.msg)
               }
@@ -228,20 +218,29 @@
                 this.form.intro = admin.intro
                 this.form.user_title_name = admin.user_title_name
 
-
+                this.isSubSuperAdmin = resp.data.isSubSuperAdmin
+                this.org = resp.data.org
 
                 //如果当前用户是超级管理员而且编辑自己的信息
-                if(this.isSubSuperAdmin || this.admin_id == org.creator){
-                  for (let i =0 ; i < this.roles.length; i++){
-                    if(this.roles[i].is_system == 1 && this.roles[i].role_name == "子管理员"){
+
+                if(!this.isSubSuperAdmin) {
+                  if (this.form.id == org.creator) {
+                    for (let i = 0; i < this.roles.length; i++) {
+                      if (this.roles[i].is_system == 1 && this.roles[i].name == "子管理员") {
+                        this.roles.splice(i, 1)
+                        i--
+                      }
+                    }
+                  }
+                }else{
+                  for (let i = 0; i < this.roles.length; i++) {
+                    if (this.roles[i].is_system == 1 && this.roles[i].name == "子管理员") {
                       this.roles.splice(i, 1)
                       i--
                     }
                   }
-                }
-
-
 
+                }
 
               } else {
                 this.$message.error('该用户不存在')

src/xt_pages/role/components/AdminRoleInfoForm.vue

@@ -129,7 +129,6 @@
           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)
@@ -206,6 +205,7 @@
                     }, 500)
 
                     this.$emit('did-edit-admin')
+                    this.$refs.form.resetFields();
 
                   } else {
                     this.$message.error(resp.msg)
@@ -231,8 +231,8 @@
                   this.loading = false
                   var resp = rs.data
                   if (resp.state === 1) {
-                   console.log("11111111")
                     this.$emit('did-edit-admin')
+                    this.$refs.form.resetFields();
 
                   } else {
                     this.$message.error(resp.msg)

src/xt_pages/role/components/EditRole.vue

@@ -121,7 +121,7 @@
 </template>
 
 <script>
-  import { addRole, AddUserRole, getStaffsList, modifyRole } from '@/api/role/role'
+  import { addRole, AddUserRole, getStaffsList, modifyRole,getRoleInfo } from '@/api/role/role'
   import { addAdmin, getAddAdminInitData, getModifyAdminInitData, modifyAdmin } from '@/api/role/admin'
 
   export default {
@@ -146,8 +146,10 @@
       }
 
       return {
+        org:null,
         submitLoading:false,
         loading:true,
+        local_user_id:0,
         form: {
           id: 0,
           name: '',
@@ -253,24 +255,21 @@
 
       },
       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
+              this.org = resp.data.org
+              this.isSubSuperAdmin = resp.data.isSubSuperAdmin;
+
               for (let i = 0; i < this.admin_user.length; i++) {
                 if (this.admin_user[i].role_ids.length > 0) {
                   let isExist = -1
@@ -283,13 +282,35 @@
                   }
                 }
               }
+              console.log(this.admin_user)
+
+
               for (let i = 0; i < this.admin_user.length; i++) {
-                if (this.admin_user[i].user_id == resp.data.org.creator) {
+                if (this.isSubSuperAdmin) { //如果当前用户是子管理员,则将管理员剔除到待添加员工列表
+                  console.log(this.admin_user[i].user_id)
+                  console.log(this.org.creator)
 
-                  this.admin_user.splice(i, 1)
-                  i = i - 1
+                  if (this.admin_user[i].user_id == this.org.creator) {
+                    this.admin_user.splice(i, 1);
+                    i = i - 1;
+                  } else {
+                    if (this.admin_user[i].is_sub_admin && this.admin_user[i].user_id != this.local_user_id) {
+                      this.admin_user.splice(i, 1);
+                      i = i - 1;
+                    }
+                  }
+                } else { //如果当前用户是超级管理员，而且当前编辑角色是子管理员的话，需要将超级管理员剔除到待添加员工列表
+                  if (this.role.name == "子管理员" && this.role.is_system == 1) {
+                    if (this.admin_user[i].user_id == this.org.creator) {
+                      this.admin_user.splice(i, 1);
+                      i = i - 1;
+                    }
+                  }
                 }
               }
+
+
+
               this.loading = false
 
             } else {
@@ -321,9 +342,34 @@
         this.admin_user = []
         this.is_check_admin_user = []
         this.checkedCities = []
-        this.GetAllStaff()
-      },
-      hide() {
+        this.local_user_id = this.$store.getters.xt_user.user.id
+
+        this.getRoleInfo(role_id)
+      },getRoleInfo(id){
+        let params = {
+          role_id: id
+        }
+        getRoleInfo(params)
+          .then(rs => {
+            var resp = rs.data
+            if (resp.state === 1) {
+              this.role = resp.data.role
+              this.loading = true
+              this.GetAllStaff()
+
+
+            } else {
+              this.$message.error(resp.msg)
+
+            }
+          })
+          .catch(err => {
+            this.$message.error(err)
+          })
+
+
+
+      }, hide() {
         this.clear()
         this.visible = false
       },

src/xt_pages/role/components/UserManagement.vue

@@ -38,7 +38,7 @@
           <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"
-                         v-if="org.creator != scope.row.user_id && (scope.row.user_id != local_user_id) && !scope.row.is_sub_super_admin"
+                         v-if="isShow(scope.row.is_sub_super_admin,scope.row.user_id)"
                          @click="openForm(scope.row.user_id, role_id)" ></el-button>
             </el-tooltip>
 
@@ -52,7 +52,7 @@
                 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"
+                v-if="scope.row.status == 1 && isShowDel(scope.row.is_sub_super_admin, scope.row.user_id) "
                 @click="disableAdminAction(scope.row)"
               ></el-button>
             </el-tooltip>
@@ -67,7 +67,7 @@
                 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"
+                v-if="scope.row.status == 0 && isShowDel(scope.row.is_sub_super_admin, scope.row.user_id)"
                 @click="recoverAdminAction(scope.row)"
               ></el-button>
             </el-tooltip>
@@ -100,10 +100,50 @@
         local_user_id: 0,
         org:null,
         loading:false,
+        isSubSuperAdmin:false,
 
       }
     },
     methods: {
+      isShowDel:function(is_sub_admin,user_id){
+        if(this.isSubSuperAdmin){ //子管理员
+          if(is_sub_admin){ //当前操作的用户是否为子管理员
+            return false
+          }else{
+            if(this.org.creator != user_id){
+              return true
+            }else{
+              return false
+            }
+          }
+        }else{ //超级管理员
+          if(this.org.creator == user_id){
+            return false
+          }else{
+            return true
+          }
+        }
+      },
+      isShow:function(is_sub_admin,user_id){
+        if (!this.isSubSuperAdmin){
+          return true
+        }else {
+          if (is_sub_admin) {
+            if (user_id == this.local_user_id) {
+              return true
+            }else{
+              return false
+            }
+          } else {
+            if (user_id != this.org.creator) {
+              return true
+            } else {
+              return false
+            }
+          }
+        }
+      },
+
       didModifyAdmin(){
         this.GetAllStaff()
         this.$refs["admininfoform"].close();
@@ -184,6 +224,7 @@
           if (response.data.state === 1) {
             this.admin_user = response.data.data.admins
             this.org = response.data.data.org
+            this.isSubSuperAdmin = response.data.data.isSubSuperAdmin
 
             for (let i = 0; i < this.admin_user.length; i++) {
               if (this.admin_user[i].role_ids.length > 0) {
@@ -213,7 +254,6 @@
         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()
       }
     }

src/xt_pages/user/dialysisSolution.vue

@@ -1,75 +1,77 @@
 <template>
   <div class="patient-container">
-   <patient-sidebar :id="patientID" defaultActive="2-1"></patient-sidebar>
-   <div class="patient-app-container app-container">
-    <div class="Total">
-      <!-- <div class="plan" >透析计划</div> -->
-      <!-- <table-title title="长期透析处方"></table-title> -->
-      <div class="sum">
-        <!-- <span>透析总频率:<el-input :value="totalrate" disabled style="width:180px"></el-input></span> -->
-        <el-button type="primary" size="small" icon="el-icon-plus"  @click="openNew" :disabled="$store.getters.xt_user.subscibe.state==3?true:false">新增透析处方</el-button>
+    <patient-sidebar :id="patientID" defaultActive="2-1"></patient-sidebar>
+    <div class="patient-app-container app-container">
+      <div class="Total">
+        <!-- <div class="plan" >透析计划</div> -->
+        <!-- <table-title title="长期透析处方"></table-title> -->
+        <div class="sum">
+          <!-- <span>透析总频率:<el-input :value="totalrate" disabled style="width:180px"></el-input></span> -->
+          <el-button type="primary" size="small" icon="el-icon-plus" @click="openNew"
+                     :disabled="$store.getters.xt_user.subscibe.state==3?true:false">新增透析处方
+          </el-button>
+        </div>
       </div>
-    </div>
-    <el-table ref="solutionTable" :data="tableData" border fit highlight-current-row
-     @current-change="tableCurrentChange" :header-cell-style="{
+      <el-table ref="solutionTable" :data="tableData" border fit highlight-current-row
+                @current-change="tableCurrentChange" :header-cell-style="{
                   backgroundColor: 'rgb(245, 247, 250)',
                   color: '#606266'
                 }"
                 :row-style="{ color: '#303133' }"
-     style="width: 100%">
-      <el-table-column
-        type="index"
-        align="center"
-        label="序号"
-        width="60">
-      </el-table-column>
-       <el-table-column
-        prop="mode_name"
-        align="center"
-        label="透析模式"
-        min-width="50">
-        <template slot-scope="scope" >
-          {{modeOptions[scope.row.mode_id].name}}
-        </template>
-      </el-table-column>
-       <el-table-column
-        prop="dialysis_duration"
-        align="center"
-        label="透析时长"
-        min-width="50">
-        <template slot-scope="scope" >
-          {{scope.row.dialysis_duration_hour}} 小时 {{scope.row.dialysis_duration_minute}} 分钟
-        </template>
-      </el-table-column>
-      <!-- <el-table-column
-        prop="period"
-        label="频率"
-        align="center"
-        min-width="50">
-        <template slot-scope="scope" >
-            <span v-if="scope.row.parent_id === 0" >{{scope.row.period}}{{scope.row.times}}</span>
-            <span v-else >--</span>
-        </template>
-      </el-table-column> -->
-      <!-- <el-table-column
-        prop="name"
-        label="处方名"
-        align="center"
-        min-width="50">
-        <template slot-scope="scope" >
-            <span >{{scope.row.name}}{{scope.row.sub_name}}</span>
-        </template>
-      </el-table-column> -->
-      <el-table-column
-        prop="doctor"
-        label="医生"
-        align="center"
-        min-width="110">
-        <template slot-scope="scope" >
-            <span >{{getAdminUserName(scope.row.registrars_id)}}</span>
-        </template>
-
-     </el-table-column>
+                style="width: 100%">
+        <el-table-column
+          type="index"
+          align="center"
+          label="序号"
+          width="60">
+        </el-table-column>
+        <el-table-column
+          prop="mode_name"
+          align="center"
+          label="透析模式"
+          min-width="50">
+          <template slot-scope="scope">
+            {{modeOptions[scope.row.mode_id].name}}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="dialysis_duration"
+          align="center"
+          label="透析时长"
+          min-width="50">
+          <template slot-scope="scope">
+            {{scope.row.dialysis_duration_hour}} 小时 {{scope.row.dialysis_duration_minute}} 分钟
+          </template>
+        </el-table-column>
+        <!-- <el-table-column
+          prop="period"
+          label="频率"
+          align="center"
+          min-width="50">
+          <template slot-scope="scope" >
+              <span v-if="scope.row.parent_id === 0" >{{scope.row.period}}{{scope.row.times}}</span>
+              <span v-else >--</span>
+          </template>
+        </el-table-column> -->
+        <!-- <el-table-column
+          prop="name"
+          label="处方名"
+          align="center"
+          min-width="50">
+          <template slot-scope="scope" >
+              <span >{{scope.row.name}}{{scope.row.sub_name}}</span>
+          </template>
+        </el-table-column> -->
+        <el-table-column
+          prop="doctor"
+          label="医生"
+          align="center"
+          min-width="110">
+          <template slot-scope="scope">
+            <span>{{getAdminUserName(scope.row.registrars_id)}}</span>
+          </template>
+
+        </el-table-column>
 
         <el-table-column
           prop="updated_time"
@@ -189,20 +191,20 @@
             </el-form-item>
           </el-col>
           <!--<el-col :span="8" v-if="isShows('目标超滤量')&&this.$store.getters.xt_user.template_info.template_id == 6">-->
-            <!--<el-form-item label="目标超滤量(ml) : ">-->
-              <!--<el-input v-model="addPlan.target_ultrafiltration" type="number"></el-input>-->
-            <!--</el-form-item>-->
+          <!--<el-form-item label="目标超滤量(ml) : ">-->
+          <!--<el-input v-model="addPlan.target_ultrafiltration" type="number"></el-input>-->
+          <!--</el-form-item>-->
           <!--</el-col>-->
 
           <!--<el-col :span="8" v-if="isShows('目标超滤量')&&this.$store.getters.xt_user.template_info.template_id != 6">-->
-            <!--<el-form-item label="目标超滤量(L) : ">-->
-              <!--<el-input v-model="addPlan.target_ultrafiltration" type="number"></el-input>-->
-            <!--</el-form-item>-->
+          <!--<el-form-item label="目标超滤量(L) : ">-->
+          <!--<el-input v-model="addPlan.target_ultrafiltration" type="number"></el-input>-->
+          <!--</el-form-item>-->
           <!--</el-col>-->
 
 
           <el-col :span="8" v-if="isShows('透析液配方')">
-            <el-form-item label="透析液配方:" >
+            <el-form-item label="透析液配方:">
               <el-select v-model="addPlan.dialysate_formulation">
                 <el-option v-for="item in dialysate_formulation" :label="item.name" :key="item.id"
                            :value="item.id"></el-option>
@@ -259,7 +261,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8" v-if="anticoagulant.gaijiliang != -1&&isShows('钙剂量')">
-            <el-form-item  :label="'钙剂量（'+anticoagulant.gaimingcheng_unit+'）: '"  prop="anticoagulant_gaijiliang">
+            <el-form-item :label="'钙剂量（'+anticoagulant.gaimingcheng_unit+'）: '" prop="anticoagulant_gaijiliang">
               <el-input v-model="addPlan.anticoagulant_gaijiliang" :disabled="anticoagulant.gaijiliang==1?false:true"
                         placeholder="钙剂量"></el-input>
             </el-form-item>
@@ -359,7 +361,8 @@
 
 
           <el-col :span="8">
-            <el-form-item label="置换液：" v-if="isShows('置换液')&&this.$store.getters.xt_user.template_info.template_id != 6">
+            <el-form-item label="置换液："
+                          v-if="isShows('置换液')&&this.$store.getters.xt_user.template_info.template_id != 6">
               <el-select v-model="addPlan.displace_liqui_part" placeholder="请选择">
                 <el-option :key="0" label="请选择" :value="0"></el-option>
                 <el-option v-for="(option, index) in displace_liqui_part_option" :key="index"
@@ -368,7 +371,8 @@
             </el-form-item>
 
 
-            <el-form-item label="置换方式：" v-if="isShows('置换液')&&this.$store.getters.xt_user.template_info.template_id == 6">
+            <el-form-item label="置换方式："
+                          v-if="isShows('置换液')&&this.$store.getters.xt_user.template_info.template_id == 6">
               <el-select v-model="addPlan.displace_liqui_part" placeholder="请选择">
                 <el-option :key="0" label="请选择" :value="0"></el-option>
                 <el-option v-for="(option, index) in displace_liqui_part_option" :key="index"
@@ -454,12 +458,7 @@
     fetchPatientDialysisSolutions
   } from '@/api/patient'
 
-  import {
-    getSystemPrescription,
-  } from '@/api/config'
-
-
-
+  import { getSystemPrescription } from '@/api/config'
 
   import { calculateAnticoagulantZL, uParseTime } from '@/utils/tools'
   import store from '@/store'
@@ -537,6 +536,7 @@
           id: 0,
           mode: '',
           mode_name: '',
+          registrars_id: 0,
           dialyzer: '',
           dialysis_duration: '',
           dialysis_duration_hour: '',
@@ -564,10 +564,10 @@
           dialysate_temperature: '',
           conductivity: '',
           doctor: '',
-          dialysate_formulation:'',
+          dialysate_formulation: '',
           remark: '',
-          target_ktv:'',
-          target_ultrafiltration:'',
+          target_ktv: '',
+          target_ultrafiltration: '',
           dialyzer_perfusion_apparatus: '',
           body_fluid: '',
           body_fluid_other: '',
@@ -576,7 +576,7 @@
           displace_liqui_part: '',
           displace_liqui_value: '',
           ultrafiltration: '',
-          blood_access: '',
+          blood_access: ''
         },
         childPlan: {
           mode: '',
@@ -701,26 +701,26 @@
       }
     },
     watch: {
-      "addPlan.dialysis_duration":function(){
-        this.addPlan.anticoagulant_zongliang=calculateAnticoagulantZL(1,
+      'addPlan.dialysis_duration': function() {
+        this.addPlan.anticoagulant_zongliang = calculateAnticoagulantZL(1,
           this.addPlan.anticoagulant_shouji,
           this.addPlan.dialysis_duration,
           this.addPlan.anticoagulant_weichi
-        );
+        )
       },
-      "addPlan.anticoagulant_shouji":function(){
-        this.addPlan.anticoagulant_zongliang=calculateAnticoagulantZL(1,
+      'addPlan.anticoagulant_shouji': function() {
+        this.addPlan.anticoagulant_zongliang = calculateAnticoagulantZL(1,
           this.addPlan.anticoagulant_shouji,
           this.addPlan.dialysis_duration,
           this.addPlan.anticoagulant_weichi
-        );
+        )
       },
-      "addPlan.anticoagulant_weichi":function(){
-        this.addPlan.anticoagulant_zongliang=calculateAnticoagulantZL(1,
+      'addPlan.anticoagulant_weichi': function() {
+        this.addPlan.anticoagulant_zongliang = calculateAnticoagulantZL(1,
           this.addPlan.anticoagulant_shouji,
           this.addPlan.dialysis_duration,
           this.addPlan.anticoagulant_weichi
-        );
+        )
       }
     },
     components: {
@@ -966,7 +966,14 @@
       submitEditSolution(formName) {
         this.$refs[formName].validate(valid => {
           if (valid) {
-            editPatientDialysisSolution(this.patientID, this.addPlan.id, this.addPlan).then(response => {
+
+            let mode = '2'
+
+            if (this.addPlan.registrars_id != this.$store.getters.xt_user.user.id) {
+              mode = '3'
+            }
+
+            editPatientDialysisSolution(this.patientID, this.addPlan.id, this.addPlan, mode).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
                 return false
@@ -1002,7 +1009,8 @@
         this.addPlan.anticoagulant_zongliang = this.addPlan.anticoagulant_zongliang.toString()
         this.$refs[formName].validate(valid => {
           if (valid) {
-            createPatientDialysisSolution(this.patientID, this.addPlan).then(response => {
+            let mode = '1'
+            createPatientDialysisSolution(this.patientID, this.addPlan, mode).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
                 return false
@@ -1050,42 +1058,41 @@
         this.addPlan.dialysis_duration = '' + row.dialysis_duration
         this.addPlan.dialysis_duration_hour = '' + row.dialysis_duration_hour
         this.addPlan.dialysis_duration_minute = '' + row.dialysis_duration_minute
-        this.addPlan.hemodialysis_machine = row.hemodialysis_machine + '';
-        this.addPlan.perfusion_apparatus = row.perfusion_apparatus + '';
-        this.addPlan.blood_flow_volume = row.blood_flow_volume.toString();
-        this.addPlan.anticoagulant = row.anticoagulant;
-        this.addPlan.replacement_total = row.replacement_total;
-
-        this.addPlan.target_ktv = row.target_ktv.toString();
-        this.addPlan.target_ultrafiltration = row.target_ultrafiltration.toString();
-
-
-        this.addPlan.anticoagulant_shouji = row.anticoagulant_shouji.toString();
-        this.addPlan.anticoagulant_weichi = row.anticoagulant_weichi.toString();
-        this.addPlan.anticoagulant_zongliang = row.anticoagulant_zongliang.toString();
-        this.addPlan.anticoagulant_gaimingcheng = row.anticoagulant_gaimingcheng.toString();
-        this.addPlan.anticoagulant_gaijiliang = row.anticoagulant_gaijiliang.toString();
-        this.addPlan.kalium = row.kalium.toString();
-        this.addPlan.sodium = row.sodium.toString();
-        this.addPlan.calcium = row.calcium.toString();
-        this.addPlan.bicarbonate = row.bicarbonate.toString();
-        this.addPlan.glucose = row.glucose.toString();
-        this.addPlan.dialysate_flow = row.dialysate_flow.toString();
-        this.addPlan.dialysate_temperature = row.dialysate_temperature.toString();
-        this.addPlan.conductivity = row.conductivity.toString();
-        this.addPlan.remark = row.remark;
-
-
-        this.addPlan.dialyzer_perfusion_apparatus = row.dialyzer_perfusion_apparatus.toString();
+        this.addPlan.hemodialysis_machine = row.hemodialysis_machine + ''
+        this.addPlan.perfusion_apparatus = row.perfusion_apparatus + ''
+        this.addPlan.blood_flow_volume = row.blood_flow_volume.toString()
+        this.addPlan.anticoagulant = row.anticoagulant
+        this.addPlan.replacement_total = row.replacement_total
+
+        this.addPlan.target_ktv = row.target_ktv.toString()
+        this.addPlan.target_ultrafiltration = row.target_ultrafiltration.toString()
+
+        this.addPlan.anticoagulant_shouji = row.anticoagulant_shouji.toString()
+        this.addPlan.anticoagulant_weichi = row.anticoagulant_weichi.toString()
+        this.addPlan.anticoagulant_zongliang = row.anticoagulant_zongliang.toString()
+        this.addPlan.anticoagulant_gaimingcheng = row.anticoagulant_gaimingcheng.toString()
+        this.addPlan.anticoagulant_gaijiliang = row.anticoagulant_gaijiliang.toString()
+        this.addPlan.kalium = row.kalium.toString()
+        this.addPlan.sodium = row.sodium.toString()
+        this.addPlan.calcium = row.calcium.toString()
+        this.addPlan.bicarbonate = row.bicarbonate.toString()
+        this.addPlan.glucose = row.glucose.toString()
+        this.addPlan.dialysate_flow = row.dialysate_flow.toString()
+        this.addPlan.dialysate_temperature = row.dialysate_temperature.toString()
+        this.addPlan.conductivity = row.conductivity.toString()
+        this.addPlan.remark = row.remark
+
+        this.addPlan.dialyzer_perfusion_apparatus = row.dialyzer_perfusion_apparatus.toString()
         this.addPlan.body_fluid = row.body_fluid
-        this.addPlan.body_fluid_other = row.body_fluid_other.toString();
-        this.addPlan.special_medicine = row.special_medicine;
-        this.addPlan.special_medicine_other = row.special_medicine_other.toString();
-        this.addPlan.displace_liqui_part = row.displace_liqui_part;
-        this.addPlan.displace_liqui_value = row.displace_liqui_value.toString();
-        this.addPlan.ultrafiltration = row.ultrafiltration.toString();
-        this.addPlan.blood_access = row.blood_access;
+        this.addPlan.body_fluid_other = row.body_fluid_other.toString()
+        this.addPlan.special_medicine = row.special_medicine
+        this.addPlan.special_medicine_other = row.special_medicine_other.toString()
+        this.addPlan.displace_liqui_part = row.displace_liqui_part
+        this.addPlan.displace_liqui_value = row.displace_liqui_value.toString()
+        this.addPlan.ultrafiltration = row.ultrafiltration.toString()
+        this.addPlan.blood_access = row.blood_access
 
+        this.addPlan.registrars_id = row.registrars_id
 
         this.dialogVisible = true
         this.isEdit = true
@@ -1115,10 +1122,8 @@
           doctor: '',
           first_dialysis: '',
 
-
-
           dialyzer: '',
-          dialysate_formulation:'',
+          dialysate_formulation: '',
           hemodialysis_machine: '',
           perfusion_apparatus: '',
           blood_flow_volume: '',
@@ -1142,8 +1147,8 @@
           dialysate_temperature: '',
           conductivity: '',
           remark: '',
-          target_ktv:'',
-          target_ultrafiltration:'',
+          target_ktv: '',
+          target_ultrafiltration: '',
           dialyzer_perfusion_apparatus: '',
           body_fluid: '',
           body_fluid_other: '',
@@ -1154,14 +1159,6 @@
           ultrafiltration: '',
           blood_access: '',
 
-
-
-
-
-
-
-
-
           dialysis_duration: '3.30',
           dialysis_duration_hour: '3',
           dialysis_duration_minute: '30'
@@ -1258,29 +1255,25 @@
           id: thismode
         }
 
-
-
         getSystemPrescription(params).then(response => {
           if (response.data.state == 1) {
-            if(response.data.data.prescription.id > 0) {
+            if (response.data.data.prescription.id > 0) {
               for (const key in  response.data.data.prescription) {
                 //因为el-input特性整数类型或者浮点数类型需要转换成字符串，所以加上toString()
                 this.$set(this.addPlan, key, response.data.data.prescription[key].toString())
               }
 
               //因为el-select特性,整数类型不能转字符串，所以额外处理这些数据
-              this.$set(this.addPlan, "dialysate_formulation", response.data.data.prescription['dialysate_formulation'])
-              this.$set(this.addPlan, "anticoagulant", response.data.data.prescription['anticoagulant'])
-              this.$set(this.addPlan, "body_fluid", response.data.data.prescription['body_fluid'])
-              this.$set(this.addPlan, "special_medicine", response.data.data.prescription['special_medicine'])
-              this.$set(this.addPlan, "displace_liqui_part", response.data.data.prescription['displace_liqui_part'])
-              this.$set(this.addPlan, "blood_access", response.data.data.prescription['blood_access'])
-
-
+              this.$set(this.addPlan, 'dialysate_formulation', response.data.data.prescription['dialysate_formulation'])
+              this.$set(this.addPlan, 'anticoagulant', response.data.data.prescription['anticoagulant'])
+              this.$set(this.addPlan, 'body_fluid', response.data.data.prescription['body_fluid'])
+              this.$set(this.addPlan, 'special_medicine', response.data.data.prescription['special_medicine'])
+              this.$set(this.addPlan, 'displace_liqui_part', response.data.data.prescription['displace_liqui_part'])
+              this.$set(this.addPlan, 'blood_access', response.data.data.prescription['blood_access'])
 
               this.dialysisTimeShow = new Date(2018, 1, 1, this.addPlan.dialysis_duration_hour, this.addPlan.dialysis_duration_minute)
 
-            }else{
+            } else {
               var tempAddPlan = {
                 id: 0,
                 dialyzer: '',
@@ -1288,7 +1281,7 @@
                 dialysis_duration_hour: '',
                 dialysis_duration_minute: '',
                 hemodialysis_machine: '',
-                dialysate_formulation:'',
+                dialysate_formulation: '',
                 perfusion_apparatus: '',
                 blood_flow_volume: '',
                 dewater: '',
@@ -1329,7 +1322,6 @@
                 this.addPlan[key] = tempAddPlan[key]
               }
 
-
             }
           }
         })
@@ -1385,8 +1377,6 @@
     },
     created() {
 
-
-
       const id = this.$route.params && this.$route.params.id
       this.patientID = parseInt(id)
       if (isNaN(this.patientID) || this.patientID <= 0) {
@@ -1413,8 +1403,6 @@
       this.displace_liqui_part_option = this.$store.getters.displace_liqui
       this.blood_access_option = this.$store.getters.blood_access
 
-
-
       this.queryParams.id = this.patientID
       // this.fetchAllDoctorAndNurse();
       this.fetchAllAdminUsers()
@@ -1475,15 +1463,16 @@
   }
 </style>
 <style>
-.el-table td,
-.el-table th.is-leaf,
-.el-table--border,
-.el-table--group {
-  border-color: #d0d3da;
-}
-.el-table--border::after,
-.el-table--group::after,
-.el-table::before {
-  background-color: #d0d3da;
-}
+  .el-table td,
+  .el-table th.is-leaf,
+  .el-table--border,
+  .el-table--group {
+    border-color: #d0d3da;
+  }
+
+  .el-table--border::after,
+  .el-table--group::after,
+  .el-table::before {
+    background-color: #d0d3da;
+  }
 </style>

src/xt_permission.js

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