pad

src/pages/main/DialysisArea.vue

             {{ selected_date_str }}
             <span class="iconfont">&#xe74a;</span>
           </li>
+          <li @click="mypatient()">
+            我的病人
+            <span class="iconfont">&#xe74a;</span>
+          </li>
         </ul>
       </div>
       <div class="stateBox">
   data () {
     return {
       loading: false,
-
+      user_id: 0,
       networkStates: true,
       timer: null,
+<<<<<<< .mine
       selected_date: this.$store.getters.app.dialysis_area.schedule_date, // new Date(),
+
+=======
+      ismypatient: false,
+      selected_date: this.$store.getters.app.dialysis_area.schedule_date, //new Date(),
+>>>>>>> .theirs
       schedual_types: [
         { value: 0, text: '全部班', select: true },
         { value: 1, text: '上午', select: false },
         return schedules
       }
 
+<<<<<<< .mine
       var zone_selected = this.zone_selected
       var timetype_selected = this.schedual_type_selected
-      if (
-        (zone_selected == 0 && timetype_selected == 0) ||
-        this.zones.length <= 1
-      ) {
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+=======
+       if (this.ismypatient) {
+        var schedules = [];
+        for (let o_i = 0; o_i < this.dialysis_scheduals.length; o_i++) {
+          const scheduleInfo = this.dialysis_scheduals[o_i];
+          var originSchedules = scheduleInfo.scheduals;
+          if (originSchedules.length == 0) {
+            continue;
+          }
+          var filtedSchedules = [];
+          for (let s_i = 0; s_i < originSchedules.length; s_i++) {
+            const schedule = originSchedules[s_i];
+            if (schedule.dialysis_order.start_nurse == this.user_id ) {
+              filtedSchedules.push(schedule);
+              // break;
+            }
+          }
+          if (filtedSchedules.length > 0) {
+            schedules.push({
+              zone_name: scheduleInfo.zone_name,
+              scheduals: filtedSchedules
+            });
+          }
+        }
+        return schedules;
+      }
+
+      var zone_selected = this.zone_selected;
+      var timetype_selected = this.schedual_type_selected;
+>>>>>>> .theirs
+      if ( (zone_selected == 0 && timetype_selected == 0) || this.zones.length <= 1 ) {
         return this.dialysis_scheduals
       }
 
         var filtedSchedules = []
         for (let s_i = 0; s_i < originSchedules.length; s_i++) {
           const schedule = originSchedules[s_i]
+<<<<<<< .mine
           if (
             zone_name.length == 0 ||
             (zone_name.length > 0 &&
               schedule.schedule_type == timetype_selected
             ) {
               filtedSchedules.push(schedule)
+=======
+           if(this.ismypatient){
+             if ( schedule.dialysis_order.creator == this.user_id){
+               filtedSchedules.push(schedule);
+             }
+           }
+          else {
+            if  ( zone_name.length == 0 || (zone_name.length > 0 && zone_name == schedule.device_number.zone.name) ) {
+              if ( timetype_selected == 0 || schedule.schedule_type == timetype_selected ) {
+                filtedSchedules.push(schedule);
+              }
+>>>>>>> .theirs
             }
           }
         }
           })
         }
       }
+<<<<<<< .mine
       return schedules
+
+=======
+      this.ismypatient = false
+      return schedules;
+>>>>>>> .theirs
     }
   },
