Browse Source

修改pad端医生报错透前评估,进度条不打勾问题

张保健 5 years ago
parent
commit
9d5eaa2883
2 changed files with 6 additions and 7 deletions
  1. 2 1
      src/pages/main/dialog/OrdersDialog.vue
  2. 4 6
      src/pages/main/today/TodayTab.vue

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

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

+ 4 - 6
src/pages/main/today/TodayTab.vue View File

@@ -369,7 +369,7 @@ import {parseTime} from '@/utils'
369 369
           steps[1].value = 1
370 370
         }
371 371
 
372
-        if (typeof this.predialysis_evaluation.id != 'undefined' && !isNaN(this.predialysis_evaluation.id) && this.predialysis_evaluation.id > 0 && this.predialysis_evaluation.creater > 0) {
372
+        if (typeof this.predialysis_evaluation.id != 'undefined' && !isNaN(this.predialysis_evaluation.id) && this.predialysis_evaluation.id > 0 && this.predialysis_evaluation.evaluator > 0) {
373 373
           steps[2].value = 1
374 374
         }
375 375
 
@@ -780,7 +780,7 @@ import {parseTime} from '@/utils'
780 780
       this.advice_groups = []
781 781
       this.doctor_advices = []
782 782
 
783
-      getDialysisRecord(params).then(rs => {
783
+      getDialysisRecord(params).then(rs => {debugger
784 784
         var resp = rs.data
785 785
         console.log(resp)
786 786
 
@@ -825,10 +825,8 @@ import {parseTime} from '@/utils'
825 825
 
826 826
           var types = resp.data.types // 所有系统库存商品类型
827 827
 
828
-          var last_predialysis_evaluation =
829
-              resp.data.last_predialysis_evaluation // 上一次透前评估
830
-          var last_assessment_after_dislysis =
831
-              resp.data.last_assessment_after_dislysis // 上一次透前评估
828
+          var last_predialysis_evaluation = resp.data.last_predialysis_evaluation // 上一次透前评估
829
+          var last_assessment_after_dislysis = resp.data.last_assessment_after_dislysis // 上一次透前评估
832 830
           var last_monitor_record = resp.data.last_monitor_record
833 831
 
834 832
           if (Object.keys(waitstoredata).length > 0) {