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

src/xt_pages/outpatientCharges/statementTemplate/printTen.vue

@@ -274,7 +274,7 @@
             <td style="border: 1px solid gray;width: 150px;height: 30px;">个人账户支付</td>
             <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.new_order.acct_pay}}</td>
             <td style="border: 1px solid gray;width: 150px;height: 30px;">个人现金支付</td>
-            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.new_order.psn_cash_pay}}</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.psn_cash_pay}}</td>
             <td style="border: 1px solid gray;width: 150px;height: 30px;">其他基金支付</td>
             <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.new_order.oth_pay}}</td>
           </tr>

src/xt_pages/workforce/appointment.vue

@@ -124,7 +124,7 @@
         <table-data ref="tableData"  :week-time="activeName" :partitions-prop="partitions"
                     :schedule-zone-row-prop="scheduleZoneRow"
                     :schedule-zone-prop="scheduleZone" title="" @event1="changePartition"
-                    @event2="changeSchedule"  @event3="changeWeekDay" @event6="changeScheduleType" v-show="showtableOne">
+                    @event2="changeSchedule"  @event3="changeWeekDay" @event6="changeScheduleType" @guanliu_show="guanliu" v-show="showtableOne">
         </table-data>
       </div>
       <!-- 编辑 -->
@@ -369,7 +369,8 @@ export default {
       schedule_week: 0,
       newDay: [],
       templateObj: {},
-      week_date:""
+      week_date:"",
+      guanliu_show:false,
       
     }
   },
