Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

src/xt_pages/hospitalStation/doctorDesk.vue

@@ -1275,16 +1275,23 @@
                 var preTime = ''
 
                 if (prescription.pre_time == 0) {
-                  if (this.schedule.schedule_type == 1) {
-                    preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
-                  } else if (this.schedule.schedule_type == 2) {
-                    preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
-                  } else if (this.schedule.schedule_type == 3) {
-                    preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
+                  if (this.$store.getters.xt_user.org.id != 10210 || this.$store.getters.xt_user.org.id != 0){
+                    if (this.schedule.schedule_type == 1) {
+                      preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
+                    } else if (this.schedule.schedule_type == 2) {
+                      preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
+                    } else if (this.schedule.schedule_type == 3) {
+                      preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
+                    }
+                  }else{
+                    preTime = ""
                   }
-                  // preTime = nowTime
                 } else {
-                  preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
+                  if (this.$store.getters.xt_user.org.id != 10210  || this.$store.getters.xt_user.org.id != 0){
+                    preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
+                  }else{
+                    preTime = ""
+                  }
                 }
 
                 let index = i + 1

src/xt_pages/user/ktv.vue

@@ -162,6 +162,9 @@
               <el-form-item
                 :label="item.item_name"
                 :key="item.item_id"
+                :rules="item.item_name != 'URR(%)'?[
+                { required: true, message: '请输入数值', trigger: 'blur' }
+              ]:[]"
                 :prop="'formItem.' + index + '.value'"
               >
                 <el-input
@@ -614,39 +617,24 @@ export default {
     calURR(items, value){
       let valueOne = 0
       let valueTwo = 0
-      let valueThree = 0
-      let valueFour = 0
-      let valueSix = 0
 
       for(let i = 0; i < items.length; i++){
         if(items[i].item_name == "透析前尿素氮"){
-
           valueOne = items[i].value
         }
         if(items[i].item_name == "透析后尿素氮"){
           valueTwo = items[i].value
         }
-        if(items[i].item_name == "透析时间"){
-
-          valueThree = items[i].value
-
-        }
-        if(items[i].item_name == "实际超滤量"){
-          valueFour = items[i].value
-
-        }
-        if(items[i].item_name == "透后体重"){
-          valueSix = items[i].value
-        }
-
       }
-      console.log(valueOne)
-      console.log(valueTwo)
-      console.log(valueThree)
-      console.log(valueFour)
-      console.log(valueSix)
-
-      value = ((valueOne - valueTwo) / valueOne) * 100
+      if(valueOne.length == 0){
+        this.$message.error("透析前尿素氮不能为空")
+        return
+      }
+      if(valueTwo.length == 0){
+        this.$message.error("透析后尿素氮不能为空")
+        return
+      }
+      value = (((valueOne - valueTwo) / valueOne) * 100).toFixed(2)
       for(let i = 0; i < items.length; i++){
         if(items[i].item_name == "URR(%)"){
           items[i].value = value
@@ -658,7 +646,6 @@ export default {
       let valueTwo = 0
       let valueThree = 0
       let valueFour = 0
-      let valueFive = 0
       let valueSix = 0
       for(let i = 0; i < items.length; i++){
         if(items[i].item_name == "透析前尿素氮"){
@@ -676,18 +663,37 @@ export default {
           valueFour = items[i].value
 
         }
-        if(items[i].item_name == "透前体重"){
-          valueFive = items[i].value
-        }
+
 
         if(items[i].item_name == "透后体重"){
           valueSix = items[i].value
         }
 
       }
-      value = ((valueTwo/valueOne - (0.008 * valueThree)) + (4 - (3.5 * (valueTwo / valueOne)))  * ((valueSix - valueFive) / valueSix)).toFixed(2)
 
 
+      if(valueOne.length == 0){
+        this.$message.error("透析前尿素氮不能为空")
+        return
+      }
+      if(valueTwo.length == 0){
+        this.$message.error("透析后尿素氮不能为空")
+        return
+      }
+      if(valueThree.length == 0){
+        this.$message.error("透析时间不能为空")
+        return
+      }
+      if(valueFour.length == 0){
+        this.$message.error("实际超滤量不能为空")
+        return
+      }
+
+      if(valueSix.length == 0){
+        this.$message.error("透后体重不能为空")
+        return
+      }
+      value = ((-Math.log((valueTwo /valueOne - (0.008 * valueThree)))) +  (4-3.5*(valueTwo/valueOne)) * valueFour/valueSix).toFixed(5)
 
       for(let i = 0; i < items.length; i++){
         if(items[i].item_name == "KT/V"){
@@ -777,6 +783,9 @@ export default {
       })
     },
     submitNew(formName) {
+
+
+
       this.$refs[formName].validate(valid => {
         if (valid) {
           this.formLoading = true