病人相关功能

src/api/ncs_customer.js

@@ -0,0 +1,27 @@
+import request from '@/utils/request'
+
+export function addAll(params) {
+  return request({
+    url: '/ncs/customer/addAll',
+    method: 'POST',
+    data: params,
+    headers: { 'Content-Type': 'application/json' }
+  })
+}
+
+export function getCustomerInfo(id) {
+  return request({
+    url: `/ncs/customer/${id}`,
+    method: 'GET'
+  })
+}
+
+
+export function updateAll(params) {
+  return request({
+    url: '/ncs/customer/updateAll',
+    method: 'POST',
+    data: params,
+    headers: { 'Content-Type': 'application/json' }
+  })
+}

src/api/ncs_remark.js

@@ -0,0 +1,20 @@
+import request from '@/utils/request'
+
+export function getRemarks(params) {
+  return request({
+    url: '/ncs/remark/page',
+    method: 'POST',
+    loading: true,
+    data: params
+  })
+}
+
+/** 新增 */
+export function save(params) {
+  return request({
+    url: '/ncs/remark',
+    method: 'POST',
+    loading: true,
+    data: params
+  })
+}

src/store/getters.js

@@ -15,6 +15,7 @@ const getters = {
   errorLogs: state => state.errorLog.logs,
   addRoutes: state => state.permission.addRoutes,
   editLock: state => state.user.editLock,
-  uuid: state => state.user.uuid
+  uuid: state => state.user.uuid,
+  userInfo: state => state.user.userInfo
 }
 export default getters

src/store/modules/user.js

