bug修复

src/api/dialysis.js

@@ -233,3 +233,14 @@ export function CreateGroupAdvice(id, groupno, advices){
 }
 
 
+export function CreateDryWeight(params){
+  return request({
+    url:"/m/api/dryweight/commit",
+    method:'post',
+    params:params,
+  })
+
+}
+
+
+

src/pages/main/WaitingArea.vue

@@ -176,80 +176,114 @@ export default {
         return this.processScheduals(scheduals);
       }
       //
-      // if (this.zone_selected != 0) {
-      //   var zone_name = this.zone_options[this.zone_selected].text
-      //   for (let index = 0; index < this.zone_scheduals.length; index++) {
-      //     const zone_scheduals = this.zone_scheduals[index]
-      //     if (zone_scheduals.zone_name == zone_name) {
-      //       return [zone_scheduals]
-      //     }
-      //   }
-      // }
-
-      // if (this.time_selected != 0) {
-      //   var zone_name = this.zone_options[this.zone_selected].text
-      //   console.log(zone_name)
-      //   var schedules = [];
-      //   for (let o_i = 0; o_i < this.zone_scheduals.length; o_i++) {
-      //     const scheduleInfo = this.zone_scheduals[o_i];
-      //     var originSchedules = scheduleInfo.scheduals;
-      //     var filtedSchedules = [];
-      //     for (let s_i = 0; s_i < originSchedules.length; s_i++) {
-      //       const schedule = originSchedules[s_i];
-      //       if(this.zone_selected == 0){
-      //         if (this.time_selected == 0 || schedule.schedule_type == this.time_selected) {
-      //           filtedSchedules.push(schedule);
-      //         }
-      //
-      //       }else{
-      //         console.log(zone_name)
-      //         console.log(schedule.device_number.zone.name)
-      //
-      //         if ((zone_name.length > 0 && zone_name == schedule.device_number.zone.name)) {
-      //           if (this.time_selected == 0 || schedule.schedule_type == this.time_selected) {
-      //             filtedSchedules.push(schedule);
-      //           }
-      //         }
-      //       }
-      //     }
-      //     if (filtedSchedules.length > 0) {
-      //       schedules.push({
-      //         zone_name: scheduleInfo.zone_name,
-      //         scheduals: filtedSchedules
-      //       });
-      //     }
-      //   }
-      //   return schedules
-      // }
-      
+      if (this.zone_selected != 0) {
+
+        // var zone_name = this.zone_options[this.zone_selected].text
+        // for (let index = 0; index < this.zone_scheduals.length; index++) {
+        //   const zone_scheduals = this.zone_scheduals[index]
+        //   if (zone_scheduals.zone_name == zone_name) {
+        //     return [zone_scheduals]
+        //   }
+        // }
+        var zone_name = this.zone_options[this.zone_selected].text
+        console.log(zone_name)
+        var schedules = [];
+        for (let o_i = 0; o_i < this.zone_scheduals.length; o_i++) {
+          const scheduleInfo = this.zone_scheduals[o_i];
+          var originSchedules = scheduleInfo.scheduals;
+          var filtedSchedules = [];
+          for (let s_i = 0; s_i < originSchedules.length; s_i++) {
+            const schedule = originSchedules[s_i];
+            if(this.zone_selected == 0){
+              if (this.time_selected == 0 || schedule.schedule_type == this.time_selected) {
+                filtedSchedules.push(schedule);
+              }
+
+            }else{
+              console.log(zone_name)
+              console.log(schedule.device_number.zone.name)
+
+              if ((zone_name.length > 0 && zone_name == schedule.device_number.zone.name)) {
+                if (this.time_selected == 0 || schedule.schedule_type == this.time_selected) {
+                  filtedSchedules.push(schedule);
+                }
+              }
+            }
+          }
+          if (filtedSchedules.length > 0) {
+            schedules.push({
+              zone_name: scheduleInfo.zone_name,
+              scheduals: filtedSchedules
+            });
+          }
+        }
+        return schedules
+      }
+
+      if (this.time_selected != 0) {
+        var zone_name = this.zone_options[this.zone_selected].text
+        console.log(zone_name)
+        var schedules = [];
+        for (let o_i = 0; o_i < this.zone_scheduals.length; o_i++) {
+          const scheduleInfo = this.zone_scheduals[o_i];
+          var originSchedules = scheduleInfo.scheduals;
+          var filtedSchedules = [];
+          for (let s_i = 0; s_i < originSchedules.length; s_i++) {
+            const schedule = originSchedules[s_i];
+            if(this.zone_selected == 0){
+              if (this.time_selected == 0 || schedule.schedule_type == this.time_selected) {
+                filtedSchedules.push(schedule);
+              }
+
+            }else{
+              console.log(zone_name)
+              console.log(schedule.device_number.zone.name)
+
+              if ((zone_name.length > 0 && zone_name == schedule.device_number.zone.name)) {
+                if (this.time_selected == 0 || schedule.schedule_type == this.time_selected) {
+                  filtedSchedules.push(schedule);
+                }
+              }
+            }
+          }
+          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.time_selected;
       var assessment_before_dislysis_count = 0;
       var prescription_count = 0;
       if (zone_selected != 0 || timetype_selected != 0) {
-        // var zone_name = zone_selected == 0 ? "" : this.zone_options[zone_selected].text;
-        // var schedules = [];
-        // for (let o_i = 0; o_i < this.zone_scheduals.length; o_i++) {
-        //   const scheduleInfo = this.zone_scheduals[o_i];
-        //   var originSchedules = scheduleInfo.scheduals;
-        //   var filtedSchedules = [];
-        //   for (let s_i = 0; s_i < originSchedules.length; s_i++) {
-        //     const schedule = originSchedules[s_i];
-        //     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);
-        //       }
-        //     }
-        //   }
-        //   if (filtedSchedules.length > 0) {
-        //     schedules.push({
-        //       zone_name: scheduleInfo.zone_name,
-        //       scheduals: filtedSchedules
-        //     });
-        //   }
-        // }
-       
-        // return schedules;
+        var zone_name = zone_selected == 0 ? "" : this.zone_options[zone_selected].text;
+        var schedules = [];
+        for (let o_i = 0; o_i < this.zone_scheduals.length; o_i++) {
+          const scheduleInfo = this.zone_scheduals[o_i];
+          var originSchedules = scheduleInfo.scheduals;
+          var filtedSchedules = [];
+          for (let s_i = 0; s_i < originSchedules.length; s_i++) {
+            const schedule = originSchedules[s_i];
+            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);
+              }
+            }
+          }
+          if (filtedSchedules.length > 0) {
+            schedules.push({
+              zone_name: scheduleInfo.zone_name,
+              scheduals: filtedSchedules
+            });
+          }
+        }
+
+        return schedules;
         if (this.select_index == 2) {
           var scheduals = [];
           for (let index = 0; index < this.scheduals.length; index++) {
@@ -406,7 +440,7 @@ export default {
       if (this.select_index == 2) {
         this.menuList[2].count = assessment_before_dislysis_count;
       }
-            
+
 
       var zones = [];
       // zones.push({ value: 0, text: "全部分区" })

src/pages/main/dialog/AssessmentDialog.vue

@@ -14,12 +14,23 @@
             <input type="tel" @focus="inputFocus" v-model="formValue.weight_before"/>
           </div>
         </div>
-        <div class="item" v-if="isShow('干体重')">
+
+
+        <div class="item" v-if="isShow('干体重')&&this.$store.getters.user.template_info.template_id == 6">
           <h2 class="name">干体重(kg)</h2>
           <div class="content" @click="showDryWeight">
             <input type="tel" @focus="inputFocus" v-model="formValue.dry_weight" disabled="disabled"/>
           </div>
         </div>
+
+        <div class="item" v-if="isShow('干体重')&& this.$store.getters.user.template_info.template_id != 6">
+          <h2 class="name">干体重(kg)</h2>
+          <div class="content">
+            <input type="tel" @focus="inputFocus" v-model="formValue.dry_weight" />
+          </div>
+        </div>
+
+
         <div class="item" v-if="isShow('衣物重')">
           <h2 class="name">衣物重(kg)</h2>
           <div class="content">
@@ -328,15 +339,13 @@
                     v-model="formValue.remark"></textarea>
         </div>
       </div>
-
     </div>
-    <!--<two-menu title="二级菜单" v-show="true" ></two-menu>-->
+
     <check-box-sub-menu :visibility="visibility" v-on:menu-cancle="menuCancle" v-on:menu-comfirm="menuComfirm" v-on:menu-empty="menuEmpty"
                         :propsForm="propForm"></check-box-sub-menu>
 
+    <dry-weight-menu ref="dry"  v-on:menu-cancle-two="menuDryCancle" v-on:menu-comfirm-two="menuDryComfirm" :propsForm="propDryForm"></dry-weight-menu>
 
-    <check-box-sub-menu :visibility="visibility" v-on:menu-cancle="menuCancle" v-on:menu-comfirm="menuComfirm" v-on:menu-empty="menuEmpty"
-                        :propsForm="propForm"></check-box-sub-menu>
   </div>
 </template>
 
@@ -346,6 +355,7 @@
   import {EditAssessmentBeforeDislysis} from '@/api/patient'
   import {Toast} from 'vant'
   import {getDataConfig} from '@/utils/data'
+  import DryWeightMenu from './subMenu/dryWeightMenu'
 
   export default {
     name: 'PrescriptionDialog',
@@ -362,13 +372,20 @@
       },
       last_predialysis: {
         type: Object,
+      },  admin_users_prop: {
+        type: Array
       },
     },
     data () {
       return {
+        propDryForm:{
+          weight:0,
+          doctor:[],
+        },
         isShowDialog: true,
         //sub menu prop
         visibility: false,
+        is_show_dry_weight: false,
         propForm: {
           title: '',
           list: [],
@@ -441,6 +458,24 @@
       }
     },
     methods: {
+      menuDryComfirm(val){
+        console.log(val)
+        this.isShowDialog = true
+        this.$refs.dry.close()
+        this.formValue.dry_weight = val.dry_weight
+        this.propDryForm.weight = val.dry_weight
+        this.dry_weight = val
+        this.$emit("weight_update",this.dry_weight);
+
+      },
+      menuDryCancle(){
+        this.isShowDialog = true
+        this.$refs.dry.close()
+
+        // this.is_show_dry_weight = false
+
+
+      },
       isShow(name){
         var filedList = this.$store.getters.user.fileds
 
@@ -1113,7 +1148,14 @@
       },
       commitInfo: function () {
         Toast.loading({forbidClick: true, duration: 0})
-        console.log(this.formValue)
+        if (this.formValue.dry_weight == undefined){
+          this.formValue.dry_weight = "0"
+        }else{
+
+          this.formValue.dry_weight = this.formValue.dry_weight.toString()
+        }
+
+
         EditAssessmentBeforeDislysis(this.$route.query.patient_id, this.record_date, this.formValue).then(response => {
           if (response.data.state == 0) {
             Toast(response.data.msg)
@@ -1124,10 +1166,17 @@
           }
         })
       },showDryWeight:function(){
-
-
-
-
+        if(this.$store.getters.user.user.user_type == 3){
+          return
+        }
+        this.isShowDialog = false
+        this.$refs.dry.open()
+        this.propDryForm.doctor=[]
+        for (let i = 0; i < this.admin_users_prop.length;i++){
+          if(this.admin_users_prop[i].user_type == 2 || this.admin_users_prop[i].user_type == 1){
+            this.propDryForm.doctor.push(this.admin_users_prop[i])
+          }
+        }
       },
       close: function () {
         this.$emit('close')
@@ -1173,6 +1222,7 @@
       }
 
     }, components: {
+      DryWeightMenu,
       CheckBoxSubMenu,
 
     }, created () {
@@ -1191,10 +1241,11 @@
         d = newDate.getDate()
       }
       this.record_date = y + '-' + (m < 10 ? '0' + m : m) + '-' + (d < 10 ? '0' + d : d)
-      // console.log(this.predialysis)
       this.formValue = this.predialysis
+      console.log("3333333")
+
       if (this.predialysis.id == undefined && this.last_predialysis.id != undefined) {
-        // this.$set(this.formValue, 'dry_weight', this.last_predialysis['dry_weight'].toString())
+        console.log("111111")
         this.$set(this.formValue, 'additional_weight', this.last_predialysis['additional_weight'].toString())
         this.$set(this.formValue, 'internal_fistula', this.last_predialysis['internal_fistula'])
         this.$set(this.formValue, 'internal_fistula_skin', this.last_predialysis['internal_fistula_skin'])
@@ -1202,10 +1253,25 @@
         this.$set(this.formValue, 'blood_access_part_opera_id', this.last_predialysis['blood_access_part_opera_id'])
       }
 
-      if (this.predialysis.id == undefined && this.dry_weight.id != undefined) {
-        this.$set(this.formValue, 'dry_weight', this.dry_weight.adjusted_value.toString())
+      if(this.$store.getters.user.template_info.template_id != 6 && this.predialysis.id == undefined && this.last_predialysis.id != undefined){
+        console.log("222222")
+
+        this.$set(this.formValue, 'dry_weight', this.last_predialysis['dry_weight'].toString())
       }
 
+      if (this.$store.getters.user.template_info.template_id == 6 ) {
+        console.log("333333333")
+
+        if(this.dry_weight != null && this.dry_weight.id != undefined){
+          this.$set(this.formValue, 'dry_weight', this.dry_weight.dry_weight.toString())
+          this.propDryForm.weight = this.dry_weight.dry_weight.toString()
+        }else{
+          if(this.predialysis.id == undefined && this.last_predialysis.id != undefined){
+            this.$set(this.formValue, 'dry_weight', this.last_predialysis['dry_weight'].toString())
+            this.propDryForm.weight = this.formValue.dry_weight
+          }
+        }
+      }
       this.hemorrhage_state = this.formValue.is_hemorrhage == 0
     }
   }

src/pages/main/dialog/PrescriptionDialog.vue

@@ -758,13 +758,27 @@
                 return false
               } else {
 
-                var d = new Date();
-                var year = d.getFullYear();
-                var month=d.getMonth()+1;
-                var day=d.getDate();
-                var hour=d.getHours();
-                var minute=d.getMinutes();
-                var time = year+'-'+month+'-'+day+' '+hour+':'+minute
+                var date = new Date();
+                var year = date.getFullYear();
+                var month = date.getMonth() + 1;
+                var day = date.getDate();
+
+                var hours = date.getHours();
+                var minites = date.getMinutes();
+
+                if (month < 10) {
+                  month = "0" + month;
+                }
+                if (day < 10) {
+                  day = "0" + day;
+                }
+                if (hours < 10) {
+                  hours = "0" + hours;
+                }
+                if (minites < 10) {
+                  minites = "0" + minites;
+                }
+                var nowDate = year + "-" + month + "-" + day +" " +hours+":"+ minites;
 
                 Toast.success('提交成功')
                 let params = {
@@ -773,7 +787,7 @@
                   advice_doctor: targetAdvices[0].advice_doctor,
                   advice_type: targetAdvices[0].advice_type,
                   parent_id: this.$route.query.patient_id,
-                  start_time: time,
+                  start_time: nowDate,
                   remark: '',
                 }
 
@@ -802,20 +816,36 @@
                 return false
               } else {
                 Toast.success('提交成功')
-                var d=new Date();
-                var year=d.getFullYear();
-                var month=change(d.getMonth()+1);
-                var day=change(d.getDate());
-                var hour=change(d.getHours());
-                var minute=change(d.getMinutes());
-                var time=year+'-'+month+'-'+day+' '+hour+':'+minute
+                var date = new Date();
+                var year = date.getFullYear();
+                var month = date.getMonth() + 1;
+                var day = date.getDate();
+
+                var hours = date.getHours();
+                var minites = date.getMinutes();
+
+                if (month < 10) {
+                  month = "0" + month;
+                }
+                if (day < 10) {
+                  day = "0" + day;
+                }
+                if (hours < 10) {
+                  hours = "0" + hours;
+                }
+                if (minites < 10) {
+                  minites = "0" + minites;
+                }
+                var nowDate = year + "-" + month + "-" + day +" " +hours+":"+ minites;
+
+
                 let params = {
                   advices: targetAdvices,
                   advice_date: parseTime(this.$route.query.date, '{y}-{m}-{d}'),
                   advice_doctor: targetAdvices[0].advice_doctor,
                   advice_type: targetAdvices[0].advice_type,
                   parent_id: this.$route.query.patient_id,
-                  start_time: time,
+                  start_time: nowDate,
                   remark: '',
                 }
                 CreateGroupAdvice(this.$route.query.patient_id, 0, params).then(rs => {
@@ -860,7 +890,6 @@
                 return false
               } else {
                 Toast.success('提交成功')
-
                 this.$emit('longSolution', response.data.data.solution, this.doctorAdvices)
                 this.$emit('prescription', response.data.data.prescription, this.doctorAdvices)
                 this.finish()
@@ -1065,13 +1094,27 @@
                 } else {
                   Toast.success('提交成功')
 
-                  var d=new Date();
-                  var year=d.getFullYear();
-                  var month=change(d.getMonth()+1);
-                  var day=change(d.getDate());
-                  var hour=change(d.getHours());
-                  var minute=change(d.getMinutes());
-                  var time=year+'-'+month+'-'+day+' '+hour+':'+minute
+                  var date = new Date();
+                  var year = date.getFullYear();
+                  var month = date.getMonth() + 1;
+                  var day = date.getDate();
+
+                  var hours = date.getHours();
+                  var minites = date.getMinutes();
+
+                  if (month < 10) {
+                    month = "0" + month;
+                  }
+                  if (day < 10) {
+                    day = "0" + day;
+                  }
+                  if (hours < 10) {
+                    hours = "0" + hours;
+                  }
+                  if (minites < 10) {
+                    minites = "0" + minites;
+                  }
+                  var nowDate = year + "-" + month + "-" + day +" " +hours+":"+ minites;
 
                   let params = {
                     advices: this.waitUploadAdvices,
@@ -1079,7 +1122,7 @@
                     advice_doctor: this.waitUploadAdvices[0].advice_doctor,
                     advice_type: this.waitUploadAdvices[0].advice_type,
                     parent_id: this.$route.query.patient_id,
-                    start_time: time,
+                    start_time: nowDate,
                     remark: '',
                   }
                   CreateGroupAdvice(this.$route.query.patient_id, 0, params).then(rs => {
@@ -1183,14 +1226,27 @@
                     return false
                   } else {
 
+                    var date = new Date();
+                    var year = date.getFullYear();
+                    var month = date.getMonth() + 1;
+                    var day = date.getDate();
 
-                    var d=new Date();
-                    var year=d.getFullYear();
-                    var month=change(d.getMonth()+1);
-                    var day=change(d.getDate());
-                    var hour=change(d.getHours());
-                    var minute=change(d.getMinutes());
-                    var time=year+'-'+month+'-'+day+' '+hour+':'+minute
+                    var hours = date.getHours();
+                    var minites = date.getMinutes();
+
+                    if (month < 10) {
+                      month = "0" + month;
+                    }
+                    if (day < 10) {
+                      day = "0" + day;
+                    }
+                    if (hours < 10) {
+                      hours = "0" + hours;
+                    }
+                    if (minites < 10) {
+                      minites = "0" + minites;
+                    }
+                    var nowDate = year + "-" + month + "-" + day +" " +hours+":"+ minites;
 
 
                     let params = {
@@ -1199,7 +1255,7 @@
                       advice_doctor: this.waitUploadAdvices[0].advice_doctor,
                       advice_type: this.waitUploadAdvices[0].advice_type,
                       parent_id: this.$route.query.patient_id,
-                      start_time: time,
+                      start_time: nowDate,
                       remark: '',
                     }
 
@@ -1334,13 +1390,27 @@
                 } else {
                   Toast.success('提交成功')
 
-                  var d=new Date();
-                  var year=d.getFullYear();
-                  var month=change(d.getMonth()+1);
-                  var day=change(d.getDate());
-                  var hour=change(d.getHours());
-                  var minute=change(d.getMinutes());
-                  var time=year+'-'+month+'-'+day+' '+hour+':'+minute
+                  var date = new Date();
+                  var year = date.getFullYear();
+                  var month = date.getMonth() + 1;
+                  var day = date.getDate();
+
+                  var hours = date.getHours();
+                  var minites = date.getMinutes();
+
+                  if (month < 10) {
+                    month = "0" + month;
+                  }
+                  if (day < 10) {
+                    day = "0" + day;
+                  }
+                  if (hours < 10) {
+                    hours = "0" + hours;
+                  }
+                  if (minites < 10) {
+                    minites = "0" + minites;
+                  }
+                  var nowDate = year + "-" + month + "-" + day +" " +hours+":"+ minites;
 
 
                   let params = {
@@ -1349,7 +1419,7 @@
                     advice_doctor: this.waitUploadAdvices[0].advice_doctor,
                     advice_type: this.waitUploadAdvices[0].advice_type,
                     parent_id: this.$route.query.patient_id,
-                    start_time: time,
+                    start_time: nowDate,
                     remark: '',
                   }
                   CreateGroupAdvice(this.$route.query.patient_id, 0, params).then(rs => {
@@ -1463,14 +1533,27 @@
                     this.advice_visibility = false
 
 
-                    var d=new Date();
-                    var year=d.getFullYear();
-                    var month=change(d.getMonth()+1);
-                    var day=change(d.getDate());
-                    var hour=change(d.getHours());
-                    var minute=change(d.getMinutes());
-                    var time = year+'-'+month+'-'+day+' '+hour+':'+minute
+                    var date = new Date();
+                    var year = date.getFullYear();
+                    var month = date.getMonth() + 1;
+                    var day = date.getDate();
+
+                    var hours = date.getHours();
+                    var minites = date.getMinutes();
 
+                    if (month < 10) {
+                      month = "0" + month;
+                    }
+                    if (day < 10) {
+                      day = "0" + day;
+                    }
+                    if (hours < 10) {
+                      hours = "0" + hours;
+                    }
+                    if (minites < 10) {
+                      minites = "0" + minites;
+                    }
+                    var nowDate = year + "-" + month + "-" + day +" " +hours+":"+ minites;
 
                     let params = {
                       advices: this.waitUploadAdvices,
@@ -1478,7 +1561,7 @@
                       advice_doctor: this.waitUploadAdvices[0].advice_doctor,
                       advice_type: this.waitUploadAdvices[0].advice_type,
                       parent_id: this.$route.query.patient_id,
-                      start_time: time,
+                      start_time: nowDate,
                       remark: '',
                     }
                     CreateGroupAdvice(this.$route.query.patient_id, 0, params).then(rs => {

src/pages/main/dialog/ThorougDialog.vue

@@ -570,6 +570,7 @@
             this.propForm.title = '凝血'
             this.propForm.isHasOther = 2
             this.visibility = true
+            this.propForm.list = []
             this.propForm.list = getDataConfig("hemodialysis", "cruor");
             this.propForm.optionList = []
             this.propForm.isMultiple = 2
@@ -582,7 +583,6 @@
             } else {
               this.propForm.result = []
             }
-
             this.propForm.click_ref = "cruor"
             break
           case 'symptom_after_dialysis':
@@ -592,6 +592,8 @@
             this.propForm.isHasOther = 2
 
             this.visibility = true
+            this.propForm.list = []
+
             this.propForm.list = getDataConfig('hemodialysis','symptoms');
             this.propForm.optionList = []
             this.propForm.isMultiple = 2
@@ -613,6 +615,7 @@
             this.propForm.title = '导管'
             this.visibility = true
             this.propForm.isHasOther = 2
+            this.propForm.list = []
 
             this.propForm.list = getDataConfig('hemodialysis','catheter')
             this.propForm.optionList = []
@@ -635,6 +638,8 @@
             this.propForm.isHasOther = 2
 
             this.visibility = true
+            this.propForm.list = []
+
             this.propForm.list = getDataConfig('hemodialysis','complication')
             this.propForm.optionList = []
             this.propForm.isMultiple = 2
@@ -683,6 +688,7 @@
             this.isShowDialog = false
             this.propForm.title = '内瘘'
             this.visibility = true
+            this.propForm.list = []
             this.propForm.list = getDataConfig('hemodialysis','internal_fistula')
             this.propForm.optionList = []
             this.propForm.isMultiple = 2
@@ -732,6 +738,7 @@
             this.propForm.title = '交待病房护士/患者/陪人观察内容'
             this.visibility = true
             this.propForm.isHasOther = 2
+            this.propForm.list = []
 
             this.propForm.list = this.$store.getters.observation_content
             this.propForm.optionList = []
@@ -769,6 +776,7 @@
             this.propForm.title = '透析过程提前原因'
             this.visibility = true
             this.propForm.isHasOther = 2
+            this.propForm.list = []
 
             this.propForm.list = this.$store.getters.in_advance_reason
             this.propForm.optionList = []
@@ -830,6 +838,7 @@
             this.propForm.title = '失衡综合症情况'
             this.visibility = true
             this.propForm.isHasOther = 2
+            this.propForm.list = []
 
             this.propForm.list = this.$store.getters.disequilibrium_syndrome_option
             this.propForm.optionList = []
@@ -850,6 +859,7 @@
             this.isShowDialog = false
             this.propForm.title = '动脉管道'
             this.propForm.isHasOther = 2
+            this.propForm.list = []
 
             this.visibility = true
             this.propForm.list = []
@@ -1249,17 +1259,14 @@
       this.template_id = this.$store.getters.user.template_info.template_id
 
       if (this.record != null && this.record.id != '' && this.record.assessment_doctor != 0) {
+        console.log("111111111")
         for (const key in this.formValue) {
           // console.log(key, this.record[key]);
           this.formValue[key] = this.record[key];
         }
       }else  {
-        // if (this.last_record != null && this.last_record.id != ""){
-        //   for (const key in this.formValue) {
-        //     // console.log(key, this.record[key]);
-        //     this.formValue[key] = this.last_record[key];
-        //   }
-        // }
+        console.log("2222222")
+
         if (this.record != null && this.record.id != '' && this.record.assessment_doctor == 0){
           this.$set(this.formValue, "actual_ultrafiltration", this.record.actual_ultrafiltration)
           this.$set(this.formValue, "weight_after", this.record.weight_after)
@@ -1277,8 +1284,8 @@
           this.$set(this.formValue, "actual_treatment_hour", '')
           this.$set(this.formValue, "actual_treatment_minute", '')
         }
-      } 
-  
+      }
+
 
 
 

src/pages/main/dialog/TwoMenu.vue

@@ -104,6 +104,7 @@ 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/dryWeightMenu.vue

@@ -1,25 +1,24 @@
 <template>
   <div>
-
     <div class="Dialog" v-if="visibility">
       <div class="DialogTit">
         <span class="iconfont" @click="closeDialog()">&#xe720; 返回</span>
         <h1 class="name">干体重调整</h1>
-        <span class="success" @click="commitDryWeight()"></span>
+        <span class="success" @click="commitDryWeight()">提交</span>
       </div>
 
-      <div class="optionsBox">
+      <div class="DialogContent">
         <div class="item">
           <label class="name" for="xll">干体重</label>
           <div class="content">
-            <input type="tel" id="xll" v-model="dry_weight"/>
+            <input autofocus placeholder="请输入干体重" type="tel" id="xll" v-model="dry_weight"/>
           </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">{{getDoctorName(this.creator)}}</span>
             <span class="iconfont">&#xe6f9;</span>
           </div>
         </div>
@@ -32,38 +31,82 @@
         </div>
       </div>
     </div>
-
+    <!--<two-menu ref="selector">-->
+    <!--</two-menu>-->
     <two-menu ref="selector"></two-menu>
-
   </div>
-
-
 </template>
 
 <script>
+
   import TwoMenu from '../TwoMenu'
+  import {CreateDryWeight} from '@/api/dialysis'
 
   export default {
+
     name: 'dryWeightMenu',
     components: {TwoMenu},
+    data () {
+      return {
+        dry_weight: 0,
+        remark: '',
+        creator: 0,
+        visibility: false
+
+      }
+    },
     props: {
-      title: '',
-      dry_weight: 0,
-      remark: '',
-      index: 0,
-      visibility: false,
+      propsForm: {
+        type: Object
+      },
     },
     methods: {
+      open () {
+        this.creator = this.$store.getters.user.user.id
+        this.dry_weight =  this.propsForm.weight
+        this.visibility = true
+      },
+      close () {
+        this.visibility = false
+      },
       closeDialog () {
         this.$emit('menu-cancle-two')
+
       }, commitDryWeight () {
+        let params = {
+          id: this.$route.query.patient_id,
+          dry_weight: this.dry_weight,
+          remark: this.remark,
+          doctor_id: this.creator,
+        }
+        CreateDryWeight(params).then(rs => {
+          var res = rs.data
+          if (res.state == 1) {
+            this.$message.success("提交成功");
+            this.$emit('menu-comfirm-two',res.data.weight)
 
-        this.$emit('menu-cancle-two')
-      },
+          }
+        })
+      }, select_nurse () {
+        this.close()
+        var _this = this
+        if (this.$store.getters.user.user.user_type = 2) {
+          this.$refs.selector.showSingleSelect(this.propsForm.doctor, _this.creator, '选择医生', 'name', 'id', function (select_id) {
+            _this.visibility = true
+            _this.creator = select_id
+          }, function () {
+            _this.visibility = true
+          })
+        }
+      }, getDoctorName (id) {
+        for (let i = 0; i < this.propsForm.doctor.length; i++) {
+          if (this.propsForm.doctor[i].id == id) {
+            return this.propsForm.doctor[i].name
+          }
+        }
+
+      }
     },
-    data () {
-      return {}
-    }
   }
 </script>
 

src/pages/main/template/DialysisPrintOrderSix.vue

@@ -384,8 +384,8 @@
                   <td>{{monitor.transmembrane_pressure?monitor.transmembrane_pressure:0}}</td>
                   <td>{{monitor.dialysate_temperature?monitor.dialysate_temperature:''}}</td>
                   <td>{{monitor.sodium_concentration?monitor.sodium_concentration:''}}</td>
-                  <td v-if="monitor.systolic_blood_pressure  > 0">{{monitor.ultrafiltration_volume?monitor.ultrafiltration_volume:0}}</td>
-                  <td v-else> </td>
+                  <td>{{monitor.ultrafiltration_volume?monitor.ultrafiltration_volume:0}}</td>
+
                   <td style="line-height:16px;padding:0px;">
                     <div style="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;">

src/pages/main/today/TodayTab.vue

@@ -71,7 +71,7 @@
 
     <div class="blueBorder"></div>
     <assessment-before id="assessment_before" :record="predialysis_evaluation" ref="assessment_before"
-                       title="透前评估"></assessment-before>
+                       title="透前评估" :dry_weights="dryWeight"  :last_predialysis="last_predialysis_evaluation" ></assessment-before>
 
     <div class="blueBorder"></div>
     <stat-order id="stat_order" ref="stat_order" title="临时医嘱" :doctor_map="admin_user_map"
@@ -127,8 +127,8 @@
 
     <van-popup title="透前评估" v-model="menuList[3].showPopup" :overlay="true" :close-on-click-overlay="false">
       <assessment-dialog :predialysis="predialysis_evaluation" :last_predialysis="last_predialysis_evaluation" :dry_weight="dryWeight"
-                         :patient_prop="patient" @evaluation="update_evaluation" @close="closeAssessmentBefore"
-                         ref="assessment_dialog"></assessment-dialog>
+                         :patient_prop="patient" @evaluation="update_evaluation" @close="closeAssessmentBefore"  :admin_users_prop="admin_users"
+                         ref="assessment_dialog" @weight_update="weightFunc"></assessment-dialog>
     </van-popup>
 
     <van-popup title="临时医嘱" v-model="menuList[4].showPopup" :overlay="true" :close-on-click-overlay="false">
@@ -333,6 +333,7 @@
           {title: '治疗小结', name: 'treatment_of', value: 0}
         ]
 
+
         if (!isNaN(this.prescription.id) && this.prescription.id > 0 && this.prescription.creater> 0) {
           steps[0].value = 1
         }
@@ -342,9 +343,11 @@
         ) {
           steps[1].value = 1
         }
+
         if ( typeof this.predialysis_evaluation.id != 'undefined' && !isNaN(this.predialysis_evaluation.id) && this.predialysis_evaluation.id > 0  && this.predialysis_evaluation.creater > 0) {
           steps[2].value = 1
         }
+
         if (this.advice_groups.length > 0) {
           steps[3].value = 1
         }
@@ -742,15 +745,18 @@
             this.loading = false
           }
         })
-      },
+      },weightFunc(val){
+
+        this.dryWeight = val
 
-      requestDialysisRecord () {
+      }, requestDialysisRecord () {
         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

src/pages/main/today/assessmentBefore.vue

@@ -212,6 +212,8 @@
     props: {
       record: {
         type: Object
+      },dry_weights:{
+        type: Object
       }
     },
     created () {
@@ -251,10 +253,27 @@
       },
 
       dry_weight: function () {
-        if (this.record == null || this.record.id == '') {
-          return '-'
+        if (this.$store.getters.user.template_info.template_id == 6){
+          if(this.dry_weights != null && this.dry_weights.id > 0 ){
+            return this.dry_weights.dry_weight
+          }else{
+            if (this.record == null || this.record.id == '') {
+              return '-'
+            }
+            return this.record.dry_weight
+          }
+
+        }else{
+
+          if (this.record == null || this.record.id == '') {
+
+            return '-'
+          }
+
+          return this.record.dry_weight
         }
-        return this.record.dry_weight
+
+
       },
       diastolic_blood_pressure: function () {
         if (this.record == null || this.record.id == '') {