陈少旭 пре 9 месеци
родитељ
комит
1ae510605a
1 измењених фајлова са 20 додато и 21 уклоњено
  1. 20 21
      src/xt_pages/outpatientDoctorStation/doctorDesk.vue

+ 20 - 21
src/xt_pages/outpatientDoctorStation/doctorDesk.vue Прегледај датотеку

@@ -2013,12 +2013,12 @@ export default {
2013 2013
 
2014 2014
 
2015 2015
               var preTime = nowTime
2016
-              if ( this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 && this.$store.getters.xt_user.org.id != 10191 && this.$store.getters.xt_user.org.id != 10375 && this.$store.getters.xt_user.org.id != 0) {
2016
+              if ( this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 && this.$store.getters.xt_user.org.id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
2017 2017
                 if (prescription.pre_time == 0) {
2018 2018
                   if (this.schedule.schedule_type == 1) {
2019
-                    if (this.org_id == 10028) {
2019
+                    if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0) {
2020 2020
                       preTime = this.record_date + ' ' + '6:30'
2021
-                    } else if(this.org_id == 10206  || this.org_id == 0){
2021
+                    } else if(this.org_id == 10206 ){
2022 2022
                       preTime = this.record_date + ' ' + '6:00'
2023 2023
                     } else {
2024 2024
                       preTime = this.record_date + ' ' + '7:00'
@@ -2209,15 +2209,14 @@ export default {
2209 2209
                   tempProject.push(obj)
2210 2210
                 }
2211 2211
                 var preTime = nowTime
2212
-                if (this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 && this.$store.getters.xt_user.org.id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
2212
+                if (this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 && this.$store.getters.xt_user.org.id != 10191 && this.$store.getters.xt_user.org.id != 10375 ) {
2213 2213
                   if (this.schedule.schedule_type == 1) {
2214
-                    if (this.org_id == 10028) {
2214
+                    if (this.org_id == 10028 ||  this.org_id == 10571 || this.org_id == 0) {
2215 2215
                       preTime = this.record_date + ' ' + '6:30'
2216
-                    } else if(this.org_id == 10206  || this.org_id == 0) {
2216
+                    } else if(this.org_id == 10206  ) {
2217 2217
                       preTime = this.record_date+ ' ' + '6:00'
2218 2218
                     } else {
2219 2219
                       preTime = this.record_date + ' ' + '7:00'
2220
-
2221 2220
                     }
2222 2221
                     // preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
2223 2222
                   } else if (this.schedule.schedule_type == 2) {
@@ -2591,9 +2590,9 @@ export default {
2591 2590
                     if ( this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 && this.$store.getters.xt_user.org.id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
2592 2591
                       if (prescription.pre_time == 0) {
2593 2592
                         if (this.schedule.schedule_type == 1) {
2594
-                          if (this.org_id == 10028) {
2593
+                          if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0) {
2595 2594
                             preTime = this.record_date + ' ' + '6:30'
2596
-                          } else if(this.org_id == 10206 || this.org_id == 0){
2595
+                          } else if(this.org_id == 10206 ){
2597 2596
                             preTime = this.record_date + ' ' + '6:00'
2598 2597
                           } else {
2599 2598
                             preTime = this.record_date + ' ' + '7:00'
@@ -2779,9 +2778,9 @@ export default {
2779 2778
                       // var preTime = ''
2780 2779
                       if ( this.org_id != 9919 && this.org_id != 10485 && this.org_id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
2781 2780
                         if (this.schedule.schedule_type == 1) {
2782
-                          if (this.org_id == 10028) {
2781
+                          if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0) {
2783 2782
                             preTime = this.record_date + ' ' + '6:30'
2784
-                          } else if(this.org_id == 10206  || this.org_id == 0){
2783
+                          } else if(this.org_id == 10206){
2785 2784
                             preTime = this.record_date + ' ' + '6:00'
2786 2785
                           } else {
2787 2786
                             preTime = this.record_date + ' ' + '7:00'
@@ -4474,12 +4473,12 @@ export default {
4474 4473
 
4475 4474
                     var preTime = nowTime
4476 4475
 
4477
-                    if (this.org_id != 9919 && this.org_id != 10485 && this.org_id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
4476
+                    if (this.org_id != 9919 && this.org_id != 10485 && this.org_id != 10191 && this.$store.getters.xt_user.org.id != 10375 ) {
4478 4477
                       if (prescription.pre_time == 0) {
4479 4478
                         if (this.schedule.schedule_type == 1) {
4480
-                          if (this.org_id == 10028) {
4479
+                          if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0) {
4481 4480
                             preTime = this.record_date + ' ' + '6:30'
4482
-                          } else if(this.org_id == 10206 || this.org_id == 0){
4481
+                          } else if(this.org_id == 10206){
4483 4482
 
4484 4483
                             preTime = this.record_date + ' ' + '6:00'
4485 4484
 
@@ -4666,11 +4665,11 @@ export default {
4666 4665
 
4667 4666
                       // var preTime = nowTime
4668 4667
                       var preTime = nowTime
4669
-                      if (this.org_id != 9919 && this.org_id != 10485 && this.org_id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
4668
+                      if (this.org_id != 9919 && this.org_id != 10485 && this.org_id != 10191 && this.$store.getters.xt_user.org.id != 10375 ) {
4670 4669
                         if (this.schedule.schedule_type == 1) {
4671
-                          if (this.org_id == 10028) {
4670
+                          if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0) {
4672 4671
                             preTime = this.record_date + ' ' + '6:30'
4673
-                          } else if(this.org_id == 10206  || this.org_id == 0){
4672
+                          } else if(this.org_id == 10206){
4674 4673
                             preTime = this.record_date+ ' ' + '6:00'
4675 4674
                           } else {
4676 4675
                             preTime = this.record_date + ' ' + '7:00'
@@ -5104,9 +5103,9 @@ export default {
5104 5103
                       if (prescription.pre_time == 0) {
5105 5104
                         // preTime = nowTime
5106 5105
                         if (this.schedule.schedule_type == 1) {
5107
-                          if (this.org_id == 10028) {
5106
+                          if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0) {
5108 5107
                             preTime = this.record_date + ' ' + '6:30'
5109
-                          } else if(this.org_id == 10206 || this.org_id == 0){
5108
+                          } else if(this.org_id == 10206){
5110 5109
                             preTime = this.record_date + ' ' + '6:00'
5111 5110
                           } else {
5112 5111
                             preTime = this.record_date + ' ' + '7:00'
@@ -5292,9 +5291,9 @@ export default {
5292 5291
                       // var preTime = ''
5293 5292
                       if ( this.org_id != 9919 && this.org_id != 10485 && this.org_id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
5294 5293
                         if (this.schedule.schedule_type == 1) {
5295
-                          if (this.org_id == 10028) {
5294
+                          if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0) {
5296 5295
                             preTime = this.record_date + ' ' + '6:30'
5297
-                          } else if(this.org_id == 10206 ||  this.org_id == 0){
5296
+                          } else if(this.org_id == 10206){
5298 5297
                             preTime = this.record_date + ' ' + '6:00'
5299 5298
                           } else {
5300 5299
                             preTime = this.record_date + ' ' + '7:00'