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

src/pages/main/dialog/OrdersDialog.vue

@@ -102,7 +102,7 @@
 
                 > {{getXuserName(advice.execution_staff)}}
                 </td>
-                <td
+                <td v-if="template_id != 6"
                   :class="{'td-active':current_group_index == group_index  && advice.is_selected == 1}"
                   @click="selectAdviceAction(group_index,advice_index, advice)"
                 >{{getXuserName(advice.checker)}}
@@ -974,6 +974,7 @@
           CheckDoctorAdvice(params)
             .then(response => {
               if (response.data.state == 0) {
+                Toast.fail('你没有权限核对医嘱！')
                 return false
               } else {
                 Toast.success('核对成功！')

src/pages/main/today/TodayTab.vue

@@ -369,7 +369,7 @@ import {parseTime} from '@/utils'
           steps[1].value = 1
         }
 
-        if (typeof this.predialysis_evaluation.id != 'undefined' && !isNaN(this.predialysis_evaluation.id) && this.predialysis_evaluation.id > 0 && this.predialysis_evaluation.creater > 0) {
+        if (typeof this.predialysis_evaluation.id != 'undefined' && !isNaN(this.predialysis_evaluation.id) && this.predialysis_evaluation.id > 0 && this.predialysis_evaluation.evaluator > 0) {
           steps[2].value = 1
         }
 
@@ -780,7 +780,7 @@ import {parseTime} from '@/utils'
       this.advice_groups = []
       this.doctor_advices = []
 
-      getDialysisRecord(params).then(rs => {
+      getDialysisRecord(params).then(rs => {debugger
         var resp = rs.data
         console.log(resp)
 
@@ -825,10 +825,8 @@ import {parseTime} from '@/utils'
 
           var types = resp.data.types // 所有系统库存商品类型
 
-          var last_predialysis_evaluation =
-              resp.data.last_predialysis_evaluation // 上一次透前评估
-          var last_assessment_after_dislysis =
-              resp.data.last_assessment_after_dislysis // 上一次透前评估
+          var last_predialysis_evaluation = resp.data.last_predialysis_evaluation // 上一次透前评估
+          var last_assessment_after_dislysis = resp.data.last_assessment_after_dislysis // 上一次透前评估
           var last_monitor_record = resp.data.last_monitor_record
 
           if (Object.keys(waitstoredata).length > 0) {