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/lang/zh.js

@@ -1,277 +1,285 @@
 export default {
   route: {
-    dashboard: '首页',
-    introduction: '简述',
-    documentation: '文档',
-    guide: '引导页',
-    permission: '权限测试页',
-    pagePermission: '页面权限',
-    directivePermission: '指令权限',
-    icons: '图标',
-    components: '组件',
-    componentIndex: '介绍',
-    tinymce: '富文本编辑器',
-    markdown: 'Markdown',
-    jsonEditor: 'JSON编辑器',
-    dndList: '列表拖拽',
-    splitPane: 'Splitpane',
-    avatarUpload: '头像上传',
-    dropzone: 'Dropzone',
-    sticky: 'Sticky',
-    countTo: 'CountTo',
-    componentMixin: '小组件',
-    backToTop: '返回顶部',
-    dragDialog: '拖拽 Dialog',
-    dragKanban: '可拖拽看板',
-    charts: '图表',
-    keyboardChart: '键盘图表',
-    lineChart: '折线图',
-    mixChart: '混合图表',
-    example: '综合实例',
-    nested: '路由嵌套',
-    menu1: '菜单1',
-    'menu1-1': '菜单1-1',
-    'menu1-2': '菜单1-2',
-    'menu1-2-1': '菜单1-2-1',
-    'menu1-2-2': '菜单1-2-2',
-    'menu1-3': '菜单1-3',
-    menu2: '菜单2',
-    Table: 'Table',
-    dynamicTable: '动态Table',
-    dragTable: '拖拽Table',
-    inlineEditTable: 'Table内编辑',
-    complexTable: '综合Table',
-    treeTable: '树形表格',
-    customTreeTable: '自定义树表',
-    tab: 'Tab',
-    form: '表单',
-    createArticle: '创建文章',
-    editArticle: '编辑文章',
-    articleList: '文章列表',
-    errorPages: '错误页面',
-    page401: '401',
-    page404: '404',
-    errorLog: '错误日志',
-    excel: 'Excel',
-    exportExcel: 'Export Excel',
-    selectExcel: 'Export Selected',
-    uploadExcel: 'Upload Excel',
-    zip: 'Zip',
-    exportZip: 'Export Zip',
-    theme: '换肤',
-    clipboardDemo: 'Clipboard',
-    i18n: '国际化',
-    permissionManage: '权限管理',
-    adminManage: '用户管理',
-    roleManage: '角色管理',
-    dialysis: '透析管理',
-    paper: '透析管理',
-    advice: '今日医嘱',
-    prepare: '透析准备',
-    dialysisPrintOrder: '打印透析单',
-    details: '透析',
-    data_dictionary: '数据字典',
-    field_config: '字段配置',
-    template: '模版配置',
-    druguse: '医嘱模版',
-    watch: '透析监测',
-    addAdmin: '新增用户',
-    editAdmin: '编辑用户信息',
-    setupPerview: '设置权限',
-    user: '病人管理',
-    createPatient: '新增病人',
-    patientPage: '病人信息',
-    editPatient: '修改病人信息',
-    patient: '病人管理',
-    dialysisSolution: '透析处方',
-    inspection: '检验检查',
-    home: '首页',
-    weight: '干体重',
-    dialysisRecord: '透析记录',
-    scheduling: '排班信息',
-    proeducation: '宣教信息',
-    doctorAdvice: '医嘱信息',
-    dryWeight: '干体重',
-    device: '设备',
-    deviceManage: '设备管理',
-    modemanagement:'型号管理',
-    dialysisMachineManage: '设备管理',
-    workforce: '排班管理',
-    appointment: '排班管理',
-    sign: '治疗签到',
-    remind: '排班提醒',
-    signWeight: '签到称重',
-    deviceZoneManage: '分区管理',
-    deviceGroupManage: '分组管理',
-    deviceNumberManage: '床位管理',
-    service: '我的服务',
-    invoice: '发票管理',
-    invoiceApply: '申请发票',
-    servicePay: '立即支付',
-    serviceOrder: '购买服务',
-    payType: '选择支付方式',
-    weChatPay: '确认支付',
-    completeOrder: '购买结果',
-    orderRecord: '订单详情',
-    recordList: '订单记录',
-    stockManage: '库存管理',
-    goodType: '商品类型',
-    stockIn: '入库管理',
-    stockOut: '出库管理',
-    manufacturer: '厂家',
-    dealer: '经销商',
-    salesReturn: '退货',
-    salesReutrnRecord: '退货记录',
-    warehouseRecord: '入库记录',
-    addStockOut: '出库',
-    cancelStock: '出库退库',
-    cancelStockRecord: '退库记录',
-    stockOutRecord: '出库记录',
-    addStockIn: '入库',
-    stockQuery: '库存查询',
-    workforce_template: '排班模板设置',
-    statistics: '统计分析',
-    config: '库存配置',
-    goodInfo: '商品信息',
-    CourseOfDiseaseManage: '病程管理',
-    RescueRecord: '抢救记录',
-    special_permission_manage: '特殊权限管理',
-    schedule_print: '排班打印',
+    dashboard: "首页",
+    introduction: "简述",
+    documentation: "文档",
+    guide: "引导页",
+    permission: "权限测试页",
+    pagePermission: "页面权限",
+    directivePermission: "指令权限",
+    icons: "图标",
+    components: "组件",
+    componentIndex: "介绍",
+    tinymce: "富文本编辑器",
+    markdown: "Markdown",
+    jsonEditor: "JSON编辑器",
+    dndList: "列表拖拽",
+    splitPane: "Splitpane",
+    avatarUpload: "头像上传",
+    dropzone: "Dropzone",
+    sticky: "Sticky",
+    countTo: "CountTo",
+    componentMixin: "小组件",
+    backToTop: "返回顶部",
+    dragDialog: "拖拽 Dialog",
+    dragKanban: "可拖拽看板",
+    charts: "图表",
+    keyboardChart: "键盘图表",
+    lineChart: "折线图",
+    mixChart: "混合图表",
+    example: "综合实例",
+    nested: "路由嵌套",
+    menu1: "菜单1",
+    "menu1-1": "菜单1-1",
+    "menu1-2": "菜单1-2",
+    "menu1-2-1": "菜单1-2-1",
+    "menu1-2-2": "菜单1-2-2",
+    "menu1-3": "菜单1-3",
+    menu2: "菜单2",
+    Table: "Table",
+    dynamicTable: "动态Table",
+    dragTable: "拖拽Table",
+    inlineEditTable: "Table内编辑",
+    complexTable: "综合Table",
+    treeTable: "树形表格",
+    customTreeTable: "自定义树表",
+    tab: "Tab",
+    form: "表单",
+    createArticle: "创建文章",
+    editArticle: "编辑文章",
+    articleList: "文章列表",
+    errorPages: "错误页面",
+    page401: "401",
+    page404: "404",
+    errorLog: "错误日志",
+    excel: "Excel",
+    exportExcel: "Export Excel",
+    selectExcel: "Export Selected",
+    uploadExcel: "Upload Excel",
+    zip: "Zip",
+    exportZip: "Export Zip",
+    theme: "换肤",
+    clipboardDemo: "Clipboard",
+    i18n: "国际化",
+    permissionManage: "权限管理",
+    adminManage: "用户管理",
+    roleManage: "角色管理",
+    dialysis: "透析管理",
+    paper: "透析管理",
+    advice: "今日医嘱",
+    prepare: "透析准备",
+    dialysisPrintOrder: "打印透析单",
+    details: "透析",
+    data_dictionary: "数据字典",
+    field_config: "字段配置",
+    template: "模版配置",
+    druguse: "医嘱模版",
+    watch: "透析监测",
+    addAdmin: "新增用户",
+    editAdmin: "编辑用户信息",
+    setupPerview: "设置权限",
+    user: "病人管理",
+    createPatient: "新增病人",
+    patientPage: "病人信息",
+    editPatient: "修改病人信息",
+    patient: "病人管理",
+    dialysisSolution: "透析处方",
+    inspection: "检验检查",
+    home: "首页",
+    weight: "干体重",
+    dialysisRecord: "透析记录",
+    scheduling: "排班信息",
+    proeducation: "宣教信息",
+    doctorAdvice: "医嘱信息",
+    dryWeight: "干体重",
+    device: "设备",
+    deviceManage: "设备管理",
+    modemanagement: "型号管理",
+    dialysisMachineManage: "设备管理",
+    workforce: "排班管理",
+    appointment: "排班管理",
+    sign: "治疗签到",
+    remind: "排班提醒",
+    signWeight: "签到称重",
+    deviceZoneManage: "分区管理",
+    deviceGroupManage: "分组管理",
+    deviceNumberManage: "床位管理",
+    service: "我的服务",
+    invoice: "发票管理",
+    invoiceApply: "申请发票",
+    servicePay: "立即支付",
+    serviceOrder: "购买服务",
+    payType: "选择支付方式",
+    weChatPay: "确认支付",
+    completeOrder: "购买结果",
+    orderRecord: "订单详情",
+    recordList: "订单记录",
+    stockManage: "库存管理",
+    goodType: "商品类型",
+    stockIn: "入库管理",
+    stockOut: "出库管理",
+    manufacturer: "厂家",
+    dealer: "经销商",
+    salesReturn: "退货",
+    salesReutrnRecord: "退货记录",
+    warehouseRecord: "入库记录",
+    addStockOut: "出库",
+    cancelStock: "出库退库",
+    cancelStockRecord: "退库记录",
+    stockOutRecord: "出库记录",
+    addStockIn: "入库",
+    stockQuery: "库存查询",
+    workforce_template: "排班模板设置",
+    statistics: "统计分析",
+    config: "库存配置",
+    goodInfo: "商品信息",
+    CourseOfDiseaseManage: "病程管理",
+    RescueRecord: "抢救记录",
+    special_permission_manage: "特殊权限管理",
+    schedule_print: "排班打印",
 
-    stockInOrder: '耗材入库单',
-    salesReturnOrder: '耗材退货单',
-    stockOutOrder: '耗材出库单',
-    cancelStockOrder: '耗材退库单',
-    otherStockInOrder: '其他入库单',
-    otherSalesReturnOrder: '其他退货单',
-    otherStockOutOrder: '其他出库单',
-    otherCancelStockOrder: '其他退库单',
-    stockInOrderAdd: '新增入库单',
-    salesReturnOrderAdd: '新增退货单',
-    stockOutOrderAdd: '新增出库单',
-    cancelStockOrderAdd: '新增退库单',
-    stockInDetail: '入库单详情',
-    salesReturnDetail: '退货单详情',
-    stockOutDetail: '出库单详情',
-    cancelStockDetail: '退库单详情',
-    stockDetail: '出入库明细查询',
+    warehouseReceipt: "出入库",
+    warehouseReceiptOther: "其他出入库",
+    stockInOrder: "耗材入库单",
+    salesReturnOrder: "耗材退货单",
+    stockOutOrder: "耗材出库单",
+    cancelStockOrder: "耗材退库单",
+    otherStockInOrder: "其他入库单",
+    otherSalesReturnOrder: "其他退货单",
+    otherStockOutOrder: "其他出库单",
+    otherCancelStockOrder: "其他退库单",
+    stockInOrderAdd: "新增入库单",
+    salesReturnOrderAdd: "新增退货单",
+    stockOutOrderAdd: "新增出库单",
+    cancelStockOrderAdd: "新增退库单",
+    stockInDetail: "入库单详情",
+    salesReturnDetail: "退货单详情",
+    stockOutDetail: "出库单详情",
+    cancelStockDetail: "退库单详情",
+    stockDetail: "明细查询",
 
-    showconfig: '显示配置',
-    user_detail: '使用明细',
-    systemManage: '系统管理',
-    printTemplate: '打印模版',
-    data_upload: '一键上报',
-    fast_upload: '快捷上报',
-    export: '一键导出',
-    upload_config: '质控上报配置',
-    quality_control: '质控上报',
-    remind_print: '排版提醒打印',
-    system_prescription:"透析方案",
+    showconfig: "显示配置",
+    user_detail: "使用明细",
+    systemManage: "系统管理",
+    printTemplate: "打印模版",
+    data_upload: "一键上报",
+    fast_upload: "快捷上报",
+    export: "一键导出",
+    upload_config: "质控上报配置",
+    quality_control: "质控上报",
+    remind_print: "排版提醒打印",
+    system_prescription: "透析方案",
     integration_config: "集成配置",
-    his_config:"HIS集成配置",
-
+    his_config: "HIS集成配置"
   },
   navbar: {
-    logOut: '退出登录',
-    dashboard: '首页',
-    github: '项目地址',
-    screenfull: '全屏',
-    theme: '换肤'
+    logOut: "退出登录",
+    dashboard: "首页",
+    github: "项目地址",
+    screenfull: "全屏",
+    theme: "换肤"
   },
   login: {
-    title: '系统登录',
-    logIn: '登录',
-    username: '账号',
-    password: '密码',
-    any: '随便填',
-    thirdparty: '第三方登录',
-    thirdpartyTips: '本地不能模拟，请结合自己业务进行模拟！！！'
+    title: "系统登录",
+    logIn: "登录",
+    username: "账号",
+    password: "密码",
+    any: "随便填",
+    thirdparty: "第三方登录",
+    thirdpartyTips: "本地不能模拟，请结合自己业务进行模拟！！！"
   },
   documentation: {
-    documentation: '文档',
-    github: 'Github 地址'
+    documentation: "文档",
+    github: "Github 地址"
   },
   permission: {
-    roles: '你的权限',
-    switchRoles: '切换权限'
+    roles: "你的权限",
+    switchRoles: "切换权限"
   },
   guide: {
-    description: '引导页对于一些第一次进入项目的人很有用，你可以简单介绍下项目的功能。本 Demo 是基于',
-    button: '打开引导'
+    description:
+      "引导页对于一些第一次进入项目的人很有用，你可以简单介绍下项目的功能。本 Demo 是基于",
+    button: "打开引导"
   },
   components: {
-    documentation: '文档',
-    tinymceTips: '富文本是管理后台一个核心的功能，但同时又是一个有很多坑的地方。在选择富文本的过程中我也走了不少的弯路，市面上常见的富文本都基本用过了，最终权衡了一下选择了Tinymce。更详细的富文本比较和介绍见',
-    dropzoneTips: '由于我司业务有特殊需求，而且要传七牛 所以没用第三方，选择了自己封装。代码非常的简单，具体代码你可以在这里看到 @/components/Dropzone',
-    stickyTips: '当页面滚动到预设的位置会吸附在顶部',
-    backToTopTips1: '页面滚动到指定位置会在右下角出现返回顶部按钮',
-    backToTopTips2: '可自定义按钮的样式、show/hide、出现的高度、返回的位置 如需文字提示，可在外部使用Element的el-tooltip元素',
-    imageUploadTips: '由于我在使用时它只有vue@1版本，而且和mockjs不兼容，所以自己改造了一下，如果大家要使用的话，优先还是使用官方版本。'
+    documentation: "文档",
+    tinymceTips:
+      "富文本是管理后台一个核心的功能，但同时又是一个有很多坑的地方。在选择富文本的过程中我也走了不少的弯路，市面上常见的富文本都基本用过了，最终权衡了一下选择了Tinymce。更详细的富文本比较和介绍见",
+    dropzoneTips:
+      "由于我司业务有特殊需求，而且要传七牛 所以没用第三方，选择了自己封装。代码非常的简单，具体代码你可以在这里看到 @/components/Dropzone",
+    stickyTips: "当页面滚动到预设的位置会吸附在顶部",
+    backToTopTips1: "页面滚动到指定位置会在右下角出现返回顶部按钮",
+    backToTopTips2:
+      "可自定义按钮的样式、show/hide、出现的高度、返回的位置 如需文字提示，可在外部使用Element的el-tooltip元素",
+    imageUploadTips:
+      "由于我在使用时它只有vue@1版本，而且和mockjs不兼容，所以自己改造了一下，如果大家要使用的话，优先还是使用官方版本。"
   },
   table: {
-    dynamicTips1: '固定表头, 按照表头顺序排序',
-    dynamicTips2: '不固定表头, 按照点击顺序排序',
-    dragTips1: '默认顺序',
-    dragTips2: '拖拽后顺序',
-    title: '标题',
-    importance: '重要性',
-    type: '类型',
-    remark: '点评',
-    search: '搜索',
-    add: '新增',
-    export: '导出',
-    reviewer: '审核人',
-    id: '序号',
-    date: '时间',
-    author: '作者',
-    readings: '阅读数',
-    status: '状态',
-    actions: '操作',
-    edit: '编辑',
-    publish: '发布',
-    draft: '草稿',
-    delete: '删除',
-    cancel: '取 消',
-    confirm: '保 存'
+    dynamicTips1: "固定表头, 按照表头顺序排序",
+    dynamicTips2: "不固定表头, 按照点击顺序排序",
+    dragTips1: "默认顺序",
+    dragTips2: "拖拽后顺序",
+    title: "标题",
+    importance: "重要性",
+    type: "类型",
+    remark: "点评",
+    search: "搜索",
+    add: "新增",
+    export: "导出",
+    reviewer: "审核人",
+    id: "序号",
+    date: "时间",
+    author: "作者",
+    readings: "阅读数",
+    status: "状态",
+    actions: "操作",
+    edit: "编辑",
+    publish: "发布",
+    draft: "草稿",
+    delete: "删除",
+    cancel: "取 消",
+    confirm: "保 存"
   },
   errorLog: {
-    tips: '请点击右上角bug小图标',
-    description: '现在的管理后台基本都是spa的形式了，它增强了用户体验，但同时也会增加页面出问题的可能性，可能一个小小的疏忽就导致整个页面的死锁。好在 Vue 官网提供了一个方法来捕获处理异常，你可以在其中进行错误处理或者异常上报。',
-    documentation: '文档介绍'
+    tips: "请点击右上角bug小图标",
+    description:
+      "现在的管理后台基本都是spa的形式了，它增强了用户体验，但同时也会增加页面出问题的可能性，可能一个小小的疏忽就导致整个页面的死锁。好在 Vue 官网提供了一个方法来捕获处理异常，你可以在其中进行错误处理或者异常上报。",
+    documentation: "文档介绍"
   },
   excel: {
-    export: '导出',
-    selectedExport: '导出已选择项',
-    placeholder: '请输入文件名(默认excel-list)'
+    export: "导出",
+    selectedExport: "导出已选择项",
+    placeholder: "请输入文件名(默认excel-list)"
   },
   zip: {
-    export: '导出',
-    placeholder: '请输入文件名(默认file)'
+    export: "导出",
+    placeholder: "请输入文件名(默认file)"
   },
   theme: {
-    change: '换肤',
-    documentation: '换肤文档',
-    tips: 'Tips: 它区别于 navbar 上的 theme-pick, 是两种不同的换肤方法，各自有不同的应用场景，具体请参考文档。'
+    change: "换肤",
+    documentation: "换肤文档",
+    tips:
+      "Tips: 它区别于 navbar 上的 theme-pick, 是两种不同的换肤方法，各自有不同的应用场景，具体请参考文档。"
   },
   tagsView: {
-    close: '关闭',
-    closeOthers: '关闭其它',
-    closeAll: '关闭所有'
+    close: "关闭",
+    closeOthers: "关闭其它",
+    closeAll: "关闭所有"
   },
   data_config: {
-    patient: '病人管理',
-    scheduling: '排班管理',
-    device: '设备管理',
-    hemodialysis: '血透管理',
-    system: '系统配置',
-    education: '透后宣教',
-    summary: '透析小结',
-    config_name: '名称',
-    config_field: '字段名',
-    config_value: '字段值',
-    remark: '备注',
-    course_disease: '病程',
-    rescue_record: '抢救记录',
-    manage_ment: '设备管理'
+    patient: "病人管理",
+    scheduling: "排班管理",
+    device: "设备管理",
+    hemodialysis: "血透管理",
+    system: "系统配置",
+    education: "透后宣教",
+    summary: "透析小结",
+    config_name: "名称",
+    config_field: "字段名",
+    config_value: "字段值",
+    remark: "备注",
+    course_disease: "病程",
+    rescue_record: "抢救记录",
+    manage_ment: "设备管理"
   }
-}
+};

