Kaynağa Gözat

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

28169 8 ay önce
ebeveyn
işleme
97fa8fc0e2

+ 8 - 8
src/xt_pages/outpatientDoctorStation/doctorDesk.vue Dosyayı Görüntüle

2098
               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) {
2098
               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) {
2099
                 if (prescription.pre_time == 0) {
2099
                 if (prescription.pre_time == 0) {
2100
                   if (this.schedule.schedule_type == 1) {
2100
                   if (this.schedule.schedule_type == 1) {
2101
-                    if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0) {
2101
+                    if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0 || this.org_id == 10633) {
2102
                       preTime = this.record_date + ' ' + '6:30'
2102
                       preTime = this.record_date + ' ' + '6:30'
2103
                     } else if(this.org_id == 10206 ){
2103
                     } else if(this.org_id == 10206 ){
2104
                       preTime = this.record_date + ' ' + '6:00'
2104
                       preTime = this.record_date + ' ' + '6:00'
2293
                 var preTime = nowTime
2293
                 var preTime = nowTime
2294
                 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 ) {
2294
                 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 ) {
2295
                   if (this.schedule.schedule_type == 1) {
2295
                   if (this.schedule.schedule_type == 1) {
2296
-                    if (this.org_id == 10028 ||  this.org_id == 10571 || this.org_id == 0) {
2296
+                    if (this.org_id == 10028 ||  this.org_id == 10571 || this.org_id == 0 || this.org_id == 10633) {
2297
                       preTime = this.record_date + ' ' + '6:30'
2297
                       preTime = this.record_date + ' ' + '6:30'
2298
                     } else if(this.org_id == 10206  ) {
2298
                     } else if(this.org_id == 10206  ) {
2299
                       preTime = this.record_date+ ' ' + '6:00'
2299
                       preTime = this.record_date+ ' ' + '6:00'
2672
                     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) {
2672
                     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) {
2673
                       if (prescription.pre_time == 0) {
2673
                       if (prescription.pre_time == 0) {
2674
                         if (this.schedule.schedule_type == 1) {
2674
                         if (this.schedule.schedule_type == 1) {
2675
-                          if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0) {
2675
+                          if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0 || this.org_id == 10633) {
2676
                             preTime = this.record_date + ' ' + '6:30'
2676
                             preTime = this.record_date + ' ' + '6:30'
2677
                           } else if(this.org_id == 10206 ){
2677
                           } else if(this.org_id == 10206 ){
2678
                             preTime = this.record_date + ' ' + '6:00'
2678
                             preTime = this.record_date + ' ' + '6:00'
2860
                       // var preTime = ''
2860
                       // var preTime = ''
2861
                       if ( this.org_id != 9919 && this.org_id != 10485 && this.org_id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
2861
                       if ( this.org_id != 9919 && this.org_id != 10485 && this.org_id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
2862
                         if (this.schedule.schedule_type == 1) {
2862
                         if (this.schedule.schedule_type == 1) {
2863
-                          if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0) {
2863
+                          if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0 || this.org_id == 10633) {
2864
                             preTime = this.record_date + ' ' + '6:30'
2864
                             preTime = this.record_date + ' ' + '6:30'
2865
                           } else if(this.org_id == 10206){
2865
                           } else if(this.org_id == 10206){
2866
                             preTime = this.record_date + ' ' + '6:00'
2866
                             preTime = this.record_date + ' ' + '6:00'
4558
                     if (this.org_id != 9919 && this.org_id != 10485 && this.org_id != 10191 && this.$store.getters.xt_user.org.id != 10375 ) {
4558
                     if (this.org_id != 9919 && this.org_id != 10485 && this.org_id != 10191 && this.$store.getters.xt_user.org.id != 10375 ) {
4559
                       if (prescription.pre_time == 0) {
4559
                       if (prescription.pre_time == 0) {
4560
                         if (this.schedule.schedule_type == 1) {
4560
                         if (this.schedule.schedule_type == 1) {
4561
-                          if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0) {
4561
+                          if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0 || this.org_id == 10633) {
4562
                             preTime = this.record_date + ' ' + '6:30'
4562
                             preTime = this.record_date + ' ' + '6:30'
4563
                           } else if(this.org_id == 10206){
4563
                           } else if(this.org_id == 10206){
4564
 
4564
 
4749
                       var preTime = nowTime
4749
                       var preTime = nowTime
4750
                       if (this.org_id != 9919 && this.org_id != 10485 && this.org_id != 10191 && this.$store.getters.xt_user.org.id != 10375 ) {
4750
                       if (this.org_id != 9919 && this.org_id != 10485 && this.org_id != 10191 && this.$store.getters.xt_user.org.id != 10375 ) {
4751
                         if (this.schedule.schedule_type == 1) {
4751
                         if (this.schedule.schedule_type == 1) {
4752
-                          if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0) {
4752
+                          if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0 || this.org_id == 10633) {
4753
                             preTime = this.record_date + ' ' + '6:30'
4753
                             preTime = this.record_date + ' ' + '6:30'
4754
                           } else if(this.org_id == 10206){
4754
                           } else if(this.org_id == 10206){
4755
                             preTime = this.record_date+ ' ' + '6:00'
4755
                             preTime = this.record_date+ ' ' + '6:00'
5185
                       if (prescription.pre_time == 0) {
5185
                       if (prescription.pre_time == 0) {
5186
                         // preTime = nowTime
5186
                         // preTime = nowTime
5187
                         if (this.schedule.schedule_type == 1) {
5187
                         if (this.schedule.schedule_type == 1) {
5188
-                          if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0) {
5188
+                          if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0 || this.org_id == 10633) {
5189
                             preTime = this.record_date + ' ' + '6:30'
5189
                             preTime = this.record_date + ' ' + '6:30'
5190
                           } else if(this.org_id == 10206){
5190
                           } else if(this.org_id == 10206){
5191
                             preTime = this.record_date + ' ' + '6:00'
5191
                             preTime = this.record_date + ' ' + '6:00'
5373
                       // var preTime = ''
5373
                       // var preTime = ''
5374
                       if ( this.org_id != 9919 && this.org_id != 10485 && this.org_id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
5374
                       if ( this.org_id != 9919 && this.org_id != 10485 && this.org_id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
5375
                         if (this.schedule.schedule_type == 1) {
5375
                         if (this.schedule.schedule_type == 1) {
5376
-                          if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0) {
5376
+                          if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0 || this.org_id == 10633) {
5377
                             preTime = this.record_date + ' ' + '6:30'
5377
                             preTime = this.record_date + ' ' + '6:30'
5378
                           } else if(this.org_id == 10206){
5378
                           } else if(this.org_id == 10206){
5379
                             preTime = this.record_date + ' ' + '6:00'
5379
                             preTime = this.record_date + ' ' + '6:00'