@@ -383,6 +384,12 @@ export default {
     beforeweekTable
   },
   methods: {
+    // 
+    guanliu(value){
+      this.guanliu_show=value
+      console.log('1111',value);
+      this.getThreeWeekList()
+    },
     handleClick(e,tab){
       if(e.name == 'historyWeek'){
         this.showtable=true
@@ -794,6 +801,14 @@ export default {
       this.$router.push({path: '/workforce/template'})
     },
     export_file: function () {
+      // this.getThreeWeekList()
+      if(this.$refs.tableData.value1==false){
+        this.guanliu_show=false
+        // this.export_file_step_two()
+      }else{
+        this.guanliu_show=true
+        // this.export_file_step_two()
+      }
       // this.getWeekPanelsTwo()
       this.export_file_step_two()
     },
@@ -2478,7 +2493,7 @@ export default {
         partition_id: this.partition_id,
         schedule_type: this.schedule_type
       }
-      console.log("params32323232323223", params)
+      // console.log("params32323232323223", params)
       getThreeWeekList(params).then(response => {
         if (response.data.state == 1) {
           var partitions = response.data.data.partitions
@@ -2490,7 +2505,21 @@ export default {
           for (let key in partitions) {
             var tempValue
             var jihaos = partitions[key].jihaos
-
+            
+            jihaos.sort(function(a,b) {
+              return a.sort-b.sort
+            })
+            // console.log('rrrrr',jihaos);
+            // for(let i=0;i<jihaos1.length;i++){
+            //   var jihaos=jihaos1[i].sort
+            // }
+            // for(let i in jihaos1){
+            //   var jihaos=jihaos1[i].sort
+            //    jihaos.sort(function(a,b){
+            //     return a-b
+            //   })
+            //   console.log('wwwww',jihaos);
+            // }
             if (i == 0) {
               let m = 'A3' + ':' + 'A' + (2 + jihaos.length)
               tempValue = (2 + jihaos.length)
@@ -2672,7 +2701,7 @@ export default {
           console.log("list")
           console.log(list)
           console.log("week")
-          console.log(week)
+          console.log(lastWeek)
 
           if (week.length > 0) {
             // console.log('qqqqqqqqq',list);
@@ -2682,92 +2711,191 @@ export default {
                 if (list[i].机号 == week[j].number && list[i].区号 == week[j].zon_name) {
                   //  周一上午 week[j].number week[j].zon_name
                   if (week[j].schedule_week == 1 && week[j].schedule_type == 1) {
-                    // console.log(week[j].name)
-                    list[i].shangwu = week[j].name+" "+week[j].dialysis_machine_name
-                    console.log('eeeeeee',week[j].mode_id)
+                    if(this.guanliu_show==false){
+                      list[i].shangwu = week[j].name
+                      // console.log('eeeeeee',list[i].shangwu)
+                    }else{
+                      list[i].shangwu = week[j].name+" "+week[j].dialysis_machine_name
+                      // console.log('kkkkkk',list[i].shangwu)
+                    }
                   }
                   // 周一下午
                   if (week[j].schedule_week == 1 && week[j].schedule_type == 2) {
-                    list[i].xiawu = week[j].name+" "+week[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].xiawu = week[j].name
+                    }else{
+                      list[i].xiawu = week[j].name+" "+week[j].dialysis_machine_name
+                    }
                   }
                   // 周一晚上
                   if (week[j].schedule_week == 1 && week[j].schedule_type == 3) {
-                    list[i].wanshang = week[j].name+" "+week[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].wanshang = week[j].name
+                    }else{
+                      list[i].wanshang = week[j].name+" "+week[j].dialysis_machine_name
+                    }
                   }
 
                   //周二上午
                   if (week[j].schedule_week == 2 && week[j].schedule_type == 1) {
-                    list[i].shangwu1 = week[j].name+" "+week[j].dialysis_machine_name
-                    console.log('eeeeeee',week[j].mode_id)
+                    if(this.$refs.tableData.value1==false){
+                      list[i].shangwu1 = week[j].name
+                    }else{
+                      list[i].shangwu1 = week[j].name+" "+week[j].dialysis_machine_name
+                    }
                   }
                   //周二下午
                   if (week[j].schedule_week == 2 && week[j].schedule_type == 2) {
-                    list[i].xiawu1 = week[j].name+" "+week[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].xiawu1 = week[j].name
+                    }else{
+                      list[i].xiawu1 = week[j].name+" "+week[j].dialysis_machine_name
+                    }
                   }
                   //周二晚上
                   if (week[j].schedule_week == 2 && week[j].schedule_type == 3) {
-                    list[i].wanshang1 = week[j].name+" "+week[i].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].wanshang1 = week[j].name
+                    }else{
+                      list[i].wanshang1 = week[j].name+" "+week[j].dialysis_machine_name
+                    }
+                    // list[i].wanshang1 = week[j].name+" "+week[i].dialysis_machine_name
                   }
 
                   //周三上午
                   if (week[j].schedule_week == 3 && week[j].schedule_type == 1) {
-                    list[i].shangwu2 = week[j].name+" "+week[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].shangwu2 = week[j].name
+                    }else{
+                      list[i].shangwu2 = week[j].name+" "+week[j].dialysis_machine_name
+                    }
+                    // list[i].shangwu2 = week[j].name+" "+week[j].dialysis_machine_name
                   }
                   //周三下午
                   if (week[j].schedule_week == 3 && week[j].schedule_type == 2) {
-                    list[i].xiawu2 = week[j].name+" "+week[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].xiawu2 = week[j].name
+                    }else{
+                      list[i].xiawu2 = week[j].name+" "+week[j].dialysis_machine_name
+                    }
+                    // list[i].xiawu2 = week[j].name+" "+week[j].dialysis_machine_name
                   }
                   //周三晚上
                   if (week[j].schedule_week == 3 && week[j].schedule_type == 3) {
-                    list[i].wanshang2 = week[j].name+" "+week[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].wanshang2 = week[j].name
+                    }else{
+                      list[i].wanshang2 = week[j].name+" "+week[j].dialysis_machine_name
+                    }
+                    // list[i].wanshang2 = week[j].name+" "+week[j].dialysis_machine_name
                   }
                   //周四上午
                   if (week[j].schedule_week == 4 && week[j].schedule_type == 1) {
-                    list[i].shangwu3 = week[j].name+" "+week[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].shangwu3 = week[j].name
+                    }else{
+                      list[i].shangwu3 = week[j].name+" "+week[j].dialysis_machine_name
+                    }
+                    // list[i].shangwu3 = week[j].name+" "+week[j].dialysis_machine_name
                   }
                   //周四下午
                   if (week[j].schedule_week == 4 && week[j].schedule_type == 2) {
-                    list[i].xiawu3 = week[j].name+" "+week[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].xiawu3 = week[j].name
+                    }else{
+                      list[i].xiawu3 = week[j].name+" "+week[j].dialysis_machine_name
+                    }
+                    // list[i].xiawu3 = week[j].name+" "+week[j].dialysis_machine_name
                   }
                   //周四晚上
                   if (week[j].schedule_week == 4 && week[j].schedule_type == 3) {
-                    list[i].wanshang3 = week[j].name+" "+week[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].wanshang3 = week[j].name
+                    }else{
+                      list[i].wanshang3 = week[j].name+" "+week[j].dialysis_machine_name
+                    }
+                    // list[i].wanshang3 = week[j].name+" "+week[j].dialysis_machine_name
                   }
                   //周五上午
                   if (week[j].schedule_week == 5 && week[j].schedule_type == 1) {
-                    list[i].shangwu4 = week[j].name+" "+week[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].shangwu4 = week[j].name
+                    }else{
+                      list[i].shangwu4 = week[j].name+" "+week[j].dialysis_machine_name
+                    }
+                    // list[i].shangwu4 = week[j].name+" "+week[j].dialysis_machine_name
                   }
                   //周五下午
                   if (week[j].schedule_week == 5 && week[j].schedule_type == 2) {
-                    list[i].xiawu4 = week[j].name+" "+week[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].xiawu4 = week[j].name
+                    }else{
+                      list[i].xiawu4 = week[j].name+" "+week[j].dialysis_machine_name
+                    }
+                    // list[i].xiawu4 = week[j].name+" "+week[j].dialysis_machine_name
                   }
                   //周五晚上
                   if (week[j].schedule_week == 5 && week[j].schedule_type == 3) {
-                    list[i].wanshang4 = week[j].name+" "+week[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].wanshang4 = week[j].name
+                    }else{
+                      list[i].wanshang4 = week[j].name+" "+week[j].dialysis_machine_name
+                    }
+                    // list[i].wanshang4 = week[j].name+" "+week[j].dialysis_machine_name
                   }
                   //周六上午
                   if (week[j].schedule_week == 6 && week[j].schedule_type == 1) {
-                    list[i].shangwu5 = week[j].name+" "+week[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].shangwu5 = week[j].name
+                    }else{
+                      list[i].shangwu5 = week[j].name+" "+week[j].dialysis_machine_name
+                    }
+                    // list[i].shangwu5 = week[j].name+" "+week[j].dialysis_machine_name
                   }
                   //周六下午
                   if (week[j].schedule_week == 6 && week[j].schedule_type == 2) {
-                    list[i].xiawu5 = week[j].name+" "+week[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].xiawu5 = week[j].name
+                    }else{
+                      list[i].xiawu5 = week[j].name+" "+week[j].dialysis_machine_name
+                    }
+                    // list[i].xiawu5 = week[j].name+" "+week[j].dialysis_machine_name
                   }
                   //周六晚上
                   if (week[j].schedule_week == 6 && week[j].schedule_type == 3) {
-                    list[i].wanshang5 = week[j].name+" "+week[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].wanshang5 = week[j].name
+                    }else{
+                      list[i].wanshang5 = week[j].name+" "+week[j].dialysis_machine_name
+                    }
+                    // list[i].wanshang5 = week[j].name+" "+week[j].dialysis_machine_name
                   }
                   //周日上午
                   if (week[j].schedule_week == 7 && week[j].schedule_type == 1) {
-                    list[i].shangwu6 = week[j].name+" "+week[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].shangwu6 = week[j].name
+                    }else{
+                      list[i].shangwu6 = week[j].name+" "+week[j].dialysis_machine_name
+                    }
+                    // list[i].shangwu6 = week[j].name+" "+week[j].dialysis_machine_name
                   }
                   //周日下午
                   if (week[j].schedule_week == 7 && week[j].schedule_type == 2) {
-                    list[i].xiawu6 = week[j].name+" "+week[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].xiawu6 = week[j].name
+                    }else{
+                      list[i].xiawu6 = week[j].name+" "+week[j].dialysis_machine_name
+                    }
+                    // list[i].xiawu6 = week[j].name+" "+week[j].dialysis_machine_name
                   }
                   //周日晚上
                   if (week[j].schedule_week == 7 && week[j].schedule_type == 3) {
-                    list[i].wanshang6 = week[j].name+" "+week[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].wanshang6 = week[j].name
+                    }else{
+                      list[i].wanshang6 = week[j].name+" "+week[j].dialysis_machine_name
+                    }
+                    // list[i].wanshang6 = week[j].name+" "+week[j].dialysis_machine_name
                   }
                 }
 