src/router/modules/stock.js

@@ -1,145 +1,261 @@
-import Layout from '@/views/layout/Layout'
+import Layout from "@/views/layout/Layout";
 
 export default {
-  path: '/stock/',
+  path: "/stock",
   component: Layout,
-  redirect: 'noredirect',
-  name: 'stockManage',
+  redirect: "noredirect",
+  name: "stockManage",
   alwaysShow: true,
   meta: {
-    title: 'stockManage',
-    icon: 'stock'
+    title: "stockManage",
+    icon: "stock",
+    isChild: true
   },
   children: [
     {
-      path: '/stock/in',
-      component: () => import('@/xt_pages/stock/stockInOrder'),
-      name: 'stockInOrder',
-      meta: { title: 'stockInOrder', noCache: true }
-    }, {
-      path: '/stock/return',
-      component: () => import('@/xt_pages/stock/salesReturnOrder'),
-      name: 'salesReturnOrder',
-      meta: { title: 'salesReturnOrder', noCache: true }
-    },
-    {
-      path: '/stock/out',
-      component: () => import('@/xt_pages/stock/stockOutOrder'),
-      name: 'stockOutOrder',
-      meta: { title: 'stockOutOrder', noCache: true }
-    }, {
-      path: '/stock/cancel',
-      component: () => import('@/xt_pages/stock/cancelStockOrder'),
-      name: 'cancelStockOrder',
-      meta: { title: 'cancelStockOrder', noCache: true }
-    }, {
-      path: '/stock/in/other',
-      component: () => import('@/xt_pages/stock/otherStockInOrder'),
-      name: 'otherStockInOrder',
-      meta: { title: 'otherStockInOrder', noCache: true }
-    }, {
-      path: '/stock/return/other',
-      component: () => import('@/xt_pages/stock/otherSalesReturnOrder'),
-      name: 'otherSalesReturnOrder',
-      meta: { title: 'otherSalesReturnOrder', noCache: true }
-    }, {
-      path: '/stock/out/other',
-      component: () => import('@/xt_pages/stock/otherStockOutOrder'),
-      name: 'otherStockOutOrder',
-      meta: { title: 'otherStockOutOrder', noCache: true }
-    }, {
-      path: '/stock/cancel/other',
-      component: () => import('@/xt_pages/stock/otherCancelStockOrder'),
-      name: 'otherCancelStockOrder',
-      meta: { title: 'otherCancelStockOrder', noCache: true }
-    }, {
-      path: '/stock/query',
-      component: () => import('@/xt_pages/stock/stockQuery'),
-      name: 'stockQuery',
-      meta: { title: 'stockQuery', noCache: true  }
-    }, {
-      path: '/stock/detail',
-      component: () => import('@/xt_pages/stock/stockDetailIndex'),
-      name: 'stockDetail',
-      meta: { title: 'stockDetail', noCache: true  }
-    }, {
-      path: '/stock/in/add',
-      component: () => import('@/xt_pages/stock/stockInOrderAdd'),
-      name: 'stockInOrderAdd',
-      hidden: true,
-      is_menu: false,
-      meta: { title: 'stockInOrderAdd', noCache: true }
-    }, {
-      path: '/stock/in/detail',
-      component: () => import('@/xt_pages/stock/stockInDetail'),
-      name: 'stockInDetail',
-      hidden: true,
-      is_menu: false,
-      meta: { title: 'stockInDetail', noCache: true  }
-    }, {
-      path: '/stock/return/detail',
-      component: () => import('@/xt_pages/stock/salesReturnDetail'),
-      name: 'salesReturnDetail',
-      hidden: true,
-      is_menu: false,
-      meta: { title: 'salesReturnDetail', noCache: true  }
-    }, {
-      path: '/stock/return/add',
-      component: () => import('@/xt_pages/stock/salesReturnOrderAdd'),
-      name: 'salesReturnOrderAdd',
-      hidden: true,
-      is_menu: false,
-      meta: { title: 'salesReturnOrderAdd', noCache: true }
-    }, {
-      path: '/stock/out/add',
-      component: () => import('@/xt_pages/stock/stockOutOrderAdd'),
-      name: 'stockOutOrderAdd',
-      hidden: true,
-      is_menu: false,
-      meta: { title: 'stockOutOrderAdd', noCache: true }
-    }, {
-      path: '/stock/out/detail',
-      component: () => import('@/xt_pages/stock/stockOutDetail'),
-      name: 'stockOutDetail',
-      hidden: true,
-      is_menu: false,
-      meta: { title: 'stockOutDetail', noCache: true }
-    }, {
-      path: '/stock/cancel/add',
-      component: () => import('@/xt_pages/stock/cancelStockOrderAdd'),
-      name: 'cancelStockOrderAdd',
-      hidden: true,
-      is_menu: false,
-      meta: { title: 'cancelStockOrderAdd', noCache: true }
-    }, {
-      path: '/stock/cancel/detail',
-      component: () => import('@/xt_pages/stock/cancelStockDetail'),
-      name: 'cancelStockDetail',
-      hidden: true,
-      is_menu: false,
-      meta: { title: 'cancelStockDetail', noCache: true }
-    }, {
-      path: '/stock/config',
-      component: () => import('@/xt_pages/stock/index'),
-      name: 'config',
-      meta: { title: 'config', noCache: true  }
-    }, {
-      path: '/stock/print',
-      component: () => import('@/xt_pages/stock/detail/print'),
-      hidden: true,
-      is_menu: false,
-      name: 'stock_print',
+      path: "/warehouseReceipt/",
+      component: Layout,
+      redirect: "/stock/in",
+      name: "warehouseReceipt",
+      parentNum: 1,
       meta: {
-        title: '库存打印',
+        isChild: true,
+        title: "warehouseReceipt"
+      }
+    },
+    {
+      path: "/warehouseReceiptOther/",
+      component: Layout,
+      redirect: "/stock/in/other",
+      name: "warehouseReceiptOther",
+      parentNum: 2,
+      meta: {
+        isChild: true,
+        title: "warehouseReceiptOther"
+      }
+    },
+    {
+      path: "/stock/in",
+      component: () => import("@/xt_pages/stock/stockInOrder"),
+      name: "stockInOrder",
+      hidden: true,
+      is_menu: false,
+      num: 1,
+      meta: { title: "stockInOrder", noCache: true }
+    },
+    {
+      path: "/stock/return",
+      component: () => import("@/xt_pages/stock/salesReturnOrder"),
+      name: "salesReturnOrder",
+      hidden: true,
+      is_menu: false,
+      num: 1,
+      meta: { title: "salesReturnOrder", noCache: true }
+    },
+    {
+      path: "/stock/out",
+      component: () => import("@/xt_pages/stock/stockOutOrder"),
+      name: "stockOutOrder",
+      hidden: true,
+      is_menu: false,
+      num: 1,
+      meta: { title: "stockOutOrder", noCache: true }
+    },
+    {
+      path: "/stock/cancel",
+      component: () => import("@/xt_pages/stock/cancelStockOrder"),
+      name: "cancelStockOrder",
+      hidden: true,
+      is_menu: false,
+      num: 1,
+      meta: { title: "cancelStockOrder", noCache: true }
+    },
+    {
+      path: "/stock/in/other",
+      component: () => import("@/xt_pages/stock/otherStockInOrder"),
+      name: "otherStockInOrder",
+      hidden: true,
+      is_menu: false,
+      num: 2,
+      meta: { title: "otherStockInOrder", noCache: true }
+    },
+    {
+      path: "/stock/return/other",
+      component: () => import("@/xt_pages/stock/otherSalesReturnOrder"),
+      name: "otherSalesReturnOrder",
+      hidden: true,
+      is_menu: false,
+      num: 2,
+      meta: { title: "otherSalesReturnOrder", noCache: true }
+    },
+    {
+      path: "/stock/out/other",
+      component: () => import("@/xt_pages/stock/otherStockOutOrder"),
+      name: "otherStockOutOrder",
+      hidden: true,
+      is_menu: false,
+      num: 2,
+      meta: { title: "otherStockOutOrder", noCache: true }
+    },
+    {
+      path: "/stock/cancel/other",
+      component: () => import("@/xt_pages/stock/otherCancelStockOrder"),
+      name: "otherCancelStockOrder",
+      hidden: true,
+      is_menu: false,
+      num: 2,
+      meta: { title: "otherCancelStockOrder", noCache: true }
+    },
+    // {
+    //   path: "/stock/",
+    //   component: Layout,
+    //   redirect: "noredirect",
+    //   name: "warehouseReceipt",
+    //   meta: {
+    //     isChild: true,
+    //     title: "warehouseReceipt"
+    //   },
+    //   children: [
+
+    //   ]
+    // },
+
+    // {
+    //   path: "stock/",
+    //   component: Layout,
+    //   redirect: "noredirect",
+    //   name: "warehouseReceiptOther",
+    //   meta: {
+    //     isChild: true,
+    //     title: "warehouseReceiptOther"
+    //   },
+    //   children: [
+    //     {
+    //       path: "/stock/in/other",
+    //       component: () => import("@/xt_pages/stock/otherStockInOrder"),
+    //       name: "otherStockInOrder",
+    //       meta: { title: "otherStockInOrder", noCache: true }
+    //     },
+    //     {
+    //       path: "/stock/return/other",
+    //       component: () => import("@/xt_pages/stock/otherSalesReturnOrder"),
+    //       name: "otherSalesReturnOrder",
+    //       meta: { title: "otherSalesReturnOrder", noCache: true }
+    //     },
+    //     {
+    //       path: "/stock/out/other",
+    //       component: () => import("@/xt_pages/stock/otherStockOutOrder"),
+    //       name: "otherStockOutOrder",
+    //       meta: { title: "otherStockOutOrder", noCache: true }
+    //     },
+    //     {
+    //       path: "/stock/cancel/other",
+    //       component: () => import("@/xt_pages/stock/otherCancelStockOrder"),
+    //       name: "otherCancelStockOrder",
+    //       meta: { title: "otherCancelStockOrder", noCache: true }
+    //     }
+    //   ]
+    // },
+    {
+      path: "/stock/query",
+      component: () => import("@/xt_pages/stock/stockQuery"),
+      name: "stockQuery",
+      meta: { title: "stockQuery", noCache: true }
+    },
+    {
+      path: "/stock/detail",
+      component: () => import("@/xt_pages/stock/stockDetailIndex"),
+      name: "stockDetail",
+      meta: { title: "stockDetail", noCache: true }
+    },
+    {
+      path: "/stock/in/add",
+      component: () => import("@/xt_pages/stock/stockInOrderAdd"),
+      name: "stockInOrderAdd",
+      hidden: true,
+      is_menu: false,
+      meta: { title: "stockInOrderAdd", noCache: true }
+    },
+    {
+      path: "/stock/in/detail",
+      component: () => import("@/xt_pages/stock/stockInDetail"),
+      name: "stockInDetail",
+      hidden: true,
+      is_menu: false,
+      meta: { title: "stockInDetail", noCache: true }
+    },
+    {
+      path: "/stock/return/detail",
+      component: () => import("@/xt_pages/stock/salesReturnDetail"),
+      name: "salesReturnDetail",
+      hidden: true,
+      is_menu: false,
+      meta: { title: "salesReturnDetail", noCache: true }
+    },
+    {
+      path: "/stock/return/add",
+      component: () => import("@/xt_pages/stock/salesReturnOrderAdd"),
+      name: "salesReturnOrderAdd",
+      hidden: true,
+      is_menu: false,
+      meta: { title: "salesReturnOrderAdd", noCache: true }
+    },
+    {
+      path: "/stock/out/add",
+      component: () => import("@/xt_pages/stock/stockOutOrderAdd"),
+      name: "stockOutOrderAdd",
+      hidden: true,
+      is_menu: false,
+      meta: { title: "stockOutOrderAdd", noCache: true }
+    },
+    {
+      path: "/stock/out/detail",
+      component: () => import("@/xt_pages/stock/stockOutDetail"),
+      name: "stockOutDetail",
+      hidden: true,
+      is_menu: false,
+      meta: { title: "stockOutDetail", noCache: true }
+    },
+    {
+      path: "/stock/cancel/add",
+      component: () => import("@/xt_pages/stock/cancelStockOrderAdd"),
+      name: "cancelStockOrderAdd",
+      hidden: true,
+      is_menu: false,
+      meta: { title: "cancelStockOrderAdd", noCache: true }
+    },
+    {
+      path: "/stock/cancel/detail",
+      component: () => import("@/xt_pages/stock/cancelStockDetail"),
+      name: "cancelStockDetail",
+      hidden: true,
+      is_menu: false,
+      meta: { title: "cancelStockDetail", noCache: true }
+    },
+    {
+      path: "/stock/config",
+      component: () => import("@/xt_pages/stock/index"),
+      name: "config",
+      meta: { title: "config", noCache: true }
+    },
+    {
+      path: "/stock/print",
+      component: () => import("@/xt_pages/stock/detail/print"),
+      hidden: true,
+      is_menu: false,
+      name: "stock_print",
+      meta: {
+        title: "库存打印",
         noCache: true
       }
-    },{
-      path: '/stock/user/detail',
-      component: () => import('@/xt_pages/stock/stockUserDetail'),
-      name: 'user_detail',
+    },
+    {
+      path: "/stock/user/detail",
+      component: () => import("@/xt_pages/stock/stockUserDetail"),
+      name: "user_detail",
       hidden: true,
       is_menu: false,
-      meta: { title: 'user_detail', noCache: true  }
+      meta: { title: "user_detail", noCache: true }
     }
   ]
-}
+};

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/styles/sidebar.scss

