Etusivu Tutki Apua
Rekisteröidy Kirjaudu sisään
csx
/
Vue_New
Tarkkaile 2
Äänestä 1
Fork 1
Koodi Ongelmat 73 Pull-pyynnöt 0 Julkaisut 0 Wiki Activity
Selaa lähdekoodia

11

陈少旭 6 kuukautta sitten
vanhempi
011d5bcee3
commit
344ccc783e
1 muutettua tiedostoa jossa 39 lisäystä ja 29 poistoa
Jaettu näkymä Näytä diff tilastot
  1. 39 29
      src/xt_pages/outpatientDoctorStation/doctorDesk.vue

+ 39 - 29
src/xt_pages/outpatientDoctorStation/doctorDesk.vue Näytä tiedosto 

@@ -2102,7 +2102,7 @@ export default {
2102 2102 
               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) {
2103 2103 
                 if (prescription.pre_time == 0) {
2104 2104 
                   if (this.schedule.schedule_type == 1) {
2105 
-                    if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0 || this.org_id == 10633) {
2105 
+                    if (this.org_id == 10028 || this.org_id == 10571  || this.org_id == 10633) {
2106 2106 
                       preTime = this.record_date + ' ' + '6:30'
2107 2107 
                     } else if(this.org_id == 10206 || this.org_id == 10598){
2108 2108 
                       preTime = this.record_date + ' ' + '6:00'
 
@@ -2123,13 +2123,14 @@ export default {
2123 2123 
                     preTime = this.record_date + ' ' + '17:00'
2124 2124 
                   }
2125 2125 
                   // preTime = nowTime
2126 
+                  if(this.$store.getters.xt_user.org.id == 10510 || this.org_id == 0){
2127 
+                    preTime = nowTime
2128 
+                  }
2129 
+
2126 2130 
                 } else {
2127 2131 
                   preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
2128 2132 
                 }
2129 2133
2130 
-                if(this.$store.getters.xt_user.org.id == 10510){
2131 
-                  preTime = nowTime
2132 
-                }
2133 2134
2134 2135 
               } else {
2135 2136 
 
@@ -2138,7 +2139,7 @@ export default {
2138 2139 
                   if(nowTime.split(" ")[0] != this.record_date){
2139 2140 
                     // preTime = this.record_date
2140 2141 
                     if(this.schedule.schedule_type == 1){
2141 
-                      if(this.org_id == 10206  || this.org_id == 0 || this.org_id == 10598) {
2142 
+                      if(this.org_id == 10206   || this.org_id == 10598) {
2142 2143 
                         preTime = this.record_date+ ' ' + '6:00'
2143 2144 
                       }else {
2144 2145 
                         preTime = this.record_date + ' ' + '7:00'
 
@@ -2157,7 +2158,7 @@ export default {
2157 2158 
                     }
2158 2159
2159 2160
2160 
-                    if(this.$store.getters.xt_user.org.id == 10510){
2161 
+                    if(this.$store.getters.xt_user.org.id == 10510 || this.org_id == 0){
2161 2162 
                       preTime = nowTime
2162 2163 
                     }
2163 2164 
 
@@ -2310,7 +2311,7 @@ export default {
2310 2311 
                 var preTime = nowTime
2311 2312 
                 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 ) {
2312 2313 
                   if (this.schedule.schedule_type == 1) {
2313 
-                    if (this.org_id == 10028 ||  this.org_id == 10571 || this.org_id == 0 || this.org_id == 10633) {
2314 
+                    if (this.org_id == 10028 ||  this.org_id == 10571 || this.org_id == 10633) {
2314 2315 
                       preTime = this.record_date + ' ' + '6:30'
2315 2316 
                     } else if(this.org_id == 10206  || this.org_id == 10598) {
2316 2317 
                       preTime = this.record_date+ ' ' + '6:00'
 
@@ -2331,7 +2332,7 @@ export default {
2331 2332 
                     preTime = this.record_date + ' ' + '17:00'
2332 2333 
                   }
2333 2334
2334 
-                  if(this.$store.getters.xt_user.org.id == 10510){
2335 
+                  if(this.$store.getters.xt_user.org.id == 10510  || this.org_id == 0){
2335 2336 
                     preTime = nowTime
2336 2337 
                   }
2337 2338 
                 }
 
@@ -2702,7 +2703,7 @@ export default {
2702 2703 
                     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) {
2703 2704 
                       if (prescription.pre_time == 0) {
2704 2705 
                         if (this.schedule.schedule_type == 1) {
2705 
-                          if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0 || this.org_id == 10633) {
2706 
+                          if (this.org_id == 10028 || this.org_id == 10571  || this.org_id == 10633) {
2706 2707 
                             preTime = this.record_date + ' ' + '6:30'
2707 2708 
                           } else if(this.org_id == 10206 || this.org_id == 10598){
2708 2709 
                             preTime = this.record_date + ' ' + '6:00'
 
@@ -2723,18 +2724,18 @@ export default {
2723 2724 
                         } else if (this.schedule.schedule_type == 3) {
2724 2725 
                           preTime = this.record_date + ' ' + '17:00'
2725 2726 
                         }
2727 
+                        if(this.$store.getters.xt_user.org.id == 10510 || this.org_id == 0 ){
2728 
+                          preTime = nowTime
2729 
+                        }
2726 2730 
                       } else {
2727 2731 
                         preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
2728 2732 
                       }
2729 2733
2730 
-                      if(this.$store.getters.xt_user.org.id == 10510){
2731 
-                        preTime = nowTime
2732 
-                      }
2733 2734 
                     } else {
2734 2735 
                       if (prescription.pre_time == 0) {
2735 2736 
                         if(nowTime.split(" ")[0] != this.record_date){
2736 2737 
                           if(this.schedule.schedule_type == 1){
2737 
-                            if(this.org_id == 10206  || this.org_id == 0 || this.org_id == 10598) {
2738 
+                            if(this.org_id == 10206  || this.org_id == 10598) {
2738 2739 
                               preTime = this.record_date+ ' ' + '6:00'
2739 2740 
                             }else {
2740 2741 
                               preTime = this.record_date + ' ' + '7:00'
 
@@ -2752,6 +2753,9 @@ export default {
2752 2753 
                             preTime = this.record_date + ' ' + '17:00'
2753 2754 
                           }
2754 2755 
                         }
2756 
+                        if(this.$store.getters.xt_user.org.id == 10510  || this.org_id == 0){
2757 
+                          preTime = nowTime
2758 
+                        }
2755 2759 
                         // preTime = nowTime
2756 2760 
                       } else {
2757 2761 
                         preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
 
@@ -2900,7 +2904,7 @@ export default {
2900 2904 
                       // var preTime = ''
2901 2905 
                       if ( this.org_id != 9919 && this.org_id != 10485 && this.org_id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
2902 2906 
                         if (this.schedule.schedule_type == 1) {
2903 
-                          if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0 || this.org_id == 10633) {
2907 
+                          if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 10633) {
2904 2908 
                             preTime = this.record_date + ' ' + '6:30'
2905 2909 
                           } else if(this.org_id == 10206 || this.org_id == 10598){
2906 2910 
                             preTime = this.record_date + ' ' + '6:00'
 
@@ -2910,7 +2914,7 @@ export default {
2910 2914 
                           }
2911 2915 
                           // preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
2912 2916 
                         } else if (this.schedule.schedule_type == 2) {
2913 
-                          if(this.org_id == 10206  || this.org_id == 0){
2917 
+                          if(this.org_id == 10206 ){
2914 2918 
                             preTime =this.record_date + ' ' + '10:30'
2915 2919 
                           }else if(this.org_id == 10598){
2916 2920 
                             preTime = this.record_date + ' ' + '09:00'
 
@@ -2922,7 +2926,7 @@ export default {
2922 2926 
                           preTime = this.record_date + ' ' + '17:00'
2923 2927 
                         }
2924 2928
2925 
-                        if(this.$store.getters.xt_user.org.id == 10510){
2929 
+                        if(this.$store.getters.xt_user.org.id == 10510  || this.org_id == 0){
2926 2930 
                           preTime = nowTime
2927 2931 
                         }
2928 2932 
                       }
 
@@ -4639,7 +4643,7 @@ export default {
4639 4643 
                           }
4640 4644 
                           // preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
4641 4645 
                         } else if (this.schedule.schedule_type == 2) {
4642 
-                          if(this.org_id == 10206  || this.org_id == 0){
4646 
+                          if(this.org_id == 10206  ){
4643 4647 
                             preTime = this.record_date + ' ' + '10:30'
4644 4648
4645 4649 
                           }else if(this.org_id == 10598){
 
@@ -4651,20 +4655,21 @@ export default {
4651 4655 
                         } else if (this.schedule.schedule_type == 3) {
4652 4656 
                           preTime = this.record_date + ' ' + '17:00'
4653 4657 
                         }
4658 
+                        if(this.$store.getters.xt_user.org.id == 10510 || this.org_id == 0){
4659 
+                          preTime = nowTime
4660 
+                        }
4654 4661 
                       } else {
4655 4662 
                         preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
4656 4663 
                       }
4657 4664
4658 
-                      if(this.$store.getters.xt_user.org.id == 10510){
4659 
-                        preTime = nowTime
4660 
-                      }
4665 
+
4661 4666 
                     } else {
4662 4667 
                       console.log("0---00000000000")
4663 4668 
                       if (prescription.pre_time == 0) {
4664 4669 
                         // preTime = nowTime
4665 4670 
                         if(nowTime.split(" ")[0] != this.record_date){
4666 4671 
                           if(this.schedule.schedule_type == 1){
4667 
-                            if(this.org_id == 10206  || this.org_id == 0 || this.org_id == 10598) {
4672 
+                            if(this.org_id == 10206  || this.org_id == 10598) {
4668 4673 
                               preTime = this.record_date+ ' ' + '6:00'
4669 4674 
                             }else {
4670 4675 
                               preTime = this.record_date + ' ' + '7:00'
 
@@ -4682,6 +4687,10 @@ export default {
4682 4687 
                             preTime = this.record_date + ' ' + '17:00'
4683 4688 
                           }
4684 4689 
                         }
4690 
+                        if(this.$store.getters.xt_user.org.id == 10510  || this.org_id == 0){
4691 
+                          preTime = nowTime
4692 
+                        }
4693 
+
4685 4694 
                       } else {
4686 4695 
                         preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
4687 4696 
                       }
 
@@ -4828,7 +4837,7 @@ export default {
4828 4837 
                       var preTime = nowTime
4829 4838 
                       if (this.org_id != 9919 && this.org_id != 10485 && this.org_id != 10191 && this.$store.getters.xt_user.org.id != 10375 ) {
4830 4839 
                         if (this.schedule.schedule_type == 1) {
4831 
-                          if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0 || this.org_id == 10633) {
4840 
+                          if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 10633) {
4832 4841 
                             preTime = this.record_date + ' ' + '6:30'
4833 4842 
                           } else if(this.org_id == 10206 || this.org_id == 10598){
4834 4843 
                             preTime = this.record_date+ ' ' + '6:00'
 
@@ -4849,7 +4858,7 @@ export default {
4849 4858 
                           preTime = this.record_date + ' ' + '17:00'
4850 4859 
                         }
4851 4860
4852 
-                        if(this.$store.getters.xt_user.org.id == 10510){
4861 
+                        if(this.$store.getters.xt_user.org.id == 10510 || this.org_id == 0 ){
4853 4862 
                           preTime = nowTime
4854 4863 
                         }
4855 4864 
                       }
 
@@ -5286,7 +5295,7 @@ export default {
5286 5295 
                           }
5287 5296 
                           // preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
5288 5297 
                         } else if (this.schedule.schedule_type == 2) {
5289 
-                          if(this.org_id == 10206  || this.org_id == 0){
5298 
+                          if(this.org_id == 10206 ){
5290 5299 
                             preTime =this.record_date + ' ' + '10:30'
5291 5300 
                           }else if(this.org_id == 10598){
5292 5301 
                             preTime = this.record_date + ' ' + '09:00'
 
@@ -5298,13 +5307,14 @@ export default {
5298 5307 
                         } else if (this.schedule.schedule_type == 3) {
5299 5308 
                           preTime = this.record_date + ' ' + '17:00'
5300 5309 
                         }
5310 
+                        if(this.$store.getters.xt_user.org.id == 10510  || this.org_id == 0){
5311 
+                          preTime = nowTime
5312 
+                        }
5301 5313 
                       } else {
5302 5314 
                         preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
5303 5315 
                       }
5304 5316
5305 
-                      if(this.$store.getters.xt_user.org.id == 10510){
5306 
-                        preTime = nowTime
5307 
-                      }
5317 
+
5308 5318 
                     } else {
5309 5319 
                       if (prescription.pre_time == 0) {
5310 5320 
                         preTime = nowTime
 
@@ -5484,7 +5494,7 @@ export default {
5484 5494 
                           }
5485 5495 
                           // preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
5486 5496 
                         } else if (this.schedule.schedule_type == 2) {
5487 
-                          if(this.org_id == 10206 ||  this.org_id == 0){
5497 
+                          if(this.org_id == 10206 ){
5488 5498 
                             preTime = this.record_date + ' ' + '10:30'
5489 5499
5490 5500 
                           }else if(this.org_id == 10598){
 
@@ -5497,7 +5507,7 @@ export default {
5497 5507 
                           preTime = this.record_date + ' ' + '17:00'
5498 5508 
                         }
5499 5509
5500 
-                        if(this.$store.getters.xt_user.org.id == 10510){
5510 
+                        if(this.$store.getters.xt_user.org.id == 10510 ||  this.org_id == 0){
5501 5511 
                           preTime = nowTime
5502 5512 
                         }
5503 5513 
                       }