合并代码

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/dialog/PrescriptionDialog.vue

@@ -35,10 +35,8 @@
         </div>
 
         <div class="item" v-if="isShow('目标超滤量')">
-          <label class="name" for="mbcll"
-                 v-if="this.$store.getters.user.template_info.template_id == 6">目标超滤量(ml)</label>
-          <label class="name" for="mbcll"
-                 v-if="this.$store.getters.user.template_info.template_id != 6">目标超滤量(L)</label>
+          <label class="name" for="mbcll" v-if="this.$store.getters.user.template_info.template_id == 6">目标超滤量(ml)</label>
+          <label class="name" for="mbcll" v-if="this.$store.getters.user.template_info.template_id != 6">目标超滤量(L)</label>
           <div class="content">
             <input type="tel" @focus="inputFocus" id="mbcll" v-model="dialysisPrescription.target_ultrafiltration"/>
           </div>
@@ -455,8 +453,8 @@
           result: [],
           operators: [],
 
-        },
-        is_show: false,
+      },
+      is_show: false,
 
         perfusion_apparatus: {},
         replacementWays: [],
@@ -678,141 +676,139 @@
             this.propForm.selectId = this.dialysisPrescription.perfusion_apparatus
             this.propForm.click_ref = 'perfusion_apparatus'
 
-            break
-          case 'replacement_way':
-            this.propForm.type = 4
-            this.isShowDialog = false
-            this.propForm.title = '置换方式'
-            this.visibility = true
-            this.propForm.list = []
-            this.propForm.optionList = this.replacementWays
-            this.propForm.isMultiple = 1
-            this.propForm.selectId = this.dialysisPrescription.replacement_way
-            this.propForm.click_ref = 'replacement_way'
+          break
+        case 'replacement_way':
+          this.propForm.type = 4
+          this.isShowDialog = false
+          this.propForm.title = '置换方式'
+          this.visibility = true
+          this.propForm.list = []
+          this.propForm.optionList = this.replacementWays
+          this.propForm.isMultiple = 1
+          this.propForm.selectId = this.dialysisPrescription.replacement_way
+          this.propForm.click_ref = 'replacement_way'
 
             break
 