@@ -2,7 +2,7 @@
   // 主体区域
   .main-container {
     min-height: 100%;
-    transition: margin-left .28s;
+    transition: margin-left 0.28s;
     margin-left: 150px;
     position: relative;
   }
@@ -13,17 +13,18 @@
     height: 100%;
     position: fixed;
     font-size: 0px;
-    top: 60px;
+    // top: 60px;
     bottom: 0;
     left: 0;
     z-index: 1001;
     overflow: hidden;
     //reset element-ui css
     .horizontal-collapse-transition {
-      transition: 0s width ease-in-out, 0s padding-left ease-in-out, 0s padding-right ease-in-out;
+      transition: 0s width ease-in-out, 0s padding-left ease-in-out,
+        0s padding-right ease-in-out;
     }
     .scrollbar-wrapper {
-      overflow-x: hidden!important;
+      overflow-x: hidden !important;
       .el-scrollbar__view {
         height: 100%;
         .hamburger-container {
@@ -51,45 +52,45 @@
       width: 100% !important;
     }
   }
-  .hideSidebar {
-    .sidebar-container {
-      width: 36px !important;
-    }
-    .main-container {
-      margin-left: 36px;
-    }
-    .submenu-title-noDropdown {
-      padding-left: 10px !important;
-      position: relative;
-      .el-tooltip {
-        padding: 0 10px !important;
-      }
-    }
-    .el-submenu {
-      overflow: hidden;
-      &>.el-submenu__title {
-        padding-left: 10px !important;
-        
-        .el-submenu__icon-arrow {
-          display: none;
-        }
-      }
-    }
-    .el-menu--collapse {
-      .el-submenu {
-        &>.el-submenu__title {
-          &>span {
-            height: 0;
-            width: 0;
-            overflow: hidden;
-            visibility: hidden;
-            display: inline-block;
-          }
-        }
-      }
-    }
-  }
-  .sidebar-container .nest-menu .el-submenu>.el-submenu__title,
+  // .hideSidebar {
+  //   .sidebar-container {
+  //     width: 36px !important;
+  //   }
+  //   // .main-container {
+  //   //   margin-left: 36px;
+  //   // }
+  //   .submenu-title-noDropdown {
+  //     padding-left: 10px !important;
+  //     position: relative;
+  //     .el-tooltip {
+  //       padding: 0 10px !important;
+  //     }
+  //   }
+  //   .el-submenu {
+  //     overflow: hidden;
+  //     & > .el-submenu__title {
+  //       padding-left: 10px !important;
+
+  //       .el-submenu__icon-arrow {
+  //         display: none;
+  //       }
+  //     }
+  //   }
+  //   .el-menu--collapse {
+  //     .el-submenu {
+  //       & > .el-submenu__title {
+  //         & > span {
+  //           height: 0;
+  //           width: 0;
+  //           overflow: hidden;
+  //           visibility: hidden;
+  //           display: inline-block;
+  //         }
+  //       }
+  //     }
+  //   }
+  // }
+  .sidebar-container .nest-menu .el-submenu > .el-submenu__title,
   .sidebar-container .el-submenu .el-menu-item {
     // min-width: 180px !important;
     background-color: $subMenuBg !important;
@@ -107,7 +108,7 @@
       margin-left: 0px;
     }
     .sidebar-container {
-      transition: transform .28s;
+      transition: transform 0.28s;
       width: 180px !important;
     }
     &.hideSidebar {

src/views/layout/Layout.vue

@@ -1,24 +1,25 @@
 <template>
   <div class="app-wrapper" :class="classObj">
-    <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"></div>
-      <navbar></navbar>
+    <div v-if="device === 'mobile' && sidebar.opened" class="drawer-bg" @click="handleClickOutside"></div>
+    <navbar></navbar>
 
     <div class="Header-container">
-    <sidebar class="sidebar-container"></sidebar>
-    <div class="main-container">
-      <tags-view></tags-view>
-      <app-main></app-main>
+      <sidebar class="sidebar-container" @callBackIndex="handleIndex"></sidebar>
+      <!-- <sidebar class="newSide" @callBackIndex="handleIndex"></sidebar> -->
+      <div class="main-container">
+        <tags-view :index="index" :num="num"></tags-view>
+        <app-main></app-main>
+      </div>
     </div>
-   </div>
   </div>
 </template>
 
 <script>
-import { Navbar, Sidebar, AppMain, TagsView } from './components'
-import ResizeMixin from './mixin/ResizeHandler'
+import { Navbar, Sidebar, AppMain, TagsView } from "./components";
+import ResizeMixin from "./mixin/ResizeHandler";
 
 export default {
-  name: 'layout',
+  name: "layout",
   components: {
     Navbar,
     Sidebar,
@@ -28,47 +29,71 @@ export default {
   mixins: [ResizeMixin],
   computed: {
     sidebar() {
-      return this.$store.state.app.sidebar
+      return this.$store.state.app.sidebar;
     },
     device() {
-      return this.$store.state.app.device
+      return this.$store.state.app.device;
     },
     classObj() {
       return {
         hideSidebar: !this.sidebar.opened,
         openSidebar: this.sidebar.opened,
         withoutAnimation: this.sidebar.withoutAnimation,
-        mobile: this.device === 'mobile'
-      }
+        mobile: this.device === "mobile"
+      };
     }
   },
+  data() {
+    return {
+      index: 0,
+      num: 1
+    };
+  },
   methods: {
     handleClickOutside() {
-      this.$store.dispatch('closeSideBar', { withoutAnimation: false })
+      this.$store.dispatch("closeSideBar", { withoutAnimation: false });
+    },
+    handleIndex(data, num) {
+      // console.log({ prop: data });
+      this.index = data;
+      this.num = num;
     }
   }
-}
+};
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  @import "src/styles/mixin.scss";
-  .app-wrapper {
-    @include clearfix;
-    // position: relative;
-    height: 100%;
-    width: 100%;
-    // &.mobile.openSidebar{
-    //   position: fixed;
-    //   top: 0;
-    // }
-  }
-  .drawer-bg {
-    background: #000;
-    opacity: 0.3;
-    width: 100%;
-    top: 0;
-    height: 100%;
-    position: absolute;
-    z-index: 999;
-  }
+@import "src/styles/mixin.scss";
+.app-wrapper {
+  @include clearfix;
+  // position: relative;
+  height: 100%;
+  width: 100%;
+  // &.mobile.openSidebar{
+  //   position: fixed;
+  //   top: 0;
+  // }
+}
+.drawer-bg {
+  background: #000;
+  opacity: 0.3;
+  width: 100%;
+  top: 0;
+  height: 100%;
+  position: absolute;
+  z-index: 999;
+}
+.newSide {
+  width: 150px !important;
+  height: 100%;
+  position: fixed;
+  top: 60px;
+  bottom: 0;
+  left: 0;
+  z-index: 1001;
+  overflow: hidden;
+}
+</style>
+<style lang="scss">
+
 </style>

src/views/layout/components/AppMain.vue

@@ -10,16 +10,16 @@
 
 <script>
 export default {
-  name: 'AppMain',
+  name: "AppMain",
   computed: {
     cachedViews() {
-      return this.$store.state.tagsView.cachedViews
+      return this.$store.state.tagsView.cachedViews;
     },
     key() {
-      return this.$route.fullPath
+      return this.$route.fullPath;
     }
   }
-}
+};
 </script>
 
 <style scoped>
@@ -28,9 +28,8 @@ export default {
   min-height: calc(100vh - 120px);
   position: relative;
   overflow: hidden;
-  margin-top: 50px;
-   background: #f6f8f9;
-  
+  margin-top: 40px;
+  background: #f6f8f9;
 }
 </style>
 

src/views/layout/components/Navbar.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="top-nav">
-    <div class="nav-logo">
+    <!-- <div class="nav-logo">
       <img :src="require(`../../../assets/logo/logo.png`)" alt="">
     </div>
     <el-menu class="navbar" mode="horizontal">
@@ -47,109 +47,223 @@
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item command="modifyUserInfoAction">
               修改个人信息
-              <!-- <span @click="modifyUserInfoAction">修改个人信息</span> -->
             </el-dropdown-item>
             <el-dropdown-item command="modifyOrgInfoAction">
               机构信息
             </el-dropdown-item>
-            <!-- <el-dropdown-item divided>
-              <span @click="myServe">我的服务</span>
-            </el-dropdown-item> -->
             <el-dropdown-item divided command="logout">
               {{$t('navbar.logOut')}}
-              <!-- <span @click="logout" style="display:block;">{{$t('navbar.logOut')}}</span> -->
+
             </el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
 
-        <!-- <screenfull class="screenfull right-menu-item"></screenfull> -->
         <modify-user-info-dialog ref="modify_user_info_dialog"></modify-user-info-dialog>
         <modify-org-info-dialog ref="modify_org_info_dialog"></modify-org-info-dialog>
 
       </div>
-    </el-menu>
+    </el-menu>-->
+    <div class="dropdownBox">
+      <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>
+    </div>
+    <div class="navRight">
+      <!-- <el-input placeholder="搜索患者透析号/姓名/首拼" prefix-icon="el-icon-search" v-model="input2"></el-input>
+      <div style="color: #b2b2b3;">通知中心</div> -->
+      <div class="right-menu">
+        <el-dropdown
+          class="avatar-container right-menu-item"
+          trigger="click"
+          @command="handleCommand"
+        >
+          <div class="avatar-wrapper">
+            <img class="user-avatar" :src="avater" />
+            <span class="user-title">{{
+              this.$store.getters.xt_user.user.user_name
+            }}</span>
+            <i class="el-icon-caret-bottom"></i>
+          </div>
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item command="modifyUserInfoAction"
+              >修改个人信息</el-dropdown-item
+            >
+            <el-dropdown-item command="modifyOrgInfoAction"
+              >机构信息</el-dropdown-item
+            >
+            <el-dropdown-item divided command="logout">{{
+              $t("navbar.logOut")
+            }}</el-dropdown-item>
+          </el-dropdown-menu>
+        </el-dropdown>
+
+        <modify-user-info-dialog
+          ref="modify_user_info_dialog"
+        ></modify-user-info-dialog>
+        <modify-org-info-dialog
+          ref="modify_org_info_dialog"
+        ></modify-org-info-dialog>
+      </div>
+      <div>
+        <i class="el-icon-question"></i>
+        <span>帮助中心</span>
+      </div>
+    </div>
   </div>
 </template>
 
 <script>
-  import { mapGetters } from 'vuex'
-  // import Breadcrumb from "@/components/Breadcrumb";
-  // import Hamburger from "@/components/Hamburger";
-  import Screenfull from '@/components/Screenfull'
-  import ModifyUserInfoDialog from '@/xt_pages/home/modify_user_info_dialog'
-  import ModifyOrgInfoDialog from '@/xt_pages/home/modifyOrgInfoDialog'
-
-  export default {
-    data() {
-      return {
-        // scrm_role_exist: $store.getters.xt_user.scrm_role_exist
+import { mapGetters } from "vuex";
+// import Breadcrumb from "@/components/Breadcrumb";
+// import Hamburger from "@/components/Hamburger";
+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: {
+    Screenfull,
+    ModifyUserInfoDialog,
+    ModifyOrgInfoDialog
+  },
+  computed: {
+    ...mapGetters(["sidebar"]),
+    avater: function() {
+      var avatar = this.$store.getters.xt_user.user.avatar;
+      return avatar.length > 0
+        ? avatar
+        : require("../../../assets/home/userData.png");
+    }
+  },
+  methods: {
+    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("网络异常")
+      });
     },
-    components: {
-      // Breadcrumb,
-      // Hamburger,
-      Screenfull,
-      ModifyUserInfoDialog,
-      ModifyOrgInfoDialog,
-    },
-    computed: {
-      ...mapGetters(['sidebar']),
-      avater: function() {
-        var avatar = this.$store.getters.xt_user.user.avatar
-        return avatar.length > 0
-          ? avatar
-          : require('../../../assets/home/userData.png')
+
+    handleCommand(command) {
+      switch (command) {
+        case "modifyUserInfoAction":
+          this.modifyUserInfoAction();
+          break;
+        case "modifyOrgInfoAction":
+          this.modifyOrgInfoAction();
+          break;
+        case "logout":
+          this.logout();
+          break;
       }
     },
-    methods: {
-      // toggleSideBar() {
-      //   this.$store.dispatch("toggleSideBar");
-      // },
-      handleCommand(command){
-        switch (command) {
-          case 'modifyUserInfoAction':
-            this.modifyUserInfoAction();
-            break;
-          case 'modifyOrgInfoAction':
-            this.modifyOrgInfoAction();
-            break;
-          case 'logout':
-            this.logout();
-            break;
-        }
-      },
-      logout() {
-        this.$store.dispatch('FrontendLogout')
-        window.location.href = process.env.BASE_API + '/logout'
-      },
-      modifyOrgInfoAction() {
-        // this.$refs.modify_org_info_dialog.show()
-        this.$router.push('/orginfo')
-        return false
-      },
-      modifyUserInfoAction() {
-        this.$refs.modify_user_info_dialog.show()
-      },
-      myServe() {
-        this.$router.push('/service')
-        return false
-      },
-      SCRMWebsit() {
-        return process.env.SRCM_HOST
-      },
-      MircoMallWebsit() {
-        return process.env.MIRCO_MALL_HOST
-      },
-      CDMWebsit() {
-        return process.env.CDM_HOST
-      },
-      APPManageWebsit() {
-        return process.env.SSO_HOST + '/org/admin/apps?org=' + this.$store.getters.xt_user.org_id
-      }
+    logout() {
+      this.$store.dispatch("FrontendLogout");
+      window.location.href = process.env.BASE_API + "/logout";
+    },
+    modifyOrgInfoAction() {
+      // this.$refs.modify_org_info_dialog.show()
+      this.$router.push("/orginfo");
+      return false;
+    },
+    modifyUserInfoAction() {
+      this.$refs.modify_user_info_dialog.show();
     },
-    created() {
+    myServe() {
+      this.$router.push("/service");
+      return false;
+    },
+    SCRMWebsit() {
+      return process.env.SRCM_HOST;
+    },
+    MircoMallWebsit() {
+      return process.env.MIRCO_MALL_HOST;
+    },
+    CDMWebsit() {
+      return process.env.CDM_HOST;
+    },
+    APPManageWebsit() {
+      return (
+        process.env.SSO_HOST +
+        "/org/admin/apps?org=" +
+        this.$store.getters.xt_user.org_id
+      );
     }
+  },
+  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>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
@@ -157,9 +271,85 @@
   background: #409eff;
   position: fixed;
   top: 0;
-  left: 0;
+  left: 150px;
   right: 0;
   z-index: 1000;
+  height: 50px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  color:#fff;
+  .dropdownBox {
+    margin-left: 10px;
+  }
+  .navRight {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    min-width: 200px;
+    margin-right: 10px;
+    .right-menu {
+      float: right;
+      height: 100%;
+      z-index: 99999;
+      color: #fff;
+      & :focus {
+        outline: none;
+      }
+
+      .right-menu-item {
+        display: inline-block;
+        margin: 0 8px;
+
+        .iconfont {
+          font-size: 18px;
+        }
+      }
+      .screenfull {
+        height: 20px;
+      }
+
+      .international {
+        vertical-align: top;
+      }
+
+      .theme-switch {
+        vertical-align: 15px;
+      }
+
+      .avatar-container {
+        margin-right: 10px;
+
+        .avatar-wrapper {
+          cursor: pointer;
+          margin-top: 3px;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+
+          .user-avatar {
+            width: 40px;
+            height: 40px;
+            border-radius: 50%;
+            object-fit: cover;
+            object-position: center;
+          }
+
+          .user-title {
+            margin: 0 8px;
+            font-size: 14px;
+            color: #fff;
+          }
+
+          .el-icon-caret-bottom {
+            font-size: 12px;
+            color: #fff;
+          }
+        }
+      }
+    }
+  }
+
   .nav-logo {
     width: 162px;
     display: flex;
@@ -171,11 +361,10 @@
     box-sizing: border-box;
     float: left;
 
-  img {
-    display: inline-block;
-    width: 100px;
-  }
-
+    img {
+      display: inline-block;
+      width: 100px;
+    }
   }
   .navbar {
     border-radius: 0px !important;
@@ -188,102 +377,96 @@
     background: #409eff;
     float: left;
 
-  .breadcrumb-container {
-    float: left;
-  }
+    .breadcrumb-container {
+      float: left;
+    }
 
-  .errLog-container {
-    display: inline-block;
-    vertical-align: top;
-  }
+    .errLog-container {
+      display: inline-block;
+      vertical-align: top;
+    }
 
-  .right-menu {
-    float: right;
-    height: 100%;
-    z-index: 99999;
+    .right-menu {
+      float: right;
+      height: 100%;
+      z-index: 99999;
 
-  &
-  :focus {
-    outline: none;
-  }
+      & :focus {
+        outline: none;
+      }
 
-  .right-menu-item {
-    display: inline-block;
-    margin: 0 8px;
+      .right-menu-item {
+        display: inline-block;
+        margin: 0 8px;
 
-  .iconfont {
-    font-size: 18px;
-  }
+        .iconfont {
+          font-size: 18px;
+        }
+      }
+      .screenfull {
+        height: 20px;
+      }
 
-  }
-  .screenfull {
-    height: 20px;
-  }
+      .international {
+        vertical-align: top;
+      }
 
-  .international {
-    vertical-align: top;
-  }
+      .theme-switch {
+        vertical-align: 15px;
+      }
 
-  .theme-switch {
-    vertical-align: 15px;
-  }
+      .avatar-container {
+        margin-right: 10px;
 
-  .avatar-container {
-    margin-right: 10px;
+        .avatar-wrapper {
+          cursor: pointer;
+          margin-top: 3px;
+          display: flex;
+          align-items: center;
+          justify-content: center;
 
-  .avatar-wrapper {
-    cursor: pointer;
-    margin-top: 3px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
+          .user-avatar {
+            width: 40px;
+            height: 40px;
+            border-radius: 50%;
+            object-fit: cover;
+            object-position: center;
+          }
 
-  .user-avatar {
-    width: 40px;
-    height: 40px;
-    border-radius: 50%;
-    object-fit: cover;
-    object-position: center;
-  }
+          .user-title {
+            margin: 0 8px;
+            font-size: 14px;
+            color: #fff;
+          }
 
-  .user-title {
-    margin: 0 8px;
-    font-size: 14px;
-    color: #fff;
-  }
-
-  .el-icon-caret-bottom {
-    font-size: 12px;
-    color: #fff;
-  }
-
-  }
-  }
-  }
+          .el-icon-caret-bottom {
+            font-size: 12px;
+            color: #fff;
+          }
+        }
+      }
+    }
   }
   .system-nav {
+    .system-nav-menu {
+      float: left;
+      height: 60px;
+      line-height: 60px;
+      padding: 0 25px;
 
-  .system-nav-menu {
-    float: left;
-    height: 60px;
-    line-height: 60px;
-    padding: 0 25px;
-
-  a {
-    font-size: 15px;
-
-  .iconfont {
-    font-size: 18px;
-  }
-
-  }
-  }
-  .active {
-    background: #3090eb;
-    border-left: 1px #5fabf7 solid;
-    border-right: 1px #5fabf7 solid;
-  }
+      a {
+        font-size: 15px;
 
+        .iconfont {
+          font-size: 18px;
+        }
+      }
+    }
+    .active {
+      background: #3090eb;
+      border-left: 1px #5fabf7 solid;
+      border-right: 1px #5fabf7 solid;
+    }
   }
   .el-menu::after,
   .el-menu::before {
@@ -293,13 +476,30 @@
     top: 0;
     left: 0;
   }
+}
+.el-dropdown-menu {
+  z-index: 9999 !important;
+}
 
+.v-modal {
+  z-index: 9999 !important;
+}
+</style>
+
+<style lang="scss">
+.navRight {
+  .el-input {
+    width: 250px;
   }
-  .el-dropdown-menu {
-    z-index: 9999 !important;
+  .el-input__inner {
+    border-radius: 30px;
+    background: #f5f7fa;
   }
-
-  .v-modal {
-    z-index: 9999 !important;
+}
+.dropdownBox {
+    .el-dropdown-link{
+      font-size: 18px;
+      color:#fff;
+    }
   }
 </style>

src/views/layout/components/Sidebar/SidebarItem.vue

@@ -1,40 +1,116 @@
 <template>
-  <div v-if="!item.hidden&&item.children" class="menu-wrapper">
-
-      <router-link v-if="hasOneShowingChild(item.children) && !onlyOneChild.children&&!item.alwaysShow" :to="resolvePath(onlyOneChild.path)">
-        <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}">
-          <svg-icon v-if="onlyOneChild.meta&&onlyOneChild.meta.icon" :icon-class="onlyOneChild.meta.icon"></svg-icon>
-          <span v-if="onlyOneChild.meta&&onlyOneChild.meta.title" slot="title">{{generateTitle(onlyOneChild.meta.title)}}</span>
+  <div v-if="!item.hidden && item.children" class="menu-wrapper">
+    <div
+      v-if="
+        hasOneShowingChild(item.children) &&
+          !onlyOneChild.children &&
+          !item.alwaysShow
+      "
+      @click="onClick(item)"
+    >
+      <router-link :to="resolvePath(onlyOneChild.path)">
+        <el-menu-item
+          :index="resolvePath(onlyOneChild.path)"
+          :class="{ 'submenu-title-noDropdown': !isNest }"
+        >
+          <svg-icon
+            v-if="onlyOneChild.meta && onlyOneChild.meta.icon"
+            :icon-class="onlyOneChild.meta.icon"
+          ></svg-icon>
+          <span
+            v-if="onlyOneChild.meta && onlyOneChild.meta.title"
+            slot="title"
+          >{{ generateTitle(onlyOneChild.meta.title) }}</span>
         </el-menu-item>
       </router-link>
+    </div>
 
-      <el-submenu v-else :index="item.name||item.path">
+    <div v-else>
+      <el-submenu v-if="item.meta.isChild" id="mySubmenu" :index="item.name || item.path">
         <template slot="title">
-          <svg-icon v-if="item.meta&&item.meta.icon" :icon-class="item.meta.icon"></svg-icon>
-          <span v-if="item.meta&&item.meta.title" slot="title">{{generateTitle(item.meta.title)}}</span>
+          <svg-icon v-if="item.meta && item.meta.icon" :icon-class="item.meta.icon"></svg-icon>
+          <span v-if="item.meta && item.meta.title" slot="title">
+            {{
+            generateTitle(item.meta.title)
+            }}
+          </span>
         </template>
-
         <template v-for="child in item.children" v-if="!child.hidden">
-          <sidebar-item :is-nest="true" class="nest-menu" v-if="child.children&&child.children.length>0" :item="child" :key="child.path" :base-path="resolvePath(child.path)"></sidebar-item>
+          <router-link
+            :to="resolvePath(child.path)"
+            v-if="child.meta.isChild != true"
+            :key="child.name"
+          >
+            <el-menu-item @click="onClick(item)" :index="resolvePath(child.path)">
+              <svg-icon v-if="child.meta && child.meta.icon" :icon-class="child.meta.icon"></svg-icon>
+              <span v-if="child.meta && child.meta.title" slot="title">
+                {{
+                generateTitle(child.meta.title)
+                }}
+              </span>
+            </el-menu-item>
+          </router-link>
 
-          <router-link v-else :to="resolvePath(child.path)" :key="child.name">
-            <el-menu-item :index="resolvePath(child.path)">
-              <svg-icon v-if="child.meta&&child.meta.icon" :icon-class="child.meta.icon"></svg-icon>
-              <span v-if="child.meta&&child.meta.title" slot="title">{{generateTitle(child.meta.title)}}</span>
+          <router-link v-else :to="child.path" :key="child.name">
+            <el-menu-item @click="onClick(item,child.parentNum)" :index="resolvePath(child.path)">
+              <svg-icon v-if="child.meta && child.meta.icon" :icon-class="child.meta.icon"></svg-icon>
+              <span v-if="child.meta && child.meta.title" slot="title">
+                {{
+                generateTitle(child.meta.title)
+                }}
+              </span>
             </el-menu-item>
           </router-link>
         </template>
       </el-submenu>
+      <div v-else @click="onClick(item)">
+        <router-link :to="resolvePath(item.children[0].path)">
+          <el-menu-item :index="item.name || item.path">
+            <template slot="title">
+              <svg-icon v-if="item.meta && item.meta.icon" :icon-class="item.meta.icon"></svg-icon>
+              <span v-if="item.meta && item.meta.title" slot="title">
+                {{
+                generateTitle(item.meta.title)
+                }}
+              </span>
+            </template>
 
+            <!-- <template v-for="child in item.children" v-if="!child.hidden">
+        <sidebar-item
+          :is-nest="true"
+          class="nest-menu"
+          v-if="child.children && child.children.length > 0"
+          :item="child"
+          :key="child.path"
+          :base-path="resolvePath(child.path)"
+        ></sidebar-item>
+
+        <router-link v-else :to="resolvePath(child.path)" :key="child.name">
+          <el-menu-item :index="resolvePath(child.path)">
+            <svg-icon
+              v-if="child.meta && child.meta.icon"
+              :icon-class="child.meta.icon"
+            ></svg-icon>
+            <span v-if="child.meta && child.meta.title" slot="title">{{
+              generateTitle(child.meta.title)
+            }}</span>
+          </el-menu-item>
+        </router-link>
+            </template>-->
+          </el-menu-item>
+        </router-link>
+      </div>
+    </div>
   </div>
 </template>
 
 <script>
-import path from 'path'
-import { generateTitle } from '@/utils/i18n'
+import path from "path";
+import { generateTitle } from "@/utils/i18n";
+import { mapGetters } from "vuex";
 
 export default {
-  name: 'SidebarItem',
+  name: "SidebarItem",
   props: {
     // route object
     item: {
@@ -47,35 +123,97 @@ export default {
     },
     basePath: {
       type: String,
-      default: ''
+      default: ""
+    },
+    index: {
+      type: Number
     }
   },
+  computed: {
+    ...mapGetters(["permission_routers"])
+  },
   data() {
     return {
       onlyOneChild: null
-    }
+    };
   },
   methods: {
     hasOneShowingChild(children) {
       const showingChildren = children.filter(item => {
         if (item.hidden) {
-          return false
+          return false;
         } else {
           // temp set(will be used if only has one showing child )
-          this.onlyOneChild = item
-          return true
+          this.onlyOneChild = item;
+          return true;
         }
-      })
+      });
       if (showingChildren.length === 1) {
-        return true
+        return true;
       }
-      return false
+      return false;
     },
     resolvePath(...paths) {
-      return path.resolve(this.basePath, ...paths)
+      return path.resolve(this.basePath, ...paths);
     },
-    generateTitle
-  }
-}
+    generateTitle,
+    onClick(index, num) {
+      this.permission_routers.map((item, i) => {
+        if (this.isObjectValueEqual(item, index)) {
+          if (num) {
+            this.$emit("a", i, num);
+          } else {
+            this.$emit("a", i, 999);
+          }
+        }
+      });
+    },
+    isObjectValueEqual(a, b) {
+      var aProps = Object.getOwnPropertyNames(a);
+      var bProps = Object.getOwnPropertyNames(b);
+
+      if (aProps.length != bProps.length) {
+        return false;
+      }
+
+      for (var i = 0; i < aProps.length; i++) {
+        var propName = aProps[i];
+
+        if (a[propName] !== b[propName]) {
+          return false;
+        }
+      }
+
+      return true;
+    }
+  },
+  created() {}
+};
 </script>
 
+<style lang="scss">
+#mySubmenu {
+  .el-menu {
+    display: flex;
+    flex-wrap: wrap;
+    > a {
+      width: 50% !important;
+    }
+    .el-menu-item {
+      min-width: 0;
+      padding: 0 5px !important;
+      font-size: 12px;
+      background-color:#1F2D3D !important;
+    }
+  }
+}
+.el-menu-item{
+   background-color:#1F2D3D !important;
+}
+.el-menu{
+  background-color:#1F2D3D !important;
+}
+.el-submenu__title{
+  background-color:#1F2D3D !important;
+}
+</style>

