Merge branch 'new_pad_branch' of http://git.shengws.com/zhangbj/xt_pad into new_pad_branch

build/cdn.json

@@ -1,3 +1,3 @@
 {
-  "version": "1.0.318"
+  "version": "1.1.2"
 }

src/api/dialysis.js

@@ -255,3 +255,13 @@ export function GetSolution(params){
 
 
 
+
+
+export function GetSchedualNumber(params){
+  return request({
+    url:"/m/api/schedule/get",
+    method:'get',
+    params:params,
+  })
+
+}

src/pages/home/login.vue

@@ -45,17 +45,17 @@
           <a href="">免密码登录</a>
           <a href="">忘记密码？</a>
           </div>-->
-          <div class="agree">
-            <el-checkbox v-model="agreement">
-              我已阅读并同意
-              <!-- <router-link to="/privacyPolicy"> -->
+          <!--<div class="agree">-->
+            <!--<el-checkbox v-model="agreement">-->
+              <!--我已阅读并同意-->
+              <!--&lt;!&ndash; <router-link to="/privacyPolicy"> &ndash;&gt;-->
 
-              <!-- </router-link> -->
-            </el-checkbox>
-            <!-- <router-link to="/privacyPolicy"> -->
-            <span class="agreeText" @click="agree">《隐私服务协议》</span>
-            <!-- </router-link> -->
-          </div>
+              <!--&lt;!&ndash; </router-link> &ndash;&gt;-->
+            <!--</el-checkbox>-->
+            <!--&lt;!&ndash; <router-link to="/privacyPolicy"> &ndash;&gt;-->
+            <!--<span class="agreeText" @click="agree">《隐私服务协议》</span>-->
+            <!--&lt;!&ndash; </router-link> &ndash;&gt;-->
+          <!--</div>-->
         </div>
       </div>
     </div>

src/pages/main/add_urgent_schedule.vue

@@ -77,24 +77,26 @@
           </van-col>
 
           <van-col :span="24">
-            <span class="title">治疗模式：</span>
+            <span class="title">床位：</span>
             <div class="field_panel">
               <van-field
-                ref="mode_field"
-                @focus="selectModeAction"
-                :value="mode_name"
+                ref="bed_field"
+                @focus="selectBedAction"
+                :value="bed_name"
                 class="field"
                 left-icon="arrow-down"
               ></van-field>
             </div>
           </van-col>
+
+
           <van-col :span="24">
-            <span class="title">床位：</span>
+            <span class="title">治疗模式：</span>
             <div class="field_panel">
               <van-field
-                ref="bed_field"
-                @focus="selectBedAction"
-                :value="bed_name"
+                ref="mode_field"
+                @focus="selectModeAction"
+                :value="mode_name"
                 class="field"
                 left-icon="arrow-down"
               ></van-field>
@@ -129,6 +131,7 @@
     </van-popup>
     <van-popup v-model="show_bed_picker" position="bottom" class="popup">
       <van-picker
+        ref="picker"
         :columns="zone_device_options"
         value-key="number"
         @change="didChangeBed"
@@ -136,6 +139,7 @@
     </van-popup>
     <van-popup v-model="show_sch_type_picker" position="bottom" class="popup">
       <van-picker
+        ref="schedule"
         :columns="schedule_types"
         value-key="text"
         @change="didChangeSchType"
@@ -145,238 +149,116 @@
 </template>
 
 <script>
-import SideBar from "@/pages/layout/SideBar";
-import { parseTime } from "@/utils";
-import {
-  getUrgentScheduleInitData,
-  PostSearch,
-  postUrgentSchedule
-} from "@/api/dialysis";
-import { Dialog, Toast } from "vant";
-
-export default {
-  name: "AddUrgentSchedule",
-  components: {
-    SideBar
-  },
-  data() {
-    return {
-      loading: false,
-      value: "",
-      date: "2019-09-09",
-      patient_id: 0,
-      mode_id: 0,
-      device_id: 0,
-      schedule_type: 1,
-      zone_name: "",
-
-      show_patient_picker: false,
-      show_mode_picker: false,
-      show_bed_picker: false,
-      show_sch_type_picker: false,
-
-      patients: [],
-      modes: [],
-      schedule_types: [
-        { value: 1, text: "上午" },
-        { value: 2, text: "下午" },
-        { value: 3, text: "晚上" }
-      ],
-
-      origin_device_numbers: [],
-      zone_device_map: {},
-      zone_names: [],
-      current_devices: [],
-      zone_device_options: [],
-
-      origin_schedules: []
-    };
-  },
-  computed: {
-    patient_name: function() {
-      for (let index = 0; index < this.patients.length; index++) {
-        const patient = this.patients[index];
-        if (patient.id == this.patient_id) {
-          return patient.name;
-        }
-      }
-      return "";
-    },
-    mode_name: function() {
-      for (let index = 0; index < this.modes.length; index++) {
-        const mode = this.modes[index];
-        if (mode.id == this.mode_id) {
-          return mode.name;
-        }
-      }
-      return "";
-    },
-    bed_name: function() {
-      if (this.zone_name.length > 0 && this.device_id != 0) {
-        for (let index = 0; index < this.current_devices.length; index++) {
-          const device_number = this.current_devices[index];
-          if (device_number.id == this.device_id) {
-            return device_number.zone.name + " - " + device_number.number;
-          }
-        }
-      }
-      return "";
+  import SideBar from "@/pages/layout/SideBar";
+  import { parseTime } from "@/utils";
+  import {
+    getUrgentScheduleInitData,
+    PostSearch,
+    postUrgentSchedule
+  } from "@/api/dialysis";
+  import { Dialog, Toast } from "vant";
+
+  export default {
+    name: "AddUrgentSchedule",
+    components: {
+      SideBar
     },
-    schedule_type_title: function() {
-      for (let index = 0; index < this.schedule_types.length; index++) {
-        const type = this.schedule_types[index];
-        if (type.value == this.schedule_type) {
-          return type.text;
-        }
-      }
-      return "";
-    }
-  },
-  mounted() {
-    var today = new Date();
-    this.date = parseTime(today, "{y}-{m}-{d}");
-
-    var hour = today.getHours();
-    if (hour > 3 && hour < 11) {
-      this.schedule_type = 1;
-    } else if (hour >= 11 && hour < 18) {
-      this.schedule_type = 2;
-    } else {
-      this.schedule_type = 3;
-    }
+    data() {
+      return {
+        loading: false,
+        value: "",
+        date: "2019-09-09",
+        patient_id: 0,
+        mode_id: 0,
+        device_id: 0,
+        schedule_type: 2,
+        zone_name: "",
 
-    this.loading = true;
-    let params = {
-      type: this.schedule_type
-    };
-    console.log(params);
-    getUrgentScheduleInitData(params)
-      .then(rs => {
-        this.loading = false;
-        // console.log(rs.data.data)
-        if (rs.data.state == 1) {
-          this.origin_schedules = rs.data.data.schedules;
-          this.patients = rs.data.data.patients;
-          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);
-              }
-            }
-          }
+        show_patient_picker: false,
+        show_mode_picker: false,
+        show_bed_picker: false,
+        show_sch_type_picker: false,
+
+        patients: [],
+        modes: [],
+        schedule_types: [
+          { value: 1, text: "上午" },
+          { value: 2, text: "下午" },
+          { value: 3, text: "晚上" }
+        ],
+
+        origin_device_numbers: [],
+        zone_device_map: {},
+        zone_names: [],
+        current_devices: [],
+        zone_device_options: [],
 
-          if (this.patients.length > 0) {
-            this.patient_id = this.patients[0].id;
+        origin_schedules: []
+      };
+    },
+    computed: {
+      patient_name: function() {
+        for (let index = 0; index < this.patients.length; index++) {
+          const patient = this.patients[index];
+          if (patient.id == this.patient_id) {
+            return patient.name;
           }
-          if (this.modes.length > 0) {
-            this.mode_id = this.modes[0].id;
+        }
+        return "";
+      },
+      mode_name: function() {
+        for (let index = 0; index < this.modes.length; index++) {
+          const mode = this.modes[index];
+          if (mode.id == this.mode_id) {
+            return mode.name;
           }
-
-          var zone_device_map = {};
-          for (
-            let index = 0;
-            index < this.origin_device_numbers.length;
-            index++
-          ) {
-            const device_number = this.origin_device_numbers[index];
-            if (
-              zone_device_map[device_number.zone.name] == null ||
-              zone_device_map[device_number.zone.name] == undefined
-            ) {
-              zone_device_map[device_number.zone.name] = [];
+        }
+        return "";
+      },
+      bed_name: function() {
+        if (this.zone_name.length > 0 && this.device_id != 0) {
+          for (let index = 0; index < this.current_devices.length; index++) {
+            const device_number = this.current_devices[index];
+            if (device_number.id == this.device_id) {
+              return device_number.zone_name + " - " + device_number.number;
             }
-            zone_device_map[device_number.zone.name].push(device_number);
           }
-          this.zone_device_map = zone_device_map;
-
-          this.zone_names = Object.keys(this.zone_device_map);
-          if (this.zone_names.length > 0) {
-            this.zone_name = this.zone_names[0];
-            this.current_devices = this.zone_device_map[this.zone_name];
-            this.device_id = this.current_devices[0].id;
+        }
+        return "";
+      },
+      schedule_type_title: function() {
+        for (let index = 0; index < this.schedule_types.length; index++) {
+          const type = this.schedule_types[index];
+          if (type.value == this.schedule_type) {
+            return type.text;
           }
-          this.zone_device_options = [
-            { values: this.zone_names },
-            // { values: this.getDeviceNumberNames(this.current_devices) },
-            { values: this.current_devices }
-          ];
-        } else {
-          Toast.fail(rs.data.msg);
         }
-      })
-      .catch(err => {
-        this.loading = false;
-        Toast.fail(err);
-      });
-  },
-  methods: {
-    handleSelect(val) {
-      this.patient_name = val.name;
-      this.patient_id = val.id;
-    },
-    querySearchAsync(keyword, cb) {
-      let key = "";
-      if (keyword != undefined) {
-        key = keyword;
+        return "";
       }
-      let searchArray = [];
-      PostSearch(key).then(response => {
-        if (response.data.state == 1) {
-          searchArray = response.data.data.patient;
-          cb(searchArray);
-        } else {
-          cb([]);
-        }
-      });
-    },
+    },created(){
 
-    selectPatientAction: function() {
-      this.$refs.patient_field.blur();
-      this.show_patient_picker = true;
-    },
-    selectModeAction: function() {
-      this.$refs.mode_field.blur();
-      this.show_mode_picker = true;
-    },
-    selectBedAction: function() {
-      this.$refs.bed_field.blur();
-      this.show_bed_picker = true;
-    },
-    selectSchTypeAction: function() {
-      this.$refs.sch_type_field.blur();
-      this.show_sch_type_picker = true;
-    },
+      var today = new Date();
+      this.date = parseTime(today, "{y}-{m}-{d}");
 
-    didChangePatient: function(picker, patient, index) {
-      this.patient_id = patient.id;
-    },
-    didChangeMode: function(picker, mode, index) {
-      this.mode_id = mode.id;
-    },
-    didChangeBed: function(picker, values, col_index) {
-      if (col_index == 0) {
-        this.zone_name = values[0];
-        this.current_devices = this.zone_device_map[this.zone_name];
-        this.device_id = this.current_devices[0].id;
-
-        picker.setColumnValues(1, this.current_devices);
-      } else if (col_index == 1) {
-        this.device_id = values[1].id;
+      var hour = today.getHours();
+      if (hour > 3 && hour < 11) {
+        this.schedule_type = 1;
+      } else if (hour >= 11 && hour < 18) {
+        this.schedule_type = 2;
+      } else {
+        this.schedule_type = 3;
       }
+
+
+
     },
-    didChangeSchType: function(picker, sch_type, index) {
-      this.schedule_type = sch_type.value;
+    mounted() {
 
       this.loading = true;
       let params = {
         type: this.schedule_type
       };
+      console.log(params);
       getUrgentScheduleInitData(params)
         .then(rs => {
           this.loading = false;
@@ -384,26 +266,17 @@ export default {
           if (rs.data.state == 1) {
             this.origin_schedules = rs.data.data.schedules;
             this.patients = rs.data.data.patients;
+            console.log(this.patients)
             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);
-                }
-              }
-            }
 
-            // if (this.patients.length > 0) {
-            //   this.patient_id = this.patients[0].id
-            // }
-            // if (this.modes.length > 0) {
-            //   this.mode_id = this.modes[0].id
-            // }
+            if (this.patients.length > 0) {
+              this.patient_id = this.patients[0].id;
+            }
+            if (this.modes.length > 0) {
+              this.mode_id = this.modes[0].id;
+            }
 
             var zone_device_map = {};
             for (
@@ -413,12 +286,12 @@ export default {
             ) {
               const device_number = this.origin_device_numbers[index];
               if (
-                zone_device_map[device_number.zone.name] == null ||
-                zone_device_map[device_number.zone.name] == undefined
+                zone_device_map[device_number.zone_name] == null ||
+                zone_device_map[device_number.zone_name] == undefined
               ) {
-                zone_device_map[device_number.zone.name] = [];
+                zone_device_map[device_number.zone_name] = [];
               }
-              zone_device_map[device_number.zone.name].push(device_number);
+              zone_device_map[device_number.zone_name].push(device_number);
             }
             this.zone_device_map = zone_device_map;
 
@@ -433,6 +306,8 @@ export default {
               // { values: this.getDeviceNumberNames(this.current_devices) },
               { values: this.current_devices }
             ];
+            console.log(this.zone_device_options )
+
           } else {
             Toast.fail(rs.data.msg);
           }
@@ -442,77 +317,198 @@ export default {
           Toast.fail(err);
         });
     },
+    methods: {
+      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 {
+            cb([]);
+          }
+        });
+      },
 
-    submitAction: function() {
-      if (this.patient_id == 0 || this.mode_id == 0 || this.device_id == 0) {
-        Toast.fail("请选择班次、床位等");
-        return;
-      }
+      selectPatientAction: function() {
+        this.$refs.patient_field.blur();
+        this.show_patient_picker = true;
+      },
+      selectModeAction: function() {
+        this.$refs.mode_field.blur();
+        this.show_mode_picker = true;
+      },
+      selectBedAction: function() {
+        this.$refs.bed_field.blur();
+        this.show_bed_picker = true;
+      },
+      selectSchTypeAction: function() {
+        this.$refs.sch_type_field.blur();
+        this.show_sch_type_picker = true;
+
+      },
+
+      didChangePatient: function(picker, patient, index) {
+        this.patient_id = patient.id;
+      },
+      didChangeMode: function(picker, mode, index) {
+        this.mode_id = mode.id;
+      },
+      didChangeBed: function(picker, values, col_index) {
+        if (col_index == 0) {
+          this.zone_name = values[0];
+          this.current_devices = this.zone_device_map[this.zone_name];
+          this.device_id = this.current_devices[0].id;
 
-      var repeated = false;
-      for (let index = 0; index < this.origin_schedules.length; index++) {
-        const schedule = this.origin_schedules[index];
-        if (
-          schedule.bed_id == this.device_id &&
-          this.schedule_type == schedule.schedule_type
-        ) {
-          repeated = true;
-          break;
+          picker.setColumnValues(1, this.current_devices);
+        } else if (col_index == 1) {
+          this.device_id = values[1].id;
         }
-      }
-      if (repeated) {
-        Dialog.confirm({
-          title: "提醒",
-          message: "你选择的床位已经被排班，确认要替换吗？"
-        })
-          .then(() => {
-            // on confirm
-            this.submit();
+      },
+      didChangeSchType: function(picker, sch_type, index) {
+        this.schedule_type = sch_type.value;
+        this.loading = true;
+        let params = {
+          type: this.schedule_type
+        };
+        getUrgentScheduleInitData(params)
+          .then(rs => {
+            this.loading = false;
+            // console.log(rs.data.data)
+            if (rs.data.state == 1) {
+              this.zone_device_options = []
+              this.origin_schedules = rs.data.data.schedules;
+              this.patients = rs.data.data.patients;
+              console.log(this.patients)
+              this.modes = rs.data.data.modes;
+              this.origin_device_numbers = rs.data.data.device_numbers;
+
+
+              if (this.patients.length > 0) {
+                this.patient_id = this.patients[0].id;
+              }
+              if (this.modes.length > 0) {
+                this.mode_id = this.modes[0].id;
+              }
+
+              var zone_device_map = {};
+              for (
+                let index = 0;
+                index < this.origin_device_numbers.length;
+                index++
+              ) {
+                const device_number = this.origin_device_numbers[index];
+                if (
+                  zone_device_map[device_number.zone_name] == null ||
+                  zone_device_map[device_number.zone_name] == undefined
+                ) {
+                  zone_device_map[device_number.zone_name] = [];
+                }
+                zone_device_map[device_number.zone_name].push(device_number);
+              }
+              this.zone_device_map = zone_device_map;
+
+              this.zone_names = Object.keys(this.zone_device_map);
+              if (this.zone_names.length > 0) {
+                this.zone_name = this.zone_names[0];
+                this.current_devices = this.zone_device_map[this.zone_name];
+                this.device_id = this.current_devices[0].id;
+              }
+              this.zone_device_options = [
+                { values: this.zone_names },
+                // { values: this.getDeviceNumberNames(this.current_devices) },
+                { values: this.current_devices }
+              ];
+              console.log( this.zone_device_options)
+            } else {
+              Toast.fail(rs.data.msg);
+            }
           })
-          .catch(() => {
-            // on cancel
+          .catch(err => {
+            this.loading = false;
+            Toast.fail(err);
           });
-      } else {
-        this.submit();
-      }
-    },
-    submit: function() {
-      var params = {
-        patient_id: this.patient_id,
-        mode: this.mode_id,
-        schedule_type: this.schedule_type,
-        bed: this.device_id
-      };
-      this.loading = true;
-      postUrgentSchedule(params)
-        .then(rs => {
-          this.loading = false;
-          var resp = rs.data;
-          if (resp.state == 1) {
-            console.log(resp.data);
-            var patient = resp.data.patient;
-            var schedule = resp.data.schedule;
-            this.$router.push({
-              path: "/details",
-              query: {
-                patient_id: patient.id,
-                date: schedule.schedule_date,
-                patient_name: patient.name
-              }
-            });
-          } else {
-            Toast.fail(resp.msg);
+      },
+
+      submitAction: function() {
+
+        if (this.patient_id == 0 || this.mode_id == 0 || this.device_id == 0) {
+          Toast.fail("请选择班次、床位等");
+          return;
+        }
+
+        var repeated = false;
+        for (let index = 0; index < this.origin_schedules.length; index++) {
+          const schedule = this.origin_schedules[index];
+          if (
+            schedule.bed_id == this.device_id &&
+            this.schedule_type == schedule.schedule_type
+          ) {
+            repeated = true;
+            break;
           }
-        })
-        .catch(err => {
-          this.loading = false;
-          Toast.fail("err");
-        });
+        }
+        if (repeated) {
+          Dialog.confirm({
+            title: "提醒",
+            message: "你选择的床位已经被排班，确认要替换吗？"
+          })
+            .then(() => {
+              // on confirm
+              this.submit();
+            })
+            .catch(() => {
+              // on cancel
+            });
+        } else {
+          this.submit();
+        }
+      },
+      submit: function() {
+        var params = {
+          patient_id: this.patient_id,
+          mode: this.mode_id,
+          schedule_type: this.schedule_type,
+          bed: this.device_id
+        };
+        this.loading = true;
+        postUrgentSchedule(params)
+          .then(rs => {
+            this.loading = false;
+            var resp = rs.data;
+            if (resp.state == 1) {
+              var patient = resp.data.patient;
+              var schedule = resp.data.schedule;
+              this.$router.push({
+                path: "/details",
+                query: {
+                  patient_id: patient.id,
+                  date: schedule.schedule_date,
+                  patient_name: patient.name
+                }
+              });
+            } else {
+              Toast.fail(resp.msg);
+            }
+          })
+          .catch(err => {
+            this.loading = false;
+            Toast.fail("err");
+          });
+      }
     }
-  }
-};
+  };
 </script>
 
+
 <style style="stylesheet/scss" lang="scss" scoped>
 .mainContent {
   position: relative;

src/pages/main/dialog/ComputerDialog.vue

@@ -1,42 +1,33 @@
 <template>
   <div>
+
     <div class="Dialog" v-show="!selecting">
       <div class="DialogTit">
         <span @click="close()" class="iconfont">&#xe6e9;</span>
         <h1 class="name">透析上机</h1>
-        <span
-          class="success"
-          v-if="
-            this.record.id == 0 ||
-              this.$store.getters.user.user.id != this.creator
-          "
-        ></span>
-        <span
-          class="success"
-          @click="modify()"
-          v-if="
-            isPremission || this.$store.getters.user.user.id == this.creator
-          "
-          >修改</span
-        >
+        <span class="success" v-if="this.record.id == 0 || this.$store.getters.user.user.id != this.creator"></span>
+        <span class="success" @click="modify()" v-if="isPremission|| this.$store.getters.user.user.id == this.creator">修改</span>
       </div>
 
-      <div class="DialogContent">
+      <div class="DialogContent ">
+        <div class="item" @click="select_type">
+          <h2 class="name">班次</h2>
+          <div class="content">
+            <span class="text" style="width: 100px">{{getSchedualType(this.schedual_type)}}</span>
+            <span class="iconfont">&#xe6f9;</span>
+          </div>
+        </div>
         <div class="item" @click="select_bed">
           <h2 class="name">上机床位</h2>
           <div class="content">
-            <span class="text" style="width: 100px">{{
-              device_number_map[bed_id].number + "床"
-            }}</span>
+            <span class="text" style="width: 100px">{{ device_number_map[bed_id].number }}</span>
             <span class="iconfont">&#xe6f9;</span>
           </div>
         </div>
         <div class="item" @click="select_nurse">
           <h2 class="name">上机护士</h2>
           <div class="content">
-            <span class="text" style="width: 100px">{{
-              admin_map[nurse_id].name
-            }}</span>
+            <span class="text" style="width: 100px">{{ admin_map[nurse_id].name }}</span>
             <span class="iconfont">&#xe6f9;</span>
           </div>
         </div>
@@ -44,12 +35,7 @@
         <div class="item" @click="select_puncture_nurse">
           <h2 class="name">穿刺者</h2>
           <div class="content">
-            <span
-              class="text"
-              style="width: 100px"
-              v-if="admin_map[puncture_nurse_id]"
-              >{{ admin_map[puncture_nurse_id].name }}</span
-            >
+            <span class="text" style="width: 100px" v-if="admin_map[puncture_nurse_id]">{{ admin_map[puncture_nurse_id].name}}</span>
             <span class="iconfont">&#xe6f9;</span>
           </div>
         </div>
@@ -57,34 +43,24 @@
         <div class="item" v-if="template_id == 6">
           <label class="name" for="xll">引血(ml/min)</label>
           <div class="content">
-            <input
-              type="tel"
-              @focus="inputFocus"
-              id="xll"
-              v-model="blood_drawing"
-            />
+            <input type="tel" @focus="inputFocus"  id="xll" v-model="blood_drawing"/>
           </div>
         </div>
 
         <div class="item">
           <h2 class="name">上机时间</h2>
           <div class="content">
-            <span
-              class="text"
-              style="width: 100px"
-              @click="selectStartTimeAction"
-              >{{ start_time_str }}</span
-            >
+            <span class="text" style="width: 100px" @click="selectStartTimeAction">{{ start_time_str }}</span>
             <span class="iconfont">&#xe6f9;</span>
           </div>
         </div>
+
+
+
+
         <div class="perform">
-          <button @click="commitInfo" v-if="record == null || record.id == ''">
-            执行上机
-          </button>
-          <button :disabled="true" style="background-color:lightgray;" v-else>
-            已上机
-          </button>
+          <button @click="commitInfo" v-if="(record == null || record.id == '')">执行上机</button>
+          <button :disabled="true" style="background-color:lightgray;" v-else>已上机</button>
         </div>
       </div>
     </div>
@@ -99,390 +75,446 @@
   </div>
 </template>
 
+
 <script>
-import { startDialysis, PostModifyStartDialysis } from "@/api/dialysis";
-import { Toast } from "vant";
-import { parseTime } from "@/utils";
-
-import TwoMenu from "./TwoMenu";
-
-export default {
-  name: "ComputerDialog",
-  components: {
-    TwoMenu
-  },
-  data() {
-    return {
-      start_time: new Date(),
-      selecting: false,
-      start_time_str: "",
-      bed_id: 0,
-      nurse_id: 0,
-      puncture_nurse_id: 0,
-      isPremission: false,
-      zone_beds: [], // 该排班的区里的床位
-      creator: 0,
-      template_id: 0,
-      blood_drawing: 100
-    };
-  },
-  props: {
-    schedule: {
-      type: Object
-    },
-    patient_prop: {
-      type: Object
-    },
-    record: {
-      type: Object
-    },
-    admins: {
-      type: Array
-    },
-    device_numbers: {
-      type: Array
-    },
-    admin_map: {
-      type: Object
+  import {startDialysis,PostModifyStartDialysis,GetSchedualNumber} from '@/api/dialysis'
+  import {Toast} from 'vant'
+  import {parseTime} from '@/utils'
+
+  import TwoMenu from './TwoMenu'
+
+  export default {
+    name: 'ComputerDialog',
+    components: {
+      TwoMenu
     },
-    device_number_map: {
-      type: Object
+    data () {
+      return {
+        start_time: new Date(),
+        selecting: false,
+        start_time_str: '',
+        bed_id: 0,
+        nurse_id: 0,
+        puncture_nurse_id: 0,
+        isPremission: false,
+        zone_beds: [], // 该排班的区里的床位
+        creator: 0,
+        template_id: 0,
+        blood_drawing:100,
+        schedual_type:0,
+        schedules_type: [
+          {id: 1, name:"上午"},
+          {id: 2, name:"下午"},
+          {id: 3, name:"晚上"},
+        ], // 该排班的区里的床位
+      }
     },
-    special_premission: {
-      type: Array
-    }
-  },
-  mounted() {
-    if (this.record.id == 0) {
-      this.start_time_str =
-        parseTime(this.start_time, "{y}-{m}-{d} {h}:{i}") + ":00";
-    } else {
-      if (this.record.start_time == 0) {
-        this.start_time_str =
-          parseTime(this.start_time, "{y}-{m}-{d} {h}:{i}") + ":00";
+    props: {
+      schedule: {
+        type: Object,
+      },
+      patient_prop: {
+        type: Object,
+      },
+      record: {
+        type: Object,
+      },
+      admins: {
+        type: Array,
+      },
+      device_numbers: {
+        type: Array,
+      },
+      admin_map: {
+        type: Object,
+      },
+      device_number_map: {
+        type: Object,
+      },
+      special_premission: {
+        type: Array,
+      },
+    }, mounted () {
+
+      if (this.record.id == 0) {
+        this.start_time_str = parseTime(this.start_time, '{y}-{m}-{d} {h}:{i}') + ':00'
       } else {
-        this.start_time_str =
-          parseTime(this.record.start_time, "{y}-{m}-{d} {h}:{i}") + ":00";
-      }
-    }
-  },
-  created() {
-    this.template_id = this.$store.getters.user.template_info.template_id;
-    var date = this.$route.query && this.$route.query.date;
-    date *= 1000;
-    var newDate = new Date(date);
-    var y = newDate.getFullYear();
-    var m = newDate.getMonth() + 1;
-    var d = newDate.getDate();
-    if (isNaN(y) || isNaN(m) || isNaN(d)) {
-      newDate = new Date();
-      y = newDate.getFullYear();
-      m = newDate.getMonth() + 1;
-      d = newDate.getDate();
-    }
-    this.record_date =
-      y + "-" + (m < 10 ? "0" + m : m) + "-" + (d < 10 ? "0" + d : d);
-
-    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;
-    }
+        if (this.record.start_time == 0) {
+          this.start_time_str = parseTime(this.start_time, '{y}-{m}-{d} {h}:{i}') + ':00'
 
-    // var beds = []
-    // for (let index = 0; index < this.device_numbers.length; index++) {
-    //   const device_number = this.device_numbers[index]
-    //   if (device_number.zone_id == this.schedule.partition_id) {
-    //     beds.push(device_number)
-    //   }
-    // }
-    // this.zone_beds = beds
-
-    for (let index = 0; index < this.device_numbers.length; index++) {
-      const device_number = this.device_numbers[index];
-      this.device_numbers[index]["number"] =
-        device_number["zone_name"] + "-" + device_number["number"];
-    }
-    this.zone_beds = this.device_numbers;
-
-    if (this.record.id > 0) {
-      for (let i = 0; i < this.special_premission.length; i++) {
-        if (
-          this.$store.getters.user.user.id ==
-          this.special_premission[i].admin_user_id
-        ) {
-          this.isPremission = true;
+        } else {
+          this.start_time_str = parseTime(this.record.start_time, '{y}-{m}-{d} {h}:{i}') + ':00'
         }
       }
-    }
+    },
+    created () {
+      let now = new Date()
+      let hour = now.getHours()
 
-    if (this.record.id > 0) {
-      if (this.record.creator == 0) {
-        this.creator = this.record.start_nurse;
-      } else {
-        this.creator = this.record.creator;
+      if (hour >= 6 && hour < 12){
+        this.schedual_type = 1
+
+      }else if(hour >= 12 && hour < 18){
+
+        this.schedual_type = 2
+
+
+      }else if(hour >= 18){
+        this.schedual_type = 3
       }
-    }
-  },
-  methods: {
-    inputFocus: function(event) {
-      var input = event.target;
-      setTimeout(function() {
-        input.scrollIntoView();
-      }, 0);
-
-      if (input.setSelectionRange) {
-        setTimeout(function() {
-          input.setSelectionRange(0, input.value.length);
-        }, 0);
-      } else if (input.createTextRange) {
-        var rng = input.createTextRange();
-        rng.move("character", input.value.length);
-        rng.select();
+
+
+      this.GetSchedualNumber()
+
+      this.template_id = this.$store.getters.user.template_info.template_id;
+      var date = this.$route.query && this.$route.query.date
+      date *= 1000
+      var newDate = new Date(date)
+      var y = newDate.getFullYear()
+      var m = newDate.getMonth() + 1
+      var d = newDate.getDate()
+      if (isNaN(y) || isNaN(m) || isNaN(d)) {
+        newDate = new Date()
+        y = newDate.getFullYear()
+        m = newDate.getMonth() + 1
+        d = newDate.getDate()
       }
-    },
-    modify() {
-      let ParamsQuery = {};
-      ParamsQuery["id"] = this.record.id;
-      ParamsQuery["nurse"] = this.nurse_id;
-      ParamsQuery["bed"] = this.bed_id;
-      ParamsQuery["start_time"] = this.start_time_str;
-      ParamsQuery["puncture_nurse"] = this.puncture_nurse_id;
-      PostModifyStartDialysis(ParamsQuery).then(response => {
-        if (response.data.state == 0) {
-          Toast.fail(response.data.msg);
-          return false;
-        } else {
-          Toast.success("修改成功");
-          this.$emit("did_start", response.data.data.dialysis_order);
-          var record = this.record;
-          for (const key in response.data.data.dialysis_order) {
-            this.$set(record, key, response.data.data.dialysis_order[key]);
+      this.record_date = y + '-' + (m < 10 ? '0' + m : m) + '-' + (d < 10 ? '0' + d : d)
+
+      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++) {
+      //   const device_number = this.device_numbers[index]
+      //   if (device_number.zone_id == this.schedule.partition_id) {
+      //     beds.push(device_number)
+      //   }
+      // }
+      // this.zone_beds = beds
+
+      for (let index = 0; index < this.device_numbers.length; index++) {
+        const device_number = this.device_numbers[index]
+        this.device_numbers[index]['number'] = device_number['zone_name']+'-'+device_number['number']
+      }
+      this.zone_beds = this.device_numbers
+
+      if (this.record.id > 0) {
+        for (let i = 0; i < this.special_premission.length; i++) {
+          if (this.$store.getters.user.user.id == this.special_premission[i].admin_user_id) {
+            this.isPremission = true
           }
         }
-      });
-    },
-    didSelectStartTime: function(time) {
-      this.start_time_str = parseTime(time, "{y}-{m}-{d} {h}:{i}") + ":00";
-    },
-    selectStartTimeAction: function() {
-      if (this.record.id != 0) {
-        var creator = 0;
-        if (this.record.creator == 0) {
-          creator = this.record.start_nurse;
-        } else {
-          creator = this.record.creator;
-        }
+      }
 
-        if (this.$store.getters.user.user.id == creator || this.isPremission) {
-          this.$refs.start_time_picker.open();
+      if (this.record.id > 0) {
+        if (this.record.creator == 0) {
+          this.creator = this.record.start_nurse
         } else {
-          return;
+          this.creator = this.record.creator
         }
       }
-      this.$refs.start_time_picker.open();
+
+
+
     },
-    commitInfo: function() {
-      Toast.loading({ forbidClick: true, duration: 0 });
-      let ParamsQuery = {};
-      ParamsQuery["patient_id"] = this.patient_prop.id;
-      ParamsQuery["record_date"] = this.record_date;
-      ParamsQuery["nurse"] = this.nurse_id;
-      ParamsQuery["bed"] = this.bed_id;
-      ParamsQuery["start_time"] = this.start_time_str;
-      ParamsQuery["puncture_nurse"] = this.puncture_nurse_id;
-      ParamsQuery["blood_drawing"] = this.blood_drawing;
-
-      startDialysis(ParamsQuery).then(response => {
-        if (response.data.state == 0) {
-          Toast.fail(response.data.msg);
-          return false;
-        } else {
-          Toast.success("上机成功");
-          var monitor = response.data.data.monitor;
-          this.$emit("did_add_monitor", monitor);
-          this.$emit("did_start", response.data.data.dialysis_order);
-          var record = this.record;
-          for (const key in response.data.data.dialysis_order) {
-            this.$set(record, key, response.data.data.dialysis_order[key]);
-            // this.record[key] = response.data.data.dialysis_order[key]
+    methods: {
+      getSchedualType:function(type){
+        for (let i = 0; i < this.schedules_type.length; i++){
+          if(this.schedules_type[i].id == type){
+            return  this.schedules_type[i].name
           }
         }
-      });
-    },
-    close: function() {
-      this.$emit("close");
-    },
-    select_bed: function() {
-      if (this.record.id != 0) {
-        var creator = 0;
-        if (this.record.creator == 0) {
-          creator = this.record.start_nurse;
-        } else {
-          creator = this.record.creator;
+      },
+      select_type:function(){
+        if (this.record.id != 0) {
+          var creator = 0
+          if (this.record.creator == 0) {
+            creator = this.record.start_nurse
+          } else {
+            creator = this.record.creator
+          }
+
+          if (this.$store.getters.user.user.id == creator || this.isPremission) {
+            this.selecting = true
+            var t = this
+            this.$refs.selector.showSingleSelect(this.schedules_type, this.schedual_type, '选择班次', 'name', 'id', function (select_id) {
+              t.schedual_type = select_id
+
+              let ParamsQuery = {}
+              ParamsQuery['schedual_type'] = select_id
+              GetSchedualNumber(ParamsQuery).then(response => {
+                if (response.data.state == 0) {
+                  Toast.fail(response.data.msg)
+                  return false
+                } else {
+                  t.device_numbers = response.data.data.number
+                  for (let index = 0; index < t.device_numbers.length; index++) {
+                    const device_number = t.device_numbers[index]
+                    t.device_numbers[index]['number'] = device_number['zone_name']+'-'+device_number['number']
+                  }
+                  t.zone_beds = t.device_numbers
+                  t.bed_id = t.zone_beds[0].id
+                }
+              })
+            }, function () {
+              t.selecting = false
+            })
+          } else {
+            return
+          }
         }
+        this.selecting = true
+        var t = this
+        this.$refs.selector.showSingleSelect(this.schedules_type, this.schedual_type, '选择班次', 'name', 'id', function (select_id) {
+          t.schedual_type = select_id
+          let ParamsQuery = {}
+          ParamsQuery['schedual_type'] = select_id
+          GetSchedualNumber(ParamsQuery).then(response => {
+            if (response.data.state == 0) {
+              Toast.fail(response.data.msg)
+              return false
+            } else {
+              t.zone_beds = []
+              t.device_numbers = response.data.data.number
+              for (let index = 0; index < t.device_numbers.length; index++) {
+                const device_number = t.device_numbers[index]
+                t.device_numbers[index]['number'] = device_number['zone_name']+'-'+device_number['number']
+              }
+              t.zone_beds = t.device_numbers
+              t.bed_id = t.zone_beds[0].id
+
 
-        if (this.$store.getters.user.user.id == creator || this.isPremission) {
-          this.selecting = true;
-          var t = this;
-          this.$refs.selector.showSingleSelect(
-            this.zone_beds,
-            this.bed_id,
-            "选择床位号",
-            "number",
-            "id",
-            function(select_id) {
-              t.bed_id = select_id;
-            },
-            function() {
-              t.selecting = false;
             }
-          );
-        } else {
-          return;
-        }
-      }
+          })
+        }, function () {
+          t.selecting = false
+        })
 
-      this.selecting = true;
-      var t = this;
-      this.$refs.selector.showSingleSelect(
-        this.zone_beds,
-        this.bed_id,
-        "选择床位号",
-        "number",
-        "id",
-        function(select_id) {
-          t.bed_id = select_id;
-        },
-        function() {
-          t.selecting = false;
-        }
-      );
-    },
-    select_nurse: function() {
-      if (this.record.id != 0) {
-        var creator = 0;
-        if (this.record.creator == 0) {
-          creator = this.record.start_nurse;
-        } else {
-          creator = this.record.creator;
-        }
-        if (this.$store.getters.user.user.id == creator || this.isPremission) {
-          this.selecting = true;
-          var t = this;
-          this.$refs.selector.showSingleSelect(
-            this.admins,
-            this.nurse_id,
-            "选择上机护士",
-            "name",
-            "id",
-            function(select_id) {
-              t.nurse_id = select_id;
-            },
-            function() {
-              t.selecting = false;
+      },
+      GetSchedualNumber:function(){
+        let ParamsQuery = {}
+        ParamsQuery['schedual_type'] = this.schedual_type
+        GetSchedualNumber(ParamsQuery).then(response => {
+          if (response.data.state == 0) {
+            Toast.fail(response.data.msg)
+            return false
+          } else {
+            this.device_numbers = response.data.data.number
+            for (let index = 0; index < this.device_numbers.length; index++) {
+              const device_number = this.device_numbers[index]
+              this.device_numbers[index]['number'] = device_number['zone_name']+'-'+device_number['number']
             }
-          );
-        } else {
-          return;
-        }
-      }
-      this.selecting = true;
-      var t = this;
-      this.$refs.selector.showSingleSelect(
-        this.admins,
-        this.nurse_id,
-        "选择上机护士",
-        "name",
-        "id",
-        function(select_id) {
-          t.nurse_id = select_id;
-        },
-        function() {
-          t.selecting = false;
+            this.zone_beds = this.device_numbers
+          }
+        })
+      },
+
+      inputFocus: function (event) {
+        var input = event.target
+        setTimeout(function () {
+          input.scrollIntoView()
+        }, 0)
+
+        if (input.setSelectionRange) {
+          setTimeout(function () {
+            input.setSelectionRange(0, input.value.length)
+          }, 0)
+        } else if (input.createTextRange) {
+          var rng = input.createTextRange()
+          rng.move('character', input.value.length)
+          rng.select()
         }
-      );
-    },
-    select_puncture_nurse: function() {
-      if (this.record.id != 0) {
-        var creator = 0;
-        if (this.record.creator == 0) {
-          creator = this.record.start_nurse;
-        } else {
-          creator = this.record.creator;
+      },
+      modify(){
+        let ParamsQuery = {}
+        ParamsQuery['schedual_type'] = this.schedual_type
+        ParamsQuery['id'] = this.record.id
+        ParamsQuery['nurse'] = this.nurse_id
+        ParamsQuery['bed'] = this.bed_id
+        ParamsQuery['start_time'] = this.start_time_str
+        ParamsQuery['puncture_nurse'] = this.puncture_nurse_id
+        PostModifyStartDialysis(ParamsQuery).then(response => {
+          if (response.data.state == 0) {
+            Toast.fail(response.data.msg)
+            return false
+          } else {
+            Toast.success('修改成功')
+            this.$emit('did_start', response.data.data.dialysis_order)
+            var record = this.record
+            for (const key in response.data.data.dialysis_order) {
+              this.$set(record, key, response.data.data.dialysis_order[key])
+            }
+          }
+        })
+      },
+      didSelectStartTime: function (time) {
+        this.start_time_str = parseTime(time, '{y}-{m}-{d} {h}:{i}') + ':00'
+      },
+      selectStartTimeAction: function () {
+        if (this.record.id != 0) {
+          var creator = 0
+          if (this.record.creator == 0) {
+            creator = this.record.start_nurse
+          } else {
+            creator = this.record.creator
+          }
+
+          if (this.$store.getters.user.user.id == creator || this.isPremission) {
+            this.$refs.start_time_picker.open()
+          } else {
+            return
+          }
         }
-        if (this.$store.getters.user.user.id == creator || this.isPremission) {
-          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;
+        this.$refs.start_time_picker.open()
+      },
+      commitInfo: function () {
+        Toast.loading({forbidClick: true, duration: 0})
+        let ParamsQuery = {}
+        ParamsQuery['schedual_type'] = this.schedual_type
+        ParamsQuery['patient_id'] = this.patient_prop.id
+        ParamsQuery['record_date'] = this.record_date
+        ParamsQuery['nurse'] = this.nurse_id
+        ParamsQuery['bed'] = this.bed_id
+        ParamsQuery['start_time'] = this.start_time_str
+        ParamsQuery['puncture_nurse'] = this.puncture_nurse_id
+        ParamsQuery['blood_drawing'] = this.blood_drawing
+
+        startDialysis(ParamsQuery).then(response => {
+          if (response.data.state == 0) {
+            Toast.fail(response.data.msg)
+            return false
+          } else {
+            Toast.success('上机成功')
+            var monitor = response.data.data.monitor
+            this.$emit('did_add_monitor', monitor)
+            this.$emit('did_start', response.data.data.dialysis_order)
+            var record = this.record
+            for (const key in response.data.data.dialysis_order) {
+              this.$set(record, key, response.data.data.dialysis_order[key])
+              // this.record[key] = response.data.data.dialysis_order[key]
             }
-          );
-        } else {
-          return;
+          }
+        })
+      },
+      close: function () {
+        this.$emit('close')
+      },
+      select_bed: function () {
+        if (this.record.id != 0) {
+          var creator = 0
+          if (this.record.creator == 0) {
+            creator = this.record.start_nurse
+          } else {
+            creator = this.record.creator
+          }
+
+          if (this.$store.getters.user.user.id == creator || this.isPremission) {
+            this.selecting = true
+            var t = this
+            this.$refs.selector.showSingleSelect(this.zone_beds, this.bed_id, '选择床位号', 'number', 'id', function (select_id) {
+              t.bed_id = select_id
+            }, function () {
+              t.selecting = false
+            })
+          } else {
+            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;
+
+        this.selecting = true
+        var t = this
+        this.$refs.selector.showSingleSelect(this.zone_beds, this.bed_id, '选择床位号', 'number', 'id', function (select_id) {
+          t.bed_id = select_id
+        }, function () {
+          t.selecting = false
+        })
+      },
+      select_nurse: function () {
+        if (this.record.id != 0) {
+          var creator = 0
+          if (this.record.creator == 0) {
+            creator = this.record.start_nurse
+          } else {
+            creator = this.record.creator
+          }
+          if (this.$store.getters.user.user.id == creator || this.isPremission) {
+            this.selecting = true
+            var t = this
+            this.$refs.selector.showSingleSelect(this.admins, this.nurse_id, '选择上机护士', 'name', 'id', function (select_id) {
+              t.nurse_id = select_id
+            }, function () {
+              t.selecting = false
+            })
+          } else {
+            return
+          }
         }
-      );
-    },
-    open: function() {
-      this.selecting = false;
-      this.$refs.selector.hide();
-    }
-  },
-  watch: {
-    "record.id": function(val) {
-      if (val > 0) {
-        for (let i = 0; i < this.special_premission.length; i++) {
-          if (
-            this.$store.getters.user.user.id ==
-            this.special_premission[i].admin_user_id
-          ) {
-            this.isPremission = true;
+        this.selecting = true
+        var t = this
+        this.$refs.selector.showSingleSelect(this.admins, this.nurse_id, '选择上机护士', 'name', 'id', function (select_id) {
+          t.nurse_id = select_id
+        }, function () {
+          t.selecting = false
+        })
+      }, select_puncture_nurse: function () {
+        if (this.record.id != 0) {
+          var creator = 0
+          if (this.record.creator == 0) {
+            creator = this.record.start_nurse
+          } else {
+            creator = this.record.creator
+          }
+          if (this.$store.getters.user.user.id == creator || this.isPremission) {
+            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
+            })
+          } else {
+            return
           }
         }
-        if (this.record.creator == 0) {
-          this.creator = this.record.start_nurse;
-        } else {
-          this.creator = this.record.creator;
+        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
+        this.$refs.selector.hide()
+      }
+    }, watch: {
+      'record.id': function (val) {
+        if (val > 0) {
+          for (let i = 0; i < this.special_premission.length; i++) {
+            if (this.$store.getters.user.user.id == this.special_premission[i].admin_user_id) {
+              this.isPremission = true
+            }
+          }
+          if (this.record.creator == 0) {
+            this.creator = this.record.start_nurse
+          } else {
+            this.creator = this.record.creator
+          }
+
+
         }
       }
+
     }
+
   }
-};
 </script>
 
 <style style="stylesheet/scss" lang="scss" scoped>

src/pages/main/dialog/PrescriptionDialog.vue

@@ -1289,6 +1289,7 @@
               this.zhiShow = true
               this.totalShow = true
               this.huShow  = true 
+              console.log("aa")
             }
           }
         }

src/pages/main/dialog/TreatmentDialog.vue

@@ -244,25 +244,11 @@ export default {
       if (this.dialysisSummary.summaryContent == null) {
         this.dialysisSummary.summaryContent == "";
       }
-
       if (this.dialysisSummary.summaryContent == "") {
         this.dialysisSummary.summaryContent = values;
       } else {
-        if (this.dialysisSummary.summaryContent.indexOf(values) == -1) {
-          if (
-            this.dialysisSummary.summaryContent
-              .charAt(this.dialysisSummary.summaryContent.length - 1)
-              .indexOf("。") == -1
-          ) {
-            this.dialysisSummary.summaryContent =
-              this.dialysisSummary.summaryContent + "," + values;
-          } else {
-            this.dialysisSummary.summaryContent =
-              this.dialysisSummary.summaryContent + "," + values;
-            this.dialysisSummary.summaryContent =
-              this.dialysisSummary.summaryContent + values;
-          }
-        }
+        this.dialysisSummary.summaryContent =
+          this.dialysisSummary.summaryContent + values;
       }
     },
     dialysisAfterTeachSelectChange: function(values) {
@@ -272,24 +258,25 @@ export default {
       if (this.dialysisSummary.propagandaAndEducationContent == "") {
         this.dialysisSummary.propagandaAndEducationContent = values;
       } else {
-        if (
-          this.dialysisSummary.propagandaAndEducationContent.indexOf(values) ==
-          -1
-        ) {
-          if (
-            this.dialysisSummary.propagandaAndEducationContent
-              .charAt(
-                this.dialysisSummary.propagandaAndEducationContent.length - 1
-              )
-              .indexOf("。") == -1
-          ) {
-            this.dialysisSummary.propagandaAndEducationContent =
-              this.dialysisSummary.propagandaAndEducationContent + "," + values;
-          } else {
-            this.dialysisSummary.propagandaAndEducationContent =
-              this.dialysisSummary.propagandaAndEducationContent + values;
-          }
-        }
+        this.dialysisSummary.propagandaAndEducationContent =
+          this.dialysisSummary.propagandaAndEducationContent + values;
+        // if (
+        //   this.dialysisSummary.propagandaAndEducationContent.indexOf(values) ==
+        //   -1
+        // ) {
+        //   if (
+        //     this.dialysisSummary.propagandaAndEducationContent
+        //       .charAt(
+        //         this.dialysisSummary.propagandaAndEducationContent.length - 1
+        //       )
+        //       .indexOf("。") == -1
+        //   ) {
+        //     this.dialysisSummary.propagandaAndEducationContent =
+        //       this.dialysisSummary.propagandaAndEducationContent + "," + values;
+        //   } else {
+        //
+        //   }
+        // }
       }
     },
     commitInfo: function() {

src/pages/main/dialog/TwoMenu.vue

@@ -86,6 +86,11 @@ export default {
     };
   },
   methods: {
+    initSignleSelect(){
+
+
+    },
+
     showSingleSelect(
       list_options,
       current_select_id,
@@ -95,6 +100,8 @@ export default {
       handle_select,
       handle_hide
     ) {
+      console.log(this.single.cur_id);
+
       this.show = true;
       this.type = 1;
       this.title = title;
@@ -104,7 +111,6 @@ export default {
       this.single.id_key = id_key;
       this.handle_select = handle_select;
       this.handle_hide = handle_hide;
-      console.log(this.single.cur_id);
     },
     // showMutableSelect(list_options, selected_values, title, show_key, id_key, handle_select) {
     //   this.show = true

src/pages/main/dialog/subMenu/MsgTip.vue

@@ -8,8 +8,7 @@
         {{ patient_prop.name }} [透析号 {{ patient_prop.dialysis_no }} ]
       </h1>
       <span @click="comfirm" class="success" style="visibility: hidden;"
-        >确定</span
-      >
+        >确定</span>
     </div>
 
     <div class="DialogContent">

src/pages/main/template/DialysisPrintOrderSix.vue

@@ -350,7 +350,7 @@
               <td style="padding: 0; position: relative;" colspan="2">
                 <table class="inside_table">
                   <tbody>
-                    <tr><td colspan="11" style="letter-spacing:5px;text-align:center;font-weight:520;font-size:16px;padding: 6px 8px;line-height: 30px;">治疗纪录</td></tr>
+                    <tr><td :colspan="(prescription.mode_id==2 || prescription.mode_id==5) ? 12 :11" style="letter-spacing:5px;text-align:center;font-weight:520;font-size:16px;padding: 6px 8px;line-height: 30px;">治疗纪录</td></tr>
                     <tr>
                       <td width="60">时间</td>
                       <td width="60">血压<br/>(mmHg)</td>
@@ -362,6 +362,7 @@
                       <td width="60">透析液温度(°C)</td>
                       <td width="50">电导度<br/>(ms/cm)</td>
                       <td width="50">超滤量<br/>(ml)</td>
+                      <td v-if="prescription.mode_id==2 || prescription.mode_id==5" width="50">置换量<br/>(ml)</td>
                       <td width="200">病情变化及处理</td>
 
                       <!-- <td width="100">时间</td>
@@ -388,6 +389,7 @@
                       <td>{{monitor.dialysate_temperature?monitor.dialysate_temperature:''}}</td>
                       <td>{{monitor.sodium_concentration?monitor.sodium_concentration:''}}</td>
                       <td>{{monitor.ultrafiltration_volume?monitor.ultrafiltration_volume:0}}</td>
+                      <td v-if="prescription.mode_id==2 || prescription.mode_id==5" width="50">{{monitor.displacement_quantity?monitor.displacement_quantity:0}}</td>
                       <td style="line-height:16px;padding:0px;">
                         <div style="min-height:40px;line-height:40px; overflow:hidden;">
                           <span style="word-break: break-all;margin:0;line-height:16px;-webkit-line-clamp:3;overflow:visible;display:inline-block;vertical-align:middle;height:auto;">
@@ -409,6 +411,7 @@
                       <td> </td>
                       <td> </td>
                       <td> </td>
+                      <td v-if="prescription.mode_id==2 || prescription.mode_id==5" width="50"></td>
                       <td style="line-height:16px;padding:0px;"><div style="height:40px;line-height:20px; overflow:hidden;"><span style="word-break: break-all;margin:0;line-height:16px;-webkit-line-clamp:3;overflow:visible;display:inline-block;vertical-align:middle;height:auto;"> </span> </div></td>
                     </tr>
                   </tbody>

src/pages/main/today/TodayTab.vue

@@ -73,7 +73,7 @@
 
 
     <accepts-assessment id="accepts_assessment" :record="receiver_treatment_access" title="接诊评估"></accepts-assessment>
-    
+
 
 
     <div class="blueBorder"></div>
@@ -125,7 +125,7 @@
     <treatment-of id="treatment_of" ref="treatment_of" title="治疗小结" :record="treatment_summary"></treatment-of>
 </div>
     <van-popup title="透析处方" v-model="menuList[1].showPopup" :overlay="true" :close-on-click-overlay="false">
-      <prescription-dialog :patient_prop="patient" :solution_prop="solution" :machines_prop="devices" :config="config"
+      <prescription-dialog v-if="prescription_dialog_reset == true" :patient_prop="patient" :solution_prop="solution" :machines_prop="devices" :config="config"
                            :prescription_prop="prescription" @finish="closePrescriptionDialog" :operators="operators"
                            :types="goodTypes" :info="goodInfos" :status="status" :targetAdvices="longAdvices"
                            :waitUploadAdvices="waitUploadAdvices" :is_open="is_open"
@@ -254,6 +254,7 @@
       :close-on-click-overlay="false"
     >
       <thoroug-dialog
+        v-if="thoroug_dialog_reset == true"
         :patient_prop="patient"
         :record="assessment_after_dislysis"
         :last_record="last_assessment_after_dislysis"
@@ -368,6 +369,8 @@ import {parseTime} from '@/utils'
         prescription: {}, // 透析处方
         solution: {}, // 透析方案
         last_prescription:{},
+        thoroug_dialog_reset: true,
+        prescription_dialog_reset: true,
         receiver_treatment_access: {}, // 接诊评估
         predialysis_evaluation: {}, // 透前评估
         last_predialysis_evaluation: {}, // 上次透前评估
@@ -761,6 +764,7 @@ import {parseTime} from '@/utils'
 
           this.double_check = double_check == null ? {id: ''} : double_check
           this.assessment_after_dislysis = assessment_after_dislysis == null ? {id: ''} : assessment_after_dislysis
+          
           this.last_assessment_after_dislysis =
               last_assessment_after_dislysis == null
                 ? {id: ''}
@@ -918,6 +922,10 @@ import {parseTime} from '@/utils'
           this.patient = patient
           this.schedual = schedual == null ? {} : schedual
           this.prescription = prescription == null ? {id: ''} : prescription
+          this.prescription_dialog_reset = false
+          this.$nextTick(() => {
+            this.prescription_dialog_reset = true
+          })
           this.solution = solution == null ? {id: ''} : solution
           this.last_prescription = last_prescription == null ? {id: ''} : last_prescription
 
@@ -1000,10 +1008,11 @@ import {parseTime} from '@/utils'
           }
 
           this.double_check = double_check == null ? {id: ''} : double_check
-          this.assessment_after_dislysis =
-              assessment_after_dislysis == null
-                ? {id: ''}
-                : assessment_after_dislysis
+          this.assessment_after_dislysis = assessment_after_dislysis == null ? {id: ''} : assessment_after_dislysis
+          this.thoroug_dialog_reset = false
+          this.$nextTick(() => {
+            this.thoroug_dialog_reset = true
+          })
           this.last_assessment_after_dislysis =
               last_assessment_after_dislysis == null
                 ? {id: ''}
@@ -1143,7 +1152,7 @@ import {parseTime} from '@/utils'
     },
     prescriptionFunc: function (val, advices) {
       this.prescription = val
-      this.requestDialysisRecord()
+      this.newRequestDialysisRecord()
       // if (advices.length > 0){
       //
       //   // if (advices.length > 0) {
@@ -1294,7 +1303,7 @@ import {parseTime} from '@/utils'
     update_evaluation: function (evaluation) {
       this.predialysis_evaluation = evaluation
       this.closeAssessmentBefore()
-      this.requestDialysisRecord()
+      this.newRequestDialysisRecord()
     },
 
     closeStatOrder: function () {
@@ -1305,7 +1314,7 @@ import {parseTime} from '@/utils'
     closeDialysisComputer: function (dialysis_order) {
       this.closeDialog(0)
       this.dialysis_order = dialysis_order
-      this.requestDialysisRecord()
+      this.newRequestDialysisRecord()
       // this.scrollToView('dialysis_computer')
     },
     closeDialysisComputerclose: function (dialysis_order) {
@@ -1324,11 +1333,12 @@ import {parseTime} from '@/utils'
       // this.scrollToView('monitoring')
     },
 
-    closeDialysisOff: function (assessment_after_dislysis) {debugger
+    closeDialysisOff: function (assessment_after_dislysis) {
       this.closeDialog(7)
       if (assessment_after_dislysis != undefined) {
         this.assessment_after_dislysis = assessment_after_dislysis
       }
+      this.requestDialysisRecord()
     },
     closeDialysisOffclose: function () {
       this.closeDialog(7)
@@ -1434,7 +1444,209 @@ import {parseTime} from '@/utils'
       var diff = Math.abs(firstDate.getTime() - secondDate.getTime())
       var result = parseInt(diff / (1000 * 60 * 60 * 24))
       return result
-    }
+    }, newRequestDialysisRecord () {
+      var dateStr = parseTime(this.date, '{y}-{m}-{d}')
+      var params = {
+        patient_id: this.patient_id,
+        date: dateStr
+      }
+      this.advice_groups = []
+      this.doctor_advices = []
+
+      getDialysisRecord(params).then(rs => {
+        var resp = rs.data
+        console.log(resp)
+
+        if (resp.state == 1) {
+          var waitstoredata = this.$store.getters.waitscheduals
+          var waitscheduals = waitstoredata.waitscheduals
+          var storedata = this.$store.getters.scheduals
+          var scheduals = storedata.scheduals
+
+
+          var patient = resp.data.patient // 患者信息
+          var schedual = resp.data.schedual // 患者排班信息
+          var prescription = resp.data.prescription // 透析处方
+          var solution = resp.data.solution // 透析方案
+          var receiver_treatment_access = resp.data.receiver_treatment_access // 接诊评估
+          var predialysis_evaluation = resp.data.predialysis_evaluation // 透前评估
+          var doctor_advices = resp.data.doctor_advices // 临时医嘱
+          var last_prescription = resp.data.last_prescription
+
+          this.dryWeight = resp.data.dry_weight
+
+          if (prescription == null || prescription.creater == 0) {
+            this.isPullData = 1
+          } else {
+            this.isPullData = 2
+          }
+
+          this.goodInfos = resp.data.goodInfos
+
+          for (let i = 0; i < doctor_advices.length; i++) {
+            doctor_advices[i]['is_selected'] = 0
+          }
+          console.log(doctor_advices)
+
+          var double_check = resp.data.double_check // 双人核对
+          var assessment_after_dislysis = resp.data.assessment_after_dislysis // 透后评估
+          var treatment_summary = resp.data.treatment_summary // 治疗小结
+          var monitor_records = resp.data.monitor_records // 透析监测
+          var dialysis_order = resp.data.dialysis_order // 透析记录
+          var operators = resp.data.operators // 操作人
+
+          var special_premission = resp.data.special_premission // 特殊权限
+
+          var config = resp.data.config // 库存自动扣减配置
+
+          var types = resp.data.types // 所有系统库存商品类型
+
+          var last_predialysis_evaluation = resp.data.last_predialysis_evaluation // 上一次透前评估
+          var last_assessment_after_dislysis = resp.data.last_assessment_after_dislysis // 上一次透前评估
+          var last_monitor_record = resp.data.last_monitor_record
+
+          if (Object.keys(waitstoredata).length > 0) {
+            for (let index = 0; index < waitscheduals.length; index++) {
+              if (waitscheduals[index].patient_id == patient.id) {
+                waitscheduals[index].patient = patient
+                waitscheduals[index].assessment_before_dislysis = predialysis_evaluation
+                waitscheduals[index].prescription = prescription
+                waitscheduals[index].doctor_advice = doctor_advices
+                waitscheduals[index].dialysis_order = dialysis_order
+              }
+            }
+            this.$store.dispatch('SetWaitScheduals', {waitscheduals: waitscheduals})
+          }
+
+          if (Object.keys(storedata).length > 0) {
+            for (let index = 0; index < scheduals.length; index++) {
+              if (scheduals[index].patient_id == patient.id) {
+                scheduals[index].patient = patient
+                scheduals[index].assessment_before_dislysis = predialysis_evaluation
+                scheduals[index].prescription = prescription
+                scheduals[index].doctor_advice = doctor_advices
+                scheduals[index].dialysis_order = dialysis_order
+              }
+            }
+            this.$store.dispatch('SetScheduals', {scheduals: scheduals})
+          }
+
+          this.patient = patient
+          this.schedual = schedual == null ? {} : schedual
+          this.prescription = prescription == null ? {id: ''} : prescription
+          this.solution = solution == null ? {id: ''} : solution
+          this.last_prescription = last_prescription == null ? {id: ''} : last_prescription
+
+
+
+          this.receiver_treatment_access =
+            receiver_treatment_access == null
+              ? {id: ''}
+              : receiver_treatment_access
+          this.predialysis_evaluation =
+            predialysis_evaluation == null ? {} : predialysis_evaluation
+          this.last_predialysis_evaluation =
+            last_predialysis_evaluation == null
+              ? {}
+              : last_predialysis_evaluation
+
+          this.doctor_advices = doctor_advices == null ? [] : doctor_advices
+          this.special_premission = special_premission
+          this.config = config
+          this.goodTypes = types
+
+
+          if (this.doctor_advices.length > 0) {
+            var group = this.newAdviceGroupObject()
+            var initGroupBlock = function (group, advice) {
+              group.group_no = advice.groupno
+              // group.start_time = advice.start_time
+              // group.advice_doctor = advice.advice_doctor
+              // group.exec_staff = advice.execution_staff
+              // group.exec_time = advice.execution_time
+              // group.checker = advice.checker
+            }
+            for (let index = 0; index < this.doctor_advices.length; index++) {
+              const advice = this.doctor_advices[index]
+              if (advice.groupno == 0) {
+                // 老版本的医嘱没有分组的概念，所以这一个 if 是解决这个问题的，将每个无分组的医嘱各自归为一组
+                if (advice.parent_id > 0) {
+                  if (this.advice_groups.length > 0) {
+                    var parent_group = this.advice_groups[
+                    this.advice_groups.length - 1
+                      ]
+                    if (parent_group.advices.length > 0) {
+                      if (parent_group.advices[0].id == advice.parent_id) {
+                        parent_group.advices.push(advice)
+                      }
+                    }
+                  }
+                  continue
+                } else {
+                  if (group.group_no > 0) {
+                    this.advice_groups.push(group)
+                    group = this.newAdviceGroupObject()
+                  }
+
+                  initGroupBlock(group, advice)
+                  group.advices.push(advice)
+                  this.advice_groups.push(group)
+                  group = this.newAdviceGroupObject()
+                  continue
+                }
+              }
+
+              if (group.group_no > 0 && group.group_no != advice.groupno) {
+                this.advice_groups.push(group)
+                group = this.newAdviceGroupObject()
+              }
+              if (group.group_no == 0) {
+                initGroupBlock(group, advice)
+              }
+              if (group.group_no == advice.groupno) {
+                group.advices.push(advice)
+              }
+            }
+            if (group.group_no > 0) {
+              // 上述的算法会导致最后一组没有加到advice_groups，这里要手动加上
+              this.advice_groups.push(group)
+            }
+
+            // console.log(this.advice_groups)
+          }
+
+          this.double_check = double_check == null ? {id: ''} : double_check
+          this.assessment_after_dislysis =
+            assessment_after_dislysis == null
+              ? {id: ''}
+              : assessment_after_dislysis
+          this.last_assessment_after_dislysis =
+            last_assessment_after_dislysis == null
+              ? {id: ''}
+              : last_assessment_after_dislysis
+          this.treatment_summary =
+            treatment_summary == null ? {id: ''} : treatment_summary
+          this.monitor_records = monitor_records == null ? [] : monitor_records
+          this.last_monitor_record =
+            last_monitor_record == null
+              ? this.last_monitor_record
+              : last_monitor_record
+          this.dialysis_order =
+            dialysis_order == null ? {id: ''} : dialysis_order
+          this.operators = operators
+          this.$refs.stat_order.setAdvices(this.doctor_advices)
+          this.$refs.monitoring.setRecords(this.monitor_records)
+
+          this.title = patient.name
+        } else {
+          this.$toast({
+            message: resp.msg
+          })
+          this.loading = false
+        }
+      })
+    },
+
   }
 }
 </script>

src/pages/main/today/dialysisComputer.vue

@@ -64,9 +64,8 @@ export default {
       if (this.record == null || this.record.id == "") {
         return "-";
       }
-      return this.device_number_map[this.record.bed_id] == null
-        ? ""
-        : this.device_number_map[this.record.bed_id].number;
+      return this.device_number_map[this.record.bed_id] == null ? '' : this.device_number_map[this.record.bed_id].zone_name + "-"+this.device_number_map[this.record.bed_id].number
+
     },
     nurse: function() {
       if (this.record == null || this.record.id == "") {

src/pages/home/privacyPolicy.vue → src/pages/privacy/index.vue

@@ -34,14 +34,21 @@
 </template>
 
 
+<script>
+    export default {
+        name: "privacyPolicy"
+
+    }
+</script>
+
 <style lang="scss" scoped>
-.page_privacy {
-  width: 100%;
-  margin: 0 auto;
-  height: 100%;
-  overflow-y: auto;
-  display: flex;
-  flex-direction: column;
+  .page_privacy {
+    width: 100%;
+    margin: 0 auto;
+    height: 100%;
+    overflow-y: auto;
+    display: flex;
+    flex-direction: column;
   > div:last-child {
     flex: 1;
     overflow-y: auto;
@@ -50,24 +57,24 @@
     font-size: 0.45rem;
     padding: 0.3rem 0.37rem;
     color: $title-color;
-    @include align-items-center;
-    @include display-flex;
-    @include justify-content-between;
-    @include text-align;
+  @include align-items-center;
+  @include display-flex;
+  @include justify-content-between;
+  @include text-align;
     background: #fff;
-    .GoBack {
-      color: $main-color;
-      font-size: 0.45rem;
-      @include display-flex;
-      .iconfont {
-        color: $main-color;
-        font-size: 0.5rem;
-        margin-top: 1px;
-        @media only screen and (min-width: 768px) {
-          margin-top: 3px;
-        }
-      }
-    }
+  .GoBack {
+    color: $main-color;
+    font-size: 0.45rem;
+  @include display-flex;
+  .iconfont {
+    color: $main-color;
+    font-size: 0.5rem;
+    margin-top: 1px;
+  @media only screen and (min-width: 768px) {
+    margin-top: 3px;
+  }
+  }
+  }
   }
   .name {
     margin-right: 1.3rem;
@@ -83,5 +90,5 @@
     width: 90%;
     margin: 0 auto;
   }
-}
+  }
 </style>

src/router/index.js

@@ -76,9 +76,9 @@ export default new Router({
       component: () => import("@/pages/personal/ChangePassword")
     },
     {
-      path: "/privacyPolicy",
+      path: "/privacy",
       name: "privacyPolicy",
-      component: () => import("@/pages/home/privacyPolicy")
+      component: () => import("@/pages/privacy/index")
     }
   ]
 });