修改处方bug

src/pages/main/dialog/PrescriptionDialog.vue

@@ -427,7 +427,9 @@
           this.dialysisPrescription.dialysis_duration_minute = timeArray[1]
         }
         this.timeValue = this.dialysisPrescription.dialysis_duration_hour + "小时" + this.dialysisPrescription.dialysis_duration_minute + "分钟"
-        this.dialysisPrescription.dialysis_duration = this.dialysisPrescription.dialysis_duration_hour + "." + this.dialysisPrescription.dialysis_duration_minute
+
+
+        this.dialysisPrescription.dialysis_duration = this.dialysisPrescription.dialysis_duration_hour + "." + (this.dialysisPrescription.dialysis_duration_minute)
 
       },
       inputFocus: function (event) {
@@ -718,9 +720,9 @@
           } else {
             Toast.success("提交成功");
             this.$emit("prescription", response.data.data.prescription);
-            for (const key in response.data.data.prescription) {
-              this.prescription_prop[key] = response.data.data.prescription[key];
-            }
+            // for (const key in response.data.data.prescription) {
+            //   // this.prescription_prop[key] = response.data.data.prescription[key];
+            // }
             this.finish();
 
           }
@@ -737,12 +739,14 @@
             return false;
           } else {
             Toast.success("提交成功");
-            for (const key in response.data.data.solution) {
-              this.solution_prop[key] = response.data.data.solution[key];
-            }
-            for (const key in response.data.data.prescription) {
-              this.prescription_prop[key] = response.data.data.prescription[key];
-            }
+            // for (const key in response.data.data.solution) {
+            //   this.solution_prop[key] = response.data.data.solution[key];
+            // }
+            // for (const key in response.data.data.prescription) {
+            //   this.prescription_prop[key] = response.data.data.prescription[key];
+            // }
+            // console.log(response.data.data.prescription)
+
             this.$emit("longSolution", response.data.data.solution);
             this.$emit("prescription", response.data.data.prescription);
             this.finish();

src/pages/main/today/TodayTab.vue

@@ -105,7 +105,7 @@
     <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"
                            :prescription_prop="prescription" @finish="closePrescriptionDialog" :operators="operators"
-                           @close="closePrescriptionDialog" ref="prescription_dialog"></prescription-dialog>
+                           @close="closePrescriptionDialog" @prescription="prescriptionFunc" @longSolution="longSolutionFunc" ref="prescription_dialog"></prescription-dialog>
     </van-popup>
 
     <van-popup title="接诊评估" v-model="menuList[2].showPopup" :overlay="true" :close-on-click-overlay="false">
@@ -171,7 +171,7 @@
         <li @click="menuClick(9)">治疗小结</li>
       </ul>
     </div> -->
- 
+
    <el-button class="goTop" v-show="goTopShow" @click="goTop"  type="primary" icon="el-icon-arrow-up" circle style="position:fixed;right:50px;bottom:50px;"></el-button>
 
    </div>
@@ -884,7 +884,14 @@ export default {
         }
       );
     },
+    prescriptionFunc:function(val){
+        this.prescription = val
+
+    },
+    longSolutionFunc:function(val){
+      this.solution = val
 
+    },
     closePrescriptionDialog: function() {
       this.closeDialog(1);
       this.scrollToView("prescription");

src/pages/main/today/dialysisPrescription.vue

@@ -38,7 +38,6 @@
         <li>
           <label>透析时长 : </label>
           <span class="content">{{dialysis_duration != '0'?dialysis_duration:""}}</span>
-          <span class="unit">{{dialysis_duration != '0'?"h":""}}</span>
         </li>
         <li>
           <label>透析液配方 : </label>
@@ -169,6 +168,7 @@ export default {
   computed: {
     target_ultrafiltration:function(){
       var v = this.getValueStr("target_ultrafiltration", "target_ultrafiltration")
+      console.log(v)
       return v.length == 0 ? "0" : v
     },
     dialysis_mode: function() {
@@ -216,8 +216,15 @@ export default {
       return v.length == 0 ? "0" : v
     },
     dialysis_duration: function() {
-      var v = this.getValueStr("dialysis_duration", "dialysis_duration")
-      return v.length == 0 ? "0" : v
+      var dialysis_duration_hour = (this.getValueStr("dialysis_duration_hour", "dialysis_duration_hour"))
+      var dialysis_duration_minute = (this.getValueStr("dialysis_duration_minute", "dialysis_duration_minute"))
+      if(dialysis_duration_hour.length == 0 && dialysis_duration_minute.length == 0){
+        return  "0"
+      }else{
+        var time = dialysis_duration_hour+"h"+dialysis_duration_minute+"min"
+        return time.length == 0 ? "0" : time
+      }
+
     },
     blood_flow_volume: function() {
       var v = this.getValueStr("blood_flow_volume", "blood_flow_volume")