src/views/layout/components/Sidebar/index.vue

@@ -1,88 +1,208 @@
 <template>
   <el-scrollbar wrapClass="scrollbar-wrapper">
-    <div class="sideColumn">
-       <hamburger class="hamburger-container" :toggleClick="toggleSideBar" :isActive="sidebar.opened"></hamburger>      
+    <!-- <div class="sideColumn">
+      <hamburger
+        class="hamburger-container"
+        :toggleClick="toggleSideBar"
+        :isActive="sidebar.opened"
+      ></hamburger>
+    </div>-->
+    <!-- <el-menu
+      mode="vertical"
+      :unique-opened="uniqueOpened"
+      :show-timeout="200"
+      :default-active="$route.path"
+      :collapse="isCollapse"
+      background-color="#304156"
+      text-color="#bfcbd9"
+      active-text-color="#409EFF"
+    >-->
+    <div class="logo">
+      <img src="../../../../assets/logo/logo1.png" alt />
     </div>
     <el-menu
       mode="vertical"
       :unique-opened="uniqueOpened"
       :show-timeout="200"
       :default-active="$route.path"
-      :collapse="isCollapse"
       background-color="#304156"
       text-color="#bfcbd9"
       active-text-color="#409EFF"
     >
-      <sidebar-item v-for="route in permission_routers" :key="route.name" :item="route" :base-path="route.path"></sidebar-item>
+      <sidebar-item
+        v-for="(route, index) in permission_routers"
+        :key="route.name"
+        :item="route"
+        :base-path="route.path"
+        :index="index"
+        @a="b"
+      ></sidebar-item>
     </el-menu>
   </el-scrollbar>
