commit

build/cdn.json

@@ -1,3 +1,3 @@
 {
-  "version": "1.0.98"
+  "version": "1.0.99"
 }

src/pages/main/DialysisArea.vue

@@ -65,6 +65,10 @@
             我的病人
             <span class="iconfont">&#xe74a;</span>
           </li>
+          <li @click="clearPatient()">
+            全部病人
+            <span class="iconfont">&#xe74a;</span>
+          </li>
 
         </ul>
       </div>
@@ -336,6 +340,17 @@ export default {
     this.timer = null
   },
   methods: {
+    clearPatient(){
+      this.search_keyword = ''
+      this.ismypatient = false
+      this.$emit('clear_search_keyword')
+      this.$store.dispatch('SaveDialysisAreaSelectIndexs', {
+        zone: this.zone_selected,
+        schedule_type: this.schedual_type_selected,
+        schedule_date: this.selected_date,
+        ismypatient:   this.ismypatient,
+      })
+    },
     mypatient () {
       this.search_keyword = ''
       this.ismypatient = true

src/pages/main/dialog/PrescriptionDialog.vue

@@ -1080,14 +1080,14 @@
       },
       commitInfo: function () {
 
-        if(this.$store.getters.user.template_info.template_id == 6) {
-          if (this.dialysisPrescription.mode_id == 2) {
-            if (this.dialysisPrescription.displace_liqui_part == 0 || this.dialysisPrescription.displace_liqui_part == -2 || this.dialysisPrescription.replacement_total == 0 || this.dialysisPrescription.replacement_total == "") {
-              Toast.fail("HDF模式下置换方式和置换量不能为空！")
-              return
-            }
-          }
-        }
+        // if(this.$store.getters.user.template_info.template_id == 6) {
+        //   if (this.dialysisPrescription.mode_id == 2) {
+        //     if (this.dialysisPrescription.displace_liqui_part == 0 || this.dialysisPrescription.displace_liqui_part == -2 || this.dialysisPrescription.replacement_total == 0 || this.dialysisPrescription.replacement_total == "") {
+        //       Toast.fail("HDF模式下置换方式和置换量不能为空！")
+        //       return
+        //     }
+        //   }
+        // }
 
         this.is_pre = 1
         if (this.prescription_prop.id == '') {
@@ -1375,14 +1375,14 @@
 
         }
       }, commitSolutionInfo: function () {
-        if(this.$store.getters.user.template_info.template_id == 6) {
-          if (this.dialysisPrescription.mode_id == 2) {
-            if (this.dialysisPrescription.displace_liqui_part == 0 || this.dialysisPrescription.displace_liqui_part == -2 || this.dialysisPrescription.replacement_total == 0 || this.dialysisPrescription.replacement_total == "") {
-              Toast.fail("HDF模式下置换方式和置换量不能为空！")
-              return
-            }
-          }
-        }
+        // if(this.$store.getters.user.template_info.template_id == 6) {
+        //   if (this.dialysisPrescription.mode_id == 2) {
+        //     if (this.dialysisPrescription.displace_liqui_part == 0 || this.dialysisPrescription.displace_liqui_part == -2 || this.dialysisPrescription.replacement_total == 0 || this.dialysisPrescription.replacement_total == "") {
+        //       Toast.fail("HDF模式下置换方式和置换量不能为空！")
+        //       return
+        //     }
+        //   }
+        // }
         this.is_pre = 2
 
         if (this.prescription_prop.id == '') {
@@ -1933,12 +1933,14 @@
     },
     watch: {
       "dialysisPrescription.anticoagulant_shouji":function(val){
-        console.log(val)
-        this.dialysisPrescription.anticoagulant_zongliang = parseInt(this.dialysisPrescription.anticoagulant_shouji) + parseInt(this.dialysisPrescription.anticoagulant_weichi)
+        if( this.dialysisPrescription.anticoagulant_zongliang == 0) {
+          this.dialysisPrescription.anticoagulant_zongliang = parseInt(this.dialysisPrescription.anticoagulant_shouji) + parseInt(this.dialysisPrescription.anticoagulant_weichi)
+        }
 
       }, "dialysisPrescription.anticoagulant_weichi":function(val){
-        console.log(val)
-        this.dialysisPrescription.anticoagulant_zongliang = parseInt(this.dialysisPrescription.anticoagulant_shouji) + parseInt(this.dialysisPrescription.anticoagulant_weichi)
+        if( this.dialysisPrescription.anticoagulant_zongliang == 0) {
+          this.dialysisPrescription.anticoagulant_zongliang = parseInt(this.dialysisPrescription.anticoagulant_shouji) + parseInt(this.dialysisPrescription.anticoagulant_weichi)
+        }
       },
 
       isShowDialog (val) {