Merge branch 'update' of http://git.shengws.com/zhangbj/xt_pad into update

src/pages/main/PatientBox.vue

@@ -89,7 +89,11 @@
           return 'gray'
         } else if (state == 3) {
           return 'red'
-        } else {
+        } else if (state == 5){
+          return "green1";
+        } else if (state == 6){
+          return "green2";
+        }else {
           return 'blue'
         }
       },
@@ -119,12 +123,25 @@
           return '已下机'
         } else if (state == 3) {
           return '监测中'
+        }else if (state == 5) {
+          return '待称重'
+        }else if (state == 6) {
+          return '待开处方'
         } else {
           // return schedual.patient.gender == 1 ? "男" : "女"
           return '未上机'
         }
       },
       computeState: function (schedual) {
+        if (schedual.assessment_before_dislysis == null ||schedual.assessment_before_dislysis.weight_before == 0){
+          // 未签到称重
+          return 5
+        }
+        if(schedual.prescription == null || schedual.prescription.prescription_doctor == 0){
+          // 未确认处方
+          return 6
+        }
+
         if (schedual.dialysis_order == null) {
           // 未上机
           return 4
@@ -330,6 +347,12 @@
   .green {
   background: #5bd18b;
   }
+  .green1 {
+        background: #e6a23c;
+      }
+      .green2 {
+        background: #7930c3;
+      }
   .gray {
   background: #a8b3ba;
   }

src/pages/main/dialog/AssessmentDialog.vue

@@ -386,7 +386,7 @@
         formValue: {
           weight_before: '',
           dry_weight: '',
-          AdditionalWeight :'',
+          additional_weight :'',
           temperature: '',
           systolic_blood_pressure: '',
           diastolic_blood_pressure: '',

src/pages/main/dialog/PlaneDialog.vue

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

src/pages/main/dialog/subMenu/MsgTip.vue

@@ -20,7 +20,7 @@
         <div class="item">
           <label class="name" for="txms">透前体重（kg）</label>
           <div class="content">
-            <span class="text" id="txms">{{predialysis.weighing_before}}</span>
+            <span class="text" id="txms">{{predialysis.weight_before}}</span>
             
           </div>
         </div>

src/pages/main/index.vue

@@ -52,8 +52,10 @@
             let doctorAdvice = []
             for (let i = 0; i < this.scheduals.length; i++) {
               for (let y = 0; y < this.scheduals[i].doctor_advice.length; y++) {
-                if (this.scheduals[i].doctor_advice[y].execution_state == 2) {
-                  doctorAdvice.push(this.scheduals[i].doctor_advice[y])
+                if(this.scheduals[i].dialysis_order == null ){
+                  if (this.scheduals[i].doctor_advice[y].execution_state == 2) {
+                    doctorAdvice.push(this.scheduals[i].doctor_advice[y])
+                  }
                 }
               }
             }

src/pages/main/today/TodayTab.vue

@@ -332,7 +332,7 @@
           {title: '治疗小结', name: 'treatment_of', value: 0}
         ]
 
-        if (!isNaN(this.prescription.id) && this.prescription.id > 0) {
+        if (!isNaN(this.prescription.id) && this.prescription.id > 0 && this.prescription.prescription_doctor> 0) {
           steps[0].value = 1
         }
         if (
@@ -341,11 +341,7 @@
         ) {
           steps[1].value = 1
         }
-        if (
-          typeof this.predialysis_evaluation.id != 'undefined' &&
-          !isNaN(this.predialysis_evaluation.id) &&
-          this.predialysis_evaluation.id > 0
-        ) {
+        if ( typeof this.predialysis_evaluation.id != 'undefined' && !isNaN(this.predialysis_evaluation.id) && this.predialysis_evaluation.id > 0  && this.predialysis_evaluation.creater > 0) {
           steps[2].value = 1
         }
         if (this.advice_groups.length > 0) {
@@ -1187,7 +1183,7 @@
       closeStatOrder: function () {
 
         this.closeDialog(4)
-        this.scrollToView('stat_order')
+        // this.scrollToView('stat_order')
       }
       ,
       closeDialysisComputer: function (dialysis_order) {