+  <!-- <div class="mianLeft">
+    <div class="logo">
+      <img src="/static/img/logo.8dbb9fd.png" alt="" />
+    </div>
+    <div class="navBox">
+      <div
+        class="navOne"
+        :class="activeClass == index ? 'active' : ''"
+        v-for="(item, index) in permission_routers"
+        :key="item.name"
+        v-if="!item.hidden && item.children"
+      >
+        <div v-if="item.meta" @click="onClick(index)" class="one">
+          <router-link :to="item.children[0].path">
+          <svg-icon
+            v-if="item.meta && item.meta.icon"
+            :icon-class="item.meta.icon"
+          ></svg-icon>
+          <p v-if="item.meta && item.meta.title">
+            {{ generateTitle(item.meta.title) }}
+          </p>
+          </router-link>
+        </div>
+
+        <div v-else @click="onClick(index)">
+          <router-link :to="item.children[0].path" class="one">
+            <svg-icon :icon-class="item.children[0].meta.icon"></svg-icon>
+            <p>
+              {{ generateTitle(item.children[0].meta.title) }}
+            </p>
+          </router-link>
+        </div>
+      </div>
+    </div>
+  </div>-->
 </template>
 
 <script>
 import { mapGetters } from "vuex";
 import SidebarItem from "./SidebarItem";
 import Hamburger from "@/components/Hamburger";
