Browse Source

修改bug和增加新功能

张保健 5 years ago
parent
commit
9d572279e2

+ 13 - 0
src/pages/main/PatientBox.vue View File

@@ -119,12 +119,25 @@
119 119
           return '已下机'
120 120
         } else if (state == 3) {
121 121
           return '监测中'
122
+        }else if (state == 5) {
123
+          return '待称重'
124
+        }else if (state == 6) {
125
+          return '待开处方'
122 126
         } else {
123 127
           // return schedual.patient.gender == 1 ? "男" : "女"
124 128
           return '未上机'
125 129
         }
126 130
       },
127 131
       computeState: function (schedual) {
132
+        if (schedual.assessment_before_dislysis == null ||schedual.assessment_before_dislysis.weight_before == 0){
133
+          // 未签到称重
134
+          return 5
135
+        }
136
+        if(schedual.prescription == null || schedual.prescription.prescription_doctor == 0){
137
+          // 未确认处方
138
+          return 6
139
+        }
140
+
128 141
         if (schedual.dialysis_order == null) {
129 142
           // 未上机
130 143
           return 4

+ 1 - 1
src/pages/main/dialog/AssessmentDialog.vue View File

@@ -386,7 +386,7 @@
386 386
         formValue: {
387 387
           weight_before: '',
388 388
           dry_weight: '',
389
-          AdditionalWeight :'',
389
+          additional_weight :'',
390 390
           temperature: '',
391 391
           systolic_blood_pressure: '',
392 392
           diastolic_blood_pressure: '',

+ 1 - 1
src/pages/main/dialog/PlaneDialog.vue View File

@@ -197,7 +197,7 @@
197 197
         if (response.data.state == 0) {
198 198
           Toast.fail(response.data.msg);
199 199
           return false;
200
-        } else {debugger
200
+        } else {
201 201
           Toast.success("下机成功");
202 202
           this.$emit('did_off', response.data.data.assessmentAfterDislysis);
203 203
           var record = this.record

+ 1 - 1
src/pages/main/dialog/subMenu/MsgTip.vue View File

@@ -20,7 +20,7 @@
20 20
         <div class="item">
21 21
           <label class="name" for="txms">透前体重(kg)</label>
22 22
           <div class="content">
23
-            <span class="text" id="txms">{{predialysis.weighing_before}}</span>
23
+            <span class="text" id="txms">{{predialysis.weight_before}}</span>
24 24
             
25 25
           </div>
26 26
         </div>