no message

src/pages/main/WaitingArea.vue

@@ -129,7 +129,7 @@ export default {
       menuList: [
         { value: "1", label: "全部", count: 0 },
         { value: "3", label: "待开处方", count: 0 },
-        { value: "2", label: "透前称量", count: 0 }
+        { value: "2", label: "待透前称量", count: 0 }
       ],
 
       select_index: 0,

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

@@ -23,6 +23,9 @@
              <div style="padding-top: 15px;padding-left: 10px">开嘱医生&nbsp;{{ getDoctorName(advice.advice_doctor) }}</div><br/>
               <div style="padding-left: 10px">开嘱时间&nbsp;{{ getTime(advice.created_time) }}</div><br/>
               <div style="padding-bottom: 15px;padding-left: 10px"> 医嘱内容&nbsp;{{getContent(advice)}}</div>
+              <div style="padding-bottom: 15px;padding-left: 10px" v-if="advice.frequency_type == 1"> 推送频率 每日必推</div>
+              <div style="padding-bottom: 15px;padding-left: 10px" v-if="advice.frequency_type == 2"> 推送频率&nbsp;{{advice.day_count}}天/次</div>
+              <div style="padding-bottom: 15px;padding-left: 10px" v-if="advice.frequency_type == 3"> 推送频率&nbsp;每周{{advice.week_day}}</div>
 
             </van-checkbox>
           </van-checkbox-group>
@@ -123,9 +126,7 @@
       },
       getValue: function () {
         let form = {}
-
         let results = []
-
         for (let i = 0; i < this.propsForm.list.length; i++){
           for (let a = 0; a < this.propsForm.result.length; a++){
             if( this.propsForm.list[i].id == this.propsForm.result[a]){
@@ -133,15 +134,11 @@
             }
           }
         }
-
         var obj5={}
         results = results.reduce((cur, next) => {
           obj5[next.id] ? '' : obj5[next.id] = true && cur.push(next)
           return cur
         }, [])
-
-        results
-
         return results
       },
 

src/pages/main/today/TodayTab.vue

@@ -160,7 +160,7 @@
 
     <van-popup title="透析下机" v-model="menuList[7].showPopup" :overlay="true" :close-on-click-overlay="false">
       <plane-dialog :patient_prop="patient" :record="dialysis_order" :last_monitor_record="last_monitor_record" :admins="admin_users" :admin_map="admin_user_map"
-                    :special_premission="special_premission" 
+                    :special_premission="special_premission"
                     @did_off="closeDialysisOff" @close="closeDialysisOff" ref="plane_dialog"></plane-dialog>
     </van-popup>
 
@@ -347,7 +347,7 @@
         ) {
           steps[2].value = 1
         }
-        if (this.doctor_advices.length > 0) {
+        if (this.advice_groups.length > 0) {
           steps[3].value = 1
         }
 
@@ -753,6 +753,8 @@
           patient_id: this.patient_id,
           date: dateStr
         }
+        this.advice_groups = []
+
         getDialysisRecord(params).then(rs => {
           var resp = rs.data
           console.log(resp)
@@ -1021,16 +1023,7 @@
 
       },
       prescriptionFunc: function (val) {
-        if (this.status == 2) {
-          if (val.creater > 0 && val.modifier == 0) {
-            this.requestDialysisRecord()
-          }
-
-        } else if (this.status == 3) {
-          if (val.creater > 0 && val.modifier == 0) {
-            this.requestDialysisRecord()
-          }
-        }
+        this.requestDialysisRecord()
 
         this.prescription = val
 
@@ -1038,16 +1031,7 @@
       ,
       longSolutionFunc: function (val) {
         this.solution = val
-        if (this.status == 2) {
-          if (val.creater > 0 && val.modifier == 0) {
-            this.requestDialysisRecord()
-          }
-
-        } else if (this.status == 3) {
-          if (val.creater > 0 && val.modifier == 0) {
-            this.requestDialysisRecord()
-          }
-        }
+        this.requestDialysisRecord()
 
       }
       ,
@@ -1072,9 +1056,9 @@
       }
       ,
       closeStatOrder: function () {
+
         this.closeDialog(4)
-        this.doctor_advices.push([])
-        // this.scrollToView('stat_order')
+        this.scrollToView('stat_order')
       }
       ,
       closeDialysisComputer: function (dialysis_order) {

src/pages/main/today/statOrder.vue

@@ -23,7 +23,7 @@
             <td :class="advice.parent_id == 0 ? 'advice_content' : 'subadvice_content'">
               <span>{{advice.advice_name }}</span>
               <!-- <span>{{advice.drug_spec}}{{advice.drug_spec_unit}} * {{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span> -->
-              <span v-if="advice.drug_spec">{{advice.drug_spec}}{{advice.drug_spec_unit}}</span>
+              <span v-if="advice.advice_desc">{{advice.advice_desc}}{{advice.drug_spec_unit}}</span>
               <span v-if="advice.prescribing_number">{{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
               <span v-if="advice.single_dose">单次用量{{advice.single_dose}}{{advice.single_dose_unit}}</span>
               <span v-if="advice.parent_id == 0">{{advice.delivery_way}}</span>