-
+import { generateTitle } from "@/utils/i18n";
 
 export default {
-  components: { SidebarItem,Hamburger },
+  components: { SidebarItem, Hamburger },
   computed: {
     ...mapGetters(["permission_routers", "sidebar"]),
     isCollapse() {
       return !this.sidebar.opened;
     }
   },
-  data(){
-    return{
-      uniqueOpened:true,
-    }
+  data() {
+    return {
+      uniqueOpened: true,
+      activeClass: 0,
+      index: 0
+    };
   },
-  methods:{
+  methods: {
     toggleSideBar() {
       this.$store.dispatch("toggleSideBar");
     },
+    generateTitle,
+    resolvePath(...paths) {
+      return path.resolve(this.basePath, ...paths);
+    },
+    b(index, num) {
+      // this.index = index;
+      // this.activeClass = index;
+      this.$emit("callBackIndex", index, num);
+    }
+  },
+  created() {
+    console.log(1111111121121111111, this.permission_routers);
+    // this.permission_routers.map(item => {
+    //   console.log(item.children);
+    // });
   }
 };
 </script>
 
-<style  rel="stylesheet/scss" lang="scss" scoped>
-.sideColumn{
-  background-color: rgb(48, 65, 86);
-.head {
-  text-align: center;
-  padding: 20px 0 0 0;
-  .tx {
-    .img {
-      width: 45px;
-      height: 45px;
-      border-radius: 50%;
-      -o-object-fit: cover;
-    object-fit: cover;
-    -o-object-position: center;
-    object-position: center;
+<style rel="stylesheet/scss" lang="scss" scoped>
+.mianLeft {
+  width: 150px;
+  height: 100%;
+  overflow-y: auto;
+  background: #304155;
+
+  .navBox {
+    display: flex;
+    flex-wrap: wrap;
+    .navOne {
+      width: 50%;
+      height: 75px;
+      display: flex;
+      align-items: center;
+      justify-content: space-around;
+      color: #fff;
+      .one {
+        display: flex;
+        align-items: center;
+        flex-direction: column;
+        p {
+          margin-top: 10px;
+          font-size: 14px;
+        }
+      }
+    }
+    .active {
+      background: #409eff;
     }
-  } 
-  .title {
-    font-size: 14px;
-    color: #bfcbd9;
-    padding: 10px 10px 15px 10px;
-    line-height: 22px;
+  }
+}
 
+.logo {
+  width: 100px;
+  height: 32px;
+  margin: 20px auto;
+  img {
+    width: 100%;
+    height: 100%;
+    display: block;
   }
 }
-.headShrink{
-  .tx{
-    .img{
-      width: 30px;
-      height: 30px;
-    }
 
+.sideColumn {
+  background-color: rgb(48, 65, 86);
+  .head {
+    text-align: center;
+    padding: 20px 0 0 0;
+    .tx {
+      .img {
+        width: 45px;
+        height: 45px;
+        border-radius: 50%;
+        -o-object-fit: cover;
+        object-fit: cover;
+        -o-object-position: center;
+        object-position: center;
+      }
+    }
+    .title {
+      font-size: 14px;
+      color: #bfcbd9;
+      padding: 10px 10px 15px 10px;
+      line-height: 22px;
+    }
   }
-  .title{
-    display: none;
+  .headShrink {
+    .tx {
+      .img {
+        width: 30px;
+        height: 30px;
+      }
+    }
+    .title {
+      display: none;
+    }
   }
 }
-}
-
 </style>
 
+<style lang="scss">
+.scrollbar-wrapper {
+  background-color: #1F2D3D;
+}
+</style>

src/views/layout/components/TagsView.vue

@@ -1,124 +1,230 @@
 <template>
   <div class="tags-view-container">
-    <scroll-pane class='tags-view-wrapper' ref='scrollPane'>
-      <router-link 
-        ref='tag' 
-        class="tags-view-item" 
-        :class="isActive(tag)?'active':''" 
+    <!-- <scroll-pane class="tags-view-wrapper" ref="scrollPane">
+      <router-link
+        ref="tag"
+        class="tags-view-item"
+        :class="isActive(tag) ? 'active' : ''"
         v-for="tag in Array.from(visitedViews)"
-        :to="tag" 
-        :key="tag.path" 
-        @contextmenu.prevent.native="openMenu(tag,$event)">
-        {{generateTitle(tag.title)}}
-        <span class='el-icon-close' @click.prevent.stop='closeSelectedTag(tag)'></span>
+        :to="tag"
+        :key="tag.path"
+        @contextmenu.prevent.native="openMenu(tag, $event)"
+      >
+        {{ generateTitle(tag.title) }}
+        <span
+          class="el-icon-close"
+          @click.prevent.stop="closeSelectedTag(tag)"
+        ></span>
       </router-link>
     </scroll-pane>
-    <ul class='contextmenu' v-show="visible" :style="{left:left+'px',top:top+'px'}">
-      <li @click="closeSelectedTag(selectedTag)">{{$t('tagsView.close')}}</li>
-      <li @click="closeOthersTags">{{$t('tagsView.closeOthers')}}</li>
-      <li @click="closeAllTags">{{$t('tagsView.closeAll')}}</li>
-    </ul>
+    <ul
+      class="contextmenu"
+      v-show="visible"
+      :style="{ left: left + 'px', top: top + 'px' }"
+    >
+      <li @click="closeSelectedTag(selectedTag)">{{ $t("tagsView.close") }}</li>
+      <li @click="closeOthersTags">{{ $t("tagsView.closeOthers") }}</li>
+      <li @click="closeAllTags">{{ $t("tagsView.closeAll") }}</li>
+    </ul>-->
+    <div class="tags-view-wrapper">
+      <div style="height:100%">
+        <div style="height:100%" v-if="newIndex == 9">
+          <div class="tagsBox" v-if="routerList.length > 0 && newNum != 999">
+            <div
+              class="tagsOne"
+              v-if="routerList[newIndex].meta"
+              v-for="(item, i) in routerList[newIndex].children"
+              :key="i"
+            >
+              <router-link :to="item.path" v-if="item.num ? item.num == newNum : false">
+                <p
+                  class="newTags"
+                  :class="activeClass == i ? 'active' : ''"
+                  @click="onClick(i)"
+                >{{ generateTitle(item.meta.title) }}</p>
+              </router-link>
+            </div>
+          </div>
+          <div class="tagsBox" v-if="newNum == 999">
+            <div
+              class="tagsOne"
+              v-if="permission_routers[newIndex].meta"
+              v-for="(item, i) in permission_routers[newIndex].children"
+              :key="i"
+            >
+              <router-link :to="item.path" v-if="item.num ? item.num == newNum : false">
+                <p
+                  class="newTags"
+                  :class="activeClass == i ? 'active' : ''"
+                  @click="onClick(i)"
+                >{{ generateTitle(item.meta.title) }}</p>
+              </router-link>
+            </div>
+          </div>
+        </div>
+        <div class="tagsBox" v-if="newIndex != 9">
+          <div
+            class="tagsOne"
+            v-if="permission_routers[newIndex].meta"
+            v-for="(item, i) in permission_routers[newIndex].children"
+            :key="i"
+          >
+            <router-link :to="item.path" v-if="!item.hidden && !item.is_menu">
+              <p
+                class="newTags"
+                :class="activeClass == i ? 'active' : ''"
+                @click="onClick(i)"
+              >{{ generateTitle(item.meta.title) }}</p>
+            </router-link>
+          </div>
+          <div v-else class="tagsOne">
+            <p class="newTags" :class="activeClass == i ? 'active' : ''" @click="onClick(i)">
+              {{
+              generateTitle(permission_routers[newIndex].children[0].meta.title)
+              }}
+            </p>
+          </div>
+        </div>
+      </div>
+    </div>
   </div>
 </template>
 
 <script>
-import ScrollPane from '@/components/ScrollPane'
-import { generateTitle } from '@/utils/i18n'
-  
+import ScrollPane from "@/components/ScrollPane";
+import { generateTitle } from "@/utils/i18n";
+//
+import { mapGetters } from "vuex";
+
 export default {
+  props: {
+    index: Number,
+    num: Number
+  },
   components: { ScrollPane },
   data() {
     return {
       visible: false,
       top: 0,
       left: 0,
-      selectedTag: {}
-    }
+      selectedTag: {},
+      newIndex: 0,
+      activeClass: 0,
+      newNum: 1
+    };
   },
   computed: {
-    visitedViews() {
-      return this.$store.state.tagsView.visitedViews
-    }
+    // visitedViews() {
+    //   return this.$store.state.tagsView.visitedViews;
+    // },
+    ...mapGetters(["permission_routers"])
   },
   watch: {
-    $route() {
-      this.addViewTags()
-      this.moveToCurrentTag()
+    // $route() {
+    //   this.addViewTags();
+    //   this.moveToCurrentTag();
+    // },
+    // visible(value) {
+    //   if (value) {
+    //     document.body.addEventListener("click", this.closeMenu);
+    //   } else {
+    //     document.body.removeEventListener("click", this.closeMenu);
+    //   }
+    // },
+    index(newVal) {
+      if (this.newIndex != newVal) {
+        this.activeClass = 0;
+      }
+      this.newIndex = this.index;
     },
-    visible(value) {
-      if (value) {
-        document.body.addEventListener('click', this.closeMenu)
+    num(newVal) {
+      this.newNum = newVal;
+      if (newVal == 999) {
+        this.routerList = [];
       } else {
-        document.body.removeEventListener('click', this.closeMenu)
+        this.routerList = this.permission_routers;
+      }
+      if (newVal == 1) {
+        this.activeClass = 2;
+      }
+      if (newVal == 2) {
+        this.activeClass = 6;
       }
     }
   },
+  created() {
+    this.routerList = this.permission_routers;
+  },
   mounted() {
-    this.addViewTags()
+    // this.addViewTags();
   },
   methods: {
     generateTitle, // generateTitle by vue-i18n
     generateRoute() {
       if (this.$route.name) {
-        return this.$route
+        return this.$route;
       }
-      return false
+      return false;
     },
     isActive(route) {
-      return route.path === this.$route.path
+      return route.path === this.$route.path;
     },
     addViewTags() {
-      const route = this.generateRoute()
+      const route = this.generateRoute();
       if (!route) {
-        return false
+        return false;
       }
-      this.$store.dispatch('addVisitedViews', route)
+      this.$store.dispatch("addVisitedViews", route);
     },
     moveToCurrentTag() {
-      const tags = this.$refs.tag
+      const tags = this.$refs.tag;
       this.$nextTick(() => {
         for (const tag of tags) {
           if (tag.to.path === this.$route.path) {
-            this.$refs.scrollPane.moveToTarget(tag.$el)
-            break
+            this.$refs.scrollPane.moveToTarget(tag.$el);
+            break;
           }
         }
-      })
+      });
     },
     closeSelectedTag(view) {
-      this.$store.dispatch('delVisitedViews', view).then((views) => {
+      this.$store.dispatch("delVisitedViews", view).then(views => {
         if (this.isActive(view)) {
-          const latestView = views.slice(-1)[0]
+          const latestView = views.slice(-1)[0];
           if (latestView) {
-            this.$router.push(latestView)
+            this.$router.push(latestView);
           } else {
-            this.$router.push('/')
+            this.$router.push("/");
           }
         }
-      })
+      });
     },
     closeOthersTags() {
-      this.$router.push(this.selectedTag)
-      this.$store.dispatch('delOthersViews', this.selectedTag).then(() => {
-        this.moveToCurrentTag()
-      })
+      this.$router.push(this.selectedTag);
+      this.$store.dispatch("delOthersViews", this.selectedTag).then(() => {
+        this.moveToCurrentTag();
+      });
     },
     closeAllTags() {
-      this.$store.dispatch('delAllViews')
-      this.$router.push('/')
+      this.$store.dispatch("delAllViews");
+      this.$router.push("/");
     },
     openMenu(tag, e) {
-      this.visible = true
-      this.selectedTag = tag
-      const offsetLeft = this.$el.getBoundingClientRect().left // container margin left
-      this.left = e.clientX - offsetLeft + 15 // 15: margin right
-      this.top = e.clientY
+      this.visible = true;
+      this.selectedTag = tag;
+      const offsetLeft = this.$el.getBoundingClientRect().left; // container margin left
+      this.left = e.clientX - offsetLeft + 15; // 15: margin right
+      this.top = e.clientY;
     },
     closeMenu() {
-      this.visible = false
+      this.visible = false;
+    },
+    onClick(index) {
+      console.log(index);
+      this.activeClass = index;
     }
   }
-}
+};
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
@@ -128,51 +234,52 @@ export default {
     background: #fff;
     height: 50px;
     border-bottom: 1px solid #d8dce5;
-    box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .12), 0 0 3px 0 rgba(0, 0, 0, .04);
+    box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.12), 0 0 3px 0 rgba(0, 0, 0, 0.04);
     position: fixed;
     z-index: 1000;
-    top: 60px;
+    top: 50px;
     overflow-x: scroll;
     white-space: normal;
     // right: 0;
     // left: 150px;
-    
+    width: 100%;
+
     /* 针对缺省样式 (必须的) */
-      &::-webkit-scrollbar {
-        width: 6px;
-        height: 2px;
-      }
-      /* 滚动条的滑轨背景颜色 */
-      &::-webkit-scrollbar-track {
-        background-color: #fff;
-        border-radius: 3px;
-        -moz-border-radius: 3px;
-        -webkit-border-radius: 3px;
-      }
-      /* 滑块颜色 */
-      &::-webkit-scrollbar-thumb {
-        background: #fff;
-        border-radius: 3px;
-        -moz-border-radius: 3px;
-        -webkit-border-radius: 3px;
-      }
-      /*内层轨道的颜色*/
-      &::-webkit-scrollbar-track-piece {
-        background-color: #fff;
-        border-radius: 3px;
-        -moz-border-radius: 3px;
-        -webkit-border-radius: 3px;
-      }
-      /* 滑轨两头的监听按钮颜色 */
-      &::-webkit-scrollbar-button {
-        background-color: #fff;
-        width: 0;
-        height: 0;
-      }
-      /* 横向滚动条和纵向滚动条相交处尖角的颜色 */
-      &::-webkit-scrollbar-corner {
-        background-color: #fff;
-      }
+    &::-webkit-scrollbar {
+      width: 6px;
+      height: 2px;
+    }
+    /* 滚动条的滑轨背景颜色 */
+    &::-webkit-scrollbar-track {
+      background-color: #fff;
+      border-radius: 3px;
+      -moz-border-radius: 3px;
+      -webkit-border-radius: 3px;
+    }
+    /* 滑块颜色 */
+    &::-webkit-scrollbar-thumb {
+      background: #fff;
+      border-radius: 3px;
+      -moz-border-radius: 3px;
+      -webkit-border-radius: 3px;
+    }
+    /*内层轨道的颜色*/
+    &::-webkit-scrollbar-track-piece {
+      background-color: #fff;
+      border-radius: 3px;
+      -moz-border-radius: 3px;
+      -webkit-border-radius: 3px;
+    }
+    /* 滑轨两头的监听按钮颜色 */
+    &::-webkit-scrollbar-button {
+      background-color: #fff;
+      width: 0;
+      height: 0;
+    }
+    /* 横向滚动条和纵向滚动条相交处尖角的颜色 */
+    &::-webkit-scrollbar-corner {
+      background-color: #fff;
+    }
     .tags-view-item {
       display: inline-block;
       position: relative;
@@ -193,7 +300,7 @@ export default {
         color: #fff;
         border-color: #409efe;
         &::before {
-          content: '';
+          content: "";
           background: #fff;
           display: inline-block;
           width: 8px;
@@ -216,7 +323,7 @@ export default {
     font-size: 12px;
     font-weight: 400;
     color: #333;
-    box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, .3);
+    box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, 0.3);
     li {
       margin: 0;
       padding: 7px 16px;
@@ -226,11 +333,30 @@ export default {
       }
     }
   }
+  .tagsBox {
+    display: flex;
+    align-items: center;
+    height: 100%;
+    .tagsOne {
+      .newTags {
+        border: 1px solid rgba(235, 238, 240, 1);
+        border-radius: 2px;
+        padding: 8px 12px;
+        margin-left: 10px;
+        font-size: 14px;
+      }
+    }
+    .active {
+      border: 1px solid rgba(64, 158, 255, 1);
+      background: rgba(64, 158, 255, 1);
+      border-radius: 2px;
+      color: #fff;
+    }
+  }
 }
-.scroll-wrapper{
-      right: 0;
-      position: fixed!important;
-      
+.scroll-wrapper {
+  right: 0;
+  position: fixed !important;
 }
 </style>
 
@@ -244,10 +370,10 @@ export default {
       vertical-align: 2px;
       border-radius: 50%;
       text-align: center;
-      transition: all .3s cubic-bezier(.645, .045, .355, 1);
+      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
       transform-origin: 100% 50%;
       &:before {
-        transform: scale(.6);
+        transform: scale(0.6);
         display: inline-block;
         vertical-align: -3px;
       }

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/home/index.vue

@@ -112,7 +112,6 @@
             :total="total"
           ></el-pagination>
         </div>
-
       </div>
     </section>
   </div>
@@ -193,8 +192,8 @@ export default {
   methods: {
     dateCompare(date) {
       var date1 = Date.parse(new Date()) / 1000;
-      console.log(date);
-      console.log(date1);
+      // console.log(date);
+      // console.log(date1);
       if (date > date1) {
         return 1;
       } else {

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

@@ -1,233 +1,338 @@
 <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="用户手机号" :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="角色 : " prop="role">
-                    <el-select v-model="form.role" placeholder="角色">
-                        <el-option v-for="(item,index) in roles" :key="index" :label="item.name" :value="item.id"></el-option>
-                    </el-select>
-                </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>
+  <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="角色 : " 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>
+
+      <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 { 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()
+  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()
+        }
       }
-    }
-    var checkName = (rule, value, callback) => {
-      if (!value || value.length == 0) {
-        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: '',
-      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' }
+      return {
+        admin_id: 0,
+        dialogFormVisible: false,
+
+        user_types: [
+          { index: 2, name: '医生' },
+          { index: 3, name: '护士' }
         ],
-        role: [
-          { required: true, message: '请选择角色', trigger: 'change' }
+        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
-      }
-
-      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)
-          }
-        }).catch(err => {
-          this.loading = false
-          this.$message.error(err)
-        })
-      } else {
-        this.formTitle = '编辑用户'
-        getModifyAdminInitData(this.form.id).then(rs => {
+    },
+    methods: {
+      open: function(adminId) {
+        this.admin_id = adminId
+        if (this.admin_id < 0) {
+          this.$message.error('参数错误')
           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
-          } else {
-            this.$message.error("该用户不存在")
+          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: ''
           }
-        }).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) {
-            addAdmin(this.form.mobile, this.form.name, this.form.user_type, this.form.user_title, this.form.role, this.form.intro).then(rs => {
+          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.$store.dispatch('DidChangeAdmins')
-                var _this = this
-                setTimeout(() => {
-                  _this.$store.dispatch('RecoverAdminsChangeState')
-                }, 500)
-                this.dialogFormVisible = false
+                // this.roles.push(...resp.data.roles)
+                this.roles = resp.data.roles
+                this.qntoken = resp.data.qntoken
+
+                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 => {
+            })
+            .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 => {
+        } else {
+          this.formTitle = '编辑用户'
+          getModifyAdminInitData(this.form.id)
+            .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.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--
+                    }
+                  }
+                }
+
+
+
 
-                this.dialogFormVisible = false
               } else {
-                this.$message.error(resp.msg)
+                this.$message.error('该用户不存在')
               }
-            }).catch(err => {
+            })
+            .catch(err => {
               this.loading = false
-              this.$message.error(err)
+              this.$message.error('该用户不存在')
             })
-          }
-        } else {
-          return false
         }
-      })
+
+        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
+            }
+
+            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.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) {
+                    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 {
+            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

@@ -1,113 +1,589 @@
 <template>
-    <el-dialog title='新增角色' width="600px" :visible.sync="visible" :before-close="_close">
-        <el-form :model="form" :rules="rules" ref="form" label-width="90px">
+  <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="角色描述 : " prop="intro">
                 <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>
+    </el-form>-->
+    <div class="chooseuser">
+      <span style="color:#303133">选择用户：</span>
+      <el-radio v-model="checked" label="1">从已有员工中选择</el-radio>
+      <el-radio v-model="checked" label="2">新增员工</el-radio>
+    </div>
+    <div v-if="checked == '1'"   v-loading="loading" class="roleContent">
+      <div class="roleContentLeft">
+        <p style="color:#303133">选择：</p>
+        <div class="chooseBox">
+          <div>
+            <el-checkbox
+              :indeterminate="isIndeterminate"
+              v-model="checkAll"
+              @change="handleCheckAllChange"
+            >全选
+            </el-checkbox
+            >
+          </div>
+          <el-checkbox-group
+            v-model="checkedCities"
+          >
+            <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>
-    </el-dialog>
+      </div>
+
+      <div class="roleContentRight" v-loading="loading">
+        <p style="color:#303133">已选：</p>
+        <div class="chooseBox">
+          <div class="hasChoosedOne" v-for="(item,index) in is_check_admin_user" :key="index">
+            <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>
+    </div>
+    <div v-if="checked == '2'" class="newStaff">
+      <el-form
+        :model="ruleForm"
+        :rules="newrules"
+        ref="form"
+        label-position="left"
+      >
+        <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" 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="职位" label-width="50px">
+          <el-input v-model="ruleForm.position"></el-input>
+        </el-form-item>
+      </el-form>
+      <div class="newItem">
+        <p style="width:80px;text-align:right;padding-right:8px">
+          <i
+            class="el-icon-circle-plus"
+            style="font-size:20px;color:#338AFB"
+          ></i>
+        </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" :loading="submitLoading" @click="submitAction()">保 存</el-button>
+    </div>
+  </el-dialog>
 </template>
 
 <script>
-import {addRole, modifyRole} from '@/api/role/role'
+  import { addRole, AddUserRole, getStaffsList, modifyRole } from '@/api/role/role'
+  import { addAdmin, getAddAdminInitData, getModifyAdminInitData, modifyAdmin } from '@/api/role/admin'
 
-export default {
+  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'},
-                ]
-            }
+      var checkMobile = (rule, value, callback) => {
+        if (!value || value.length == 0) {
+          return callback(new Error('手机号不能为空'))
         }
-    },
-    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
+        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: ''
         },
