|
@@ -124,7 +124,7 @@
|
124
|
124
|
<table-data ref="tableData" :week-time="activeName" :partitions-prop="partitions"
|
125
|
125
|
:schedule-zone-row-prop="scheduleZoneRow"
|
126
|
126
|
:schedule-zone-prop="scheduleZone" title="" @event1="changePartition"
|
127
|
|
- @event2="changeSchedule" @event3="changeWeekDay" @event6="changeScheduleType" v-show="showtableOne">
|
|
127
|
+ @event2="changeSchedule" @event3="changeWeekDay" @event6="changeScheduleType" @guanliu_show="guanliu" v-show="showtableOne">
|
128
|
128
|
</table-data>
|
129
|
129
|
</div>
|
130
|
130
|
<!-- 编辑 -->
|
|
@@ -369,7 +369,8 @@ export default {
|
369
|
369
|
schedule_week: 0,
|
370
|
370
|
newDay: [],
|
371
|
371
|
templateObj: {},
|
372
|
|
- week_date:""
|
|
372
|
+ week_date:"",
|
|
373
|
+ guanliu_show:false,
|
373
|
374
|
|
374
|
375
|
}
|
375
|
376
|
},
|
|
@@ -383,6 +384,12 @@ export default {
|
383
|
384
|
beforeweekTable
|
384
|
385
|
},
|
385
|
386
|
methods: {
|
|
387
|
+ //
|
|
388
|
+ guanliu(value){
|
|
389
|
+ this.guanliu_show=value
|
|
390
|
+ console.log('1111',value);
|
|
391
|
+ this.getThreeWeekList()
|
|
392
|
+ },
|
386
|
393
|
handleClick(e,tab){
|
387
|
394
|
if(e.name == 'historyWeek'){
|
388
|
395
|
this.showtable=true
|
|
@@ -794,6 +801,14 @@ export default {
|
794
|
801
|
this.$router.push({path: '/workforce/template'})
|
795
|
802
|
},
|
796
|
803
|
export_file: function () {
|
|
804
|
+ // this.getThreeWeekList()
|
|
805
|
+ if(this.$refs.tableData.value1==false){
|
|
806
|
+ this.guanliu_show=false
|
|
807
|
+ // this.export_file_step_two()
|
|
808
|
+ }else{
|
|
809
|
+ this.guanliu_show=true
|
|
810
|
+ // this.export_file_step_two()
|
|
811
|
+ }
|
797
|
812
|
// this.getWeekPanelsTwo()
|
798
|
813
|
this.export_file_step_two()
|
799
|
814
|
},
|
|
@@ -2478,7 +2493,7 @@ export default {
|
2478
|
2493
|
partition_id: this.partition_id,
|
2479
|
2494
|
schedule_type: this.schedule_type
|
2480
|
2495
|
}
|
2481
|
|
- console.log("params32323232323223", params)
|
|
2496
|
+ // console.log("params32323232323223", params)
|
2482
|
2497
|
getThreeWeekList(params).then(response => {
|
2483
|
2498
|
if (response.data.state == 1) {
|
2484
|
2499
|
var partitions = response.data.data.partitions
|
|
@@ -2490,7 +2505,21 @@ export default {
|
2490
|
2505
|
for (let key in partitions) {
|
2491
|
2506
|
var tempValue
|
2492
|
2507
|
var jihaos = partitions[key].jihaos
|
2493
|
|
-
|
|
2508
|
+
|
|
2509
|
+ jihaos.sort(function(a,b) {
|
|
2510
|
+ return a.sort-b.sort
|
|
2511
|
+ })
|
|
2512
|
+ // console.log('rrrrr',jihaos);
|
|
2513
|
+ // for(let i=0;i<jihaos1.length;i++){
|
|
2514
|
+ // var jihaos=jihaos1[i].sort
|
|
2515
|
+ // }
|
|
2516
|
+ // for(let i in jihaos1){
|
|
2517
|
+ // var jihaos=jihaos1[i].sort
|
|
2518
|
+ // jihaos.sort(function(a,b){
|
|
2519
|
+ // return a-b
|
|
2520
|
+ // })
|
|
2521
|
+ // console.log('wwwww',jihaos);
|
|
2522
|
+ // }
|
2494
|
2523
|
if (i == 0) {
|
2495
|
2524
|
let m = 'A3' + ':' + 'A' + (2 + jihaos.length)
|
2496
|
2525
|
tempValue = (2 + jihaos.length)
|
|
@@ -2672,7 +2701,7 @@ export default {
|
2672
|
2701
|
console.log("list")
|
2673
|
2702
|
console.log(list)
|
2674
|
2703
|
console.log("week")
|
2675
|
|
- console.log(week)
|
|
2704
|
+ console.log(lastWeek)
|
2676
|
2705
|
|
2677
|
2706
|
if (week.length > 0) {
|
2678
|
2707
|
// console.log('qqqqqqqqq',list);
|
|
@@ -2682,92 +2711,191 @@ export default {
|
2682
|
2711
|
if (list[i].机号 == week[j].number && list[i].区号 == week[j].zon_name) {
|
2683
|
2712
|
// 周一上午 week[j].number week[j].zon_name
|
2684
|
2713
|
if (week[j].schedule_week == 1 && week[j].schedule_type == 1) {
|
2685
|
|
- // console.log(week[j].name)
|
2686
|
|
- list[i].shangwu = week[j].name+" "+week[j].dialysis_machine_name
|
2687
|
|
- console.log('eeeeeee',week[j].mode_id)
|
|
2714
|
+ if(this.guanliu_show==false){
|
|
2715
|
+ list[i].shangwu = week[j].name
|
|
2716
|
+ // console.log('eeeeeee',list[i].shangwu)
|
|
2717
|
+ }else{
|
|
2718
|
+ list[i].shangwu = week[j].name+" "+week[j].dialysis_machine_name
|
|
2719
|
+ // console.log('kkkkkk',list[i].shangwu)
|
|
2720
|
+ }
|
2688
|
2721
|
}
|
2689
|
2722
|
// 周一下午
|
2690
|
2723
|
if (week[j].schedule_week == 1 && week[j].schedule_type == 2) {
|
2691
|
|
- list[i].xiawu = week[j].name+" "+week[j].dialysis_machine_name
|
|
2724
|
+ if(this.$refs.tableData.value1==false){
|
|
2725
|
+ list[i].xiawu = week[j].name
|
|
2726
|
+ }else{
|
|
2727
|
+ list[i].xiawu = week[j].name+" "+week[j].dialysis_machine_name
|
|
2728
|
+ }
|
2692
|
2729
|
}
|
2693
|
2730
|
// 周一晚上
|
2694
|
2731
|
if (week[j].schedule_week == 1 && week[j].schedule_type == 3) {
|
2695
|
|
- list[i].wanshang = week[j].name+" "+week[j].dialysis_machine_name
|
|
2732
|
+ if(this.$refs.tableData.value1==false){
|
|
2733
|
+ list[i].wanshang = week[j].name
|
|
2734
|
+ }else{
|
|
2735
|
+ list[i].wanshang = week[j].name+" "+week[j].dialysis_machine_name
|
|
2736
|
+ }
|
2696
|
2737
|
}
|
2697
|
2738
|
|
2698
|
2739
|
//周二上午
|
2699
|
2740
|
if (week[j].schedule_week == 2 && week[j].schedule_type == 1) {
|
2700
|
|
- list[i].shangwu1 = week[j].name+" "+week[j].dialysis_machine_name
|
2701
|
|
- console.log('eeeeeee',week[j].mode_id)
|
|
2741
|
+ if(this.$refs.tableData.value1==false){
|
|
2742
|
+ list[i].shangwu1 = week[j].name
|
|
2743
|
+ }else{
|
|
2744
|
+ list[i].shangwu1 = week[j].name+" "+week[j].dialysis_machine_name
|
|
2745
|
+ }
|
2702
|
2746
|
}
|
2703
|
2747
|
//周二下午
|
2704
|
2748
|
if (week[j].schedule_week == 2 && week[j].schedule_type == 2) {
|
2705
|
|
- list[i].xiawu1 = week[j].name+" "+week[j].dialysis_machine_name
|
|
2749
|
+ if(this.$refs.tableData.value1==false){
|
|
2750
|
+ list[i].xiawu1 = week[j].name
|
|
2751
|
+ }else{
|
|
2752
|
+ list[i].xiawu1 = week[j].name+" "+week[j].dialysis_machine_name
|
|
2753
|
+ }
|
2706
|
2754
|
}
|
2707
|
2755
|
//周二晚上
|
2708
|
2756
|
if (week[j].schedule_week == 2 && week[j].schedule_type == 3) {
|
2709
|
|
- list[i].wanshang1 = week[j].name+" "+week[i].dialysis_machine_name
|
|
2757
|
+ if(this.$refs.tableData.value1==false){
|
|
2758
|
+ list[i].wanshang1 = week[j].name
|
|
2759
|
+ }else{
|
|
2760
|
+ list[i].wanshang1 = week[j].name+" "+week[j].dialysis_machine_name
|
|
2761
|
+ }
|
|
2762
|
+ // list[i].wanshang1 = week[j].name+" "+week[i].dialysis_machine_name
|
2710
|
2763
|
}
|
2711
|
2764
|
|
2712
|
2765
|
//周三上午
|
2713
|
2766
|
if (week[j].schedule_week == 3 && week[j].schedule_type == 1) {
|
2714
|
|
- list[i].shangwu2 = week[j].name+" "+week[j].dialysis_machine_name
|
|
2767
|
+ if(this.$refs.tableData.value1==false){
|
|
2768
|
+ list[i].shangwu2 = week[j].name
|
|
2769
|
+ }else{
|
|
2770
|
+ list[i].shangwu2 = week[j].name+" "+week[j].dialysis_machine_name
|
|
2771
|
+ }
|
|
2772
|
+ // list[i].shangwu2 = week[j].name+" "+week[j].dialysis_machine_name
|
2715
|
2773
|
}
|
2716
|
2774
|
//周三下午
|
2717
|
2775
|
if (week[j].schedule_week == 3 && week[j].schedule_type == 2) {
|
2718
|
|
- list[i].xiawu2 = week[j].name+" "+week[j].dialysis_machine_name
|
|
2776
|
+ if(this.$refs.tableData.value1==false){
|
|
2777
|
+ list[i].xiawu2 = week[j].name
|
|
2778
|
+ }else{
|
|
2779
|
+ list[i].xiawu2 = week[j].name+" "+week[j].dialysis_machine_name
|
|
2780
|
+ }
|
|
2781
|
+ // list[i].xiawu2 = week[j].name+" "+week[j].dialysis_machine_name
|
2719
|
2782
|
}
|
2720
|
2783
|
//周三晚上
|
2721
|
2784
|
if (week[j].schedule_week == 3 && week[j].schedule_type == 3) {
|
2722
|
|
- list[i].wanshang2 = week[j].name+" "+week[j].dialysis_machine_name
|
|
2785
|
+ if(this.$refs.tableData.value1==false){
|
|
2786
|
+ list[i].wanshang2 = week[j].name
|
|
2787
|
+ }else{
|
|
2788
|
+ list[i].wanshang2 = week[j].name+" "+week[j].dialysis_machine_name
|
|
2789
|
+ }
|
|
2790
|
+ // list[i].wanshang2 = week[j].name+" "+week[j].dialysis_machine_name
|
2723
|
2791
|
}
|
2724
|
2792
|
//周四上午
|
2725
|
2793
|
if (week[j].schedule_week == 4 && week[j].schedule_type == 1) {
|
2726
|
|
- list[i].shangwu3 = week[j].name+" "+week[j].dialysis_machine_name
|
|
2794
|
+ if(this.$refs.tableData.value1==false){
|
|
2795
|
+ list[i].shangwu3 = week[j].name
|
|
2796
|
+ }else{
|
|
2797
|
+ list[i].shangwu3 = week[j].name+" "+week[j].dialysis_machine_name
|
|
2798
|
+ }
|
|
2799
|
+ // list[i].shangwu3 = week[j].name+" "+week[j].dialysis_machine_name
|
2727
|
2800
|
}
|
2728
|
2801
|
//周四下午
|
2729
|
2802
|
if (week[j].schedule_week == 4 && week[j].schedule_type == 2) {
|
2730
|
|
- list[i].xiawu3 = week[j].name+" "+week[j].dialysis_machine_name
|
|
2803
|
+ if(this.$refs.tableData.value1==false){
|
|
2804
|
+ list[i].xiawu3 = week[j].name
|
|
2805
|
+ }else{
|
|
2806
|
+ list[i].xiawu3 = week[j].name+" "+week[j].dialysis_machine_name
|
|
2807
|
+ }
|
|
2808
|
+ // list[i].xiawu3 = week[j].name+" "+week[j].dialysis_machine_name
|
2731
|
2809
|
}
|
2732
|
2810
|
//周四晚上
|
2733
|
2811
|
if (week[j].schedule_week == 4 && week[j].schedule_type == 3) {
|
2734
|
|
- list[i].wanshang3 = week[j].name+" "+week[j].dialysis_machine_name
|
|
2812
|
+ if(this.$refs.tableData.value1==false){
|
|
2813
|
+ list[i].wanshang3 = week[j].name
|
|
2814
|
+ }else{
|
|
2815
|
+ list[i].wanshang3 = week[j].name+" "+week[j].dialysis_machine_name
|
|
2816
|
+ }
|
|
2817
|
+ // list[i].wanshang3 = week[j].name+" "+week[j].dialysis_machine_name
|
2735
|
2818
|
}
|
2736
|
2819
|
//周五上午
|
2737
|
2820
|
if (week[j].schedule_week == 5 && week[j].schedule_type == 1) {
|
2738
|
|
- list[i].shangwu4 = week[j].name+" "+week[j].dialysis_machine_name
|
|
2821
|
+ if(this.$refs.tableData.value1==false){
|
|
2822
|
+ list[i].shangwu4 = week[j].name
|
|
2823
|
+ }else{
|
|
2824
|
+ list[i].shangwu4 = week[j].name+" "+week[j].dialysis_machine_name
|
|
2825
|
+ }
|
|
2826
|
+ // list[i].shangwu4 = week[j].name+" "+week[j].dialysis_machine_name
|
2739
|
2827
|
}
|
2740
|
2828
|
//周五下午
|
2741
|
2829
|
if (week[j].schedule_week == 5 && week[j].schedule_type == 2) {
|
2742
|
|
- list[i].xiawu4 = week[j].name+" "+week[j].dialysis_machine_name
|
|
2830
|
+ if(this.$refs.tableData.value1==false){
|
|
2831
|
+ list[i].xiawu4 = week[j].name
|
|
2832
|
+ }else{
|
|
2833
|
+ list[i].xiawu4 = week[j].name+" "+week[j].dialysis_machine_name
|
|
2834
|
+ }
|
|
2835
|
+ // list[i].xiawu4 = week[j].name+" "+week[j].dialysis_machine_name
|
2743
|
2836
|
}
|
2744
|
2837
|
//周五晚上
|
2745
|
2838
|
if (week[j].schedule_week == 5 && week[j].schedule_type == 3) {
|
2746
|
|
- list[i].wanshang4 = week[j].name+" "+week[j].dialysis_machine_name
|
|
2839
|
+ if(this.$refs.tableData.value1==false){
|
|
2840
|
+ list[i].wanshang4 = week[j].name
|
|
2841
|
+ }else{
|
|
2842
|
+ list[i].wanshang4 = week[j].name+" "+week[j].dialysis_machine_name
|
|
2843
|
+ }
|
|
2844
|
+ // list[i].wanshang4 = week[j].name+" "+week[j].dialysis_machine_name
|
2747
|
2845
|
}
|
2748
|
2846
|
//周六上午
|
2749
|
2847
|
if (week[j].schedule_week == 6 && week[j].schedule_type == 1) {
|
2750
|
|
- list[i].shangwu5 = week[j].name+" "+week[j].dialysis_machine_name
|
|
2848
|
+ if(this.$refs.tableData.value1==false){
|
|
2849
|
+ list[i].shangwu5 = week[j].name
|
|
2850
|
+ }else{
|
|
2851
|
+ list[i].shangwu5 = week[j].name+" "+week[j].dialysis_machine_name
|
|
2852
|
+ }
|
|
2853
|
+ // list[i].shangwu5 = week[j].name+" "+week[j].dialysis_machine_name
|
2751
|
2854
|
}
|
2752
|
2855
|
//周六下午
|
2753
|
2856
|
if (week[j].schedule_week == 6 && week[j].schedule_type == 2) {
|
2754
|
|
- list[i].xiawu5 = week[j].name+" "+week[j].dialysis_machine_name
|
|
2857
|
+ if(this.$refs.tableData.value1==false){
|
|
2858
|
+ list[i].xiawu5 = week[j].name
|
|
2859
|
+ }else{
|
|
2860
|
+ list[i].xiawu5 = week[j].name+" "+week[j].dialysis_machine_name
|
|
2861
|
+ }
|
|
2862
|
+ // list[i].xiawu5 = week[j].name+" "+week[j].dialysis_machine_name
|
2755
|
2863
|
}
|
2756
|
2864
|
//周六晚上
|
2757
|
2865
|
if (week[j].schedule_week == 6 && week[j].schedule_type == 3) {
|
2758
|
|
- list[i].wanshang5 = week[j].name+" "+week[j].dialysis_machine_name
|
|
2866
|
+ if(this.$refs.tableData.value1==false){
|
|
2867
|
+ list[i].wanshang5 = week[j].name
|
|
2868
|
+ }else{
|
|
2869
|
+ list[i].wanshang5 = week[j].name+" "+week[j].dialysis_machine_name
|
|
2870
|
+ }
|
|
2871
|
+ // list[i].wanshang5 = week[j].name+" "+week[j].dialysis_machine_name
|
2759
|
2872
|
}
|
2760
|
2873
|
//周日上午
|
2761
|
2874
|
if (week[j].schedule_week == 7 && week[j].schedule_type == 1) {
|
2762
|
|
- list[i].shangwu6 = week[j].name+" "+week[j].dialysis_machine_name
|
|
2875
|
+ if(this.$refs.tableData.value1==false){
|
|
2876
|
+ list[i].shangwu6 = week[j].name
|
|
2877
|
+ }else{
|
|
2878
|
+ list[i].shangwu6 = week[j].name+" "+week[j].dialysis_machine_name
|
|
2879
|
+ }
|
|
2880
|
+ // list[i].shangwu6 = week[j].name+" "+week[j].dialysis_machine_name
|
2763
|
2881
|
}
|
2764
|
2882
|
//周日下午
|
2765
|
2883
|
if (week[j].schedule_week == 7 && week[j].schedule_type == 2) {
|
2766
|
|
- list[i].xiawu6 = week[j].name+" "+week[j].dialysis_machine_name
|
|
2884
|
+ if(this.$refs.tableData.value1==false){
|
|
2885
|
+ list[i].xiawu6 = week[j].name
|
|
2886
|
+ }else{
|
|
2887
|
+ list[i].xiawu6 = week[j].name+" "+week[j].dialysis_machine_name
|
|
2888
|
+ }
|
|
2889
|
+ // list[i].xiawu6 = week[j].name+" "+week[j].dialysis_machine_name
|
2767
|
2890
|
}
|
2768
|
2891
|
//周日晚上
|
2769
|
2892
|
if (week[j].schedule_week == 7 && week[j].schedule_type == 3) {
|
2770
|
|
- list[i].wanshang6 = week[j].name+" "+week[j].dialysis_machine_name
|
|
2893
|
+ if(this.$refs.tableData.value1==false){
|
|
2894
|
+ list[i].wanshang6 = week[j].name
|
|
2895
|
+ }else{
|
|
2896
|
+ list[i].wanshang6 = week[j].name+" "+week[j].dialysis_machine_name
|
|
2897
|
+ }
|
|
2898
|
+ // list[i].wanshang6 = week[j].name+" "+week[j].dialysis_machine_name
|
2771
|
2899
|
}
|
2772
|
2900
|
}
|
2773
|
2901
|
|
|
@@ -2781,93 +2909,198 @@ export default {
|
2781
|
2909
|
if (list[i].机号 == nextWeek[j].number && list[i].区号 == nextWeek[j].zon_name) {
|
2782
|
2910
|
//周一
|
2783
|
2911
|
if (nextWeek[j].schedule_week == 1 && nextWeek[j].schedule_type == 1) {
|
2784
|
|
- list[i].shangwu7 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
|
|
2912
|
+ if(this.$refs.tableData.value1==false){
|
|
2913
|
+ list[i].shangwu7 = nextWeek[j].name
|
|
2914
|
+ }else{
|
|
2915
|
+ list[i].shangwu7 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
|
|
2916
|
+ }
|
|
2917
|
+ // list[i].shangwu7 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
|
2785
|
2918
|
}
|
2786
|
2919
|
//周一下午
|
2787
|
2920
|
if (nextWeek[j].schedule_week == 1 && nextWeek[j].schedule_type == 2) {
|
2788
|
|
- list[i].xiawu7 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
|
|
2921
|
+ if(this.$refs.tableData.value1==false){
|
|
2922
|
+ list[i].xiawu7 = nextWeek[j].name
|
|
2923
|
+ }else{
|
|
2924
|
+ list[i].xiawu7 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
|
|
2925
|
+ }
|
|
2926
|
+ // list[i].xiawu7 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
|
2789
|
2927
|
}
|
2790
|
2928
|
//周一晚上
|
2791
|
2929
|
if (nextWeek[j].schedule_week == 1 && nextWeek[j].schedule_type == 3) {
|
2792
|
|
- list[i].wanshang7 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
|
|
2930
|
+ if(this.$refs.tableData.value1==false){
|
|
2931
|
+ list[i].wanshang7 = nextWeek[j].name
|
|
2932
|
+ }else{
|
|
2933
|
+ list[i].wanshang7 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
|
|
2934
|
+ }
|
|
2935
|
+ // list[i].wanshang7 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
|
2793
|
2936
|
}
|
2794
|
2937
|
|
2795
|
2938
|
//周二上午
|
2796
|
2939
|
if (nextWeek[j].schedule_week == 2 && nextWeek[j].schedule_type == 1) {
|
2797
|
|
- list[i].shangwu8 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
|
|
2940
|
+ if(this.$refs.tableData.value1==false){
|
|
2941
|
+ list[i].shangwu8 = nextWeek[j].name
|
|
2942
|
+ }else{
|
|
2943
|
+ list[i].shangwu8 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
|
|
2944
|
+ }
|
|
2945
|
+ // list[i].shangwu8 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
|
2798
|
2946
|
}
|
2799
|
2947
|
//周二下午
|
2800
|
2948
|
if (nextWeek[j].schedule_week == 2 && nextWeek[j].schedule_type == 2) {
|
2801
|
|
- list[i].xiawu8 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
|
|
2949
|
+ if(this.$refs.tableData.value1==false){
|
|
2950
|
+ list[i].xiawu8 = nextWeek[j].name
|
|
2951
|
+ }else{
|
|
2952
|
+ list[i].xiawu8 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
|
|
2953
|
+ }
|
|
2954
|
+ // list[i].xiawu8 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
|
2802
|
2955
|
}
|
2803
|
2956
|
//周二晚上
|
2804
|
2957
|
if (nextWeek[j].schedule_week == 2 && nextWeek[j].schedule_type == 3) {
|
2805
|
|
- list[i].wanshang8 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
|
|
2958
|
+ if(this.$refs.tableData.value1==false){
|
|
2959
|
+ list[i].wanshang8 = nextWeek[j].name
|
|
2960
|
+ }else{
|
|
2961
|
+ list[i].wanshang8 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
|
|
2962
|
+ }
|
|
2963
|
+ // list[i].wanshang8 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
|
2806
|
2964
|
}
|
2807
|
2965
|
|
2808
|
2966
|
//周三上午
|
2809
|
2967
|
if (nextWeek[j].schedule_week == 3 && nextWeek[j].schedule_type == 1) {
|
2810
|
|
- list[i].shangwu9 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
|
|
2968
|
+ if(this.$refs.tableData.value1==false){
|
|
2969
|
+ list[i].shangwu9 = nextWeek[j].name
|
|
2970
|
+ }else{
|
|
2971
|
+ list[i].shangwu9 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
|
|
2972
|
+ }
|
|
2973
|
+ // list[i].shangwu9 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
|
2811
|
2974
|
}
|
2812
|
2975
|
//周三下午
|
2813
|
2976
|
if (nextWeek[j].schedule_week == 3 && nextWeek[j].schedule_type == 2) {
|
2814
|
|
- list[i].xiawu9 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
|
|
2977
|
+ if(this.$refs.tableData.value1==false){
|
|
2978
|
+ list[i].xiawu9 = nextWeek[j].name
|
|
2979
|
+ }else{
|
|
2980
|
+ list[i].xiawu9 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
|
|
2981
|
+ }
|
|
2982
|
+ //
|
2815
|
2983
|
}
|
2816
|
2984
|
//周三晚上
|
2817
|
2985
|
if (nextWeek[j].schedule_week == 3 && nextWeek[j].schedule_type == 3) {
|
2818
|
|
- list[i].wanshang9 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
|
|
2986
|
+ if(this.$refs.tableData.value1==false){
|
|
2987
|
+ list[i].wanshang9 = nextWeek[j].name
|
|
2988
|
+ }else{
|
|
2989
|
+ list[i].wanshang9 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
|
|
2990
|
+ }
|
|
2991
|
+ // list[i].wanshang9 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
|
2819
|
2992
|
}
|
2820
|
2993
|
|
2821
|
2994
|
//周四上午
|
2822
|
2995
|
if (nextWeek[j].schedule_week == 4 && nextWeek[j].schedule_type == 1) {
|
2823
|
|
- list[i].shangwu10 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
|
|
2996
|
+ if(this.$refs.tableData.value1==false){
|
|
2997
|
+ list[i].shangwu10 = nextWeek[j].name
|
|
2998
|
+ }else{
|
|
2999
|
+ list[i].shangwu10 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
|
|
3000
|
+ }
|
|
3001
|
+ // list[i].shangwu10 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
|
2824
|
3002
|
}
|
2825
|
3003
|
//周四下午
|
2826
|
3004
|
if (nextWeek[j].schedule_week == 4 && nextWeek[j].schedule_type == 2) {
|
2827
|
|
- list[i].xiawu10 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
|
|
3005
|
+ if(this.$refs.tableData.value1==false){
|
|
3006
|
+ list[i].xiawu10 = nextWeek[j].name
|
|
3007
|
+ }else{
|
|
3008
|
+ list[i].xiawu10 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
|
|
3009
|
+ }
|
|
3010
|
+ // list[i].xiawu10 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
|
2828
|
3011
|
}
|
2829
|
3012
|
//周四晚上
|
2830
|
3013
|
if (nextWeek[j].schedule_week == 4 && nextWeek[j].schedule_type == 3) {
|
2831
|
|
- list[i].wanshang10 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
|
|
3014
|
+ if(this.$refs.tableData.value1==false){
|
|
3015
|
+ list[i].wanshang10 = nextWeek[j].name
|
|
3016
|
+ }else{
|
|
3017
|
+ list[i].wanshang10 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
|
|
3018
|
+ }
|
|
3019
|
+ // list[i].wanshang10 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
|
2832
|
3020
|
}
|
2833
|
3021
|
|
2834
|
3022
|
//周五上午
|
2835
|
3023
|
if (nextWeek[j].schedule_week == 5 && nextWeek[j].schedule_type == 1) {
|
2836
|
|
- list[i].shangwu11 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
|
|
3024
|
+ if(this.$refs.tableData.value1==false){
|
|
3025
|
+ list[i].shangwu11 = nextWeek[j].name
|
|
3026
|
+ }else{
|
|
3027
|
+ list[i].shangwu11 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
|
|
3028
|
+ }
|
|
3029
|
+ // list[i].shangwu11 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
|
2837
|
3030
|
}
|
2838
|
3031
|
//周五下午
|
2839
|
3032
|
if (nextWeek[j].schedule_week == 5 && nextWeek[j].schedule_type == 2) {
|
2840
|
|
- list[i].xiawu11 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
|
|
3033
|
+ if(this.$refs.tableData.value1==false){
|
|
3034
|
+ list[i].xiawu11 = nextWeek[j].name
|
|
3035
|
+ }else{
|
|
3036
|
+ list[i].xiawu11 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
|
|
3037
|
+ }
|
|
3038
|
+ // list[i].xiawu11 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
|
2841
|
3039
|
}
|
2842
|
3040
|
//周五晚上
|
2843
|
3041
|
if (nextWeek[j].schedule_week == 5 && nextWeek[j].schedule_type == 3) {
|
2844
|
|
- list[i].wanshang11 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
|
|
3042
|
+ if(this.$refs.tableData.value1==false){
|
|
3043
|
+ list[i].wanshang11 = nextWeek[j].name
|
|
3044
|
+ }else{
|
|
3045
|
+ list[i].wanshang11 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
|
|
3046
|
+ }
|
|
3047
|
+ // list[i].wanshang11 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
|
2845
|
3048
|
}
|
2846
|
3049
|
|
2847
|
3050
|
//周六上午
|
2848
|
3051
|
if (nextWeek[j].schedule_week == 6 && nextWeek[j].schedule_type == 1) {
|
2849
|
|
- list[i].shangwu12 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
|
|
3052
|
+ if(this.$refs.tableData.value1==false){
|
|
3053
|
+ list[i].shangwu12 = nextWeek[j].name
|
|
3054
|
+ }else{
|
|
3055
|
+ list[i].shangwu12 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
|
|
3056
|
+ }
|
|
3057
|
+ // list[i].shangwu12 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
|
2850
|
3058
|
}
|
2851
|
3059
|
//周六下午
|
2852
|
3060
|
if (nextWeek[j].schedule_week == 6 && nextWeek[j].schedule_type == 2) {
|
2853
|
|
- list[i].xiawu12 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
|
|
3061
|
+ if(this.$refs.tableData.value1==false){
|
|
3062
|
+ list[i].xiawu12 = nextWeek[j].name
|
|
3063
|
+ }else{
|
|
3064
|
+ list[i].xiawu12 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
|
|
3065
|
+ }
|
|
3066
|
+ // list[i].xiawu12 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
|
2854
|
3067
|
}
|
2855
|
3068
|
//周六晚上
|
2856
|
3069
|
if (nextWeek[j].schedule_week == 6 && nextWeek[j].schedule_type == 3) {
|
2857
|
|
- list[i].wanshang12 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
|
|
3070
|
+ if(this.$refs.tableData.value1==false){
|
|
3071
|
+ list[i].wanshang12 = nextWeek[j].name
|
|
3072
|
+ }else{
|
|
3073
|
+ list[i].wanshang12 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
|
|
3074
|
+ }
|
|
3075
|
+ // list[i].wanshang12 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
|
2858
|
3076
|
}
|
2859
|
3077
|
|
2860
|
3078
|
//周日上午
|
2861
|
3079
|
if (nextWeek[j].schedule_week == 7 && nextWeek[j].schedule_type == 1) {
|
2862
|
|
- list[i].shangwu13 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
|
|
3080
|
+ if(this.$refs.tableData.value1==false){
|
|
3081
|
+ list[i].shangwu13 = nextWeek[j].name
|
|
3082
|
+ }else{
|
|
3083
|
+ list[i].shangwu13 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
|
|
3084
|
+ }
|
|
3085
|
+ // list[i].shangwu13 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
|
2863
|
3086
|
}
|
2864
|
3087
|
//周日下午
|
2865
|
3088
|
if (nextWeek[j].schedule_week == 7 && nextWeek[j].schedule_type == 2) {
|
2866
|
|
- list[i].xiawu13 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
|
|
3089
|
+ if(this.$refs.tableData.value1==false){
|
|
3090
|
+ list[i].xiawu13 = nextWeek[j].name
|
|
3091
|
+ }else{
|
|
3092
|
+ list[i].xiawu13 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
|
|
3093
|
+ }
|
|
3094
|
+ // list[i].xiawu13 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
|
2867
|
3095
|
}
|
2868
|
3096
|
//周日晚上
|
2869
|
3097
|
if (nextWeek[j].schedule_week == 7 && nextWeek[j].schedule_type == 3) {
|
2870
|
|
- list[i].wanshang13 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
|
|
3098
|
+ if(this.$refs.tableData.value1==false){
|
|
3099
|
+ list[i].wanshang13 = nextWeek[j].name
|
|
3100
|
+ }else{
|
|
3101
|
+ list[i].wanshang13 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
|
|
3102
|
+ }
|
|
3103
|
+ // list[i].wanshang13 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
|
2871
|
3104
|
}
|
2872
|
3105
|
}
|
2873
|
3106
|
|
|
@@ -2876,98 +3109,205 @@ export default {
|
2876
|
3109
|
}
|
2877
|
3110
|
//
|
2878
|
3111
|
if (lastWeek.length > 0) {
|
|
3112
|
+ console.log('ttttt',lastWeek);
|
2879
|
3113
|
for (let i = 0; i < list.length; i++) {
|
2880
|
3114
|
for (let j = 0; j < lastWeek.length; j++) {
|
2881
|
3115
|
if (list[i].机号 == lastWeek[j].number && list[i].区号 == lastWeek[j].zon_name) {
|
2882
|
3116
|
//周一
|
2883
|
3117
|
if (lastWeek[j].schedule_week == 1 && lastWeek[j].schedule_type == 1) {
|
2884
|
|
- list[i].shangwu14 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
|
|
3118
|
+ if(this.guanliu_show==false){
|
|
3119
|
+ list[i].shangwu14 = lastWeek[j].name
|
|
3120
|
+ }else{
|
|
3121
|
+ list[i].shangwu14 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
|
|
3122
|
+ }
|
|
3123
|
+ // list[i].shangwu14 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
|
2885
|
3124
|
}
|
2886
|
3125
|
//周一下午
|
2887
|
3126
|
if (lastWeek[j].schedule_week == 1 && lastWeek[j].schedule_type == 2) {
|
2888
|
|
- list[i].xiawu14 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
|
|
3127
|
+ if(this.guanliu_show==false){
|
|
3128
|
+ list[i].xiawu14 = lastWeek[j].name
|
|
3129
|
+ }else{
|
|
3130
|
+ list[i].xiawu14 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
|
|
3131
|
+ }
|
|
3132
|
+ // list[i].xiawu14 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
|
2889
|
3133
|
}
|
2890
|
3134
|
//周一晚上
|
2891
|
3135
|
if (lastWeek[j].schedule_week == 1 && lastWeek[j].schedule_type == 3) {
|
2892
|
|
- list[i].wanshang14 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
|
|
3136
|
+ if(this.guanliu_show==false){
|
|
3137
|
+ list[i].wanshang14 = lastWeek[j].name
|
|
3138
|
+ }else{
|
|
3139
|
+ list[i].wanshang14 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
|
|
3140
|
+ }
|
|
3141
|
+ // list[i].wanshang14 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
|
2893
|
3142
|
}
|
2894
|
3143
|
|
2895
|
3144
|
//周二
|
2896
|
3145
|
if (lastWeek[j].schedule_week == 2 && lastWeek[j].schedule_type == 1) {
|
2897
|
|
- list[i].shangwu15 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
|
|
3146
|
+ if(this.guanliu_show==false){
|
|
3147
|
+ list[i].shangwu15 = lastWeek[j].name
|
|
3148
|
+ }else{
|
|
3149
|
+ list[i].shangwu15 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
|
|
3150
|
+ }
|
|
3151
|
+ // list[i].shangwu15 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
|
2898
|
3152
|
}
|
2899
|
3153
|
//周二下午
|
2900
|
3154
|
if (lastWeek[j].schedule_week == 2 && lastWeek[j].schedule_type == 2) {
|
2901
|
|
- list[i].xiawu15 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
|
|
3155
|
+ if(this.guanliu_show==false){
|
|
3156
|
+ list[i].xiawu15 = lastWeek[j].name
|
|
3157
|
+ console.log('22222',list[i].xiawu15);
|
|
3158
|
+ }else{
|
|
3159
|
+ list[i].xiawu15 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
|
|
3160
|
+ }
|
|
3161
|
+ // list[i].xiawu15 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
|
2902
|
3162
|
}
|
2903
|
3163
|
//周二晚上
|
2904
|
3164
|
if (lastWeek[j].schedule_week == 2 && lastWeek[j].schedule_type == 3) {
|
2905
|
|
- list[i].wanshang15 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
|
|
3165
|
+ if(this.guanliu_show==false){
|
|
3166
|
+ list[i].wanshang15 = lastWeek[j].name
|
|
3167
|
+ }else{
|
|
3168
|
+ list[i].wanshang15 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
|
|
3169
|
+ }
|
|
3170
|
+ // list[i].wanshang15 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
|
2906
|
3171
|
}
|
2907
|
3172
|
|
2908
|
3173
|
//周三
|
2909
|
3174
|
if (lastWeek[j].schedule_week == 3 && lastWeek[j].schedule_type == 1) {
|
2910
|
|
- list[i].shangwu16 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
|
|
3175
|
+ if(this.guanliu_show==false){
|
|
3176
|
+ list[i].shangwu16 = lastWeek[j].name
|
|
3177
|
+ }else{
|
|
3178
|
+ list[i].shangwu16 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
|
|
3179
|
+ }
|
|
3180
|
+ // list[i].shangwu16 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
|
2911
|
3181
|
}
|
2912
|
3182
|
//周三下午
|
2913
|
3183
|
if (lastWeek[j].schedule_week == 3 && lastWeek[j].schedule_type == 2) {
|
2914
|
|
- list[i].xiawu16 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
|
|
3184
|
+ if(this.guanliu_show==false){
|
|
3185
|
+ list[i].xiawu16 = lastWeek[j].name
|
|
3186
|
+ }else{
|
|
3187
|
+ list[i].xiawu16 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
|
|
3188
|
+ }
|
|
3189
|
+ // list[i].xiawu16 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
|
2915
|
3190
|
}
|
2916
|
3191
|
//周三晚上
|
2917
|
3192
|
if (lastWeek[j].schedule_week == 3 && lastWeek[j].schedule_type == 3) {
|
2918
|
|
- list[i].wanshang16 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
|
|
3193
|
+ if(this.guanliu_show==false){
|
|
3194
|
+ list[i].wanshang16 = lastWeek[j].name
|
|
3195
|
+ }else{
|
|
3196
|
+ list[i].wanshang16 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
|
|
3197
|
+ }
|
|
3198
|
+ // list[i].wanshang16 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
|
2919
|
3199
|
}
|
2920
|
3200
|
|
2921
|
3201
|
//周四
|
2922
|
3202
|
if (lastWeek[j].schedule_week == 4 && lastWeek[j].schedule_type == 1) {
|
2923
|
|
- list[i].shangwu17 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
|
|
3203
|
+ if(this.guanliu_show==false){
|
|
3204
|
+ list[i].shangwu17 = lastWeek[j].name
|
|
3205
|
+ }else{
|
|
3206
|
+ list[i].shangwu17 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
|
|
3207
|
+ }
|
|
3208
|
+ // list[i].shangwu17 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
|
2924
|
3209
|
}
|
2925
|
3210
|
//周四下午
|
2926
|
3211
|
if (lastWeek[j].schedule_week == 4 && lastWeek[j].schedule_type == 2) {
|
2927
|
|
- list[i].xiawu17 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
|
|
3212
|
+ if(this.guanliu_show==false){
|
|
3213
|
+ list[i].xiawu17 = lastWeek[j].name
|
|
3214
|
+ }else{
|
|
3215
|
+ list[i].xiawu17 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
|
|
3216
|
+ }
|
|
3217
|
+ // list[i].xiawu17 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
|
2928
|
3218
|
}
|
2929
|
3219
|
//周四晚上
|
2930
|
3220
|
if (lastWeek[j].schedule_week == 4 && lastWeek[j].schedule_type == 3) {
|
2931
|
|
- list[i].wanshang17 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
|
|
3221
|
+ if(this.guanliu_show==false){
|
|
3222
|
+ list[i].wanshang17 = lastWeek[j].name
|
|
3223
|
+ }else{
|
|
3224
|
+ list[i].wanshang17 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
|
|
3225
|
+ }
|
|
3226
|
+ // list[i].wanshang17 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
|
2932
|
3227
|
}
|
2933
|
3228
|
|
2934
|
3229
|
//周五
|
2935
|
3230
|
if (lastWeek[j].schedule_week == 5 && lastWeek[j].schedule_type == 1) {
|
2936
|
|
- list[i].shangwu18 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
|
|
3231
|
+ if(this.guanliu_show==false){
|
|
3232
|
+ list[i].shangwu18 = lastWeek[j].name
|
|
3233
|
+ }else{
|
|
3234
|
+ list[i].shangwu18 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
|
|
3235
|
+ }
|
|
3236
|
+ // list[i].shangwu18 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
|
2937
|
3237
|
}
|
2938
|
3238
|
//周五下午
|
2939
|
3239
|
if (lastWeek[j].schedule_week == 5 && lastWeek[j].schedule_type == 2) {
|
2940
|
|
- list[i].xiawu18 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
|
|
3240
|
+ if(this.guanliu_show==false){
|
|
3241
|
+ list[i].xiawu18 = lastWeek[j].name
|
|
3242
|
+ }else{
|
|
3243
|
+ list[i].xiawu18 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
|
|
3244
|
+ }
|
|
3245
|
+ // list[i].xiawu18 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
|
2941
|
3246
|
}
|
2942
|
3247
|
//周五晚上
|
2943
|
3248
|
if (lastWeek[j].schedule_week == 5 && lastWeek[j].schedule_type == 3) {
|
2944
|
|
- list[i].wanshang18 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
|
|
3249
|
+ if(this.guanliu_show==false){
|
|
3250
|
+ list[i].wanshang18 = lastWeek[j].name
|
|
3251
|
+ }else{
|
|
3252
|
+ list[i].wanshang18 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
|
|
3253
|
+ }
|
|
3254
|
+ // list[i].wanshang18 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
|
2945
|
3255
|
}
|
2946
|
3256
|
|
2947
|
3257
|
//周六
|
2948
|
3258
|
if (lastWeek[j].schedule_week == 6 && lastWeek[j].schedule_type == 1) {
|
2949
|
|
- list[i].shangwu19 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
|
|
3259
|
+ if(this.guanliu_show==false){
|
|
3260
|
+ list[i].shangwu19 = lastWeek[j].name
|
|
3261
|
+ }else{
|
|
3262
|
+ list[i].shangwu19 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
|
|
3263
|
+ }
|
|
3264
|
+ // list[i].shangwu19 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
|
2950
|
3265
|
}
|
2951
|
3266
|
//周六下午
|
2952
|
3267
|
if (lastWeek[j].schedule_week == 6 && lastWeek[j].schedule_type == 2) {
|
2953
|
|
- list[i].xiawu19 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
|
|
3268
|
+ if(this.guanliu_show==false){
|
|
3269
|
+ list[i].xiawu19 = lastWeek[j].name
|
|
3270
|
+ }else{
|
|
3271
|
+ list[i].xiawu19 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
|
|
3272
|
+ }
|
|
3273
|
+ // list[i].xiawu19 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
|
2954
|
3274
|
}
|
2955
|
3275
|
//周六晚上
|
2956
|
3276
|
if (lastWeek[j].schedule_week == 6 && lastWeek[j].schedule_type == 3) {
|
2957
|
|
- list[i].wanshang19 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
|
|
3277
|
+ if(this.guanliu_show==false){
|
|
3278
|
+ list[i].wanshang19 = lastWeek[j].name
|
|
3279
|
+ }else{
|
|
3280
|
+ list[i].wanshang19 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
|
|
3281
|
+ }
|
|
3282
|
+ // list[i].wanshang19 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
|
2958
|
3283
|
}
|
2959
|
3284
|
|
2960
|
3285
|
//周日
|
2961
|
3286
|
if (lastWeek[j].schedule_week == 7 && lastWeek[j].schedule_type == 1) {
|
2962
|
|
- list[i].shangwu20 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
|
|
3287
|
+ if(this.guanliu_show==false){
|
|
3288
|
+ list[i].shangwu20 = lastWeek[j].name
|
|
3289
|
+ }else{
|
|
3290
|
+ list[i].shangwu20 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
|
|
3291
|
+ }
|
|
3292
|
+ // list[i].shangwu20 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
|
2963
|
3293
|
}
|
2964
|
3294
|
//周日下午
|
2965
|
3295
|
if (lastWeek[j].schedule_week == 7 && lastWeek[j].schedule_type == 2) {
|
2966
|
|
- list[i].xiawu20 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
|
|
3296
|
+ if(this.guanliu_show==false){
|
|
3297
|
+ list[i].xiawu20 = lastWeek[j].name
|
|
3298
|
+ }else{
|
|
3299
|
+ list[i].xiawu20 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
|
|
3300
|
+ }
|
|
3301
|
+ // list[i].xiawu20 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
|
2967
|
3302
|
}
|
2968
|
3303
|
//周日晚上
|
2969
|
3304
|
if (lastWeek[j].schedule_week == 7 && lastWeek[j].schedule_type == 3) {
|
2970
|
|
- list[i].wanshang20 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
|
|
3305
|
+ if(this.guanliu_show==false){
|
|
3306
|
+ list[i].wanshang20 = lastWeek[j].name
|
|
3307
|
+ }else{
|
|
3308
|
+ list[i].wanshang20 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
|
|
3309
|
+ }
|
|
3310
|
+ // list[i].wanshang20 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
|
2971
|
3311
|
}
|
2972
|
3312
|
}
|
2973
|
3313
|
|
|
@@ -3250,7 +3590,10 @@ export default {
|
3250
|
3590
|
|
3251
|
3591
|
}
|
3252
|
3592
|
|
3253
|
|
- }
|
|
3593
|
+ },
|
|
3594
|
+ // updated(){
|
|
3595
|
+ // this.getThreeWeekList()
|
|
3596
|
+ // }
|
3254
|
3597
|
}
|
3255
|
3598
|
</script>
|
3256
|
3599
|
|