@@ -15,7 +15,8 @@ const state = {
   roles: [],
   partInfo: Auth.getPartInfo(),
   editLock: Auth.getEditLock(),
-  uuid: Auth.getUUID()
+  uuid: Auth.getUUID(),
+  userInfo: Auth.getUserInfo()
 }
 
 const mutations = {
@@ -50,6 +51,10 @@ const mutations = {
   SET_UUID: (state, uuid) => {
     state.uuid = uuid
     Auth.setUUID(uuid)
+  },
+  SET_USERINFO: (state, userInfo) => {
+    state.userInfo = userInfo
+    Auth.setUserInfo(userInfo)
   }
 }
 
@@ -62,9 +67,20 @@ const actions = {
       // commit('SET_PARTID', 1)
       // commit('SET_NAME', username)
       // resolve()
-      login({ username: username.trim(), password: password.trim(), uuid: store.getters.uuid }).then(response => {
-        commit('SET_PARTID', response.last_login_shopid)
+      login({ username: username.trim(), password: password.trim(), uuid: store.getters.uuid }).then(res => {
+        commit('SET_PARTID', res.last_login_shopid)
         commit('SET_NAME', username)
+        const u = {
+          face: res.face,
+          founder: res.founder,
+          mobile: res.mobile,
+          nickname: res.nickname,
+          role_id: res.role_id,
+          sns_json: res.sns_json,
+          uid: res.uid,
+          username: res.username
+        }
+        commit('SET_USERINFO', u)
         // dispatch('getInfo')
         resolve()
       }).catch(error => {

src/utils/auth.js

@@ -76,3 +76,15 @@ export function setUUID(uuid) {
 export function removeUUID() {
   return Cookies.remove('uuid')
 }
+
+export function getUserInfo() {
+  return Cookies.get('userInfo')
+}
+
+export function setUserInfo(userInfo) {
+  return Cookies.set('userInfo', userInfo)
+}
+
+export function removeUserInfo() {
+  return Cookies.remove('userInfo')
+}

src/utils/request.js

@@ -16,14 +16,14 @@ const service = axios.create({
 service.interceptors.request.use(
   config => {
     // do something before request is sent
-    config.headers['Content-type'] = 'application/x-www-form-urlencoded;charset=utf-8'
+    // config.headers['Content-type'] = 'application/x-www-form-urlencoded;charset=utf-8'
     // 如果是put/post请求，用qs.stringify序列化参数
     const is_put_post = config.method === 'put' || config.method === 'post' || config.method === 'delete'
-    const is_json = config.headers['Content-Type'] === 'application/json'
-    if (is_put_post && is_json) {
+    // const is_json = config.headers['Content-Type'] === 'application/json'
+    if (is_put_post && config.headers['Content-Type'] === 'application/json') {
       config.data = JSON.stringify(config.data)
     }
-    if (is_put_post && !is_json) {
+    if (is_put_post && config.headers['Content-Type'] !== 'application/json') {
       config.data = qs.stringify(config.data, { arrayFormat: 'repeat' })
     }
 

src/views/calling-board/index.vue

@@ -77,7 +77,7 @@
 </template>
 
 <script>
-import * as API_Device from '@/api/calling-device'
+import * as API_Device from '@/api/ncs_device'
 import * as API_Board from '@/api/calling-board'
 import { runtimeUrl } from '@/utils/domain'
 

src/views/calling-device/device-admin.vue

@@ -337,7 +337,7 @@
 </template>
 
 <script>
-import * as API_Device from '@/api/calling-device'
+import * as API_Device from '@/api/ncs_device'
 
 export default {
   name: 'DeviceAdmin',

src/views/calling-device/deviceInfo.vue

@@ -198,7 +198,7 @@
 </template>
 
 <script>
-  import * as API_Device from '@/api/calling-device'
+  import * as API_Device from '@/api/ncs_device'
 
   export default {
     name: 'deviceInfo',

src/views/calling-device/index.vue

@@ -203,7 +203,7 @@
 </template>
 
 <script>
-import * as API_Device from '@/api/calling-device'
+import * as API_Device from '@/api/ncs_device'
 export default {
 
   name: 'Index',

src/views/calling-ncConfig/index.vue

@@ -79,7 +79,7 @@
 </template>
 
 <script>
-import * as API_CallingNcConfig from '@/api/calling-ncConfig'
+import * as API_CallingNcConfig from '@/api/ncs_nurseConfig'
 
 export default {
   name: 'Index',

src/views/dashboard/calling-admin/components/AppVersionManager.vue

@@ -39,7 +39,7 @@
 
 <script>
 import { serverUrl } from '@/utils/domain'
-import * as API_Device from '@/api/calling-device'
+import * as API_Device from '@/api/ncs_device'
 export default {
   name: 'AppVersionManager',
   props: {

src/views/hospitalFrame/hospitalFrame.vue

@@ -33,11 +33,11 @@
         <template v-if="item.frame_bed_vos && item.frame_bed_vos.length > 0">
           <div v-for="(subItem, i) in item.frame_bed_vos" :key="i" class="param-item">
             <span><i class="el-icon-s-flag"></i> {{ subItem.frame_bed.name }} 床</span>
-            <span v-if="subItem.customer_member_id">
-          <el-button size="mini" plain round @click="handleEditPatient(subItem.customer_member_id)"><i class="el-icon-user"></i> {{ subItem.customer_name}}</el-button>
-        </span>
+            <span v-if="subItem.customer_id">
+              <el-button size="mini" plain round @click="handleEditPatient(subItem.customer_id,subItem.frame_bed.id)"><i class="el-icon-user"></i> {{ subItem.customer_name}}</el-button>
+            </span>
             <span v-else>
-          <el-button size="mini" type="success" plain round @click="handleAddPatient(null)"><i class="el-icon-circle-plus-outline"></i> 病人</el-button>
+          <el-button size="mini" type="success" plain round @click="handleAddPatient(subItem.frame_bed)"><i class="el-icon-circle-plus-outline"></i> 病人</el-button>
         </span>
             <span>
           <el-dropdown size="mini" @command="handleGroupCommand">
@@ -68,7 +68,7 @@
       :visible.sync="dialogPatientVisible"
       width="85%"
     >
-      <customer-edit :customer-id="customerId" @saved="handlePatientFinished"></customer-edit>
+      <customer-edit :customer-id="customerId" :frame-id="frameId" @saved="handlePatientFinished"></customer-edit>
     </el-dialog>
 
     <el-dialog title="科室结构" :visible.sync="dialogFrameVisible" width="500px">
@@ -118,7 +118,7 @@
 </template>
 
 <script>
-  import * as HospitalFrame_API from '@/api/hospitalFrame'
+  import * as HospitalFrame_API from '@/api/ncs_hospitalFrame'
   import * as RegExp from "@/utils/RegExp";
   import customerEdit from '@/views/customer/customerEdit'
   import DeviceInfo from '@/views/calling-device/deviceInfo'
@@ -210,15 +210,17 @@
       },
       handleAddPatient(bedFrame) {
         this.customerId = 0
+        this.frameId = bedFrame.id
         this.dialogPatientVisible = true
       },
       handlePatientFinished() {
         this.dialogPatientVisible = false
         this.GET_All()
       },
-      handleEditPatient(id) {
+      handleEditPatient(id,frameId) {
         this.dialogPatientVisible = true
         this.customerId = id
+        this.frameId = frameId
       },
       // frame handle
       handleAddRoom() {