csx пре 5 година
родитељ
комит
534922b6ad
3 измењених фајлова са 38 додато и 21 уклоњено
  1. 1 1
      build/cdn.json
  2. 15 0
      src/pages/main/DialysisArea.vue
  3. 22 20
      src/pages/main/dialog/PrescriptionDialog.vue

+ 1 - 1
build/cdn.json Прегледај датотеку

1
 {
1
 {
2
-  "version": "1.0.98"
2
+  "version": "1.0.99"
3
 }
3
 }

+ 15 - 0
src/pages/main/DialysisArea.vue Прегледај датотеку

65
             我的病人
65
             我的病人
66
             <span class="iconfont">&#xe74a;</span>
66
             <span class="iconfont">&#xe74a;</span>
67
           </li>
67
           </li>
68
+          <li @click="clearPatient()">
69
+            全部病人
70
+            <span class="iconfont">&#xe74a;</span>
71
+          </li>
68
 
72
 
69
         </ul>
73
         </ul>
70
       </div>
74
       </div>
336
     this.timer = null
340
     this.timer = null
337
   },
341
   },
338
   methods: {
342
   methods: {
343
+    clearPatient(){
344
+      this.search_keyword = ''
345
+      this.ismypatient = false
346
+      this.$emit('clear_search_keyword')
347
+      this.$store.dispatch('SaveDialysisAreaSelectIndexs', {
348
+        zone: this.zone_selected,
349
+        schedule_type: this.schedual_type_selected,
350
+        schedule_date: this.selected_date,
351
+        ismypatient:   this.ismypatient,
352
+      })
353
+    },
339
     mypatient () {
354
     mypatient () {
340
       this.search_keyword = ''
355
       this.search_keyword = ''
341
       this.ismypatient = true
356
       this.ismypatient = true

+ 22 - 20
src/pages/main/dialog/PrescriptionDialog.vue Прегледај датотеку

1080
       },
1080
       },
1081
       commitInfo: function () {
1081
       commitInfo: function () {
1082
 
1082
 
1083
-        if(this.$store.getters.user.template_info.template_id == 6) {
1084
-          if (this.dialysisPrescription.mode_id == 2) {
1085
-            if (this.dialysisPrescription.displace_liqui_part == 0 || this.dialysisPrescription.displace_liqui_part == -2 || this.dialysisPrescription.replacement_total == 0 || this.dialysisPrescription.replacement_total == "") {
1086
-              Toast.fail("HDF模式下置换方式和置换量不能为空!")
1087
-              return
1088
-            }
1089
-          }
1090
-        }
1083
+        // if(this.$store.getters.user.template_info.template_id == 6) {
1084
+        //   if (this.dialysisPrescription.mode_id == 2) {
1085
+        //     if (this.dialysisPrescription.displace_liqui_part == 0 || this.dialysisPrescription.displace_liqui_part == -2 || this.dialysisPrescription.replacement_total == 0 || this.dialysisPrescription.replacement_total == "") {
1086
+        //       Toast.fail("HDF模式下置换方式和置换量不能为空!")
1087
+        //       return
1088
+        //     }
1089
+        //   }
1090
+        // }
1091
 
1091
 
1092
         this.is_pre = 1
1092
         this.is_pre = 1
1093
         if (this.prescription_prop.id == '') {
1093
         if (this.prescription_prop.id == '') {
1375
 
1375
 
1376
         }
1376
         }
1377
       }, commitSolutionInfo: function () {
1377
       }, commitSolutionInfo: function () {
1378
-        if(this.$store.getters.user.template_info.template_id == 6) {
1379
-          if (this.dialysisPrescription.mode_id == 2) {
1380
-            if (this.dialysisPrescription.displace_liqui_part == 0 || this.dialysisPrescription.displace_liqui_part == -2 || this.dialysisPrescription.replacement_total == 0 || this.dialysisPrescription.replacement_total == "") {
1381
-              Toast.fail("HDF模式下置换方式和置换量不能为空!")
1382
-              return
1383
-            }
1384
-          }
1385
-        }
1378
+        // if(this.$store.getters.user.template_info.template_id == 6) {
1379
+        //   if (this.dialysisPrescription.mode_id == 2) {
1380
+        //     if (this.dialysisPrescription.displace_liqui_part == 0 || this.dialysisPrescription.displace_liqui_part == -2 || this.dialysisPrescription.replacement_total == 0 || this.dialysisPrescription.replacement_total == "") {
1381
+        //       Toast.fail("HDF模式下置换方式和置换量不能为空!")
1382
+        //       return
1383
+        //     }
1384
+        //   }
1385
+        // }
1386
         this.is_pre = 2
1386
         this.is_pre = 2
1387
 
1387
 
1388
         if (this.prescription_prop.id == '') {
1388
         if (this.prescription_prop.id == '') {
1933
     },
1933
     },
1934
     watch: {
1934
     watch: {
1935
       "dialysisPrescription.anticoagulant_shouji":function(val){
1935
       "dialysisPrescription.anticoagulant_shouji":function(val){
1936
-        console.log(val)
1937
-        this.dialysisPrescription.anticoagulant_zongliang = parseInt(this.dialysisPrescription.anticoagulant_shouji) + parseInt(this.dialysisPrescription.anticoagulant_weichi)
1936
+        if( this.dialysisPrescription.anticoagulant_zongliang == 0) {
1937
+          this.dialysisPrescription.anticoagulant_zongliang = parseInt(this.dialysisPrescription.anticoagulant_shouji) + parseInt(this.dialysisPrescription.anticoagulant_weichi)
1938
+        }
1938
 
1939
 
1939
       }, "dialysisPrescription.anticoagulant_weichi":function(val){
1940
       }, "dialysisPrescription.anticoagulant_weichi":function(val){
1940
-        console.log(val)
1941
-        this.dialysisPrescription.anticoagulant_zongliang = parseInt(this.dialysisPrescription.anticoagulant_shouji) + parseInt(this.dialysisPrescription.anticoagulant_weichi)
1941
+        if( this.dialysisPrescription.anticoagulant_zongliang == 0) {
1942
+          this.dialysisPrescription.anticoagulant_zongliang = parseInt(this.dialysisPrescription.anticoagulant_shouji) + parseInt(this.dialysisPrescription.anticoagulant_weichi)
1943
+        }
1942
       },
1944
       },
1943
 
1945
 
1944
       isShowDialog (val) {
1946
       isShowDialog (val) {