Merge remote-tracking branch 'origin/master'

src/api/business/mdeicalRecord.js

+import request from '@/utils/request'
+
+// 查询病例详情
+export function getRecord(id) {
+  return request({
+    url: '/business/record/' + id,
+    method: 'get'
+  })
+}
+// 根据检查类型查询检查项目
+export function listByType(params) {
+  return request({
+    url: '/business/item/listByType',
+    method: 'get',
+    params
+  })
+}
+// 根据宠物id查询检查信息列表
+export function checkList(params) {
+  return request({
+    url: '/business/check/list',
+    method: 'get',
+    params
+  })
+}
+// 查询治疗项目
+export function getTreatOptions(params) {
+  return request({
+    url: '/business/item/list',
+    method: 'get',
+    params
+  })
+}
+export function deleteCheck(id) {
+  return request({
+    url: '/business/check/' + id,
+    method: 'delete'
+  })
+}
+// 新增检查
+export function addCheck(data) {
+  return request({
+    url: '/business/check',
+    method: 'post',
+    data
+  })
+}
+// 编辑检查
+export function updateCheck(data) {
+  return request({
+    url: '/business/check',
+    method: 'put',
+    data
+  })
+}
+// 新增治疗
+export function addTreat(data) {
+  return request({
+    url: '/business/treat',
+    method: 'post',
+    data
+  })
+}
+// 编辑治疗
+export function updateTreat(data) {
+  return request({
+    url: '/business/treat',
+    method: 'put',
+    data
+  })
+}
+export function deleteTreat(id) {
+  return request({
+    url: '/business/treat/' + id,
+    method: 'delete'
+  })
+}

src/main.js

@@ -90,8 +90,9 @@ function render(props = {}) {
     store.commit('SET_TOKEN', temp.token)
     store.commit('SET_ROLES', temp.roles)
     store.commit('SET_PERMISSIONS', temp.permissions)
-    store.commit('SET_NAME', temp.userName)
+    store.commit('SET_NAME', temp.name)
     store.commit('SET_AVATAR', temp.avatar)
+    store.commit('SET_DEPTID', temp.deptId)
   }
 
   instance = new Vue({

src/store/getters.js

@@ -8,6 +8,7 @@ const getters = {
   token: state => state.user.token,
   avatar: state => state.user.avatar,
   name: state => state.user.name,
+  deptId: state => state.user.deptId,
   introduction: state => state.user.introduction,
   roles: state => state.user.roles,
   permissions: state => state.user.permissions,

src/store/modules/user.js

@@ -7,7 +7,8 @@ const user = {
     name: '',
     avatar: '',
     roles: [],
-    permissions: []
+    permissions: [],
+    deptId: ''
   },
 
   mutations: {
@@ -25,6 +26,9 @@ const user = {
     },
     SET_PERMISSIONS: (state, permissions) => {
       state.permissions = permissions
+    },
+    SET_DEPTID: (state, deptId) => {
+      state.deptId = deptId
     }
   },
 
@@ -59,6 +63,7 @@ const user = {
             commit('SET_ROLES', ['ROLE_DEFAULT'])
           }
           commit('SET_NAME', user.userName)
+          commit('SET_DEPTID', user.deptId)
           commit('SET_AVATAR', avatar)
           resolve(res)
         }).catch(error => {