-          case 'anticoagulant':
-            this.propForm.type = 5
-            this.isShowDialog = false
-            this.propForm.title = '抗疑剂'
-            this.visibility = true
-            this.propForm.list = []
-            this.propForm.optionList = this.anticoagulantsConfit
-            this.propForm.isMultiple = 1
-            this.propForm.selectId = this.dialysisPrescription.anticoagulant
-            this.propForm.click_ref = 'anticoagulant'
-            break
-          case 'dialysate_formulation':
-            this.propForm.type = 6
-            this.isShowDialog = false
-            this.propForm.title = '透析液配方'
-            this.visibility = true
-            this.propForm.list = []
-            this.propForm.optionList = this.dialysateFormulationOptions
-            this.propForm.isMultiple = 1
-            this.propForm.selectId = this.dialysisPrescription.dialysate_formulation
-            this.propForm.click_ref = 'dialysate_formulation'
-            break
-          case 'body_fluid':
-            this.propForm.type = 7
-            this.isShowDialog = false
-            this.propForm.title = '体液过多症状'
-            this.visibility = true
-            this.propForm.list = []
-            this.propForm.optionList = this.bodyFluidOptions
-            this.propForm.isMultiple = 1
-            this.propForm.selectId = this.dialysisPrescription.body_fluid
-            this.propForm.click_ref = 'body_fluid'
-            break
-          case 'special_medicine':
-            this.propForm.type = 8
-            this.isShowDialog = false
-            this.propForm.title = '透析前使用特殊药物'
-            this.visibility = true
-            this.propForm.list = []
-            this.propForm.optionList = this.specialMedicineOptions
-            this.propForm.isMultiple = 1
-            this.propForm.selectId = this.dialysisPrescription.special_medicine
-            this.propForm.click_ref = 'special_medicine'
-            break
-          case 'displace_liqui_part':
-            this.propForm.type = 9
-            this.isShowDialog = false
-            this.propForm.title = '置换液'
-            this.visibility = true
-            this.propForm.list = []
-            this.propForm.optionList = this.displaceLiquiPartOptions
-            this.propForm.isMultiple = 1
-            this.propForm.selectId = this.dialysisPrescription.displace_liqui_part
-            this.propForm.click_ref = 'displace_liqui_part'
-            break
-          case 'blood_access':
-            this.propForm.type = 10
-            this.isShowDialog = false
-            this.propForm.title = '血管通路'
-            this.visibility = true
-            this.propForm.list = []
-            this.propForm.optionList = this.bloodAccessOptions
-            this.propForm.isMultiple = 1
-            this.propForm.selectId = this.dialysisPrescription.blood_access
-            this.propForm.click_ref = 'blood_access'
-            break
-          case 'dialyzer_perfusion_apparatus':
-            // this.propForm.type = 11
-            // this.isShowDialog = false
-            // this.propForm.title = '透析器/灌流器'
-            // this.visibility = true
-            // this.propForm.list = []
-            // this.propForm.optionList = this.bloodAccessOptions
-            // this.propForm.isMultiple = 1
-            // this.propForm.selectId = this.dialysisPrescription.dialyzer_perfusion_apparatus
-            // this.propForm.click_ref = 'dialyzer_perfusion_apparatus'
-            // break
-
-            this.propForm.result = []
-            this.isHasOther = 2
-            this.propForm.type = 11
-            this.isShowDialog = false
-            this.propForm.title = '透析器/灌流器'
-            this.visibility = true
-            this.propForm.list = []
-            this.propForm.list = getDataConfig('hemodialysis', 'dialyzer_perfusion_apparatus')
-            this.propForm.optionList = []
-            this.propForm.isMultiple = 2
-            // this.propForm.result = typeof(this.formValue.hemorrhage) == "string"? this.formValue.hemorrhage.split(","):[]
-            if (this.dialysisPrescription.dialyzer_perfusion_apparatus != undefined || this.dialysisPrescription.dialyzer_perfusion_apparatus != null) {
-              if (this.dialysisPrescription.dialyzer_perfusion_apparatus.length > 0) {
-                this.propForm.result = this.dialysisPrescription.dialyzer_perfusion_apparatus.split(',')
-              } else {
-                this.propForm.result = []
-              }
+        case 'anticoagulant':
+          this.propForm.type = 5
+          this.isShowDialog = false
+          this.propForm.title = '抗疑剂'
+          this.visibility = true
+          this.propForm.list = []
+          this.propForm.optionList = this.anticoagulantsConfit
+          this.propForm.isMultiple = 1
+          this.propForm.selectId = this.dialysisPrescription.anticoagulant
+          this.propForm.click_ref = 'anticoagulant'
+          break
+        case 'dialysate_formulation':
+          this.propForm.type = 6
+          this.isShowDialog = false
+          this.propForm.title = '透析液配方'
+          this.visibility = true
+          this.propForm.list = []
+          this.propForm.optionList = this.dialysateFormulationOptions
+          this.propForm.isMultiple = 1
+          this.propForm.selectId = this.dialysisPrescription.dialysate_formulation
+          this.propForm.click_ref = 'dialysate_formulation'
+          break
+        case 'body_fluid':
+          this.propForm.type = 7
+          this.isShowDialog = false
+          this.propForm.title = '体液过多症状'
+          this.visibility = true
+          this.propForm.list = []
+          this.propForm.optionList = this.bodyFluidOptions
+          this.propForm.isMultiple = 1
+          this.propForm.selectId = this.dialysisPrescription.body_fluid
+          this.propForm.click_ref = 'body_fluid'
+          break
+        case 'special_medicine':
+          this.propForm.type = 8
+          this.isShowDialog = false
+          this.propForm.title = '透析前使用特殊药物'
+          this.visibility = true
+          this.propForm.list = []
+          this.propForm.optionList = this.specialMedicineOptions
+          this.propForm.isMultiple = 1
+          this.propForm.selectId = this.dialysisPrescription.special_medicine
+          this.propForm.click_ref = 'special_medicine'
+          break
+        case 'displace_liqui_part':
+          this.propForm.type = 9
+          this.isShowDialog = false
+          this.propForm.title = '置换液'
+          this.visibility = true
+          this.propForm.list = []
+          this.propForm.optionList = this.displaceLiquiPartOptions
+          this.propForm.isMultiple = 1
+          this.propForm.selectId = this.dialysisPrescription.displace_liqui_part
+          this.propForm.click_ref = 'displace_liqui_part'
+          break
+        case 'blood_access':
+          this.propForm.type = 10
+          this.isShowDialog = false
+          this.propForm.title = '血管通路'
+          this.visibility = true
+          this.propForm.list = []
+          this.propForm.optionList = this.bloodAccessOptions
+          this.propForm.isMultiple = 1
+          this.propForm.selectId = this.dialysisPrescription.blood_access
+          this.propForm.click_ref = 'blood_access'
+          break
+        case 'dialyzer_perfusion_apparatus':
+          // this.propForm.type = 11
+          // this.isShowDialog = false
+          // this.propForm.title = '透析器/灌流器'
+          // this.visibility = true
+          // this.propForm.list = []
+          // this.propForm.optionList = this.bloodAccessOptions
+          // this.propForm.isMultiple = 1
+          // this.propForm.selectId = this.dialysisPrescription.dialyzer_perfusion_apparatus
+          // this.propForm.click_ref = 'dialyzer_perfusion_apparatus'
+          // break
+
+          this.propForm.result = []
+          this.isHasOther = 2
+          this.propForm.type = 11
+          this.isShowDialog = false
+          this.propForm.title = '透析器/灌流器'
+          this.visibility = true
+          this.propForm.list = []
+          this.propForm.list = getDataConfig('hemodialysis', 'dialyzer_perfusion_apparatus')
+          this.propForm.optionList = []
+          this.propForm.isMultiple = 2
+          // this.propForm.result = typeof(this.formValue.hemorrhage) == "string"? this.formValue.hemorrhage.split(","):[]
+          if (this.dialysisPrescription.dialyzer_perfusion_apparatus != undefined || this.dialysisPrescription.dialyzer_perfusion_apparatus != null) {
+            if (this.dialysisPrescription.dialyzer_perfusion_apparatus.length > 0) {
+              this.propForm.result = this.dialysisPrescription.dialyzer_perfusion_apparatus.split(',')
             } else {
               this.propForm.result = []
             }
-            this.propForm.click_ref = 'dialyzer_perfusion_apparatus'
-            break
-
-        }
-      },
-      menuCancle: function () {
-        this.visibility = false
-        this.isShowDialog = true
-        this.$nextTick(() => {
-          if (this.$refs[this.propForm.click_ref] != undefined && this.$refs[this.propForm.click_ref] != null) {
-            this.$refs[this.propForm.click_ref].scrollIntoView()
+          } else {
+            this.propForm.result = []
           }
-        })
-      },
-      menuCancleThree: function () {
-        this.advice_visibility = false
-        this.isShowDialog = true
-
-      },
-      menuMsgTip: function () {
-        this.msgtip_visibility = false
-        this.isShowDialog = true
-      },
+          this.propForm.click_ref = 'dialyzer_perfusion_apparatus'
+          break
+      }
+    },
+    menuCancle: function () {
+      this.visibility = false
+      this.isShowDialog = true
+      this.$nextTick(() => {
+        if (this.$refs[this.propForm.click_ref] != undefined && this.$refs[this.propForm.click_ref] != null) {
+          this.$refs[this.propForm.click_ref].scrollIntoView()
+        }
+      })
+    },
+    menuCancleThree: function () {
+      this.advice_visibility = false
+      this.isShowDialog = true
+    },
+    menuMsgTip: function () {
+      this.msgtip_visibility = false
+      this.isShowDialog = true
+    },
 
       menuComfirmThree: function (targetAdvices) {
 
@@ -828,27 +824,27 @@
                 return false
               } else {
 
-                var date = new Date()
-                var year = date.getFullYear()
-                var month = date.getMonth() + 1
-                var day = date.getDate()
+                var date = new Date();
+                var year = date.getFullYear();
+                var month = date.getMonth() + 1;
+                var day = date.getDate();
 
-                var hours = date.getHours()
-                var minites = date.getMinutes()
+                var hours = date.getHours();
+                var minites = date.getMinutes();
 
                 if (month < 10) {
-                  month = '0' + month
+                  month = "0" + month;
                 }
                 if (day < 10) {
-                  day = '0' + day
+                  day = "0" + day;
                 }
                 if (hours < 10) {
-                  hours = '0' + hours
+                  hours = "0" + hours;
                 }
                 if (minites < 10) {
-                  minites = '0' + minites
+                  minites = "0" + minites;
                 }
-                var nowDate = year + '-' + month + '-' + day + ' ' + hours + ':' + minites
+                var nowDate = year + "-" + month + "-" + day +" " +hours+":"+ minites;
 
                 Toast.success('提交成功')
                 let params = {
@@ -864,7 +860,7 @@
                 CreateGroupAdvice(this.$route.query.patient_id, 0, params).then(rs => {
                   var resp = rs.data
                   if (resp.state == 1) {
-                    this.$emit('prescription', response.data.data.prescription, resp.data.advices)
+                    this.$emit('prescription', response.data.data.prescription,resp.data.advices)
 
                   } else {
 
@@ -886,27 +882,28 @@
                 return false
               } else {
                 Toast.success('提交成功')
-                var date = new Date()
-                var year = date.getFullYear()
-                var month = date.getMonth() + 1
-                var day = date.getDate()
+                var date = new Date();
+                var year = date.getFullYear();
+                var month = date.getMonth() + 1;
+                var day = date.getDate();
 
-                var hours = date.getHours()
-                var minites = date.getMinutes()
+                var hours = date.getHours();
+                var minites = date.getMinutes();
 
                 if (month < 10) {
-                  month = '0' + month
+                  month = "0" + month;
                 }
                 if (day < 10) {
-                  day = '0' + day
+                  day = "0" + day;
                 }
                 if (hours < 10) {
-                  hours = '0' + hours
+                  hours = "0" + hours;
                 }
                 if (minites < 10) {
-                  minites = '0' + minites
+                  minites = "0" + minites;
                 }
-                var nowDate = year + '-' + month + '-' + day + ' ' + hours + ':' + minites
+                var nowDate = year + "-" + month + "-" + day +" " +hours+":"+ minites;
+
 
                 let params = {
                   advices: targetAdvices,
@@ -920,8 +917,8 @@
                 CreateGroupAdvice(this.$route.query.patient_id, 0, params).then(rs => {
                   var resp = rs.data
                   if (resp.state == 1) {
-                    this.$emit('prescription', response.data.data.prescription, resp.data.advices)
-                    this.$emit('longSolution', response.data.data.solution, resp.data.advices)
+                    this.$emit('prescription', response.data.data.prescription,resp.data.advices)
+                    this.$emit('longSolution', response.data.data.solution,resp.data.advices)
                   } else {
 
                   }
@@ -1228,27 +1225,27 @@
                 } else {
                   Toast.success('提交成功')
 
-                  var date = new Date()
-                  var year = date.getFullYear()
-                  var month = date.getMonth() + 1
-                  var day = date.getDate()
+                  var date = new Date();
+                  var year = date.getFullYear();
+                  var month = date.getMonth() + 1;
+                  var day = date.getDate();
 
-                  var hours = date.getHours()
-                  var minites = date.getMinutes()
+                  var hours = date.getHours();
+                  var minites = date.getMinutes();
 
                   if (month < 10) {
-                    month = '0' + month
+                    month = "0" + month;
                   }
                   if (day < 10) {
-                    day = '0' + day
+                    day = "0" + day;
                   }
                   if (hours < 10) {
-                    hours = '0' + hours
+                    hours = "0" + hours;
                   }
                   if (minites < 10) {
-                    minites = '0' + minites
+                    minites = "0" + minites;
                   }
-                  var nowDate = year + '-' + month + '-' + day + ' ' + hours + ':' + minites
+                  var nowDate = year + "-" + month + "-" + day +" " +hours+":"+ minites;
 
                   let params = {
                     advices: this.waitUploadAdvices,
@@ -1360,27 +1357,28 @@
                     return false
                   } else {
 
-                    var date = new Date()
-                    var year = date.getFullYear()
-                    var month = date.getMonth() + 1
-                    var day = date.getDate()
+                    var date = new Date();
+                    var year = date.getFullYear();
+                    var month = date.getMonth() + 1;
+                    var day = date.getDate();
 
-                    var hours = date.getHours()
-                    var minites = date.getMinutes()
+                    var hours = date.getHours();
+                    var minites = date.getMinutes();
 
                     if (month < 10) {
-                      month = '0' + month
+                      month = "0" + month;
                     }
                     if (day < 10) {
-                      day = '0' + day
+                      day = "0" + day;
                     }
                     if (hours < 10) {
-                      hours = '0' + hours
+                      hours = "0" + hours;
                     }
                     if (minites < 10) {
-                      minites = '0' + minites
+                      minites = "0" + minites;
                     }
-                    var nowDate = year + '-' + month + '-' + day + ' ' + hours + ':' + minites
+                    var nowDate = year + "-" + month + "-" + day +" " +hours+":"+ minites;
+
 
                     let params = {
                       advices: this.waitUploadAdvices,
@@ -1531,27 +1529,28 @@
                 } else {
                   Toast.success('提交成功')
 
-                  var date = new Date()
-                  var year = date.getFullYear()
-                  var month = date.getMonth() + 1
-                  var day = date.getDate()
+                  var date = new Date();
+                  var year = date.getFullYear();
+                  var month = date.getMonth() + 1;
+                  var day = date.getDate();
 
-                  var hours = date.getHours()
-                  var minites = date.getMinutes()
+                  var hours = date.getHours();
+                  var minites = date.getMinutes();
 
                   if (month < 10) {
-                    month = '0' + month
+                    month = "0" + month;
                   }
                   if (day < 10) {
-                    day = '0' + day
+                    day = "0" + day;
                   }
                   if (hours < 10) {
-                    hours = '0' + hours
+                    hours = "0" + hours;
                   }
                   if (minites < 10) {
-                    minites = '0' + minites
+                    minites = "0" + minites;
                   }
-                  var nowDate = year + '-' + month + '-' + day + ' ' + hours + ':' + minites
+                  var nowDate = year + "-" + month + "-" + day +" " +hours+":"+ minites;
+
 
                   let params = {
                     advices: this.waitUploadAdvices,
@@ -1672,27 +1671,28 @@
                   } else {
                     this.advice_visibility = false
 
-                    var date = new Date()
-                    var year = date.getFullYear()
-                    var month = date.getMonth() + 1
-                    var day = date.getDate()
 
-                    var hours = date.getHours()
-                    var minites = date.getMinutes()
+                    var date = new Date();
+                    var year = date.getFullYear();
+                    var month = date.getMonth() + 1;
+                    var day = date.getDate();
+
+                    var hours = date.getHours();
+                    var minites = date.getMinutes();
 
                     if (month < 10) {
-                      month = '0' + month
+                      month = "0" + month;
                     }
                     if (day < 10) {
-                      day = '0' + day
+                      day = "0" + day;
                     }
                     if (hours < 10) {
-                      hours = '0' + hours
+                      hours = "0" + hours;
                     }
                     if (minites < 10) {
-                      minites = '0' + minites
+                      minites = "0" + minites;
                     }
-                    var nowDate = year + '-' + month + '-' + day + ' ' + hours + ':' + minites
+                    var nowDate = year + "-" + month + "-" + day +" " +hours+":"+ minites;
 
                     let params = {
                       advices: this.waitUploadAdvices,
@@ -1707,8 +1707,8 @@
                       var resp = rs.data
                       if (resp.state == 1) {
                         this.doctorAdvices = resp.data.advices
-                        this.$emit('longSolution', response.data.data.solution, resp.data.advices)
-                        this.$emit('prescription', response.data.data.prescription, resp.data.advices)
+                        this.$emit('longSolution', response.data.data.solution,resp.data.advices)
+                        this.$emit('prescription', response.data.data.prescription,resp.data.advices)
                       } else {
 
                       }

src/pages/main/today/TodayTab.vue

@@ -374,7 +374,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
         }
 
@@ -787,7 +787,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)
 
@@ -838,10 +838,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) {