+<<<<<<< .mine
   methods: {
     myPatients () {
       alert('aaa')
     }
+=======
+  created() {
+    this.user_id = this.$store.getters.user.user.id;
+    this.requestDialysisScheduals();
+
+>>>>>>> .theirs
   },
   created () {
     this.requestDialysisScheduals()
   },
   mounted () {
-    // this.timer = window.setInterval(() => {
-    //   setTimeout(this.requestDialysisScheduals(), 0);
-    // }, 30000);
+    this.timer = window.setInterval(() => {
+      setTimeout(this.requestDialysisScheduals(), 0);
+    }, 30000);
   },
   beforeDestroy () {
     clearInterval(this.timer)
     this.timer = null
   },
   methods: {
+<<<<<<< .mine
     reloads: function () {
       this.reload()
+
+
+
+
+
+
+=======
+    mypatient(){
+      this.search_keyword = '';
+      this.zone_selected = 0;
+      this.schedual_type_selected = 0;
+      this.ismypatient = true;
+    },
+    reloads: function() {
+      this.reload();
+>>>>>>> .theirs
     },
+<<<<<<< .mine
     handletimeType: function (index) {
       this.sch_type_options_visible = false
       this.schedual_type_selected = index
       this.$emit('clear_search_keyword')
       this.$store.dispatch('SaveDialysisAreaSelectIndexs', {
+
+=======
+    handletimeType: function(index) {
+      this.ismypatient = false
+      this.sch_type_options_visible = false;
+      this.schedual_type_selected = index;
+      this.$emit("clear_search_keyword");
+      this.$store.dispatch("SaveDialysisAreaSelectIndexs", {
+>>>>>>> .theirs
         zone: this.zone_selected,
         schedule_type: this.schedual_type_selected,
         schedule_date: this.selected_date
       })
     },
+<<<<<<< .mine
     handleZoneChange: function (index) {
       this.zone_options_visible = false
       this.zone_selected = index
       this.$emit('clear_search_keyword')
       this.$store.dispatch('SaveDialysisAreaSelectIndexs', {
+
+=======
+    handleZoneChange: function(index) {
+      this.ismypatient = false
+      this.zone_options_visible = false;
+      this.zone_selected = index;
+      this.$emit("clear_search_keyword");
+      this.$store.dispatch("SaveDialysisAreaSelectIndexs", {
+>>>>>>> .theirs
         zone: this.zone_selected,
         schedule_type: this.schedual_type_selected,
         schedule_date: this.selected_date
       })
     },
+<<<<<<< .mine
     handleScheduleDateChange: function (date) {
       this.zone_selected = 0
       this.schedual_type_selected = 0
 
+=======
+    handleScheduleDateChange: function(date) {
+      this.ismypatient = false
+      this.zone_selected = 0;
+      this.schedual_type_selected = 0;
+>>>>>>> .theirs
+
       this.$emit('clear_search_keyword')
       this.$store.dispatch('SaveDialysisAreaSelectIndexs', {
         zone: this.zone_selected,
 
     requestDialysisScheduals () {
       // this.$toast.loading({forbidClick: true, duration: 0})
+<<<<<<< .mine
       this.loading = true
       var type = 0
+=======
+      // this.loading = true;
+      var type = 0;
+>>>>>>> .theirs
       getDialysisScheduals({ type: type, date: this.selected_date_str })
         .then(rs => {
           this.networkStates = true

src/pages/main/WaitingArea.vue

           var scheduals = [];
           for (let index = 0; index < this.scheduals.length; index++) {
             const schedual = this.scheduals[index];
-            if (schedual.assessment_before_dislysis == null) {
+            if (schedual.assessment_before_dislysis == null || schedual.assessment_before_dislysis.weighing_before == 0) {
               if(this.cur_zone_selected > 0 && schedual.device_number.zone.id != this.cur_zone_selected) {
                 continue
               }
           var scheduals = [];
           for (let index = 0; index < this.scheduals.length; index++) {
             const schedual = this.scheduals[index];
-            if (schedual.assessment_before_dislysis == null && schedual.prescription == null) {
+            if (schedual.prescription == null || schedual.prescription.creater == 0) {
               if(this.cur_zone_selected > 0 && schedual.device_number.zone.id != this.cur_zone_selected) {
                 continue
               }
         var scheduals = [];
         for (let index = 0; index < this.scheduals.length; index++) {
           const schedual = this.scheduals[index];
-          if (schedual.assessment_before_dislysis == null) {
+          if (schedual.assessment_before_dislysis == null || schedual.assessment_before_dislysis.weighing_before == 0) {
             scheduals.push(schedual);
           }
         }
         var scheduals = [];
         for (let index = 0; index < this.scheduals.length; index++) {
           const schedual = this.scheduals[index];
-          if (schedual.assessment_before_dislysis == null && schedual.prescription == null) {
+          if (schedual.prescription == null || schedual.prescription.creater == 0) {
             scheduals.push(schedual);
           }
         }
     this.requestScheduals();
   },
   mounted() {
-    // this.timer = window.setInterval(() => {
-    //   setTimeout(this.requestScheduals(), 0);
-    // }, 30000);
+    this.timer = window.setInterval(() => {
+      setTimeout(this.requestScheduals(), 0);
+    }, 30000);
   },
   beforeDestroy() {
     clearInterval(this.timer);
     this.timer = null;
-    // this.$once('hook:beforeDestroy', () => {
-    //   clearInterval(this.timer);
-    // })
+    this.$once('hook:beforeDestroy', () => {
+      clearInterval(this.timer);
+    })
   },
   methods: {
     processScheduals: function(scheduals) {
           schedualMap[schedual.device_number.zone.id] = [];
         }
         if (this.select_index == 1) {
-            if(schedual.assessment_before_dislysis == null && schedual.prescription == null){
+            if(schedual.prescription == null || schedual.prescription.creater == 0){
             schedualMap[schedual.device_number.zone.id].push(schedual);
             prescription_count++
           }
         } else if (this.select_index == 2){
-            if(schedual.assessment_before_dislysis == null ){
+            if(schedual.assessment_before_dislysis == null || schedual.assessment_before_dislysis.weighing_before == 0){
             schedualMap[schedual.device_number.zone.id].push(schedual);
             assessment_before_dislysis_count++
           }
     },
 
     requestScheduals() {
-      this.loading = true;
+      // this.loading = true;
       var date = parseTime(Date.parse(new Date()), "{y}-{m}-{d}");
       getWaitingScheduals({ date: date })
         .then(rs => {

src/pages/main/dialog/PrescriptionDialog.vue

       <div class="DialogTit">
         <span @click="close()" class="iconfont">&#xe6e9;</span>
         <h1 class="name">透析处方</h1>
+        <botton @click="showmsgtip">{{patient.name}}  [透析号 {{patient.dialysis_no}} ]</botton>
         <span @click="commitInfo" class="success" v-if="isPermission()">完成</span>
         <span @click="commitInfo" class="success" v-if="!isPermission()"></span>
 
     <long-advice-sub-menu :visibility="advice_visibility" v-on:menu-cancle-three="menuCancleThree"
                           v-on:menu-comfirm-three="menuComfirmThree" :propsForm="advicePropForm"></long-advice-sub-menu>
 
+    <msg-tip style="width:500px;" :visibility="msgtip_visibility" :predialysis="predialysis"
+                           :last_predialysis="last_predialysis"
+                           :record="record"
+                           :last_record="last_record"
+                           :patient_prop="patient"
+                           :prescription_prop="prescription_prop" 
+                           v-on:menu-msg-tip="menuMsgTip"></msg-tip>
+
   </div>
 </template>
 
 
 import {parseTime} from '@/utils'
 import LongAdviceSubMenu from './subMenu/LongAdviceSubMenu'
+import MsgTip from './subMenu/MsgTip'
 
 export default {
   name: 'PrescriptionDialog',
         return new Array()
       }
     },
+    predialysis:{
+      type:Object
+    },
+    last_predialysis: {
+      type:Object
+    },
+    record:{
+      type:Object
+    },
+    last_record: {
+      type:Object
+    },
     patient_prop: {
       type: Object
     },
         return new Array()
       }
     }
+  },
+   components: {
+    LongAdviceSubMenu,
+    MsgTip,
+    MultipleSubMenu,
+
+    // MultipleSubMenu,
+    CheckBoxSubMenu
   },
   data () {
     return {
       signUrl: '',
       isShowDesc: true,
       advice_visibility: false,
+      msgtip_visibility: false,
       time: '03:00',
       timeValue: '',
       isShowSign: false,
     }
   },
 
+
   methods: {
+    showmsgtip(){
+        this.msgtip_visibility = true
+        this.isShowDialog = false
+      
+    },
     isPermission () {
       if (this.$store.getters.user.user.user_type == 3 && (this.$store.getters.user.template_info.template_id == 2 || this.$store.getters.user.template_info.template_id == 6)) {
         return false
       this.advice_visibility = false
       this.isShowDialog = true
     },
+    menuMsgTip: function () {
+      this.msgtip_visibility = false
+      this.isShowDialog = true
+    },
+
     menuComfirmThree: function (targetAdvices) {
       let params = {
         advices: targetAdvices,
     }
   },
   created () {
+    // this.$refs.computer_dialog.open()
     if (this.$store.getters.user.user.user_type == 2) {
       this.isShowSign = true
     }
     this.dialysisPrescription.ultrafiltration = this.getFloat(this.dialysisPrescription.ultrafiltration)
     this.dialysisPrescription.target_ultrafiltration = this.getFloat(this.dialysisPrescription.target_ultrafiltration)
   },
-
-  components: {
-    LongAdviceSubMenu,
-    MultipleSubMenu,
-    // MultipleSubMenu,
-    CheckBoxSubMenu
-  },
   watch: {
     isShowDialog (val) {
       if (val) {
         this.advice_visibility = false
+    
       }
     }
   }

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

+<template>
+  <div v-if="visibility" class="Dialog">
+    <div class="DialogTit">
+      <div class="back" @click="cancle()">
+        <span class="iconfont">&#xe720; </span>返回
+      </div>
+      <h1 class="name">{{patient_prop.name}} [透析号 {{patient_prop.dialysis_no}} ]</h1>
+      <span @click="comfirm" class="success" >确定</span
+      >
+    </div>
+
+    <div class="DialogContent">
+        <div class="item">
+          <label class="name" for="txms">本次透析日期</label>
+          <div class="content">
+            <span class="text" id="txms"> {{dialysis_date}}</span>
+            
+          </div>
+        </div>
+        <div class="item">
+          <label class="name" for="txms">透前体重（kg）</label>
+          <div class="content">
+            <span class="text" id="txms">{{predialysis.weighing_before}}</span>
+            
+          </div>
+        </div>
+        <div class="item">
+          <label class="name" for="txms">干体重（kg）</label>
+          <div class="content">
+            <span class="text" id="txms">{{predialysis.dry_weight}}</span>
+            
+          </div>
+        </div>
+        <div class="item">
+          <label class="name" for="txms">衣物重（kg）</label>
+          <div class="content">
+            <span class="text" id="txms">{{predialysis.additional_weight}}</span>
+            
+          </div>
+        </div>
+        <div class="item">
+          <label class="name" for="txms">体重增加（kg）</label>
+          <div class="content">
+            <span class="text" id="txms">{{prescription_prop.dewater_amount}}</span>
+            
+          </div>
+        </div>
+        <div class="item">
+          <label class="name" for="txms">透后体重（kg）</label>
+          <div class="content">
+            <span class="text" id="txms">{{record.weight_after}}</span>
+            
+          </div>
+        </div>
+        <div class="item">
+          <label class="name" for="txms">体重减少（kg）</label>
+          <div class="content">
+            <span class="text" id="txms">{{record.weight_loss}}</span>
+            
+          </div>
+        </div>
+        <div class="item">
+          <label class="name" for="txms">上次透后体重（kg）</label>
+          <div class="content">
+            <span class="text" id="txms">{{predialysis.weight_after_last_transparency}}</span>
+            
+          </div>
+        </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {parseTime} from '@/utils'
+
+  export default {
+    name: 'LongAdviceSubMenu',
+    created () {
+    },
+    data () {
+      return {
+        result: [],
+        id: 0,
+        selectName: ''
+      }
+    },
+    props: {
+      predialysis: {
+        type: Object
+      },
+      visibility: {
+        type: Boolean,
+        default: false
+      },
+      last_predialysis: {
+        type: Object
+      },
+      record: {
+        type: Object
+      },
+      last_record: {
+        type: Object
+      },
+      patient_prop: {
+        type: Object
+      },
+      prescription_prop: {
+        type: Object
+      },
+    },
+    computed: {
+    dialysis_date: function () {
+      return parseTime(this.$route.query.date, '{y}/{m}/{d}')
+      }
+    },
+    methods: {
+
+
+      cancle: function () {
+        this.$emit('menu-msg-tip')
+      },
+      comfirm: function () {
+        this.$emit('menu-msg-tip')
+      },
+      getValue: function () {
+        let form = {}
+
+        let results = []
+
+        for (let i = 0; i < this.propsForm.list.length; i++){
+          for (let a = 0; a < this.propsForm.result.length; a++){
+            if( this.propsForm.list[i].id == this.propsForm.result[a]){
+              results.push(this.propsForm.list[i])
+            }
+          }
+        }
+
+        var obj5={}
+        results = results.reduce((cur, next) => {
+          obj5[next.id] ? '' : obj5[next.id] = true && cur.push(next)
+          return cur
+        }, [])
+
+        results
+
+        return results
+      },
+
+    },
+    watch: {
+      visibility (val) {
+        //初始化数据操作
+      }
+    }
+  }
+</script>
+
+<style style="stylesheet/scss" lang="scss" scoped>
+  .optionsBox {
+  background: #fff;
+  max-height: 10rem;
+  min-height: 5rem;
+  @media only screen and (max-width: 812px) {
+  min-height: 8rem !important;
+  }
+  ul {
+  overflow-y: scroll;
+  max-height: 9rem;
+  li {
+  height: 1.1rem;
+  line-height: 1.1rem;
+  border-bottom: 1px #e5e5e5 solid;
+  padding: 0 0.38rem;
+  font-size: 0.36rem;
+  color: $title-color;
+  }
+  .tick {
+  position: relative;
+  &::before {
+  content: "";
+  display: inline-block;
+  border: 2px solid $main-color;
+  border-top-width: 0;
+  border-right-width: 0;
+  width: 0.3rem;
+  height: 0.15rem;
+  -webkit-transform: rotate(-50deg);
+  position: absolute;
+  top: 0.38rem;
+  right: 0.44rem;
+  }
+  }
+  }
+  }
+  .CheckBox {
+  background: #fff;
+  max-height: 6.8rem;
+  min-height: 5rem;
+  overflow-y: scroll;
+  @media only screen and (max-width: 812px) {
+  max-height: 8rem !important;
+  min-height: 8rem !important;
+  }
+
+  ul {
+  li {
+  line-height: 1rem;
+  }
+  }
+  }
+</style>

src/pages/main/today/TodayTab.vue

                   :step_data="stepData"></details-info>
 
     <div class="blueBorder"></div>
-    <dialysis-prescription id="prescription" :prescription="prescription" :solution="solution" title="透析处方"
+    <dialysis-prescription id="prescription"  :prescription="prescription" :solution="solution" title="透析处方"
                            :device_number_map="device_map"></dialysis-prescription>
 
     <div class="blueBorder"></div>
                            :waitUploadAdvices="waitUploadAdvices" :is_open="is_open"
                            @close="closePrescriptionDialog" @prescription="prescriptionFunc"
                            :admin_users_prop="admin_users" @advice="adviceFunc"
+                           :predialysis="predialysis_evaluation"
+                           :last_predialysis="last_predialysis_evaluation"
+                           :record="assessment_after_dislysis"
+                           :last_record="last_assessment_after_dislysis"
                            @longSolution="longSolutionFunc" ref="prescription_dialog"></prescription-dialog>
     </van-popup>
 
       ,
       closePrescriptionDialog: function () {
         this.closeDialog(1)
-        this.scrollToView('prescription')
+        // this.scrollToView('prescription')
       }
       ,
       closeAcceptsAssessment: function () {
         this.closeDialog(2)
-        this.scrollToView('accepts_assessment')
+        // this.scrollToView('accepts_assessment')
       }
       ,
       closeAssessmentBefore: function () {
         this.closeDialog(3)
-        this.scrollToView('assessment_before')
+        // this.scrollToView('assessment_before')
       }
       ,
       update_evaluation: function (evaluation) {
       closeStatOrder: function () {
         this.closeDialog(4)
         this.doctor_advices.push([])
-        this.scrollToView('stat_order')
+        // this.scrollToView('stat_order')
       }
       ,
       closeDialysisComputer: function (dialysis_order) {
         this.closeDialog(0)
-        this.scrollToView('dialysis_computer')
+        // this.scrollToView('dialysis_computer')
       }
       ,
       closeDoubleCheck: function () {
         this.closeDialog(5)
-        this.scrollToView('double_check')
+        // this.scrollToView('double_check')
       }
       ,
       closeMonitoring: function () {
         this.closeDialog(6)
-        this.scrollToView('monitoring')
+        // this.scrollToView('monitoring')
       }
       ,
       closeDialysisOff: function () {
         this.closeDialog(7)
-        this.scrollToView('dialysis_off')
+        // this.scrollToView('dialysis_off')
       }
       ,
       closeAssessmentAfter: function (assessment_after_dislysis) {
         this.closeDialog(8)
-        this.scrollToView('assessment_after')
+        // this.scrollToView('assessment_after')
         if (assessment_after_dislysis != undefined) {
           this.assessment_after_dislysis = assessment_after_dislysis
         }
       ,
       closeTreatmentOf: function () {
         this.closeDialog(9)
-        this.scrollToView('treatment_of')
+        // this.scrollToView('treatment_of')
       }
       ,
       scrollToView: function (id) {