修改华侨医院bug

config/dev.env.js

@@ -4,7 +4,7 @@ const prodEnv = require('./prod.env')
 
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://localhost:9529"'
+  // BASE_API: '"http://api.xt.test.sgjyun.com"'
    //http://api.xt.test.sgjyun.com http://localhost:9529
-   // BASE_API: '"http://localhost:9529"'
+   BASE_API: '"http://localhost:9529"'
 })

src/api/dialysis.js

@@ -203,3 +203,12 @@ export function GetMonitor(params){
     params:params
   })
 }
+
+
+export function PostSearch(keyword) {
+  return request({
+    url: '/api/patients/search?keyword=' + keyword,
+    method: 'post'
+
+  })
+}

src/pages/main/WaitingArea.vue

@@ -195,7 +195,6 @@
         }
 
         if (this.select_index == 2) {
-          console.log('点击了第二个')
           var scheduals = []
           for (let index = 0; index < this.scheduals.length; index++) {
             const schedual = this.scheduals[index]
@@ -206,7 +205,6 @@
           return this.processScheduals(scheduals)
           // return scheduals;
         } else if (this.select_index == 1) {
-          console.log('点击了第三个')
           var scheduals = []
           for (let index = 0; index < this.scheduals.length; index++) {
             const schedual = this.scheduals[index]

src/pages/main/add_urgent_schedule.vue

@@ -25,16 +25,43 @@
             <div class="field_panel">
               <van-field v-model="date" class="field"></van-field>
             </div>
+
           </van-col>
+
+
         </van-row>
         <van-row class="row">
+
           <van-col :span="9">
             <span class="title">患者：</span>
             <div class="field_panel">
-              <van-field ref="patient_field" @focus="selectPatientAction" :value="patient_name" class="field"
-                         left-icon="arrow-down"></van-field>
+                <van-field ref="patient_field" @focus="selectPatientAction" :value="patient_name" class="field"
+                           left-icon="arrow-down"></van-field>
+            </div>
+          </van-col>
+
+          <van-col :span="9">
+
+            <div class="field_panel">
+              <el-autocomplete
+                style="float: right"
+                popper-class="my-autocomplete"
+                v-model="value"
+                :fetch-suggestions="querySearchAsync"
+                :trigger-on-focus="false"
+                placeholder="请输入病人名字"
+                @select="handleSelect"
+              >
+                <i class="el-icon-search el-input__icon" slot="suffix"> </i>
+                <template slot-scope="{ item }">
+                  <div class="name">{{ item.name }}</div>
+                </template>
+              </el-autocomplete>
             </div>
           </van-col>
+
+        </van-row>
+        <van-row class="row">
           <van-col :span="9">
             <span class="title">班次：</span>
             <div class="field_panel">
@@ -42,8 +69,7 @@
                          left-icon="arrow-down"></van-field>
             </div>
           </van-col>
-        </van-row>
-        <van-row class="row">
+
           <van-col :span="9">
             <span class="title">治疗模式：</span>
             <div class="field_panel">
@@ -88,7 +114,7 @@
 <script>
   import SideBar from '@/pages/layout/SideBar'
   import {parseTime} from '@/utils'
-  import {getUrgentScheduleInitData, postUrgentSchedule} from '@/api/dialysis'
+  import {getUrgentScheduleInitData, PostSearch, postUrgentSchedule} from '@/api/dialysis'
   import {Dialog, Toast} from 'vant'
 
   export default {
@@ -99,7 +125,7 @@
     data () {
       return {
         loading: false,
-
+        value: '',
         date: '2019-09-09',
         patient_id: 0,
         mode_id: 0,
@@ -196,10 +222,10 @@
           this.modes = rs.data.data.modes
           this.origin_device_numbers = rs.data.data.device_numbers
 
-          for (let i = this.origin_schedules.length-1; i >= 0 ; i--) {
-            for (let y = this.origin_device_numbers.length-1; y >=0 ; y--){
-              if(this.origin_device_numbers[y].id == this.origin_schedules[i].bed_id){
-                this.origin_device_numbers.splice(y,1)
+          for (let i = this.origin_schedules.length - 1; i >= 0; i--) {
+            for (let y = this.origin_device_numbers.length - 1; y >= 0; y--) {
+              if (this.origin_device_numbers[y].id == this.origin_schedules[i].bed_id) {
+                this.origin_device_numbers.splice(y, 1)
               }
             }
           }
@@ -242,14 +268,26 @@
       })
     },
     methods: {
-      // getDeviceNumberNames: function(device_numbers) {
-      //     var names = []
-      //     for (let index = 0; index < device_numbers.length; index++) {
-      //         const device_number = device_numbers[index];
-      //         names.push(device_number.number)
-      //     }
-      //     return names
-      // },
+      handleSelect (val) {
+        this.patient_name = val.name
+        this.patient_id = val.id
+      },
+      querySearchAsync (keyword, cb) {
+        let key = ''
+        if (keyword != undefined) {
+          key = keyword
+        }
+        let searchArray = []
+        PostSearch(key).then(response => {
+          if (response.data.state == 1) {
+            searchArray = response.data.data.patient
+            cb(searchArray)
+          } else {
+            this.$message.error(response.data.msg)
+            cb([])
+          }
+        })
+      },
 
       selectPatientAction: function () {
         this.$refs.patient_field.blur()
@@ -302,10 +340,10 @@
             this.modes = rs.data.data.modes
             this.origin_device_numbers = rs.data.data.device_numbers
 
-            for (let i = this.origin_schedules.length-1; i >= 0 ; i--) {
-              for (let y = this.origin_device_numbers.length-1; y >=0 ; y--){
-                if(this.origin_device_numbers[y].id == this.origin_schedules[i].bed_id){
-                  this.origin_device_numbers.splice(y,1)
+            for (let i = this.origin_schedules.length - 1; i >= 0; i--) {
+              for (let y = this.origin_device_numbers.length - 1; y >= 0; y--) {
+                if (this.origin_device_numbers[y].id == this.origin_schedules[i].bed_id) {
+                  this.origin_device_numbers.splice(y, 1)
                 }
               }
             }

src/pages/main/dialog/ComputerDialog.vue

@@ -24,6 +24,14 @@
             </div>
           </div>
 
+          <div class="item" @click="select_puncture_nurse">
+            <h2 class="name">穿刺者</h2>
+            <div class="content">
+              <span class="text" style="width: 100px">{{ admin_map[puncture_nurse_id].name}}</span>
+              <span class="iconfont">&#xe6f9;</span>
+            </div>
+          </div>
+
 
           <div class="item">
             <h2 class="name">上机时间</h2>
@@ -72,6 +80,8 @@ export default {
       start_time_str: "",
       bed_id: 0,
       nurse_id: 0,
+      puncture_nurse_id: 0,
+
       zone_beds: [], // 该排班的区里的床位
     }
   },
@@ -127,6 +137,11 @@ export default {
 
     this.bed_id = (this.record == null || this.record.id == '') ? this.schedule.bed_id : this.record.bed_id
     this.nurse_id = (this.record == null || this.record.id == '') ? this.$store.getters.user.user.id : this.record.start_nurse
+    this.puncture_nurse_id = (this.record == null || this.record.id == '') ? this.$store.getters.user.user.id : this.record.puncture_nurse
+
+    if(this.puncture_nurse_id == 0){
+      this.puncture_nurse_id =  this.$store.getters.user.user.id
+    }
 
     var beds = []
     for (let index = 0; index < this.device_numbers.length; index++) {
@@ -155,7 +170,7 @@ export default {
       ParamsQuery["nurse"] = this.nurse_id
       ParamsQuery["bed"] = this.bed_id
       ParamsQuery["start_time"] = this.start_time_str
-
+      ParamsQuery["puncture_nurse"] = this.puncture_nurse_id
 
       startDialysis(ParamsQuery).then(response => {
         if (response.data.state == 0) {
@@ -194,11 +209,21 @@ export default {
       this.selecting = true
       var t = this
       this.$refs.selector.showSingleSelect(this.admins, this.nurse_id, "选择上机护士", "name", "id", function(select_id) {
-        console.log("nurse id: ", select_id)
         t.nurse_id = select_id
       }, function() {
         t.selecting = false
       })
+    },select_puncture_nurse:function(){
+      if (this.record.id != 0) {
+        return
+      }
+      this.selecting = true
+      var t = this
+      this.$refs.selector.showSingleSelect(this.admins, this.puncture_nurse_id, "选择穿刺护士", "name", "id", function(select_id) {
+        t.puncture_nurse_id = select_id
+      }, function() {
+        t.selecting = false
+      })
     },
     open:function(){
       this.selecting = false;

src/pages/main/today/dialysisComputer.vue

@@ -13,6 +13,11 @@
           <span class="content">{{nurse}}</span>
         </li>
 
+        <li>
+          <label>穿刺者 : </label>
+          <span class="content">{{puncture_nurse}}</span>
+        </li>
+
         <li>
           <label>上机时间 : </label>
           <span class="content" style="font-size: 15px">{{start_time}}</span>
@@ -76,7 +81,13 @@
         }
         return parseTime(this.record.start_time, '{y}年{m}月{d}日 {h}时{i}分')
 
-      },
+      },puncture_nurse:function () {
+        if (this.record == null || this.record.id == '') {
+          return '-'
+        }
+        return this.admin_map[this.record.puncture_nurse] == null ? '' : this.admin_map[this.record.puncture_nurse].name
+
+      }
     },
     methods: {}
   }