-        hide() {
-            this.clear()
-            this.visible = false
+        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' }]
         },
-        modify(id, name, intro) {
-            this.form.id = id
-            this.form.name = name
-            this.form.intro = intro
-            this.visible = true
+        admin_user: [],
+        is_check_admin_user: [],
+        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: '运营主管' }
+        ],
+        //
+        checked: '1',
+        checkAll: false,
+        checkedCities: [],
+        isIndeterminate: true,
+        ruleForm: {
+          name: '',
+          phone: '',
+          position: '',
+          user_type: 2,
+          user_title: 1,
+          role: ''
         },
-        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)
-                        })
-                        
-                    } 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
+        newrules: {
+          phone: [{ required: true, validator: checkMobile, trigger: 'blur' }],
+
+          name: [
+            { required: true, message: '请输入用户名字', trigger: 'blur' },
+            { max: 10, message: '10个字以内', trigger: 'blur' }
+          ]
+        }
+      }
+    },
+    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 {
+            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
                 }
-            })
+              }
+              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 {
+          this.checkedCities = []
+        }
+
+        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/PermissionSettings.vue

@@ -0,0 +1,346 @@
+<template>
+  <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="role.name" :disabled="true"></el-input>
+        </div>
+        <p style="color:#338AFB" v-if="role.is_system == 0" @click="disableRoleAction(role.id)">删除该角色</p>
+      </div>
+      <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-->
+            <!--&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>
+            </el-tree>
+          </div>
+        </div>
+        <!--<div class="roleMainRight">-->
+        <!--<div class="hasChoose">已选择权限</div>-->
+        <!--<el-tree-->
+        <!--:props="treeProps" :data="check_purviews"   node-key="id" ref="tree" default-expand-all-->
+
+        <!--&gt;</el-tree>-->
+        <!--</div>-->
+      </div>
+    </div>
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="hide">取 消</el-button>
+      <el-button type="primary" @click="submitAction" :loading="submitLoading">保 存</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+  import { 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
+        }
+        this.role_id = role_id
+        getEditPurviewInitData(this.role_id).then(rs => {
+          var resp = rs.data
+          if (resp.state === 1) {
+            this.role = resp.data.role
+            this.purviews.push(...resp.data.purviews)
+            // 初始化默认选中项
+            var role_purview_ids = resp.data.role_purview_ids
+            var checkeds = []
+            if (role_purview_ids.length > 0) {
+              var ids = role_purview_ids.split(',')
+              this.purviews.forEach(purview => {
+                if (purview.childs != null && purview.childs.length > 0) {
+                  purview.childs.forEach(childs => {
+
+                    if (childs.childs != null && childs.childs.length > 0) {
+                      childs.childs.forEach(child => {
+                        if (ids.indexOf(child.id + '') != -1) {
+                          checkeds.push(child.id)
+                        }
+                      })
+
+                      }else{
+                      if (ids.indexOf(childs.id + '') != -1) {
+                        checkeds.push(childs.id)
+                      }
+                    }
+                  })
+
+                } else {
+                  if (ids.indexOf(purview.id + '') != -1) {
+                    checkeds.push(purview.id)
+                  }
+                }
+              })
+            }
+
+
+
+            this.$nextTick(() => {
+              this.default_checkeds = checkeds
+            })
+
+            this.loading = false
+
+          } else {
+            this.loading = false
+
+            this.$message.error(resp.msg)
+          }
+        }).catch(err => {
+          this.loading = false
+
+          this.$message.error(err)
+        })
+      },
+      hide() {
+        this.visible =false
+
+      }
+
+    }, created() {
+
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .roleSettings {
+
+  .roleName {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+  }
+
+  .roleNameLeft {
+    display: flex;
+    align-items: center;
+
+  p {
+    width: 100px;
+  }
+
+  }
+  .roleMain {
+    display: flex;
+    justify-content: space-between;
+    margin-top: 18px;
+
+  .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 {
+
+  .el-dialog__body {
+    max-height: 600px !important;
+  }
+
+  }
+</style>

src/xt_pages/role/components/UserManagement.vue

@@ -0,0 +1,242 @@
+<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)',
+          color: '#606266'
+        }"
+        style="width:100%;"
+        ref="table"
+        border
+        :data="admin_user"
+      >
+        <el-table-column prop="name" label="员工姓名" width="120">
+          <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">
+             <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="操作" >
+          <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"
+                         @click="openForm(scope.row.user_id, role_id)" ></el-button>
+            </el-tooltip>
+
+            <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>
+  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 {
+
+  .cell {
+    text-align: center;
+  }
+
+  }
+</style>
+
+
+<style lang="scss">
+  .userManagement {
+
+  .cell {
+    text-align: center;
+  }
+
+  }
+</style>

src/xt_pages/role/role.vue

@@ -11,8 +11,8 @@
         >新增</el-button
       >
     </div>
-    <div class="app-container">
-      <el-table
+    <div class="app-container" v-loading="loading_roles">
+      <!-- <el-table
         :data="roles"
         v-loading="loading_roles"
         border
@@ -22,24 +22,11 @@
           color: '#606266'
         }"
       >
