Merge branch 'master' of http://git.shengws.com/csx/Vue_New

src/xt_pages/dialysis/PatientBox.vue

@@ -18,7 +18,7 @@
         <ul>
           <li><span class="iconfont">&#xe6f5;</span>班次 : {{timeTypeText(schedule)}}</li>
           <li><span class="iconfont">&#xe6de;</span>床位号 : {{schedule.device_number.number}}</li>
-          <li><span class="iconfont">&#xe6f6;</span>透析模式 : {{schedule.mode_id?$store.getters.treatment_mode[schedule.mode_id].name:''}}</li>
+          <li><span class="iconfont">&#xe6f6;</span>透析模式 : {{schedule.mode_id&&$store.getters.treatment_mode[schedule.mode_id]?$store.getters.treatment_mode[schedule.mode_id].name:''}}</li>
         </ul>
       </div>
     </div>

src/xt_pages/dialysis/details/dialog/monitor_dialog.vue

@@ -990,6 +990,78 @@ export default {
           }
           this.reset();
         } else {
+          this.form.systolic_bp =
+            parseFloat(this.form.systolic_bp) == NaN
+              ? 0
+              : parseFloat(this.form.systolic_bp);
+          this.form.diastolic_bp =
+            parseFloat(this.form.diastolic_bp) == NaN
+              ? 0
+              : parseFloat(this.form.diastolic_bp);
+          this.form.temperature =
+            parseFloat(this.form.temperature) == NaN
+              ? 0
+              : parseFloat(this.form.temperature);
+          this.form.pulse_frequency =
+            parseFloat(this.form.pulse_frequency) == NaN
+              ? 0
+              : parseFloat(this.form.pulse_frequency);
+          this.form.breathing_rated =
+            parseFloat(this.form.breathing_rated) == NaN
+              ? 0
+              : parseFloat(this.form.breathing_rated);
+          this.form.blood_flow_volume =
+            parseFloat(this.form.blood_flow_volume) == NaN
+              ? 0
+              : parseFloat(this.form.blood_flow_volume);
+          this.form.venous_pressure =
+            parseFloat(this.form.venous_pressure) == NaN
+              ? 0
+              : parseFloat(this.form.venous_pressure);
+          this.form.transmembrane_pressure =
+            parseFloat(this.form.transmembrane_pressure) == NaN
+              ? 0
+              : parseFloat(this.form.transmembrane_pressure);
+          this.form.ultrafiltration_volume =
+            parseFloat(this.form.ultrafiltration_volume) == NaN
+              ? 0
+              : parseFloat(this.form.ultrafiltration_volume);
+          this.form.ultrafiltration_rate =
+            parseFloat(this.form.ultrafiltration_rate) == NaN
+              ? 0
+              : parseFloat(this.form.ultrafiltration_rate);
+          this.form.arterial_pressure =
+            parseFloat(this.form.arterial_pressure) == NaN
+              ? 0
+              : parseFloat(this.form.arterial_pressure);
+          this.form.sodium_concentration =
+            parseFloat(this.form.sodium_concentration) == NaN
+              ? 0
+              : parseFloat(this.form.sodium_concentration);
+          this.form.dialysate_temperature =
+            parseFloat(this.form.dialysate_temperature) == NaN
+              ? 0
+              : parseFloat(this.form.dialysate_temperature);
+          this.form.replacement_rate =
+            parseFloat(this.form.replacement_rate) == NaN
+              ? 0
+              : parseFloat(this.form.replacement_rate);
+          this.form.displacement_quantity =
+            parseFloat(this.form.displacement_quantity) == NaN
+              ? 0
+              : parseFloat(this.form.displacement_quantity);
+          this.form.conductivity =
+            parseFloat(this.form.conductivity) == NaN
+              ? 0
+              : parseFloat(this.form.conductivity);
+          this.form.displacement_flow_quantity =
+            parseFloat(this.form.displacement_flow_quantity) == NaN
+              ? 0
+              : parseFloat(this.form.displacement_flow_quantity);
+          this.form.ktv =
+            parseFloat(this.form.ktv) == NaN ? 0 : parseFloat(this.form.ktv);
+
+
           this.$message.error(resp.msg);
         }
       });
@@ -1060,6 +1132,7 @@ export default {
           const params = {
             patient_id: this.patient_id,
             record_id: this.table_current_row.id
+            mode: mode
 
           };
 
@@ -1074,6 +1147,8 @@ export default {
                   this.monitors.splice(i, 1);
                 }
               }
+              this.$message.success("删除成功");
+
             }
           });
         })

src/xt_pages/user/components/EditGroupAdvice.vue

@@ -1403,7 +1403,10 @@
             frequency_type: this.groupSelectRow.frequency_type
           }
           // console.log(this.nameForm.week_days)
-          this.weeks = this.groupSelectRow.week_day.split(',')
+          if(this.isChild = true){
+          }else{
+            this.weeks = this.groupSelectRow.week_day.split(',')
+          }
           this.nameFormTitle = '修改医嘱内容'
         } else {
           this.nameForm = {