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

src/xt_pages/dialysis/details/dialog/monitor_dialog.vue

             align="center"
             label="置换液流量(ml/h)"
             width="100"
-            v-if="isShow('置换液流量') && template_id != 27"
+            v-if="isShow('置换液流量') && template_id != 27 && template_id != 60"
           >
             <template slot-scope="scope">
               {{
             align="center"
             label="置换液流量(ml/min)"
             width="100"
-            v-if="isShow('置换液流量') && template_id == 27"
+            v-if="isShow('置换液流量') && (template_id == 27 || template_id == 60)"
           >
             <template slot-scope="scope">
               {{
             </el-form-item>
           </el-col>
 
-          <el-col :span="8" v-if="isShow('置换液流量') && template_id != 27">
+          <el-col :span="8" v-if="isShow('置换液流量') && template_id != 27  && template_id != 60">
             <el-form-item label="置换液流量(ml/h)：" :prop="isName('置换液流量')"
               :rules="isCheckmust('置换液流量')">
               <el-input v-model="form.displacement_flow_quantity"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8" v-if="isShow('置换液流量') && template_id == 27">
+          <el-col :span="8" v-if="isShow('置换液流量') && (template_id ==27 ||  template_id == 60)">
             <el-form-item label="置换液流量(ml/min)：" :prop="isName('置换液流量')"
               :rules="isCheckmust('置换液流量')">
               <el-input v-model="form.displacement_flow_quantity"></el-input>

src/xt_pages/dialysis/details/dialysisMonitoring.vue

           <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432  && this.$store.getters.xt_user.template_info.org_id != 10445) || org_id == 10558" width="92px" > 置换量(L) </th>
           <th v-if=" isShow('SpO₂') && template_id != 6 && template_id != 10 && template_id != 11  " width="92px" > SpO₂(%) </th>
           <th v-if="isShow('电导度')" width="92px">电导度(mS/m)</th>
-          <th v-if="isShow('置换液流量') && template_id != 27" width="92px">置换液流量(ml/h)</th>
-          <th v-if="isShow('置换液流量') && template_id == 27" width="92px">置换液流量(ml/min)</th>
+          <th v-if="isShow('置换液流量') && template_id != 27 && template_id != 60" width="92px">置换液流量(ml/h)</th>
+          <th v-if="isShow('置换液流量') && (template_id == 27 ||  template_id == 60)" width="92px">置换液流量(ml/min)</th>
           <th v-if="isShow('透析液流量')" width="92px">透析液流量(ml/h)</th>
           <th v-if="isShow('肝素用量余量')" width="92px">肝素用量余量(ml)</th>
           <th v-if="isShow('抗凝剂')" width="92px">抗凝剂</th>

src/xt_pages/workforce/appointment.vue

   </span>
     </el-dialog>
 
-
     <el-dialog
         title="提示"
         :visible.sync="isExistRepeatVisible"
 
           this.tableList.map(item => {
             data.push(Object.values(item))
-
           })
 
           const filename = '排班模版'
 
-
+          console.log('333333333',this.tableList),
           excel.export_json_to_excel({
+            
             multiHeader,
             header,
             merges,
       getThreeWeekList(params).then(response => {
         if (response.data.state == 1) {
           var partitions = response.data.data.partitions
-
+          console.log('yyyyyyy',response.data.data);
           const merges = ['A1:A2', 'B1:B2', 'C1:E1', 'F1:H1', 'I1:K1', 'L1:N1', 'O1:Q1', 'R1:T1', 'U1:W1', 'X1:Z1', 'AA1:AC1', 'AD1:AF1', 'AG1:AI1', 'AJ1:AL1', 'AM1:AO1', 'AP1:AR1', 'AS1:AU1', 'AV1:AX1', 'AY1:BA1', 'BB1:BD1', 'BE1:BG1', 'BH1:BJ1', 'BK1:BM1']
           var list = []
           let i = 0
           var end = this.getTimestamp(end_time) - 28800
           console.log("end", end)
           var scheduleList = response.data.data.list
-
+          // console.log('ttttttttt',scheduleList);
           var week = []
           var nextWeek = []
           var lastWeek = []
           console.log(week)
 
           if (week.length > 0) {
+            // console.log('qqqqqqqqq',list);
+            // console.log('wwwwwwwww',week);
             for (let i = 0; i < list.length; i++) {
               for (let j = 0; j < week.length; j++) {
                 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[i].dialysis_machine_name
+                    // console.log(week[j].name)
+                    list[i].shangwu = week[j].name+" "+week[j].dialysis_machine_name
+                    console.log('eeeeeee',list[i])
                   }
                   // 周一下午
                   if (week[j].schedule_week == 1 && week[j].schedule_type == 2) {
-                    list[i].xiawu = week[j].name+" "+week[i].dialysis_machine_name
+                    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[i].dialysis_machine_name
+                    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[i].dialysis_machine_name
+                    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[i].dialysis_machine_name
+                    list[i].xiawu1 = week[j].name+" "+week[j].dialysis_machine_name
                   }
                   //周二晚上
                   if (week[j].schedule_week == 2 && week[j].schedule_type == 3) {
 
                   //周三上午
                   if (week[j].schedule_week == 3 && week[j].schedule_type == 1) {
-                    list[i].shangwu2 = week[j].name+" "+week[i].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[i].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[i].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[i].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[i].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[i].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[i].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[i].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[i].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[i].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[i].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[i].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[i].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[i].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[i].dialysis_machine_name
+                    list[i].wanshang6 = week[j].name+" "+week[j].dialysis_machine_name
                   }
                 }
 
                 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[i].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[i].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[i].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[i].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[i].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[i].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[i].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[i].dialysis_machine_name
+                    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[i].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[i].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[i].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[i].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[i].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[i].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[i].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[i].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[i].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[i].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[i].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[i].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[i].dialysis_machine_name
+                    list[i].wanshang13 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
                   }
                 }
 
                 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[i].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[i].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[i].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[i].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[i].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[i].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[i].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[i].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[i].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[i].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[i].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[i].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[i].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[i].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[i].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[i].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[i].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[i].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[i].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[i].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[i].dialysis_machine_name
+                    list[i].wanshang20 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
                   }
                 }
 

src/xt_pages/workforce/printOne.vue

         for (let i = 0; i < arr.length; i++) {
           arr[i].name = this.nameSplit(arr[i].name)
           if (this.hiddenFlag) {
-            str += arr[i].name + '&nbsp&nbsp&nbsp&nbsp'
+            str += arr[i].name + '&nbsp&nbsp&nbsp&nbsp '
           } else {
             str += arr[i].name + '(' + '上次床位:' + arr[i].order.DeviceNumber.zone.name + '-' + arr[i].order.DeviceNumber.number + '  ' + '血管通路:' + this.getBloodAccess(arr[i].order.blood_access_id) + '  ' + '排班备注:' + arr[i].order.schedule_remark + ')<br/>'
           }