@@ -2781,93 +2909,198 @@ export default {
                 if (list[i].机号 == nextWeek[j].number && list[i].区号 == nextWeek[j].zon_name) {
                   //周一
                   if (nextWeek[j].schedule_week == 1 && nextWeek[j].schedule_type == 1) {
-                    list[i].shangwu7 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].shangwu7 = nextWeek[j].name
+                    }else{
+                      list[i].shangwu7 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    }
+                    // list[i].shangwu7 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
                   }
                   //周一下午
                   if (nextWeek[j].schedule_week == 1 && nextWeek[j].schedule_type == 2) {
-                    list[i].xiawu7 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].xiawu7 = nextWeek[j].name
+                    }else{
+                      list[i].xiawu7 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    }
+                    // list[i].xiawu7 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
                   }
                   //周一晚上
                   if (nextWeek[j].schedule_week == 1 && nextWeek[j].schedule_type == 3) {
-                    list[i].wanshang7 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].wanshang7 = nextWeek[j].name
+                    }else{
+                      list[i].wanshang7 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    }
+                    // list[i].wanshang7 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
                   }
 
                   //周二上午
                   if (nextWeek[j].schedule_week == 2 && nextWeek[j].schedule_type == 1) {
-                    list[i].shangwu8 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].shangwu8 = nextWeek[j].name
+                    }else{
+                      list[i].shangwu8 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    }
+                    // list[i].shangwu8 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
                   }
                   //周二下午
                   if (nextWeek[j].schedule_week == 2 && nextWeek[j].schedule_type == 2) {
-                    list[i].xiawu8 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].xiawu8 = nextWeek[j].name
+                    }else{
+                      list[i].xiawu8 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    }
+                    // list[i].xiawu8 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
                   }
                   //周二晚上
                   if (nextWeek[j].schedule_week == 2 && nextWeek[j].schedule_type == 3) {
-                    list[i].wanshang8 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].wanshang8 = nextWeek[j].name
+                    }else{
+                      list[i].wanshang8 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    }
+                    // list[i].wanshang8 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
                   }
 
                   //周三上午
                   if (nextWeek[j].schedule_week == 3 && nextWeek[j].schedule_type == 1) {
-                    list[i].shangwu9 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].shangwu9 = nextWeek[j].name
+                    }else{
+                      list[i].shangwu9 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    }
+                    // list[i].shangwu9 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
                   }
                   //周三下午
                   if (nextWeek[j].schedule_week == 3 && nextWeek[j].schedule_type == 2) {
-                    list[i].xiawu9 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].xiawu9 = nextWeek[j].name
+                    }else{
+                      list[i].xiawu9 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    }
+                    // 
                   }
                   //周三晚上
                   if (nextWeek[j].schedule_week == 3 && nextWeek[j].schedule_type == 3) {
-                    list[i].wanshang9 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].wanshang9 = nextWeek[j].name
+                    }else{
+                      list[i].wanshang9 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    }
+                    // list[i].wanshang9 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
                   }
 
                   //周四上午
                   if (nextWeek[j].schedule_week == 4 && nextWeek[j].schedule_type == 1) {
-                    list[i].shangwu10 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].shangwu10 = nextWeek[j].name
+                    }else{
+                      list[i].shangwu10 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    }
+                    // list[i].shangwu10 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
                   }
                   //周四下午
                   if (nextWeek[j].schedule_week == 4 && nextWeek[j].schedule_type == 2) {
-                    list[i].xiawu10 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].xiawu10 = nextWeek[j].name
+                    }else{
+                      list[i].xiawu10 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    }
+                    // list[i].xiawu10 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
                   }
                   //周四晚上
                   if (nextWeek[j].schedule_week == 4 && nextWeek[j].schedule_type == 3) {
-                    list[i].wanshang10 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].wanshang10 = nextWeek[j].name
+                    }else{
+                      list[i].wanshang10 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    }
+                    // list[i].wanshang10 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
                   }
 
                   //周五上午
                   if (nextWeek[j].schedule_week == 5 && nextWeek[j].schedule_type == 1) {
-                    list[i].shangwu11 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].shangwu11 = nextWeek[j].name
+                    }else{
+                      list[i].shangwu11 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    }
+                    // list[i].shangwu11 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
                   }
                   //周五下午
                   if (nextWeek[j].schedule_week == 5 && nextWeek[j].schedule_type == 2) {
-                    list[i].xiawu11 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].xiawu11 = nextWeek[j].name
+                    }else{
+                      list[i].xiawu11 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    }
+                    // list[i].xiawu11 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
                   }
                   //周五晚上
                   if (nextWeek[j].schedule_week == 5 && nextWeek[j].schedule_type == 3) {
-                    list[i].wanshang11 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].wanshang11 = nextWeek[j].name
+                    }else{
+                      list[i].wanshang11 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    }
+                    // list[i].wanshang11 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
                   }
 
                   //周六上午
                   if (nextWeek[j].schedule_week == 6 && nextWeek[j].schedule_type == 1) {
-                    list[i].shangwu12 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].shangwu12 = nextWeek[j].name
+                    }else{
+                      list[i].shangwu12 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    }
+                    // list[i].shangwu12 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
                   }
                   //周六下午
                   if (nextWeek[j].schedule_week == 6 && nextWeek[j].schedule_type == 2) {
-                    list[i].xiawu12 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].xiawu12 = nextWeek[j].name
+                    }else{
+                      list[i].xiawu12 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    }
+                    // list[i].xiawu12 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
                   }
                   //周六晚上
                   if (nextWeek[j].schedule_week == 6 && nextWeek[j].schedule_type == 3) {
-                    list[i].wanshang12 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].wanshang12 = nextWeek[j].name
+                    }else{
+                      list[i].wanshang12 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    }
+                    // list[i].wanshang12 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
                   }
 
                   //周日上午
                   if (nextWeek[j].schedule_week == 7 && nextWeek[j].schedule_type == 1) {
-                    list[i].shangwu13 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].shangwu13 = nextWeek[j].name
+                    }else{
+                      list[i].shangwu13 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    }
+                    // list[i].shangwu13 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
                   }
                   //周日下午
                   if (nextWeek[j].schedule_week == 7 && nextWeek[j].schedule_type == 2) {
-                    list[i].xiawu13 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].xiawu13 = nextWeek[j].name
+                    }else{
+                      list[i].xiawu13 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    }
+                    // list[i].xiawu13 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
                   }
                   //周日晚上
                   if (nextWeek[j].schedule_week == 7 && nextWeek[j].schedule_type == 3) {
-                    list[i].wanshang13 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    if(this.$refs.tableData.value1==false){
+                      list[i].wanshang13 = nextWeek[j].name
+                    }else{
+                      list[i].wanshang13 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
+                    }
+                    // list[i].wanshang13 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
                   }
                 }
 