-        <el-table-column
-          label="角色名称"
-          prop="name"
-          min-width="20%"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          label="角色描述"
-          prop="intro"
-          min-width="25%"
-          align="center"
-        ></el-table-column>
+        <el-table-column label="角色名称" prop="name" min-width="20%" align="center"></el-table-column>
+        <el-table-column label="角色描述" prop="intro" min-width="25%" align="center"></el-table-column>
         <el-table-column label="状态" min-width="15%" align="center">
           <template slot-scope="scope">
-            <div
-              v-if="scope.row.status == 1"
-              style="color: #67C23A; font-size:20px;"
-            >
+            <div v-if="scope.row.status == 1" style="color: #67C23A; font-size:20px;">
               <li class="el-icon-success"></li>
             </div>
             <div v-else style="color: #F56C6C; font-size:20px;">
@@ -49,28 +36,12 @@
         </el-table-column>
         <el-table-column label="操作" width="180" align="center">
           <template slot-scope="scope">
-            <router-link
-              :to="{ path: '/role/perview', query: { id: scope.row.id } }"
-            >
-              <el-tooltip
-                class="item"
-                effect="dark"
-                content="权限设置"
-                placement="top"
-              >
-                <el-button
-                  type="warning"
-                  icon="el-icon-setting"
-                  size="small"
-                ></el-button>
+            <router-link :to="{ path: '/role/perview', query: { id: scope.row.id } }">
+              <el-tooltip class="item" effect="dark" content="权限设置" placement="top">
+                <el-button type="warning" icon="el-icon-setting" size="small"></el-button>
               </el-tooltip>
             </router-link>
-            <el-tooltip
-              class="item"
-              effect="dark"
-              content="编辑"
-              placement="top"
-            >
+            <el-tooltip class="item" effect="dark" content="编辑" placement="top">
               <el-button
                 type="primary"
                 size="small"
@@ -79,12 +50,7 @@
               ></el-button>
             </el-tooltip>
 
-            <el-tooltip
-              class="item"
-              effect="dark"
-              content="移除"
-              placement="top"
-            >
+            <el-tooltip class="item" effect="dark" content="移除" placement="top">
               <el-button
                 type="danger"
                 size="small"
@@ -94,12 +60,7 @@
               ></el-button>
             </el-tooltip>
 
-            <el-tooltip
-              class="item"
-              effect="dark"
-              content="恢复"
-              placement="top"
-            >
+            <el-tooltip class="item" effect="dark" content="恢复" placement="top">
               <el-button
                 type="info"
                 size="small"
@@ -122,26 +83,80 @@
             layout="total, prev, pager, next, jumper"
           ></el-pagination>
         </el-col>
-      </el-row>
+      </el-row>-->
 
       <edit-role
         ref="edit_role"
-        @did-add-role="didAddRole"
         @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>
+      </div>
+      <div class="roleBox">
+        <div class="roleOne" v-for="item in this.roles">
+          <div class="setting">
+            <i class="el-icon-setting"></i>
+            <span style="margin-right:20px" @click="onClick(item.id)">权限配置</span>
+          </div>
+          <div class="avatar">
+            <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="roleTip">
+           {{item.intro}}
+          </div>
+          <div class="roleTxt">
+            该角色目前已配置
+            <span style="color:#4A8AF3">{{item.staff_number}}</span> 个员工
+          </div>
+          <div class="btnBox">
+            <el-button @click="addStaff(item.id)">新增用户</el-button>
+            <el-button @click="onClickManagement(item.id)">用户管理</el-button>
+          </div>
+        </div>
+
+      </div>
     </div>
   </div>
 </template>
 
 <script>
 import EditRole from "./components/EditRole.vue";
-import { getRoles, setRoleStatus } from "@/api/role/role";
+import PermissionSettings from "./components/PermissionSettings.vue";
+import { getRoles, setRoleStatus,getRolesList } from "@/api/role/role";
+import UserManagement from "./components/UserManagement.vue";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
+import AddRole from './components/AddRole'
 
 export default {
   components: {
+    AddRole,
     EditRole,
-    BreadCrumb
+    BreadCrumb,
+    PermissionSettings,
+    UserManagement
   },
   data: function() {
     return {
@@ -159,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);
           }
@@ -180,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);
@@ -245,20 +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(role_id) {
+      this.$refs.permission_settings.show(role_id);
+    },
+    onClickManagement(role_id) {
+      this.$refs.user_management.show(role_id);
+    },deleteRole(){
+      this.$refs.permission_settings.hide();
+      this.requestRoleWithPage(1);
     }
   }
 };
@@ -267,6 +297,71 @@ export default {
 .el-button + .el-button {
   margin-left: 0 !important;
 }
+.roleTitle {
+  display: flex;
+  align-items: center;
+  font-size: 14px;
+  margin-bottom: 24px;
+  .warn {
+    font-size: 18px;
+    color: #409eff;
+    margin-right: 5px;
+  }
+}
+.roleBox {
+  display: flex;
+  flex-wrap: wrap;
+  .roleOne {
+    width: 280px;
+    height: 350px;
+    margin: 0 15px 20px;
+    border: 1px solid rgba(235, 238, 240, 1);
+    border-radius: 4px;
+    overflow: hidden;
+  }
+  .setting {
+    // float: right;
+    text-align: right;
+    margin-right: 20px;
+    margin-top: 20px;
+    width: 100%;
+    color: #313234;
+  }
+  .avatar {
+    width: 100%;
+    display: flex;
+    justify-content: space-around;
+    flex-direction: column;
+    align-items: center;
+    img {
+      width: 60px;
+      height: 60px;
+      margin: 10px 0;
+    }
+    .avatarname {
+      font-size: 18px;
+    }
+  }
+  .roleTip {
+    width: 82%;
+    margin: 20px auto 10px;
+    font-size: 14px;
+    color: #989898;
+  }
+  .roleTxt {
+    width: 82%;
+    margin: 0 auto;
+    font-size: 14px;
+    color: #666666;
+  }
+  .btnBox {
+    width: 82%;
+    margin: 0 auto;
+    display: flex;
+    justify-content: space-between;
+    margin-top: 50px;
+  }
+}
 </style>
 <style>
 .el-table td,