@@ -2876,98 +3109,205 @@ export default {
           }
           //
           if (lastWeek.length > 0) {
+            console.log('ttttt',lastWeek);
             for (let i = 0; i < list.length; i++) {
               for (let j = 0; j < lastWeek.length; j++) {
                 if (list[i].机号 == lastWeek[j].number && list[i].区号 == lastWeek[j].zon_name) {
                   //周一
                   if (lastWeek[j].schedule_week == 1 && lastWeek[j].schedule_type == 1) {
-                    list[i].shangwu14 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    if(this.guanliu_show==false){
+                      list[i].shangwu14 = lastWeek[j].name
+                    }else{
+                      list[i].shangwu14 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    }
+                    // list[i].shangwu14 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
                   }
                   //周一下午
                   if (lastWeek[j].schedule_week == 1 && lastWeek[j].schedule_type == 2) {
-                    list[i].xiawu14 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    if(this.guanliu_show==false){
+                      list[i].xiawu14 = lastWeek[j].name
+                    }else{
+                      list[i].xiawu14 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    }
+                    // list[i].xiawu14 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
                   }
                   //周一晚上
                   if (lastWeek[j].schedule_week == 1 && lastWeek[j].schedule_type == 3) {
-                    list[i].wanshang14 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    if(this.guanliu_show==false){
+                      list[i].wanshang14 = lastWeek[j].name
+                    }else{
+                      list[i].wanshang14 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    }
+                    // list[i].wanshang14 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
                   }
 
                   //周二
                   if (lastWeek[j].schedule_week == 2 && lastWeek[j].schedule_type == 1) {
-                    list[i].shangwu15 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    if(this.guanliu_show==false){
+                      list[i].shangwu15 = lastWeek[j].name
+                    }else{
+                      list[i].shangwu15 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    }
+                    // list[i].shangwu15 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
                   }
                   //周二下午
                   if (lastWeek[j].schedule_week == 2 && lastWeek[j].schedule_type == 2) {
-                    list[i].xiawu15 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    if(this.guanliu_show==false){
+                      list[i].xiawu15 = lastWeek[j].name
+                      console.log('22222',list[i].xiawu15);
+                    }else{
+                      list[i].xiawu15 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    }
+                    // list[i].xiawu15 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
                   }
                   //周二晚上
                   if (lastWeek[j].schedule_week == 2 && lastWeek[j].schedule_type == 3) {
-                    list[i].wanshang15 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    if(this.guanliu_show==false){
+                      list[i].wanshang15 = lastWeek[j].name
+                    }else{
+                      list[i].wanshang15 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    }
+                    // list[i].wanshang15 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
                   }
 
                   //周三
                   if (lastWeek[j].schedule_week == 3 && lastWeek[j].schedule_type == 1) {
-                    list[i].shangwu16 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    if(this.guanliu_show==false){
+                      list[i].shangwu16 = lastWeek[j].name
+                    }else{
+                      list[i].shangwu16 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    }
+                    // list[i].shangwu16 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
                   }
                   //周三下午
                   if (lastWeek[j].schedule_week == 3 && lastWeek[j].schedule_type == 2) {
-                    list[i].xiawu16 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    if(this.guanliu_show==false){
+                      list[i].xiawu16 = lastWeek[j].name
+                    }else{
+                      list[i].xiawu16 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    }
+                    // list[i].xiawu16 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
                   }
                   //周三晚上
                   if (lastWeek[j].schedule_week == 3 && lastWeek[j].schedule_type == 3) {
-                    list[i].wanshang16 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    if(this.guanliu_show==false){
+                      list[i].wanshang16 = lastWeek[j].name
+                    }else{
+                      list[i].wanshang16 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    }
+                    // list[i].wanshang16 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
                   }
 
                   //周四
                   if (lastWeek[j].schedule_week == 4 && lastWeek[j].schedule_type == 1) {
-                    list[i].shangwu17 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    if(this.guanliu_show==false){
+                      list[i].shangwu17 = lastWeek[j].name
+                    }else{
+                      list[i].shangwu17 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    }
+                    // list[i].shangwu17 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
                   }
                   //周四下午
                   if (lastWeek[j].schedule_week == 4 && lastWeek[j].schedule_type == 2) {
-                    list[i].xiawu17 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    if(this.guanliu_show==false){
+                      list[i].xiawu17 = lastWeek[j].name
+                    }else{
+                      list[i].xiawu17 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    }
+                    // list[i].xiawu17 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
                   }
                   //周四晚上
                   if (lastWeek[j].schedule_week == 4 && lastWeek[j].schedule_type == 3) {
-                    list[i].wanshang17 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    if(this.guanliu_show==false){
+                      list[i].wanshang17 = lastWeek[j].name
+                    }else{
+                      list[i].wanshang17 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    }
+                    // list[i].wanshang17 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
                   }
 
                   //周五
                   if (lastWeek[j].schedule_week == 5 && lastWeek[j].schedule_type == 1) {
-                    list[i].shangwu18 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    if(this.guanliu_show==false){
+                      list[i].shangwu18 = lastWeek[j].name
+                    }else{
+                      list[i].shangwu18 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    }
+                    // list[i].shangwu18 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
                   }
                   //周五下午
                   if (lastWeek[j].schedule_week == 5 && lastWeek[j].schedule_type == 2) {
-                    list[i].xiawu18 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    if(this.guanliu_show==false){
+                      list[i].xiawu18 = lastWeek[j].name
+                    }else{
+                      list[i].xiawu18 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    }
+                    // list[i].xiawu18 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
                   }
                   //周五晚上
                   if (lastWeek[j].schedule_week == 5 && lastWeek[j].schedule_type == 3) {
-                    list[i].wanshang18 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    if(this.guanliu_show==false){
+                      list[i].wanshang18 = lastWeek[j].name
+                    }else{
+                      list[i].wanshang18 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    }
+                    // list[i].wanshang18 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
                   }
 
                   //周六
                   if (lastWeek[j].schedule_week == 6 && lastWeek[j].schedule_type == 1) {
-                    list[i].shangwu19 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    if(this.guanliu_show==false){
+                      list[i].shangwu19 = lastWeek[j].name
+                    }else{
+                      list[i].shangwu19 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    }
+                    // list[i].shangwu19 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
                   }
                   //周六下午
                   if (lastWeek[j].schedule_week == 6 && lastWeek[j].schedule_type == 2) {
-                    list[i].xiawu19 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    if(this.guanliu_show==false){
+                      list[i].xiawu19 = lastWeek[j].name
+                    }else{
+                      list[i].xiawu19 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    }
+                    // list[i].xiawu19 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
                   }
                   //周六晚上
                   if (lastWeek[j].schedule_week == 6 && lastWeek[j].schedule_type == 3) {
-                    list[i].wanshang19 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    if(this.guanliu_show==false){
+                      list[i].wanshang19 = lastWeek[j].name
+                    }else{
+                      list[i].wanshang19 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    }
+                    // list[i].wanshang19 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
                   }
 
                   //周日
                   if (lastWeek[j].schedule_week == 7 && lastWeek[j].schedule_type == 1) {
-                    list[i].shangwu20 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    if(this.guanliu_show==false){
+                      list[i].shangwu20 = lastWeek[j].name
+                    }else{
+                      list[i].shangwu20 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    }
+                    // list[i].shangwu20 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
                   }
                   //周日下午
                   if (lastWeek[j].schedule_week == 7 && lastWeek[j].schedule_type == 2) {
-                    list[i].xiawu20 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    if(this.guanliu_show==false){
+                      list[i].xiawu20 = lastWeek[j].name
+                    }else{
+                      list[i].xiawu20 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    }
+                    // list[i].xiawu20 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
                   }
                   //周日晚上
                   if (lastWeek[j].schedule_week == 7 && lastWeek[j].schedule_type == 3) {
-                    list[i].wanshang20 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    if(this.guanliu_show==false){
+                      list[i].wanshang20 = lastWeek[j].name
+                    }else{
+                      list[i].wanshang20 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
+                    }
+                    // list[i].wanshang20 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
                   }
                 }
 
@@ -3250,7 +3590,10 @@ export default {
 
     }
 
-  }
+  },
+  // updated(){
+  //   this.getThreeWeekList()
+  // }
 }
 </script>